Index: head/sysutils/rsyslog8/Makefile =================================================================== --- head/sysutils/rsyslog8/Makefile (revision 422608) +++ head/sysutils/rsyslog8/Makefile (revision 422609) @@ -1,117 +1,125 @@ # $FreeBSD$ PORTNAME= rsyslog -PORTVERSION= 8.19.0 -PORTREVISION= 1 +PORTVERSION= 8.21.0 CATEGORIES= sysutils MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/ MAINTAINER= matthew@FreeBSD.org COMMENT= Syslogd supporting SQL, TCP, and TLS -BUILD_DEPENDS= libgcrypt-config:security/libgcrypt \ - rst2man:textproc/py-docutils +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 -USE_LDCONFIG= yes +BUILD_DEPENDS= rst2man:textproc/py-docutils PORTSCOUT= limit:^8\. -OPTIONS_DEFINE= DBI DOCS GNUTLS GSSAPI MYSQL PGSQL RELP SNMP \ - NORMALIZE +USE_LDCONFIG= yes +OPTIONS_DEFINE= DBI DOCS GCRYPT GNUTLS GSSAPI MYSQL PGSQL RELP \ + SNMP NORMALIZE +OPTIONS_DEFAULT=GCRYPT +OPTIONS_SUB= yes + DBI_DESC= LibDBI output module for rsyslog +GCRYPT_DESC= Enable support for encrypted logfiles GNUTLS_DESC= GNUTLS module for rsyslog 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 SNMP_DESC= SNMP trap sender for rsyslog NORMALIZE_DESC= Message normalization module for rsyslog USES= libtool pkgconfig autoreconf DBI_LIB_DEPENDS= libdbi.so:databases/libdbi DBI_CONFIGURE_ENABLE= libdbi DBI_PLIST_FILES= lib/rsyslog/omlibdbi.so -GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls \ - libgcrypt.so:security/libgcrypt +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_LIB_DEPENDS= libgnutls.so:security/gnutls +GNUTLS_IMPLIES= GCRYPT 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:devel/librelp RELP_CONFIGURE_ENABLE= relp RELP_PLIST_FILES= lib/rsyslog/imrelp.so \ lib/rsyslog/omrelp.so SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp SNMP_CONFIGURE_ENABLE= snmp SNMP_PLIST_FILES= lib/rsyslog/omsnmp.so NORMALIZE_LIB_DEPENDS= liblognorm.so:devel/liblognorm NORMALIZE_CONFIGURE_ENABLE= mmnormalize NORMALIZE_PLIST_FILES= lib/rsyslog/mmnormalize.so .include .ifdef WITH_MYSQL_MICROSECONDS EXTRA_PATCHES+= ${FILESDIR}/extra-patch-mysql-microseconds .endif .ifdef WITH_SANE_HOSTNAME EXTRA_PATCHES+= ${FILESDIR}/extra-patch-sane-hostname .endif -CONFLICTS= rsyslog6-* rsyslog-[0-9].* 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-cached-man-pages --enable-imdiag --enable-imfile --enable-impstats --enable-mail --enable-omprog --enable-omstdout --enable-omuxsock --enable-rfc3195 --disable-testbench +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 @${FIND} ${WRKSRC} -name '*.bak' -delete .include Index: head/sysutils/rsyslog8/distinfo =================================================================== --- head/sysutils/rsyslog8/distinfo (revision 422608) +++ head/sysutils/rsyslog8/distinfo (revision 422609) @@ -1,3 +1,3 @@ -TIMESTAMP = 1465480650 -SHA256 (rsyslog-8.19.0.tar.gz) = 3379b30f2e6ef05a0f1c7327c73923fa5877a80b984506cdf48ed068c94a575e -SIZE (rsyslog-8.19.0.tar.gz) = 2279714 +TIMESTAMP = 1474304109 +SHA256 (rsyslog-8.21.0.tar.gz) = bdb1fde87b75107b58d1cd5d00408822fb15b9f3efb8d9dbb93a1dee128339ab +SIZE (rsyslog-8.21.0.tar.gz) = 2290993 Index: head/sysutils/rsyslog8/pkg-plist =================================================================== --- head/sysutils/rsyslog8/pkg-plist (revision 422608) +++ head/sysutils/rsyslog8/pkg-plist (revision 422609) @@ -1,27 +1,27 @@ lib/rsyslog/im3195.so lib/rsyslog/imdiag.so lib/rsyslog/imfile.so lib/rsyslog/imklog.so lib/rsyslog/immark.so lib/rsyslog/impstats.so lib/rsyslog/imtcp.so lib/rsyslog/imudp.so lib/rsyslog/imuxsock.so -lib/rsyslog/lmcry_gcry.so +%%GCRYPT%%lib/rsyslog/lmcry_gcry.so lib/rsyslog/lmnet.so lib/rsyslog/lmnetstrms.so lib/rsyslog/lmnsd_ptcp.so lib/rsyslog/lmregexp.so lib/rsyslog/lmstrmsrv.so lib/rsyslog/lmtcpclt.so lib/rsyslog/lmtcpsrv.so lib/rsyslog/lmzlibw.so lib/rsyslog/mmexternal.so 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