Index: head/sysutils/rsyslog8/Makefile =================================================================== --- head/sysutils/rsyslog8/Makefile (revision 506320) +++ head/sysutils/rsyslog8/Makefile (revision 506321) @@ -1,170 +1,164 @@ # $FreeBSD$ PORTNAME= rsyslog -PORTVERSION= 8.1905.0 +PORTVERSION= 8.1907.0 CATEGORIES= sysutils MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/ MAINTAINER= matthew@FreeBSD.org COMMENT= Syslogd supporting SQL, TCP, and TLS LICENSE= GPLv3 LGPL3 APACHE20 LICENSE_COMB= multi LIB_DEPENDS= libee.so:devel/libee \ libestr.so:devel/libestr \ libfastjson.so:devel/libfastjson \ liblogging-rfc3195.so:devel/liblogging \ libuuid.so:misc/e2fsprogs-libuuid \ libcurl.so:ftp/curl BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${PY_FLAVOR} USES= libtool pkgconfig autoreconf python:env USE_LDCONFIG= yes PORTSCOUT= limit:^8\. OPTIONS_DEFINE= DBI DOCS ELASTIC GCRYPT GSSAPI HTTP JSONPARSE KAFKA \ MYSQL NORMALIZE PGSQL RABBITMQ RELP SNMP OPTIONS_RADIO= SSLLIB OPTIONS_RADIO_SSLLIB= GNUTLS OPENSSL OPTIONS_DEFAULT=GCRYPT OPTIONS_SUB= yes DBI_DESC= LibDBI output module for rsyslog DBI_LIB_DEPENDS= libdbi.so:databases/libdbi DBI_CONFIGURE_ENABLE= libdbi DBI_PLIST_FILES= lib/rsyslog/omlibdbi.so ELASTIC_DESC= Elasticsearch module for rsyslog ELASTIC_CONFIGURE_ENABLE= elasticsearch ELASTIC_PLIST_FILES= lib/rsyslog/omelasticsearch.so GCRYPT_DESC= Enable support for encrypted logfiles GCRYPT_CONFIGURE_ENABLE=libgcrypt GCRYPT_LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ libgpg-error.so:security/libgpg-error GCRYPT_BUILD_DEPENDS= libgcrypt-config:security/libgcrypt GCRYPT_PLIST_FILES= lib/rsyslog/lmcry_gcry.so GNUTLS_DESC= GNUTLS module for rsyslog GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls GNUTLS_IMPLIES= GCRYPT GNUTLS_CONFIGURE_ENABLE=gnutls GNUTLS_PLIST_FILES= lib/rsyslog/lmnsd_gtls.so GSSAPI_DESC= GSS API input/output module for rsyslog GSSAPI_CONFIGURE_ENABLE=gssapi-krb5 GSSAPI_PLIST_FILES= lib/rsyslog/imgssapi.so \ lib/rsyslog/lmgssutil.so \ lib/rsyslog/omgssapi.so HTTP_DESC= HTTP output module for rsyslog HTTP_CONFIGURE_ENABLE= omhttp HTTP_PLIST_FILES= lib/rsyslog/omhttp.so JSONPARSE_DESC= JSONPARSE module for rsyslog JSONPARSE_CONFIGURE_ENABLE= mmjsonparse JSONPARSE_PLIST_FILES= lib/rsyslog/mmjsonparse.so KAFKA_DESC= Kafka input/output module for rsyslog KAFKA_LIB_DEPENDS= librdkafka.so:net/librdkafka KAFKA_CONFIGURE_ENABLE= imkafka omkafka KAFKA_PLIST_FILES= lib/rsyslog/imkafka.so \ lib/rsyslog/omkafka.so MYSQL_DESC= MySQL output module for rsyslog MYSQL_USES= mysql MYSQL_CONFIGURE_ENABLE= mysql MYSQL_PLIST_FILES= lib/rsyslog/ommysql.so MYSQL_PORTDOCS= plugins/ommysql/createDB.sql NORMALIZE_DESC= Message normalization module for rsyslog NORMALIZE_LIB_DEPENDS= liblognorm.so:devel/liblognorm NORMALIZE_CONFIGURE_ENABLE= mmnormalize NORMALIZE_PLIST_FILES= lib/rsyslog/mmnormalize.so OPENSSL_USES= ssl OPENSSL_CONFIGURE_ENABLE= openssl OPENSSL_CONFIGURE_ENV= OPENSSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" \ OPENSSL_CFLAGS="-I ${OPENSSLINC}" OPENSSL_PLIST_FILES= lib/rsyslog/lmnsd_ossl.so PGSQL_DESC= PostgreSQL output module for rsyslog PGSQL_USES= pgsql PGSQL_CONFIGURE_ENABLE= pgsql PGSQL_PLIST_FILES= lib/rsyslog/ompgsql.so PGSQL_PORTDOCS= plugins/ompgsql/createDB.sql RABBITMQ_DESC= RabbitMQ output module for rsyslog RABBITMQ_LIB_DEPENDS= librabbitmq.so:net/rabbitmq-c RABBITMQ_CONFIGURE_ENABLE= omrabbitmq RABBITMQ_PLIST_FILES= lib/rsyslog/omrabbitmq.so RELP_DESC= RELP input/output module for rsyslog RELP_LIB_DEPENDS= librelp.so:devel/librelp RELP_CONFIGURE_ENABLE= relp RELP_PLIST_FILES= lib/rsyslog/imrelp.so \ lib/rsyslog/omrelp.so SNMP_DESC= SNMP trap sender for rsyslog SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp SNMP_CONFIGURE_ENABLE= snmp SNMP_PLIST_FILES= lib/rsyslog/omsnmp.so .ifdef WITH_MYSQL_MICROSECONDS EXTRA_PATCHES+= ${FILESDIR}/extra-patch-mysql-microseconds .endif .ifdef WITH_SANE_HOSTNAME EXTRA_PATCHES+= ${FILESDIR}/extra-patch-sane-hostname .endif 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 .endif .include .if ${ARCH} == "i386" CPPFLAGS+=-march=i686 .endif CONFIGURE_ENV+= LIBESTR_CFLAGS="${CFLAGS}" LIBESTR_LIBS="${LDFLAGS} -lestr" LIBEE_CFLAGS="${CFLAGS}" LIBEE_LIBS="${LDFLAGS} -lee -lkvm" CFLAGS+= ${CPPFLAGS} USE_RC_SUBR= ${PORTNAME}d SUB_FILES= pkg-message CONFIGURE_ARGS+= --enable-imdiag --enable-imfile --enable-impstats \ --enable-mail --enable-omprog --enable-omstdout \ --enable-omuxsock --enable-rfc3195 --disable-testbench \ ac_cv_func_inotify_init=no ac_cv_header_sys_inotify_h=no - -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200061 -CONFIGURE_ARGS+= --enable-imuxsock-rfc5424 -.else -CONFIGURE_ARGS+= --disable-imuxsock-rfc5424 -.endif post-patch: @${REINPLACE_CMD} -e 's|/lib/rsyslog/|${PREFIX}/lib/rsyslog/|'\ ${WRKSRC}/tools/syslogd.c @${GREP} -rl '/etc/rsyslog.conf' ${WRKSRC}|${XARGS} ${REINPLACE_CMD} -e\ 's|/etc/rsyslog.conf|${PREFIX}/etc/rsyslog.conf|' @${REINPLACE_CMD} -e 's,/lib/rsyslog,${PREFIX}/lib/rsyslog,' ${WRKSRC}/tools/syslogd.c @${FIND} ${WRKSRC} -name '*.bak' -delete post-install-DOCS-on: .for SQL in ${PORTDOCS:M*.sql} @${MKDIR} ${STAGEDIR}${DOCSDIR}/${SQL:H} ${INSTALL_DATA} ${WRKSRC}/${SQL} ${STAGEDIR}${DOCSDIR}/${SQL} .endfor .include Index: head/sysutils/rsyslog8/distinfo =================================================================== --- head/sysutils/rsyslog8/distinfo (revision 506320) +++ head/sysutils/rsyslog8/distinfo (revision 506321) @@ -1,3 +1,3 @@ -TIMESTAMP = 1559113281 -SHA256 (rsyslog-8.1905.0.tar.gz) = 96bd4fab8d768fd6ad22d45e10b83e159b93df9bafcde1d582e1224f647116e4 -SIZE (rsyslog-8.1905.0.tar.gz) = 2911703 +TIMESTAMP = 1562702295 +SHA256 (rsyslog-8.1907.0.tar.gz) = eb27535ece93174ef6b551c88467d2c9cd826b62479625bb881a53d50b079fb5 +SIZE (rsyslog-8.1907.0.tar.gz) = 2926855 Index: head/sysutils/rsyslog8/files/patch-configure.ac =================================================================== --- head/sysutils/rsyslog8/files/patch-configure.ac (revision 506320) +++ head/sysutils/rsyslog8/files/patch-configure.ac (nonexistent) @@ -1,31 +0,0 @@ ---- configure.ac.orig 2019-05-29 07:03:26 UTC -+++ configure.ac -@@ -1661,6 +1661,20 @@ if test "x$enable_imfile" = "xyes"; then - fi - AM_CONDITIONAL(ENABLE_IMFILE, test x$enable_imfile = xyes) - -+# choose default settings for the format the system syslog(3) -+# generates: (old, default) RFC 3164 needs a special parser. (new) RFC -+# 5424 is handled by the default parser. -+AC_ARG_ENABLE(imuxsock_rfc5424, -+ [AS_HELP_STRING([--enable-imuxsock-rfc5424],[unix socket input defaults to RFC5424 format @<:default=no@:>@])], -+ [case "${enableval}" in -+ yes) enable_imuxsock_rfc5424="yes" ;; -+ no) enable_imuxsock_rfc5424="no" ;; -+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-imuxsock-rfc5424) ;; -+ esac], -+ [enable_imuxsock_rfc5424=no] -+) -+AM_CONDITIONAL(ENABLE_IMUXSOCK_RFC5424, test x$enable_imuxsock_rfc5424 = xyes) -+ - # settings for the docker log input module - AC_ARG_ENABLE(imdocker, - [AS_HELP_STRING([--enable-imdocker],[input docker module enabled @<:@default=no@:>@])], -@@ -2529,6 +2543,7 @@ echo " file input module enabled: $e - echo " docker log input module enabled: $enable_imdocker" - echo " Solaris input module enabled: $enable_imsolaris" - echo " periodic statistics module enabled: $enable_impstats" -+echo " syslog(3) unix socket uses RFC5424: $enable_imuxsock_rfc5424" - echo " imczmq input module enabled: $enable_imczmq" - echo " imjournal input module enabled: $enable_imjournal" - echo " imbatchreport input module enabled: $enable_imbatchreport" Property changes on: head/sysutils/rsyslog8/files/patch-configure.ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/rsyslog8/files/patch-config.h.in =================================================================== --- head/sysutils/rsyslog8/files/patch-config.h.in (revision 506320) +++ head/sysutils/rsyslog8/files/patch-config.h.in (nonexistent) @@ -1,13 +0,0 @@ ---- config.h.in.orig 2018-04-14 15:52:32 UTC -+++ config.h.in -@@ -18,6 +18,10 @@ - /* Indicator that RELP is present */ - #undef ENABLE_RELP - -+/* Indicator that syslog(3) sends RFC5424 format via the local unix -+ socket, rather than the traditional RFC3164 */ -+#undef ENABLE_IMUXSOCK_RFC5424 -+ - /* Regular expressions support enabled. */ - #undef FEATURE_REGEXP - Property changes on: head/sysutils/rsyslog8/files/patch-config.h.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/rsyslog8/files/patch-plugins_imuxsock_imuxsock.c =================================================================== --- head/sysutils/rsyslog8/files/patch-plugins_imuxsock_imuxsock.c (revision 506320) +++ head/sysutils/rsyslog8/files/patch-plugins_imuxsock_imuxsock.c (nonexistent) @@ -1,34 +0,0 @@ ---- plugins/imuxsock/imuxsock.c.orig 2018-04-08 11:15:54 UTC -+++ plugins/imuxsock/imuxsock.c -@@ -180,6 +180,13 @@ static int sd_fds = 0; /* number of sy - #define DFLT_ratelimitInterval 0 - #define DFLT_ratelimitBurst 200 - #define DFLT_ratelimitSeverity 1 /* do not rate-limit emergency messages */ -+ -+#ifdef ENABLE_IMUXSOCK_RFC5424 -+#define DFLT_bUseSpecialParser 0 /* assumes syslog(3) generates RFC5424 format */ -+#else -+#define DFLT_bUseSpecialParser 1 /* assumes syslog(3) generates RFC3164 format */ -+#endif -+ - /* config vars for the legacy config system */ - static struct configSettings_s { - int bOmitLocalLogging; -@@ -323,7 +330,7 @@ createInstance(instanceConf_t **pinst) - inst->ratelimitBurst = DFLT_ratelimitBurst; - inst->ratelimitSeverity = DFLT_ratelimitSeverity; - inst->bUseFlowCtl = 0; -- inst->bUseSpecialParser = 1; -+ inst->bUseSpecialParser = DFLT_bUseSpecialParser; - inst->bParseHost = UNSET; - inst->bIgnoreTimestamp = 1; - inst->bCreatePath = DFLT_bCreatePath; -@@ -1243,7 +1250,7 @@ CODESTARTbeginCnfLoad - pModConf->bAnnotateSysSock = 0; - pModConf->bParseTrusted = 0; - pModConf->bParseHost = UNSET; -- pModConf->bUseSpecialParser = 1; -+ pModConf->bUseSpecialParser = DFLT_bUseSpecialParser; - /* if we do not process internal messages, we will see messages - * from ourselves, and so we need to permit this. - */ Property changes on: head/sysutils/rsyslog8/files/patch-plugins_imuxsock_imuxsock.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property