svn commit: r478287 - head/sysutils/rsyslog8
Matthew Seaman
matthew at FreeBSD.org
Tue Aug 28 06:49:05 UTC 2018
Author: matthew
Date: Tue Aug 28 06:49:04 2018
New Revision: 478287
URL: https://svnweb.freebsd.org/changeset/ports/478287
Log:
Add a new OPENSSL option as an alternative to GNUTLS. This parallels
a simlar fix to librelp, and tracks the upstream project's intention
to switch from gnutls to openssl over time. The default remains to
not compile in any TLS support in rsyslog8.
PR: 230913
Modified:
head/sysutils/rsyslog8/Makefile
head/sysutils/rsyslog8/pkg-plist
Modified: head/sysutils/rsyslog8/Makefile
==============================================================================
--- head/sysutils/rsyslog8/Makefile Tue Aug 28 06:19:13 2018 (r478286)
+++ head/sysutils/rsyslog8/Makefile Tue Aug 28 06:49:04 2018 (r478287)
@@ -2,6 +2,7 @@
PORTNAME= rsyslog
PORTVERSION= 8.37.0
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/
@@ -27,8 +28,10 @@ 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
@@ -46,6 +49,7 @@ 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
@@ -68,6 +72,13 @@ 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
Modified: head/sysutils/rsyslog8/pkg-plist
==============================================================================
--- head/sysutils/rsyslog8/pkg-plist Tue Aug 28 06:19:13 2018 (r478286)
+++ head/sysutils/rsyslog8/pkg-plist Tue Aug 28 06:49:04 2018 (r478287)
@@ -9,7 +9,6 @@ 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
More information about the svn-ports-all
mailing list