Index: head/sysutils/rsyslog8/Makefile =================================================================== --- head/sysutils/rsyslog8/Makefile (revision 458700) +++ head/sysutils/rsyslog8/Makefile (revision 458701) @@ -1,143 +1,143 @@ # $FreeBSD$ PORTNAME= rsyslog -PORTVERSION= 8.31.0 +PORTVERSION= 8.32.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-stdlog.so:devel/liblogging \ - libuuid.so:misc/e2fsprogs-libuuid + libuuid.so:misc/e2fsprogs-libuuid \ + libcurl.so:ftp/curl BUILD_DEPENDS= rst2man:textproc/py-docutils PORTSCOUT= limit:^8\. USES= libtool pkgconfig autoreconf USE_LDCONFIG= yes CONFLICTS_BUILD= libinotify-* OPTIONS_DEFINE= DBI DOCS ELASTIC GCRYPT GNUTLS GSSAPI JSONPARSE MYSQL PGSQL \ RELP SNMP NORMALIZE 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_LIB_DEPENDS= libcurl.so:ftp/curl 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 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 JSONPARSE_DESC= JSONPARSE module for rsyslog JSONPARSE_CONFIGURE_ENABLE= mmjsonparse JSONPARSE_PLIST_FILES= lib/rsyslog/mmjsonparse.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 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 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 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 .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 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 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100504 @${REINPLACE_CMD} -e 's,recvmmsg ,,' ${WRKSRC}/configure.ac .endif @${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 458700) +++ head/sysutils/rsyslog8/distinfo (revision 458701) @@ -1,3 +1,3 @@ -TIMESTAMP = 1511983511 -SHA256 (rsyslog-8.31.0.tar.gz) = eee6318f8127f56500c1e1f672fac6207eeb87bbf0985f5af964f881a96601b2 -SIZE (rsyslog-8.31.0.tar.gz) = 2498675 +TIMESTAMP = 1515623023 +SHA256 (rsyslog-8.32.0.tar.gz) = 9646fdc33a6314464cba68323716010a8a55c3deb523cd798ba8b41a0efa40b8 +SIZE (rsyslog-8.32.0.tar.gz) = 2478990 Index: head/sysutils/rsyslog8/files/patch-runtime_nsd__ptcp.c =================================================================== --- head/sysutils/rsyslog8/files/patch-runtime_nsd__ptcp.c (revision 458700) +++ head/sysutils/rsyslog8/files/patch-runtime_nsd__ptcp.c (nonexistent) @@ -1,38 +0,0 @@ ---- runtime/nsd_ptcp.c.orig 2017-04-28 07:04:53 UTC -+++ runtime/nsd_ptcp.c -@@ -665,7 +665,11 @@ EnableKeepAlive(nsd_t *pNsd) - if(pThis->iKeepAliveProbes > 0) { - optval = pThis->iKeepAliveProbes; - optlen = sizeof(optval); -+#if defined(SOL_TCP) - ret = setsockopt(pThis->sock, SOL_TCP, TCP_KEEPCNT, &optval, optlen); -+#else -+ ret = setsockopt(pThis->sock, SOL_SOCKET, TCP_KEEPCNT, &optval, optlen); -+#endif - } else { - ret = 0; - } -@@ -680,7 +684,11 @@ EnableKeepAlive(nsd_t *pNsd) - if(pThis->iKeepAliveTime > 0) { - optval = pThis->iKeepAliveTime; - optlen = sizeof(optval); -+#if defined(SOL_TCP) - ret = setsockopt(pThis->sock, SOL_TCP, TCP_KEEPIDLE, &optval, optlen); -+#else -+ ret = setsockopt(pThis->sock, SOL_SOCKET, TCP_KEEPIDLE, &optval, optlen); -+#endif - } else { - ret = 0; - } -@@ -695,7 +703,11 @@ EnableKeepAlive(nsd_t *pNsd) - if(pThis->iKeepAliveIntvl > 0) { - optval = pThis->iKeepAliveIntvl; - optlen = sizeof(optval); -+#if defined(SOL_TCP) - ret = setsockopt(pThis->sock, SOL_TCP, TCP_KEEPINTVL, &optval, optlen); -+#else -+ ret = setsockopt(pThis->sock, SOL_SOCKET, TCP_KEEPINTVL, &optval, optlen); -+#endif - } else { - ret = 0; - } Property changes on: head/sysutils/rsyslog8/files/patch-runtime_nsd__ptcp.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