aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcy <cy@FreeBSD.org>2018-01-24 09:25:35 +0800
committercy <cy@FreeBSD.org>2018-01-24 09:25:35 +0800
commit80ac40b533feca422e599e93f25e91cf2a90d9d9 (patch)
tree653b8cb4f13c97007ef2adeafa1de491e1bf0677
parent1f52d6b8dea56ec1ceda3230e334a9ff43bddef2 (diff)
downloadfreebsd-ports-gnome-80ac40b533feca422e599e93f25e91cf2a90d9d9.tar.gz
freebsd-ports-gnome-80ac40b533feca422e599e93f25e91cf2a90d9d9.tar.zst
freebsd-ports-gnome-80ac40b533feca422e599e93f25e91cf2a90d9d9.zip
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@balabit.com> Balabit / syslog-ng upstream MFH: 2018Q1
-rw-r--r--sysutils/syslog-ng310/Makefile2
-rw-r--r--sysutils/syslog-ng311/Makefile8
-rw-r--r--sysutils/syslog-ng311/pkg-plist1
-rw-r--r--sysutils/syslog-ng312/Makefile8
-rw-r--r--sysutils/syslog-ng312/pkg-plist1
-rw-r--r--sysutils/syslog-ng313/Makefile8
-rw-r--r--sysutils/syslog-ng313/pkg-plist1
7 files changed, 19 insertions, 10 deletions
diff --git a/sysutils/syslog-ng310/Makefile b/sysutils/syslog-ng310/Makefile
index 70c0cf8d3660..400b60ffdc15 100644
--- a/sysutils/syslog-ng310/Makefile
+++ b/sysutils/syslog-ng310/Makefile
@@ -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}/
diff --git a/sysutils/syslog-ng311/Makefile b/sysutils/syslog-ng311/Makefile
index ec7a54969f2f..250a64be44ac 100644
--- a/sysutils/syslog-ng311/Makefile
+++ b/sysutils/syslog-ng311/Makefile
@@ -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/include" \
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
GEOIP_CONFIGURE_ENV= GEOIP_LIBS="-L${LOCALBASE}/lib -lGeoIP"
diff --git a/sysutils/syslog-ng311/pkg-plist b/sysutils/syslog-ng311/pkg-plist
index 899e4b1e8b31..1945d89033bd 100644
--- a/sysutils/syslog-ng311/pkg-plist
+++ b/sysutils/syslog-ng311/pkg-plist
@@ -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
diff --git a/sysutils/syslog-ng312/Makefile b/sysutils/syslog-ng312/Makefile
index a01d5cf64358..671ef6bdaf73 100644
--- a/sysutils/syslog-ng312/Makefile
+++ b/sysutils/syslog-ng312/Makefile
@@ -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/include" \
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
GEOIP_CONFIGURE_ENV= GEOIP_LIBS="-L${LOCALBASE}/lib -lGeoIP"
diff --git a/sysutils/syslog-ng312/pkg-plist b/sysutils/syslog-ng312/pkg-plist
index 4c3448fabb3f..8db246565805 100644
--- a/sysutils/syslog-ng312/pkg-plist
+++ b/sysutils/syslog-ng312/pkg-plist
@@ -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
diff --git a/sysutils/syslog-ng313/Makefile b/sysutils/syslog-ng313/Makefile
index ea37fb6b0612..7ce742106df5 100644
--- a/sysutils/syslog-ng313/Makefile
+++ b/sysutils/syslog-ng313/Makefile
@@ -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/include" \
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
GEOIP_CONFIGURE_ENV= GEOIP_LIBS="-L${LOCALBASE}/lib -lGeoIP"
diff --git a/sysutils/syslog-ng313/pkg-plist b/sysutils/syslog-ng313/pkg-plist
index 9ced6e745cf1..dda7a18bfc2d 100644
--- a/sysutils/syslog-ng313/pkg-plist
+++ b/sysutils/syslog-ng313/pkg-plist
@@ -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