svn commit: r393550 - in head/sysutils/rsyslog8: . files
Matthew Seaman
matthew at FreeBSD.org
Tue Aug 4 20:29:33 UTC 2015
Author: matthew
Date: Tue Aug 4 20:29:28 2015
New Revision: 393550
URL: https://svnweb.freebsd.org/changeset/ports/393550
Log:
* Update to 8.11.0
- Upstream has incorporated one part of the patches to runtime/stream.c
- regenerate patches with 'make makepatch'
* Modernize port
- Use OPTION helpers
- USE_AUTOTOOLS -> USES+= autoreconf
* Set INSTALL_TARGET=install-strip rather than stripping in post-install:
- Previously optional modules wouldn't have been stripped
* Update pkg-message.in to use the now standard 'Rainier script' configuration
file syntax (http://www.rsyslog.com/doc/rainerscript.html).
* Add new option to enable the mmnormalize module. (http://www.rsyslog.com/doc/v8-stable/configuration/modules/mmnormalize.html)
This enables converting some not-standard log formats to RFC3164 or
RFC5424 styles, amongst other possible transformations.
* Tweak PORTSCOUT setting
PR: 202080
Approved by: brd (maintainer)
Modified:
head/sysutils/rsyslog8/Makefile
head/sysutils/rsyslog8/distinfo
head/sysutils/rsyslog8/files/patch-grammar_rainerscript.c
head/sysutils/rsyslog8/files/patch-plugins__mmexternal__mmexternal.c
head/sysutils/rsyslog8/files/patch-plugins__omprog__omprog.c
head/sysutils/rsyslog8/files/patch-plugins_imfile_imfile.c
head/sysutils/rsyslog8/files/patch-plugins_impstats_impstats.c
head/sysutils/rsyslog8/files/patch-runtime_nsd__ptcp.c
head/sysutils/rsyslog8/files/patch-runtime_stream.c
head/sysutils/rsyslog8/files/pkg-message.in
Modified: head/sysutils/rsyslog8/Makefile
==============================================================================
--- head/sysutils/rsyslog8/Makefile Tue Aug 4 20:07:40 2015 (r393549)
+++ head/sysutils/rsyslog8/Makefile Tue Aug 4 20:29:28 2015 (r393550)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= rsyslog
-PORTVERSION= 8.10.0
+PORTVERSION= 8.11.0
CATEGORIES= sysutils
MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/
@@ -18,12 +18,12 @@ LIB_DEPENDS= libee.so:${PORTSDIR}/devel/
libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
USE_LDCONFIG= yes
-USE_AUTOTOOLS= autoconf
-PORTSCOUT= limit:^8\.8
+PORTSCOUT= limit:^8\.
PKGNAMESUFFIX= 8
-OPTIONS_DEFINE= DBI DOCS GNUTLS GSSAPI MYSQL PGSQL RELP SNMP
+OPTIONS_DEFINE= DBI DOCS GNUTLS GSSAPI MYSQL PGSQL RELP SNMP \
+ NORMALIZE
DBI_DESC= LibDBI output module for rsyslog
GNUTLS_DESC= GNUTLS module for rsyslog
@@ -32,69 +32,46 @@ MYSQL_DESC= MySQL output module for rsys
PGSQL_DESC= PostgreSQL output module for rsyslog
RELP_DESC= RELP input/output module for rsyslog
SNMP_DESC= SNMP trap sender for rsyslog
+NORMALIZE_DESC= Message normalization module for rsyslog
-USES= libtool pkgconfig
+USES= libtool pkgconfig autoreconf
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDBI}
-LIB_DEPENDS+= libdbi.so:${PORTSDIR}/databases/libdbi
-CONFIGURE_ARGS+=--enable-libdbi
-PLIST_FILES+= lib/rsyslog/omlibdbi.so
-.else
-CONFIGURE_ARGS+=--disable-libdbi
-.endif
-
-.if ${PORT_OPTIONS:MGNUTLS}
-LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls \
- libgcrypt.so:${PORTSDIR}/security/libgcrypt
-CONFIGURE_ARGS+=--enable-gnutls
-PLIST_FILES+= lib/rsyslog/lmnsd_gtls.so
-.else
-CONFIGURE_ARGS+=--disable-gnutls
-.endif
-
-.if ${PORT_OPTIONS:MGSSAPI}
-CONFIGURE_ARGS+=--enable-gssapi-krb5
-PLIST_FILES+= lib/rsyslog/imgssapi.so \
- lib/rsyslog/lmgssutil.so \
- lib/rsyslog/omgssapi.so
-.else
-CONFIGURE_ARGS+=--disable-gssapi-krb5
-.endif
-
-.if ${PORT_OPTIONS:MMYSQL}
-USE_MYSQL= yes
-CONFIGURE_ARGS+=--enable-mysql
-PLIST_FILES+= lib/rsyslog/ommysql.so
-.else
-CONFIGURE_ARGS+=--disable-mysql
-.endif
-
-.if ${PORT_OPTIONS:MPGSQL}
-USES+= pgsql
-CONFIGURE_ARGS+=--enable-pgsql
-PLIST_FILES+= lib/rsyslog/ompgsql.so
-.else
-CONFIGURE_ARGS+=--disable-pgsql
-.endif
-
-.if ${PORT_OPTIONS:MRELP}
-LIB_DEPENDS+= librelp.so:${PORTSDIR}/devel/librelp
-CONFIGURE_ARGS+=--enable-relp
-PLIST_FILES+= lib/rsyslog/imrelp.so \
- lib/rsyslog/omrelp.so
-.else
-CONFIGURE_ARGS+=--disable-relp
-.endif
+DBI_LIB_DEPENDS= libdbi.so:${PORTSDIR}/databases/libdbi
+DBI_CONFIGURE_ENABLE= libdbi
+DBI_PLIST_FILES= lib/rsyslog/omlibdbi.so
+
+GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \
+ libgcrypt.so:${PORTSDIR}/security/libgcrypt
+GNUTLS_CONFIGURE_ENABLE=gnutls
+GNUTLS_PLIST_FILES= lib/rsyslog/lmnsd_gtls.so
+
+GSSAPI_CONFIGURE_ENABLE=gssapi-krb5
+GSSAPI_PLIST_FILES= lib/rsyslog/imgssapi.so \
+ lib/rsyslog/lmgssutil.so \
+ lib/rsyslog/omgssapi.so
+
+MYSQL_USE= MYSQL=yes
+MYSQL_CONFIGURE_ENABLE= mysql
+MYSQL_PLIST_FILES= lib/rsyslog/ommysql.so
+
+PGSQL_USES= pgsql
+PGSQL_CONFIGURE_ENABLE= pgsql
+PGSQL_PLIST_FILES= lib/rsyslog/ompgsql.so
+
+RELP_LIB_DEPENDS= librelp.so:${PORTSDIR}/devel/librelp
+RELP_CONFIGURE_ENABLE= relp
+RELP_PLIST_FILES= lib/rsyslog/imrelp.so \
+ lib/rsyslog/omrelp.so
+
+SNMP_LIB_DEPENDS= libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
+SNMP_CONFIGURE_ENABLE= snmp
+SNMP_PLIST_FILES= lib/rsyslog/omsnmp.so
+
+NORMALIZE_LIB_DEPENDS= liblognorm.so:${PORTSDIR}/devel/liblognorm
+NORMALIZE_CONFIGURE_ENABLE= mmnormalize
+NORMALIZE_PLIST_FILES= lib/rsyslog/mmnormalize.so
-.if ${PORT_OPTIONS:MSNMP}
-LIB_DEPENDS+= libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
-CONFIGURE_ARGS+=--enable-snmp
-PLIST_FILES+= lib/rsyslog/omsnmp.so
-.else
-CONFIGURE_ARGS+=--disable-snmp
-.endif
+.include <bsd.port.options.mk>
.ifdef WITH_MYSQL_MICROSECONDS
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-mysql-microseconds
@@ -109,6 +86,7 @@ CFLAGS+= -I${LOCALBASE}/include
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
GNU_CONFIGURE= yes
+INSTALL_TARGET= install-strip
.ifdef WITH_DEBUG
CONFIGURE_ARGS+=--enable-rtinst --enable-debug
@@ -136,9 +114,4 @@ post-patch:
@${REINPLACE_CMD} -e 's,/lib/rsyslog,${PREFIX}/lib/rsyslog,' ${WRKSRC}/tools/syslogd.c
@${FIND} ${WRKSRC} -name '*.bak' -delete
-post-install:
-.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
-
.include <bsd.port.post.mk>
Modified: head/sysutils/rsyslog8/distinfo
==============================================================================
--- head/sysutils/rsyslog8/distinfo Tue Aug 4 20:07:40 2015 (r393549)
+++ head/sysutils/rsyslog8/distinfo Tue Aug 4 20:29:28 2015 (r393550)
@@ -1,2 +1,2 @@
-SHA256 (rsyslog-8.10.0.tar.gz) = b92df3f367108219e2fffccd463bf49d75cb8ab3ceaa52e9789f85eace066912
-SIZE (rsyslog-8.10.0.tar.gz) = 2013205
+SHA256 (rsyslog-8.11.0.tar.gz) = bc64d8ba1e3fb8cfe21eadd5fb0938381bb37ed72cef9d6f14d376d2bac9bf78
+SIZE (rsyslog-8.11.0.tar.gz) = 2060890
Modified: head/sysutils/rsyslog8/files/patch-grammar_rainerscript.c
==============================================================================
--- head/sysutils/rsyslog8/files/patch-grammar_rainerscript.c Tue Aug 4 20:07:40 2015 (r393549)
+++ head/sysutils/rsyslog8/files/patch-grammar_rainerscript.c Tue Aug 4 20:29:28 2015 (r393550)
@@ -1,6 +1,6 @@
---- grammar/rainerscript.c.orig 2014-12-02 10:15:16 UTC
+--- grammar/rainerscript.c.orig 2015-06-30 12:26:24 UTC
+++ grammar/rainerscript.c
-@@ -34,6 +34,7 @@
+@@ -35,6 +35,7 @@
#include <sys/stat.h>
#include <sys/types.h>
#include <libestr.h>
Modified: head/sysutils/rsyslog8/files/patch-plugins__mmexternal__mmexternal.c
==============================================================================
--- head/sysutils/rsyslog8/files/patch-plugins__mmexternal__mmexternal.c Tue Aug 4 20:07:40 2015 (r393549)
+++ head/sysutils/rsyslog8/files/patch-plugins__mmexternal__mmexternal.c Tue Aug 4 20:29:28 2015 (r393550)
@@ -1,4 +1,4 @@
---- plugins/mmexternal/mmexternal.c.orig 2014-11-25 15:45:35 UTC
+--- plugins/mmexternal/mmexternal.c.orig 2015-04-30 08:50:16 UTC
+++ plugins/mmexternal/mmexternal.c
@@ -31,7 +31,7 @@
#include <errno.h>
Modified: head/sysutils/rsyslog8/files/patch-plugins__omprog__omprog.c
==============================================================================
--- head/sysutils/rsyslog8/files/patch-plugins__omprog__omprog.c Tue Aug 4 20:07:40 2015 (r393549)
+++ head/sysutils/rsyslog8/files/patch-plugins__omprog__omprog.c Tue Aug 4 20:29:28 2015 (r393550)
@@ -1,4 +1,4 @@
---- plugins/omprog/omprog.c.orig 2014-11-25 15:45:35 UTC
+--- plugins/omprog/omprog.c.orig 2015-04-30 08:50:16 UTC
+++ plugins/omprog/omprog.c
@@ -36,7 +36,7 @@
#include <errno.h>
Modified: head/sysutils/rsyslog8/files/patch-plugins_imfile_imfile.c
==============================================================================
--- head/sysutils/rsyslog8/files/patch-plugins_imfile_imfile.c Tue Aug 4 20:07:40 2015 (r393549)
+++ head/sysutils/rsyslog8/files/patch-plugins_imfile_imfile.c Tue Aug 4 20:29:28 2015 (r393550)
@@ -1,4 +1,4 @@
---- plugins/imfile/imfile.c.orig 2015-05-19 08:53:40 UTC
+--- plugins/imfile/imfile.c.orig 2015-06-30 12:26:24 UTC
+++ plugins/imfile/imfile.c
@@ -1869,12 +1869,14 @@ CODESTARTmodExit
objRelease(errmsg, CORE_COMPONENT);
Modified: head/sysutils/rsyslog8/files/patch-plugins_impstats_impstats.c
==============================================================================
--- head/sysutils/rsyslog8/files/patch-plugins_impstats_impstats.c Tue Aug 4 20:07:40 2015 (r393549)
+++ head/sysutils/rsyslog8/files/patch-plugins_impstats_impstats.c Tue Aug 4 20:29:28 2015 (r393550)
@@ -1,6 +1,6 @@
---- plugins/impstats/impstats.c.orig 2014-12-10 15:46:20 UTC
+--- plugins/impstats/impstats.c.orig 2015-04-30 08:50:15 UTC
+++ plugins/impstats/impstats.c
-@@ -35,6 +35,7 @@
+@@ -36,6 +36,7 @@
#include <errno.h>
#include <sys/time.h>
#include <sys/resource.h>
Modified: head/sysutils/rsyslog8/files/patch-runtime_nsd__ptcp.c
==============================================================================
--- head/sysutils/rsyslog8/files/patch-runtime_nsd__ptcp.c Tue Aug 4 20:07:40 2015 (r393549)
+++ head/sysutils/rsyslog8/files/patch-runtime_nsd__ptcp.c Tue Aug 4 20:29:28 2015 (r393550)
@@ -1,4 +1,4 @@
---- runtime/nsd_ptcp.c.orig 2015-01-13 22:06:22 UTC
+--- runtime/nsd_ptcp.c.orig 2015-04-30 08:50:16 UTC
+++ runtime/nsd_ptcp.c
@@ -656,7 +656,11 @@ EnableKeepAlive(nsd_t *pNsd)
if(pThis->iKeepAliveProbes > 0) {
Modified: head/sysutils/rsyslog8/files/patch-runtime_stream.c
==============================================================================
--- head/sysutils/rsyslog8/files/patch-runtime_stream.c Tue Aug 4 20:07:40 2015 (r393549)
+++ head/sysutils/rsyslog8/files/patch-runtime_stream.c Tue Aug 4 20:29:28 2015 (r393550)
@@ -1,15 +1,6 @@
---- runtime/stream.c.orig 2015-05-19 08:53:40 UTC
+--- runtime/stream.c.orig 2015-06-30 12:26:24 UTC
+++ runtime/stream.c
-@@ -1063,7 +1063,7 @@ tryTTYRecover(strm_t *pThis, int err)
- {
- DEFiRet;
- ISOBJ_TYPE_assert(pThis, strm);
-- if(err == ERR_TTYHUP) {
-+ if(err == ERR_TTYHUP || err == ENXIO) {
- close(pThis->fd);
- CHKiRet(doPhysOpen(pThis));
- }
-@@ -1089,12 +1089,30 @@ doWriteCall(strm_t *pThis, uchar *pBuf,
+@@ -1097,12 +1097,30 @@ doWriteCall(strm_t *pThis, uchar *pBuf,
char *pWriteBuf;
DEFiRet;
ISOBJ_TYPE_assert(pThis, strm);
Modified: head/sysutils/rsyslog8/files/pkg-message.in
==============================================================================
--- head/sysutils/rsyslog8/files/pkg-message.in Tue Aug 4 20:07:40 2015 (r393549)
+++ head/sysutils/rsyslog8/files/pkg-message.in Tue Aug 4 20:29:28 2015 (r393550)
@@ -14,9 +14,9 @@ this:
Add the following (3) lines to the beginning of the config file, for
basic functionality:
- $ModLoad immark.so # provides --MARK-- message capability
- $ModLoad imuxsock.so # provides support for local system logging
- $ModLoad imklog.so # kernel logging
+ module(load="immark") # provides --MARK-- message capability
+ module(load="imuxsock") # provides support for local system logging
+ module(load="imklog") # kernel logging
newsyslog(8) has the path of syslogd's pid file hardcoded. To
make it work seamlessly with rsyslog, add this:
More information about the svn-ports-all
mailing list