svn commit: r459973 - in branches/2018Q1/sysutils: syslog-ng310 syslog-ng311 syslog-ng312 syslog-ng313
Cy Schubert
cy at FreeBSD.org
Fri Jan 26 03:07:14 UTC 2018
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) <peter.czanik at balabit.com>
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
More information about the svn-ports-branches
mailing list