From owner-svn-ports-head@freebsd.org Tue Aug 28 06:49:05 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9952D108178B; Tue, 28 Aug 2018 06:49:05 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4E89B75CA9; Tue, 28 Aug 2018 06:49:05 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2B397114E; Tue, 28 Aug 2018 06:49:05 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7S6n5kM034426; Tue, 28 Aug 2018 06:49:05 GMT (envelope-from matthew@FreeBSD.org) Received: (from matthew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7S6n4iC034424; Tue, 28 Aug 2018 06:49:04 GMT (envelope-from matthew@FreeBSD.org) Message-Id: <201808280649.w7S6n4iC034424@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: matthew set sender to matthew@FreeBSD.org using -f From: Matthew Seaman Date: Tue, 28 Aug 2018 06:49:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r478287 - head/sysutils/rsyslog8 X-SVN-Group: ports-head X-SVN-Commit-Author: matthew X-SVN-Commit-Paths: head/sysutils/rsyslog8 X-SVN-Commit-Revision: 478287 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Aug 2018 06:49:05 -0000 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