diff options
author | Brad Davis <brd@FreeBSD.org> | 2014-12-17 22:07:53 +0000 |
---|---|---|
committer | Brad Davis <brd@FreeBSD.org> | 2014-12-17 22:07:53 +0000 |
commit | c72bec751e839caa9eef0f7eca96b362471ad210 (patch) | |
tree | 3f5370b49925fe5af41b7c950b42558c215ae2c8 /sysutils/rsyslog8 | |
parent | e8184547fefe6c30d3ad2a3e1be7e44af98fdb25 (diff) | |
download | ports-c72bec751e839caa9eef0f7eca96b362471ad210.tar.gz ports-c72bec751e839caa9eef0f7eca96b362471ad210.zip |
Notes
Diffstat (limited to 'sysutils/rsyslog8')
-rw-r--r-- | sysutils/rsyslog8/Makefile | 18 | ||||
-rw-r--r-- | sysutils/rsyslog8/distinfo | 4 | ||||
-rw-r--r-- | sysutils/rsyslog8/files/patch-grammar_rainerscript.c | 10 | ||||
-rw-r--r-- | sysutils/rsyslog8/files/patch-plugins__mmexternal__mmexternal.c | 2 | ||||
-rw-r--r-- | sysutils/rsyslog8/files/patch-plugins__omprog__omprog.c | 4 | ||||
-rw-r--r-- | sysutils/rsyslog8/files/patch-plugins_impstats_impstats.c | 10 | ||||
-rw-r--r-- | sysutils/rsyslog8/files/patch-tools_rsyslogd.c | 10 | ||||
-rw-r--r-- | sysutils/rsyslog8/pkg-plist | 2 |
8 files changed, 41 insertions, 19 deletions
diff --git a/sysutils/rsyslog8/Makefile b/sysutils/rsyslog8/Makefile index 014efc5aa6da..67ba4a88349e 100644 --- a/sysutils/rsyslog8/Makefile +++ b/sysutils/rsyslog8/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= rsyslog -PORTVERSION= 8.4.2 -PORTREVISION= 1 +PORTVERSION= 8.6.0 CATEGORIES= sysutils MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/ @@ -24,7 +23,7 @@ USE_AUTOTOOLS= autoconf PORTSCOUT= limit:^8\.2 PKGNAMESUFFIX= 8 -OPTIONS_DEFINE= DBI DOCS GNUTLS GSSAPI MYSQL PGSQL RELP RFC3195 SNMP +OPTIONS_DEFINE= DBI DOCS GNUTLS GSSAPI MYSQL PGSQL RELP SNMP DBI_DESC= LibDBI output module for rsyslog GNUTLS_DESC= GNUTLS module for rsyslog @@ -32,7 +31,6 @@ GSSAPI_DESC= GSS API input/output module for rsyslog MYSQL_DESC= MySQL output module for rsyslog PGSQL_DESC= PostgreSQL output module for rsyslog RELP_DESC= RELP input/output module for rsyslog -RFC3195_DESC= RFC3195 input support for rsyslog SNMP_DESC= SNMP trap sender for rsyslog USES= libtool pkgconfig @@ -90,14 +88,6 @@ PLIST_FILES+= lib/rsyslog/imrelp.so \ CONFIGURE_ARGS+=--disable-relp .endif -.if ${PORT_OPTIONS:MRFC3195} -LIB_DEPENDS+= liblogging.so:${PORTSDIR}/devel/liblogging -CONFIGURE_ARGS+=--enable-rfc3195 -PLIST_FILES+= lib/rsyslog/im3195.so -.else -CONFIGURE_ARGS+=--disable-rfc3195 -.endif - .if ${PORT_OPTIONS:MSNMP} LIB_DEPENDS+= libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp CONFIGURE_ARGS+=--enable-snmp @@ -136,7 +126,7 @@ CFLAGS+= ${CPPFLAGS} USE_RC_SUBR= ${PORTNAME}d SUB_FILES= pkg-message -CONFIGURE_ARGS+= --enable-cached-man-pages --enable-imdiag --enable-imfile --enable-impstats --enable-mail --enable-omprog --enable-omstdout --disable-testbench +CONFIGURE_ARGS+= --enable-cached-man-pages --enable-imdiag --enable-imfile --enable-impstats --enable-mail --enable-omprog --enable-omstdout --enable-omuxsock --enable-rfc3195 --disable-testbench post-patch: @${REINPLACE_CMD} -e 's|/lib/rsyslog/|${PREFIX}/lib/rsyslog/|'\ @@ -147,7 +137,7 @@ post-patch: @${FIND} ${WRKSRC} -name '*.bak' -delete post-install: -.for l in imdiag imfile imklog immark impstats imtcp imudp imuxsock lmcry_gcry lmnet lmnetstrms lmnsd_ptcp lmregexp lmstrmsrv lmtcpclt lmtcpsrv lmzlibw mmexternal ommail omprog omstdout omtesting +.for l in im3195 imdiag imfile imklog immark impstats imtcp imudp imuxsock lmcry_gcry lmnet lmnetstrms lmnsd_ptcp lmregexp lmstrmsrv lmtcpclt lmtcpsrv lmzlibw mmexternal ommail omprog omstdout omtesting omuxsock ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/rsyslog/${l}.so .endfor diff --git a/sysutils/rsyslog8/distinfo b/sysutils/rsyslog8/distinfo index b2ed7ab8a680..5f371007a039 100644 --- a/sysutils/rsyslog8/distinfo +++ b/sysutils/rsyslog8/distinfo @@ -1,2 +1,2 @@ -SHA256 (rsyslog-8.4.2.tar.gz) = 71c3c6dac74fba2692f9fefb092cd3d22e2bd71eb702e0da06648de51b8b7b9a -SIZE (rsyslog-8.4.2.tar.gz) = 1938563 +SHA256 (rsyslog-8.6.0.tar.gz) = 759f836be460c794a7649f2b5b5ef8d423388ec599bf3b49f51fded3f8c02431 +SIZE (rsyslog-8.6.0.tar.gz) = 1975854 diff --git a/sysutils/rsyslog8/files/patch-grammar_rainerscript.c b/sysutils/rsyslog8/files/patch-grammar_rainerscript.c new file mode 100644 index 000000000000..f061df0641f1 --- /dev/null +++ b/sysutils/rsyslog8/files/patch-grammar_rainerscript.c @@ -0,0 +1,10 @@ +--- grammar/rainerscript.c.orig 2014-12-02 10:15:16 UTC ++++ grammar/rainerscript.c +@@ -34,6 +34,7 @@ + #include <sys/stat.h> + #include <sys/types.h> + #include <libestr.h> ++#include <unistd.h> + #include "rsyslog.h" + #include "rainerscript.h" + #include "conf.h" diff --git a/sysutils/rsyslog8/files/patch-plugins__mmexternal__mmexternal.c b/sysutils/rsyslog8/files/patch-plugins__mmexternal__mmexternal.c index 4393552aef9f..8a1a7a170c58 100644 --- a/sysutils/rsyslog8/files/patch-plugins__mmexternal__mmexternal.c +++ b/sysutils/rsyslog8/files/patch-plugins__mmexternal__mmexternal.c @@ -1,4 +1,4 @@ ---- plugins/mmexternal/mmexternal.c.orig 2014-09-30 16:57:35 UTC +--- plugins/mmexternal/mmexternal.c.orig 2014-11-25 15:45:35 UTC +++ plugins/mmexternal/mmexternal.c @@ -31,7 +31,7 @@ #include <errno.h> diff --git a/sysutils/rsyslog8/files/patch-plugins__omprog__omprog.c b/sysutils/rsyslog8/files/patch-plugins__omprog__omprog.c index 6172284f0538..d0bbe115ad21 100644 --- a/sysutils/rsyslog8/files/patch-plugins__omprog__omprog.c +++ b/sysutils/rsyslog8/files/patch-plugins__omprog__omprog.c @@ -1,5 +1,5 @@ ---- plugins/omprog/omprog.c.orig 2014-11-15 15:26:55.633028880 -0600 -+++ plugins/omprog/omprog.c 2014-11-15 15:27:01.695054590 -0600 +--- plugins/omprog/omprog.c.orig 2014-11-25 15:45:35 UTC ++++ plugins/omprog/omprog.c @@ -36,7 +36,7 @@ #include <errno.h> #include <unistd.h> diff --git a/sysutils/rsyslog8/files/patch-plugins_impstats_impstats.c b/sysutils/rsyslog8/files/patch-plugins_impstats_impstats.c new file mode 100644 index 000000000000..42d7c3b3b616 --- /dev/null +++ b/sysutils/rsyslog8/files/patch-plugins_impstats_impstats.c @@ -0,0 +1,10 @@ +--- plugins/impstats/impstats.c.orig 2014-12-10 15:46:20 UTC ++++ plugins/impstats/impstats.c +@@ -35,6 +35,7 @@ + #include <errno.h> + #include <sys/time.h> + #include <sys/resource.h> ++#include <unistd.h> + + #include "dirty.h" + #include "cfsysline.h" diff --git a/sysutils/rsyslog8/files/patch-tools_rsyslogd.c b/sysutils/rsyslog8/files/patch-tools_rsyslogd.c new file mode 100644 index 000000000000..75439dc6ce31 --- /dev/null +++ b/sysutils/rsyslog8/files/patch-tools_rsyslogd.c @@ -0,0 +1,10 @@ +--- tools/rsyslogd.c.orig 2014-12-10 15:46:03 UTC ++++ tools/rsyslogd.c +@@ -32,6 +32,7 @@ + #else + # include <sys/errno.h> + #endif ++#include <unistd.h> + #include "sd-daemon.h" + + #include "wti.h" diff --git a/sysutils/rsyslog8/pkg-plist b/sysutils/rsyslog8/pkg-plist index 34ea12a7a9a4..75c2d2a40cd0 100644 --- a/sysutils/rsyslog8/pkg-plist +++ b/sysutils/rsyslog8/pkg-plist @@ -1,3 +1,4 @@ +lib/rsyslog/im3195.so lib/rsyslog/imdiag.so lib/rsyslog/imfile.so lib/rsyslog/imklog.so @@ -20,6 +21,7 @@ lib/rsyslog/ommail.so lib/rsyslog/omprog.so lib/rsyslog/omstdout.so lib/rsyslog/omtesting.so +lib/rsyslog/omuxsock.so man/man5/rsyslog.conf.5.gz man/man8/rsyslogd.8.gz sbin/rsyslogd |