Adding metadata

3 files changed, 64 insertions, 15 deletions

diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 9fa9dcb7569f..a810922fcaa4 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -1,2 +1,2 @@
-DIST syslog-ng-3.37.1.tar.gz 6033219 BLAKE2B fe3787daec137d5eb61c6bf55d6066b642e7944738ec0655fcc7ddf8d0c841a734ec423b0710f424576fa78bbecfb1121475921e6f8bf896c10470c89dbf98c8 SHA512 beebd89c54a415469dc58630ac1900d632ef351f6a13fad4a95ce7bb1760b16d6cfdcede02225a35e97ebce7dae151c6aa228f3d378463e8b873c4f71ed86ab7
 DIST syslog-ng-3.38.1.tar.gz 5405048 BLAKE2B 7819cbe0caab7f580ca9f71181c84d64da838a238a6f8b8b79c8816e37e5691e72e1284de57d5066d3c681d8751950e5a32d65a1b1af4e064dd82f2c59899fe3 SHA512 3a3ef5c72d8c211ed2914791380061dcd48ea1ea95f636a1a8649dc5dee731a11e9ae000a37cbeeba624f4053b623b697e6c7f945a81153106c2365f4f09a847
+DIST syslog-ng-4.2.0.tar.gz 5763000 BLAKE2B 7dfa6a1aff896072cc742c6dba5dc1680955e06ce4400fde5b0ddecedd984c039a687f35286685d66e7a5580c7da94f00a14b10f6eb8c162233683bf170e37fb SHA512 85442b57b7934e8afbb4e7d8285ed1fd16aaad2a8d853e3765db4f885d88bee4910a3b5d271f1cbd100c2d3a3f81f1a4fe845bc948fe68c22d32bc9b730af04b
diff --git a/app-admin/syslog-ng/files/syslog-ng-4.2.0-tls-context_c.patch b/app-admin/syslog-ng/files/syslog-ng-4.2.0-tls-context_c.patch
new file mode 100644
index 000000000000..6ec5bafe8534
--- /dev/null
+++ b/app-admin/syslog-ng/files/syslog-ng-4.2.0-tls-context_c.patch
@@ -0,0 +1,30 @@
+diff -urN syslog-ng-4.2.0.orig/lib/transport/tls-context.c syslog-ng-4.2.0/lib/transport/tls-context.c
+--- syslog-ng-4.2.0.orig/lib/transport/tls-context.c	2023-07-16 14:39:12.465959752 +0200
++++ syslog-ng-4.2.0/lib/transport/tls-context.c	2023-07-16 14:40:13.295964133 +0200
+@@ -314,6 +314,7 @@
+   return TRUE;
+ }
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+ static gboolean
+ tls_context_setup_cmd_context(TLSContext *self)
+ {
+@@ -347,6 +348,7 @@
+   SSL_CONF_CTX_free(ssl_conf_ctx);
+   return result;
+ }
++#endif
+ 
+ static PKCS12 *
+ _load_pkcs12_file(TLSContext *self, const gchar *pkcs12_file)
+@@ -567,8 +569,10 @@
+   if (!tls_context_setup_sigalgs(self))
+     goto error;
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+   if (!tls_context_setup_cmd_context(self))
+     goto error;
++#endif
+ 
+   return TLS_CONTEXT_SETUP_OK;
+ 
diff --git a/app-admin/syslog-ng/syslog-ng-3.37.1.ebuild b/app-admin/syslog-ng/syslog-ng-4.2.0.ebuild
index 45707c69c93c..698c9ac54792 100644
--- a/app-admin/syslog-ng/syslog-ng-3.37.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-4.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Liguros Authors
+# Copyright 2021-2023 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 
@@ -7,20 +7,23 @@ inherit autotools python-single-r1 systemd
 
 MY_PV_MM=$(ver_cut 1-2)
 DESCRIPTION="syslog replacement with advanced filtering features"
-HOMEPAGE="https://www.syslog-ng.com/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
+HOMEPAGE="https://www.syslog-ng.com/products/open-source-log-management/"
+SRC_URI="https://github.com/syslog-ng/syslog-ng/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="amqp caps dbi geoip2 http ipv6 json kafka libressl mongodb pacct python redis smtp snmp test spoof-source systemd tcpd"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( python )"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/glib-2.10.1:2
 	>=dev-libs/ivykis-0.42.4
-	>=dev-libs/libpcre-6.1:=
+	>=dev-libs/libpcre-6.1
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( >=dev-libs/libressl-3.5.0:0= )
 	!dev-libs/eventlog
 	amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] )
 	caps? ( sys-libs/libcap )
@@ -28,26 +31,34 @@ RDEPEND="
 	geoip2? ( dev-libs/libmaxminddb:= )
 	http? ( net-misc/curl )
 	json? ( >=dev-libs/json-c-0.9:= )
-	kafka? ( >=dev-libs/librdkafka-1.0.0:= )
+	kafka? ( >=dev-libs/librdkafka-1.1.0:= )
 	mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
-	python? ( ${PYTHON_DEPS} )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_USEDEP}]
+		')
+	)
 	redis? ( >=dev-libs/hiredis-0.11.0:= )
-	smtp? ( >=net-libs/libesmtp-1.0.6_p20200824:= )
+	smtp? ( net-libs/libesmtp:= )
 	snmp? ( net-analyzer/net-snmp:0= )
-	spoof-source? ( net-libs/libnet:1.1= )
+	spoof-source? ( net-libs/libnet:1.1 )
 	systemd? ( sys-apps/systemd:= )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( >=dev-libs/libressl-3.5.0:0= )"
-DEPEND="${RDEPEND}
-	test? ( dev-libs/criterion )"
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-libs/criterion )
+"
 BDEPEND="
+	>=sys-devel/bison-3.7.6
 	sys-devel/flex
 	virtual/pkgconfig"
 
 DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc}
 	contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened"
 	"${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" )
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.28.1-net-snmp.patch
 )
@@ -59,13 +70,17 @@ pkg_setup() {
 src_prepare() {
 	local f
 
+	# disable python-modules test as it requires additional python modules not
+	# packaged in Gentoo
+	sed -i '/MAKE/s/.*/exit 0/g' modules/python-modules/test_pymodules.sh || die
+
 	use python && python_fix_shebang .
 
 	# remove bundled libs
 	rm -r lib/ivykis || die
 
 	if use libressl; then
-		eapply ${FILESDIR}/tlscontext_c.patch
+		eapply -p1 ${FILESDIR}/syslog-ng-4.2.0-tls-context_c.patch
 	fi
 
 	# drop scl modules requiring json
@@ -101,6 +116,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# Needs bison/flex.
+	unset YACC LEX
+
 	local myconf=(
 		--disable-docs
 		--disable-java
@@ -113,6 +131,7 @@ src_configure() {
 		--with-ivykis=system
 		--with-module-dir=/usr/$(get_libdir)/syslog-ng
 		--with-pidfile-dir=/var/run
+		--with-python-packages=none
 		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
 		$(use_enable amqp)
 		$(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client)