Attachment 203261 Details for Bug 236845 – Functional diff.

[patch] Functional diff.

syslog-ng-PR236845.diff (text/plain), 5.18 KB, created by Cy Schubert on 2019-03-30 17:33:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Cy Schubert

Created: 2019-03-30 17:33:16 UTC

Size: 5.18 KB

patch

obsolete

>diff --git a/sysutils/syslog-ng318/Makefile b/sysutils/syslog-ng318/Makefile
>index 1d6ed599258f..4fe3719d2aa7 100644
>--- a/sysutils/syslog-ng318/Makefile
>+++ b/sysutils/syslog-ng318/Makefile
>@@ -19,7 +19,7 @@ LIB_DEPENDS=	libpcre.so:devel/pcre \
> 		libuuid.so:misc/e2fsprogs-libuuid
> 
> USES=		autoreconf:build gmake libtool pathfix pkgconfig ssl \
>-		gettext-runtime python:3.6,build shebangfix
>+		gettext-runtime shebangfix
> 
> CONFLICTS?=	syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \
> 		syslog-ng[0-9][0-9]-[0-9]* \
>@@ -38,7 +38,7 @@ GEOIP2_DESC=		Build with geoip2 (MaxMindDB) support
> REDIS_DESC=		Build with Redis support
> JAVA_DESC=		Build with Java support (no modules)
> JAVA_MOD_DESC=		Build with Java modules (needs Maven / Internet access)
>-PYTHON_DESC=		Build with Python 3.6 support
>+PYTHON_DESC=		Build with Python ${PYTON_VER} support
> CURL_DESC=		Build with Curl HTTP support
> AMQP_DESC=		Build with AMQP support
> 
>@@ -47,6 +47,7 @@ USE_RC_SUBR=	syslog-ng
> SHEBANG_FILES=	lib/merge-grammar.py
> SHEBANG_LANG=	python3
> GNU_CONFIGURE=	yes
>+# Note: Even if PYTHON is deselected, glib20 will install python.
> USE_GNOME=	glib20
> SUB_FILES=	pkg-message
> INSTALL_TARGET=	install-strip
>@@ -137,8 +138,9 @@ JAVA_MOD_PLIST_FILES=		lib/syslog-ng/java-modules/log4j-1.2.16.jar \
> 				lib/syslog-ng/java-modules/syslog-ng-common.jar
> 
> PYTHON_CONFIGURE_ON=		--enable-python
>-PYTHON_CONFIGURE_OFF=		--disable-python --with-python=3.6
>-PYTHON_CONFIGURE_WITH=		python=3.6
>+PYTHON_CONFIGURE_OFF=		--disable-python
>+PYTHON_CONFIGURE_WITH=		python=${PYTHON_VER}
>+PYTHON_USES			bison python:3.5+
> PYTHON_PLIST_FILES=		lib/syslog-ng/libmod-python.so \
> 		%%PYTHON_SITELIBDIR%%/syslogng-1.0-py%%PYTHON_VER%%.egg-info \
> 		%%PYTHON_SITELIBDIR%%/syslogng/__init__.py \
>diff --git a/sysutils/syslog-ng319/Makefile b/sysutils/syslog-ng319/Makefile
>index b45159270b3f..f93203e7c41a 100644
>--- a/sysutils/syslog-ng319/Makefile
>+++ b/sysutils/syslog-ng319/Makefile
>@@ -19,7 +19,7 @@ LIB_DEPENDS=	libpcre.so:devel/pcre \
> 		libuuid.so:misc/e2fsprogs-libuuid
> 
> USES=		autoreconf:build gmake libtool pathfix pkgconfig ssl \
>-		gettext-runtime python:3.6,build shebangfix
>+		gettext-runtime shebangfix
> 
> CONFLICTS?=	syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \
> 		syslog-ng[0-9][0-9]-[0-9]* \
>@@ -38,7 +38,7 @@ GEOIP2_DESC=		Build with geoip2 (MaxMindDB) support
> REDIS_DESC=		Build with Redis support
> JAVA_DESC=		Build with Java support (no modules)
> JAVA_MOD_DESC=		Build with Java modules (needs Maven / Internet access)
>-PYTHON_DESC=		Build with Python 3.6 support
>+PYTHON_DESC=		Build with Python ${PYTON_VER} support
> CURL_DESC=		Build with Curl HTTP support
> AMQP_DESC=		Build with AMQP support
> 
>@@ -47,6 +47,7 @@ USE_RC_SUBR=	syslog-ng
> SHEBANG_FILES=	lib/merge-grammar.py
> SHEBANG_LANG=	python3
> GNU_CONFIGURE=	yes
>+# Note: Even if PYTHON is deselected, glib20 will install python.
> USE_GNOME=	glib20
> SUB_FILES=	pkg-message
> INSTALL_TARGET=	install-strip
>@@ -137,8 +138,9 @@ JAVA_MOD_PLIST_FILES=		lib/syslog-ng/java-modules/log4j-1.2.16.jar \
> 				lib/syslog-ng/java-modules/syslog-ng-common.jar
> 
> PYTHON_CONFIGURE_ON=		--enable-python
>-PYTHON_CONFIGURE_OFF=		--disable-python --with-python=3.6
>-PYTHON_CONFIGURE_WITH=		python=3.6
>+PYTHON_CONFIGURE_OFF=		--disable-python
>+PYTHON_CONFIGURE_WITH=		python=${PYTHON_VER}
>+PYTHON_USES			bison python:3.5+
> PYTHON_PLIST_FILES=		lib/syslog-ng/libmod-python.so \
> 		%%PYTHON_SITELIBDIR%%/syslogng-1.0-py%%PYTHON_VER%%.egg-info \
> 		%%PYTHON_SITELIBDIR%%/syslogng/__init__.py \
>diff --git a/sysutils/syslog-ng320/Makefile b/sysutils/syslog-ng320/Makefile
>index b79a0ae3f07c..2ee5e703efc6 100644
>--- a/sysutils/syslog-ng320/Makefile
>+++ b/sysutils/syslog-ng320/Makefile
>@@ -18,7 +18,7 @@ LIB_DEPENDS=	libpcre.so:devel/pcre \
> 		libuuid.so:misc/e2fsprogs-libuuid
> 
> USES=		autoreconf:build gmake libtool pathfix pkgconfig ssl \
>-		gettext-runtime python:3.6,build shebangfix
>+		gettext-runtime shebangfix
> 
> CONFLICTS?=	syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \
> 		syslog-ng[0-9][0-9]-[0-9]* \
>@@ -37,7 +37,7 @@ GEOIP2_DESC=		Build with geoip2 (MaxMindDB) support
> REDIS_DESC=		Build with Redis support
> JAVA_DESC=		Build with Java support (no modules)
> JAVA_MOD_DESC=		Build with Java modules (needs Maven / Internet access)
>-PYTHON_DESC=		Build with Python 3.6 support
>+PYTHON_DESC=		Build with Python ${PYTHON_VER} support
> CURL_DESC=		Build with Curl HTTP support
> AMQP_DESC=		Build with AMQP support
> RIEMANN_DESC=		Build with Riemann support
>@@ -47,6 +47,7 @@ USE_RC_SUBR=	syslog-ng
> SHEBANG_FILES=	lib/merge-grammar.py
> SHEBANG_LANG=	python3
> GNU_CONFIGURE=	yes
>+# Note: Even if PYTHON is deselected, glib20 will install python.
> USE_GNOME=	glib20
> SUB_FILES=	pkg-message
> INSTALL_TARGET=	install-strip
>@@ -136,8 +137,9 @@ JAVA_MOD_PLIST_FILES=		lib/syslog-ng/java-modules/log4j-1.2.16.jar \
> 				lib/syslog-ng/java-modules/syslog-ng-common.jar
> 
> PYTHON_CONFIGURE_ON=		--enable-python
>-PYTHON_CONFIGURE_OFF=		--disable-python --with-python=3.6
>-PYTHON_CONFIGURE_WITH=		python=3.6
>+PYTHON_CONFIGURE_OFF=		--disable-python
>+PYTHON_CONFIGURE_WITH=		python=${PYTHON_VER}
>+PYTHON_USES=			bison python:3.5+
> PYTHON_PLIST_FILES=		lib/syslog-ng/libmod-python.so \
> 		%%PYTHON_SITELIBDIR%%/syslogng-1.0-py%%PYTHON_VER%%.egg-info \
> 		%%PYTHON_SITELIBDIR%%/syslogng/__init__.py \

Actions: View | Diff

Attachments on bug 236845: 203203 | 203233 | 203261 | 203268