From owner-svn-ports-all@freebsd.org Fri Jan 26 03:07:14 2018 Return-Path: Delivered-To: svn-ports-all@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 A53C6EB5D4C; Fri, 26 Jan 2018 03:07:14 +0000 (UTC) (envelope-from cy@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 52B827F334; Fri, 26 Jan 2018 03:07:14 +0000 (UTC) (envelope-from cy@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 4D4B215FC0; Fri, 26 Jan 2018 03:07:14 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0Q37EwQ062075; Fri, 26 Jan 2018 03:07:14 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0Q37DoX062068; Fri, 26 Jan 2018 03:07:13 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201801260307.w0Q37DoX062068@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Fri, 26 Jan 2018 03:07:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459973 - in branches/2018Q1/sysutils: syslog-ng310 syslog-ng311 syslog-ng312 syslog-ng313 X-SVN-Group: ports-branches X-SVN-Commit-Author: cy X-SVN-Commit-Paths: in branches/2018Q1/sysutils: syslog-ng310 syslog-ng311 syslog-ng312 syslog-ng313 X-SVN-Commit-Revision: 459973 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Jan 2018 03:07:14 -0000 Author: cy Date: Fri Jan 26 03:07:13 2018 New Revision: 459973 URL: https://svnweb.freebsd.org/changeset/ports/459973 Log: MFH: r459810 Make AQMP support optional. AQMP support, which was prior to this revision not optional, caused syslog-ng to fail to build with LibreSSL. Users of LibreSSL should disable AQMP support. PR: 225380 Submitted by: Peter Czanik (CzP) Balabit / syslog-ng upstream Approved by: portmgr (swills) Modified: branches/2018Q1/sysutils/syslog-ng310/Makefile branches/2018Q1/sysutils/syslog-ng311/Makefile branches/2018Q1/sysutils/syslog-ng311/pkg-plist branches/2018Q1/sysutils/syslog-ng312/Makefile branches/2018Q1/sysutils/syslog-ng312/pkg-plist branches/2018Q1/sysutils/syslog-ng313/Makefile branches/2018Q1/sysutils/syslog-ng313/pkg-plist Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/sysutils/syslog-ng310/Makefile ============================================================================== --- branches/2018Q1/sysutils/syslog-ng310/Makefile Fri Jan 26 00:16:16 2018 (r459972) +++ branches/2018Q1/sysutils/syslog-ng310/Makefile Fri Jan 26 03:07:13 2018 (r459973) @@ -3,7 +3,7 @@ PORTNAME= syslog-ng DISTVERSION= 3.10.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils DISTFILES= syslog-ng-${DISTVERSION}.tar.gz MASTER_SITES= https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/ Modified: branches/2018Q1/sysutils/syslog-ng311/Makefile ============================================================================== --- branches/2018Q1/sysutils/syslog-ng311/Makefile Fri Jan 26 00:16:16 2018 (r459972) +++ branches/2018Q1/sysutils/syslog-ng311/Makefile Fri Jan 26 03:07:13 2018 (r459973) @@ -3,7 +3,7 @@ PORTNAME= syslog-ng DISTVERSION= 3.11.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils DISTFILES= syslog-ng-${DISTVERSION}.tar.gz MASTER_SITES= https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/ @@ -30,7 +30,7 @@ CONFLICTS?= syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \ WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} MAKE_JOBS_UNSAFE= yes -OPTIONS_DEFINE= TCP_WRAPPERS SQL SPOOF IPV6 SMTP JSON GEOIP GEOIP2 DOCS REDIS JAVA PYTHON MONGO CURL JAVA_MOD +OPTIONS_DEFINE= TCP_WRAPPERS SQL SPOOF IPV6 SMTP JSON GEOIP GEOIP2 DOCS REDIS JAVA PYTHON MONGO CURL JAVA_MOD AMQP OPTIONS_DEFAULT= JSON TCP_WRAPPERS_DESC= Build with TCP Wrappers SQL_DESC= Build with database (libdbi) support @@ -44,6 +44,7 @@ JAVA_DESC= Build with Java support (no modules) JAVA_MOD_DESC= Build with Java modules (needs Maven / Internet access) PYTHON_DESC= Build with Python 2.7 support CURL_DESC= Build with Curl HTTP support +AMQP_DESC= Build with AMQP support USES= autoreconf:build gmake libtool pathfix pkgconfig ssl \ gettext-runtime python shebangfix @@ -74,6 +75,9 @@ SPOOF_CONFIGURE_ENV= LIBNET_CFLAGS="-I/usr/local/incl IPV6_CONFIGURE_ENABLE= ipv6 + +AMQP_CONFIGURE_ENABLE= amqp +AMQP_PLIST_FILES= lib/syslog-ng/libafamqp.so GEOIP_CONFIGURE_ENABLE= geoip GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP Modified: branches/2018Q1/sysutils/syslog-ng311/pkg-plist ============================================================================== --- branches/2018Q1/sysutils/syslog-ng311/pkg-plist Fri Jan 26 00:16:16 2018 (r459972) +++ branches/2018Q1/sysutils/syslog-ng311/pkg-plist Fri Jan 26 03:07:13 2018 (r459973) @@ -246,7 +246,6 @@ lib/syslog-ng/libafsocket.so lib/syslog-ng/libaffile.so lib/syslog-ng/libafprog.so lib/syslog-ng/libafuser.so -lib/syslog-ng/libafamqp.so lib/syslog-ng/libcsvparser.so lib/syslog-ng/libconfgen.so lib/syslog-ng/libsystem-source.so Modified: branches/2018Q1/sysutils/syslog-ng312/Makefile ============================================================================== --- branches/2018Q1/sysutils/syslog-ng312/Makefile Fri Jan 26 00:16:16 2018 (r459972) +++ branches/2018Q1/sysutils/syslog-ng312/Makefile Fri Jan 26 03:07:13 2018 (r459973) @@ -3,7 +3,7 @@ PORTNAME= syslog-ng DISTVERSION= 3.12.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils DISTFILES= syslog-ng-${DISTVERSION}.tar.gz MASTER_SITES= https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/ @@ -27,7 +27,7 @@ CONFLICTS?= syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \ WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} MAKE_JOBS_UNSAFE= yes -OPTIONS_DEFINE= TCP_WRAPPERS SQL SPOOF IPV6 SMTP JSON GEOIP GEOIP2 DOCS REDIS JAVA PYTHON MONGO CURL JAVA_MOD +OPTIONS_DEFINE= TCP_WRAPPERS SQL SPOOF IPV6 SMTP JSON GEOIP GEOIP2 DOCS REDIS JAVA PYTHON MONGO CURL JAVA_MOD AMQP OPTIONS_DEFAULT= JSON TCP_WRAPPERS_DESC= Build with TCP Wrappers SQL_DESC= Build with database (libdbi) support @@ -41,6 +41,7 @@ JAVA_DESC= Build with Java support (no modules) JAVA_MOD_DESC= Build with Java modules (needs Maven / Internet access) PYTHON_DESC= Build with Python 2.7 support CURL_DESC= Build with Curl HTTP support +AMQP_DESC= Build with AMQP support USES= autoreconf:build gmake libtool pathfix pkgconfig ssl \ gettext-runtime python shebangfix @@ -71,6 +72,9 @@ SPOOF_CONFIGURE_ENV= LIBNET_CFLAGS="-I/usr/local/incl IPV6_CONFIGURE_ENABLE= ipv6 + +AMQP_CONFIGURE_ENABLE= amqp +AMQP_PLIST_FILES= lib/syslog-ng/libafamqp.so GEOIP_CONFIGURE_ENABLE= geoip GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP Modified: branches/2018Q1/sysutils/syslog-ng312/pkg-plist ============================================================================== --- branches/2018Q1/sysutils/syslog-ng312/pkg-plist Fri Jan 26 00:16:16 2018 (r459972) +++ branches/2018Q1/sysutils/syslog-ng312/pkg-plist Fri Jan 26 03:07:13 2018 (r459973) @@ -246,7 +246,6 @@ lib/syslog-ng/libafsocket.so lib/syslog-ng/libaffile.so lib/syslog-ng/libafprog.so lib/syslog-ng/libafuser.so -lib/syslog-ng/libafamqp.so lib/syslog-ng/libcsvparser.so lib/syslog-ng/libconfgen.so lib/syslog-ng/libsystem-source.so Modified: branches/2018Q1/sysutils/syslog-ng313/Makefile ============================================================================== --- branches/2018Q1/sysutils/syslog-ng313/Makefile Fri Jan 26 00:16:16 2018 (r459972) +++ branches/2018Q1/sysutils/syslog-ng313/Makefile Fri Jan 26 03:07:13 2018 (r459973) @@ -3,7 +3,7 @@ PORTNAME= syslog-ng DISTVERSION= 3.13.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils DISTFILES= syslog-ng-${DISTVERSION}.tar.gz MASTER_SITES= https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/ @@ -27,7 +27,7 @@ CONFLICTS?= syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \ WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} MAKE_JOBS_UNSAFE= yes -OPTIONS_DEFINE= TCP_WRAPPERS SQL SPOOF IPV6 SMTP JSON GEOIP GEOIP2 DOCS REDIS JAVA PYTHON MONGO CURL JAVA_MOD +OPTIONS_DEFINE= TCP_WRAPPERS SQL SPOOF IPV6 SMTP JSON GEOIP GEOIP2 DOCS REDIS JAVA PYTHON MONGO CURL JAVA_MOD AMQP OPTIONS_DEFAULT= JSON TCP_WRAPPERS_DESC= Build with TCP Wrappers SQL_DESC= Build with database (libdbi) support @@ -41,6 +41,7 @@ JAVA_DESC= Build with Java support (no modules) JAVA_MOD_DESC= Build with Java modules (needs Maven / Internet access) PYTHON_DESC= Build with Python 2.7 support CURL_DESC= Build with Curl HTTP support +AMQP_DESC= Build with AMQP support USES= autoreconf:build gmake libtool pathfix pkgconfig ssl \ gettext-runtime python shebangfix @@ -71,6 +72,9 @@ SPOOF_CONFIGURE_ENV= LIBNET_CFLAGS="-I/usr/local/incl IPV6_CONFIGURE_ENABLE= ipv6 + +AMQP_CONFIGURE_ENABLE= amqp +AMQP_PLIST_FILES= lib/syslog-ng/libafamqp.so GEOIP_CONFIGURE_ENABLE= geoip GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP Modified: branches/2018Q1/sysutils/syslog-ng313/pkg-plist ============================================================================== --- branches/2018Q1/sysutils/syslog-ng313/pkg-plist Fri Jan 26 00:16:16 2018 (r459972) +++ branches/2018Q1/sysutils/syslog-ng313/pkg-plist Fri Jan 26 03:07:13 2018 (r459973) @@ -251,7 +251,6 @@ lib/syslog-ng/libafsocket.so lib/syslog-ng/libaffile.so lib/syslog-ng/libafprog.so lib/syslog-ng/libafuser.so -lib/syslog-ng/libafamqp.so lib/syslog-ng/libcsvparser.so lib/syslog-ng/libconfgen.so lib/syslog-ng/libsystem-source.so