Author: brd (doc committer)
Date: Tue Jan 1 04:04:16 2013
New Revision: 309770
URL: http://svnweb.freebsd.org/changeset/ports/309770
Log:
- Update to 6.6.0 [1]
- Fix the CONFLICTS to behave better with pkgng
PR: 174648 [1]
Submitted by: Cristiano Rolim Pereira <cristianorolim at outlook.com>
Modified:
head/sysutils/rsyslog6/Makefile
head/sysutils/rsyslog6/distinfo
head/sysutils/rsyslog6/files/pkg-message.in
head/sysutils/rsyslog6/pkg-plist
Modified: head/sysutils/rsyslog6/Makefile
==============================================================================
--- head/sysutils/rsyslog6/Makefile Mon Dec 31 17:42:31 2012 (r309769)
+++ head/sysutils/rsyslog6/Makefile Tue Jan 1 04:04:16 2013 (r309770)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= rsyslog
-PORTVERSION= 6.4.2
+PORTVERSION= 6.6.0
PORTREVISION?= 0
CATEGORIES= sysutils
MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/
@@ -16,7 +16,9 @@ USE_LDCONFIG= yes
LIB_DEPENDS+= ee:${PORTSDIR}/devel/libee \
estr:${PORTSDIR}/devel/libestr \
- sysinfo:${PORTSDIR}/devel/libsysinfo
+ sysinfo:${PORTSDIR}/devel/libsysinfo \
+ json:${PORTSDIR}/devel/json-c/ \
+ uuid:${PORTSDIR}/misc/e2fsprogs-libuuid
.ifdef MNAME
RUN_DEPENDS= rsyslog>=${PORTVERSION}:${PORTSDIR}/sysutils/rsyslog6
@@ -36,7 +38,7 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-sane-hostname
.endif
-CONFLICTS= rsyslog-[!6].[0-9]*
+CONFLICTS= rsyslog-[57].[0-9]*
CFLAGS+= -I${LOCALBASE}/include
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
@@ -62,7 +64,7 @@ MAN5= rsyslog.conf.5
USE_RC_SUBR= ${PORTNAME}d
SUB_FILES= pkg-message
-CONFIGURE_ARGS+= --enable-imfile --enable-mail --enable-imtemplate --enable-testbench=no
+CONFIGURE_ARGS+= --enable-imfile --enable-mail --enable-imdiag --enable-impstats --enable-omstdout
post-patch:
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
@@ -88,7 +90,7 @@ post-install:
.ifdef MNAME
-CONFIGURE_ARGS+= --disable-rsyslogd --disable-klog
+CONFIGURE_ARGS+= --disable-rsyslogd --disable-klog --disable-testbench --disable-omruleset
DESCR?= ${.CURDIR}/../rsyslog6/pkg-descr
DISTINFO_FILE?= ${.CURDIR}/../rsyslog6/distinfo
Modified: head/sysutils/rsyslog6/distinfo
==============================================================================
--- head/sysutils/rsyslog6/distinfo Mon Dec 31 17:42:31 2012 (r309769)
+++ head/sysutils/rsyslog6/distinfo Tue Jan 1 04:04:16 2013 (r309770)
@@ -1,2 +1,2 @@
-SHA256 (rsyslog-6.4.2.tar.gz) = ca92434c87f7390a5ea7ce6aea94c6cb05474bf778ec5d8ebc0b9a50f321749c
-SIZE (rsyslog-6.4.2.tar.gz) = 2518961
+SHA256 (rsyslog-6.6.0.tar.gz) = 80aabccf5945d7e26152a2ad29100e147d1fecb300397dc4ccda41acaf2ec33d
+SIZE (rsyslog-6.6.0.tar.gz) = 2672981
Modified: head/sysutils/rsyslog6/files/pkg-message.in
==============================================================================
--- head/sysutils/rsyslog6/files/pkg-message.in Mon Dec 31 17:42:31 2012 (r309769)
+++ head/sysutils/rsyslog6/files/pkg-message.in Tue Jan 1 04:04:16 2013 (r309770)
@@ -5,11 +5,6 @@ add the following lines to rc.conf(5):
syslogd_enable="NO"
rsyslogd_enable="YES"
-To avoid warnings about rsyslogd running in compatibility mode, add
-this:
-
- rsyslogd_flags="-c5"
-
It's recommended to copy syslog.conf(5) to
%%PREFIX%%/etc/rsyslog.conf and edit it there. Otherwise add
this:
Modified: head/sysutils/rsyslog6/pkg-plist
==============================================================================
--- head/sysutils/rsyslog6/pkg-plist Mon Dec 31 17:42:31 2012 (r309769)
+++ head/sysutils/rsyslog6/pkg-plist Tue Jan 1 04:04:16 2013 (r309770)
@@ -1,9 +1,13 @@
+lib/rsyslog/imdiag.la
+lib/rsyslog/imdiag.so
lib/rsyslog/imfile.la
lib/rsyslog/imfile.so
lib/rsyslog/imklog.la
lib/rsyslog/imklog.so
lib/rsyslog/immark.la
lib/rsyslog/immark.so
+lib/rsyslog/impstats.la
+lib/rsyslog/impstats.so
lib/rsyslog/imtcp.la
lib/rsyslog/imtcp.so
lib/rsyslog/imudp.la
@@ -30,6 +34,8 @@ lib/rsyslog/ommail.la
lib/rsyslog/ommail.so
lib/rsyslog/omruleset.la
lib/rsyslog/omruleset.so
+lib/rsyslog/omstdout.la
+lib/rsyslog/omstdout.so
lib/rsyslog/omtesting.la
lib/rsyslog/omtesting.so
sbin/rsyslogd
@@ -37,10 +43,12 @@ sbin/rsyslogd
%%PORTDOCS%%%%DOCSDIR%%/build_from_repo.html
%%PORTDOCS%%%%DOCSDIR%%/contributors.html
%%PORTDOCS%%%%DOCSDIR%%/debug.html
+%%PORTDOCS%%%%DOCSDIR%%/dev_oplugins.html
%%PORTDOCS%%%%DOCSDIR%%/dev_queue.html
%%PORTDOCS%%%%DOCSDIR%%/droppriv.html
%%PORTDOCS%%%%DOCSDIR%%/expression.html
%%PORTDOCS%%%%DOCSDIR%%/features.html
+%%PORTDOCS%%%%DOCSDIR%%/free_support.html
%%PORTDOCS%%%%DOCSDIR%%/generic_design.html
%%PORTDOCS%%%%DOCSDIR%%/gssapi.html
%%PORTDOCS%%%%DOCSDIR%%/history.html
@@ -54,6 +62,7 @@ sbin/rsyslogd
%%PORTDOCS%%%%DOCSDIR%%/imrelp.html
%%PORTDOCS%%%%DOCSDIR%%/imsolaris.html
%%PORTDOCS%%%%DOCSDIR%%/imtcp.html
+%%PORTDOCS%%%%DOCSDIR%%/imudp.html
%%PORTDOCS%%%%DOCSDIR%%/imuxsock.html
%%PORTDOCS%%%%DOCSDIR%%/index.html
%%PORTDOCS%%%%DOCSDIR%%/install.html
@@ -61,6 +70,7 @@ sbin/rsyslogd
%%PORTDOCS%%%%DOCSDIR%%/licensing.html
%%PORTDOCS%%%%DOCSDIR%%/log_rotation_fix_size.html
%%PORTDOCS%%%%DOCSDIR%%/manual.html
+%%PORTDOCS%%%%DOCSDIR%%/messageparser.html
%%PORTDOCS%%%%DOCSDIR%%/mmnormalize.html
%%PORTDOCS%%%%DOCSDIR%%/mmsnmptrapd.html
%%PORTDOCS%%%%DOCSDIR%%/modules.html
@@ -68,15 +78,21 @@ sbin/rsyslogd
%%PORTDOCS%%%%DOCSDIR%%/netstream.html
%%PORTDOCS%%%%DOCSDIR%%/ns_gtls.html
%%PORTDOCS%%%%DOCSDIR%%/ns_ptcp.html
+%%PORTDOCS%%%%DOCSDIR%%/omfile.html
+%%PORTDOCS%%%%DOCSDIR%%/omfwd.html
+%%PORTDOCS%%%%DOCSDIR%%/omhdfs.html
%%PORTDOCS%%%%DOCSDIR%%/omlibdbi.html
%%PORTDOCS%%%%DOCSDIR%%/ommail.html
%%PORTDOCS%%%%DOCSDIR%%/ommysql.html
%%PORTDOCS%%%%DOCSDIR%%/omoracle.html
+%%PORTDOCS%%%%DOCSDIR%%/ompipe.html
+%%PORTDOCS%%%%DOCSDIR%%/omprog.html
%%PORTDOCS%%%%DOCSDIR%%/omrelp.html
%%PORTDOCS%%%%DOCSDIR%%/omruleset.html
%%PORTDOCS%%%%DOCSDIR%%/omsnmp.html
%%PORTDOCS%%%%DOCSDIR%%/omstdout.html
%%PORTDOCS%%%%DOCSDIR%%/omudpspoof.html
+%%PORTDOCS%%%%DOCSDIR%%/omusrmsg.html
%%PORTDOCS%%%%DOCSDIR%%/omuxsock.html
%%PORTDOCS%%%%DOCSDIR%%/pmlastmsg.html
%%PORTDOCS%%%%DOCSDIR%%/property_replacer.html
@@ -85,6 +101,7 @@ sbin/rsyslogd
%%PORTDOCS%%%%DOCSDIR%%/queues.html
%%PORTDOCS%%%%DOCSDIR%%/queues_analogy.html
%%PORTDOCS%%%%DOCSDIR%%/rainerscript.html
+%%PORTDOCS%%%%DOCSDIR%%/rsconf1_abortonuncleanconfig.html
%%PORTDOCS%%%%DOCSDIR%%/rsconf1_actionexeconlywhenpreviousissuspended.html
%%PORTDOCS%%%%DOCSDIR%%/rsconf1_actionresumeinterval.html
%%PORTDOCS%%%%DOCSDIR%%/rsconf1_allowedsender.html
@@ -111,8 +128,10 @@ sbin/rsyslogd
%%PORTDOCS%%%%DOCSDIR%%/rsconf1_includeconfig.html
%%PORTDOCS%%%%DOCSDIR%%/rsconf1_mainmsgqueuesize.html
%%PORTDOCS%%%%DOCSDIR%%/rsconf1_markmessageperiod.html
+%%PORTDOCS%%%%DOCSDIR%%/rsconf1_maxopenfiles.html
%%PORTDOCS%%%%DOCSDIR%%/rsconf1_moddir.html
%%PORTDOCS%%%%DOCSDIR%%/rsconf1_modload.html
+%%PORTDOCS%%%%DOCSDIR%%/rsconf1_omfileforcechown.html
%%PORTDOCS%%%%DOCSDIR%%/rsconf1_repeatedmsgreduction.html
%%PORTDOCS%%%%DOCSDIR%%/rsconf1_resetconfigvariables.html
%%PORTDOCS%%%%DOCSDIR%%/rsconf1_rulesetcreatemainqueue.html
@@ -122,8 +141,10 @@ sbin/rsyslogd
%%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf.html
%%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf_actions.html
%%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf_examples.html
+%%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf_file_syntax_differences.html
%%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf_filter.html
%%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf_global.html
+%%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf_lines.html
%%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf_modules.html
%%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf_nomatch.html
%%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf_output.html
@@ -156,6 +177,7 @@ sbin/rsyslogd
%%PORTDOCS%%%%DOCSDIR%%/v3compatibility.html
%%PORTDOCS%%%%DOCSDIR%%/v4compatibility.html
%%PORTDOCS%%%%DOCSDIR%%/v5compatibility.html
+%%PORTDOCS%%%%DOCSDIR%%/v6compatibility.html
%%PORTDOCS%%%%DOCSDIR%%/version_naming.html
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rsyslog-example.conf
%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%