Index: head/sysutils/rsyslog8/Makefile =================================================================== --- head/sysutils/rsyslog8/Makefile (revision 478286) +++ head/sysutils/rsyslog8/Makefile (revision 478287) @@ -1,149 +1,160 @@ # $FreeBSD$ PORTNAME= rsyslog PORTVERSION= 8.37.0 +PORTREVISION= 1 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} PORTSCOUT= limit:^8\. USES= libtool pkgconfig autoreconf python:env USE_LDCONFIG= yes CONFLICTS_BUILD= libinotify-* -OPTIONS_DEFINE= DBI DOCS ELASTIC GCRYPT GNUTLS GSSAPI JSONPARSE MYSQL PGSQL \ +OPTIONS_DEFINE= DBI DOCS ELASTIC GCRYPT GSSAPI JSONPARSE MYSQL PGSQL \ RELP SNMP NORMALIZE +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 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 + +OPENSSL_USES= ssl +OPENSSL_CONFIGURE_ENABLE= openssl +OPENSSL_CONFIGURE_ENV= OPENSSL_LIBS="-L${OPENSSLLIB} -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 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 .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 .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/pkg-plist =================================================================== --- head/sysutils/rsyslog8/pkg-plist (revision 478286) +++ head/sysutils/rsyslog8/pkg-plist (revision 478287) @@ -1,29 +1,28 @@ lib/rsyslog/fmhash.so lib/rsyslog/fmhttp.so 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 -%%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