gentoo auto-resync : 28:10:2022 - 15:59:37

7 files changed, 186 insertions, 11 deletions

diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 8398236cefc3..9a3218e9cbdf 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -10,8 +10,10 @@ DIST syslog-ng-3.34.1.tar.gz 5903489 BLAKE2B ae94dacb324f2db68fdaad6d41d1974e450
 DIST syslog-ng-3.35.1.tar.gz 5901321 BLAKE2B 9ee93c22358703bc95c951f6fc9207da0291b3d5a6dedf0222302ca16576f49734d31891265c8c1d218a0308a76074301babbaa39b37e1564107e2ab6adf8a92 SHA512 7a0aa149d3e01b256e0f3168ceabebcbeadb0d8bbee6838d646cb425571b26330cccbcdd3a221f7b57a4605e875f48e48cd367825623299dc43d5ba77f94c50d
 DIST syslog-ng-3.36.1.tar.gz 5968598 BLAKE2B b74536e20ae2a2eac056fe278f2e7973b3c97657cd80962ee551812633045dbdeb65fe34b66448d565a6f1b9edb2f1066fc1934d3f7ffbd43b9527a73a181e58 SHA512 b74c10e708616f7f5f5d529de5c1a3ce8ac888c05aa4b0fcf390d70082e9bc3432f3752998a5a258663fd47b8e4d0c2735240a3e4eda28178579b18308ebb376
 DIST syslog-ng-3.37.1.tar.gz 6033219 BLAKE2B fe3787daec137d5eb61c6bf55d6066b642e7944738ec0655fcc7ddf8d0c841a734ec423b0710f424576fa78bbecfb1121475921e6f8bf896c10470c89dbf98c8 SHA512 beebd89c54a415469dc58630ac1900d632ef351f6a13fad4a95ce7bb1760b16d6cfdcede02225a35e97ebce7dae151c6aa228f3d378463e8b873c4f71ed86ab7
-EBUILD syslog-ng-3.34.1.ebuild 4875 BLAKE2B 67e9fec7003b0f0da9a90873a009f20ed3f4aa66fc33b3acb6bbfd0a317d380c1b2306b6043a135535cc44b7802568c611820eaf23fc4819dc7c8968286c8481 SHA512 1c5bd39853364a1e1dcc79e97ac88bc4bf38b4e94152eb7f4a8acafabca9da8e6a71a509b28658b92871672a1e518ca8ac2355515c3506a742e182c2eef04e72
-EBUILD syslog-ng-3.35.1.ebuild 4876 BLAKE2B 91ff5899b72a81743ab3dc7fb26076ce83788b2068e5ac7cc30ff5e375add7fb5f4957ed2e5e0320f80c47e4dc803778c3423079426649f6d47dc16bb7e7426b SHA512 24e3c0b98dd9b50e442d4be5fefa9fe12aba92847bc2f173ee59aaa27a75b9d1323566b3f2deea065ac7a3ef620dba11b1cf152206c77e650b1c55780be54eca
-EBUILD syslog-ng-3.36.1.ebuild 4885 BLAKE2B a6e10cd408691ee8aae45c2ffa874f870038673289b756fbce720db491bc87dcbdade0cfbde4e605fa1255664ab73282904d1522f744e2ba2cba65b990947c71 SHA512 1793e5bcb7ee2ad400c71a611578bac44f4c8a2cbf3bfcf2d8dce49ef44ffba198999a3b98895d1fd8d8a4ecba146a55441ec11527b7e52fdf38e0c1e54c942b
-EBUILD syslog-ng-3.37.1.ebuild 4898 BLAKE2B fd9245c70b04b247ca5f463acc0ed923b25aebef5716a92096ed218f739181884fe18d725ad0e53cdf0be2f0507b1336665a08994d4a0335d202ef169f50af8d SHA512 e208187804c1bb9fd62668c23fd3072c5305e7041299a98e4c1748574cbbc1384636137143967754a4e4f2f52bf9b1adf46adcbe3bd51c0e236308e40ec88936
-MISC metadata.xml 1283 BLAKE2B 22643ccf254541685f0b58255d42ef6bdfc4af8800b871f96cc2e17e1f7aa05c3380672fe293260a7a395e0e7431c81abed871f248805a6dda991fcb877400b6 SHA512 37610fc48a1e169c478250a36634afae6de03c49b257e27d81cdef3243200c1fb3a00b84d4efc8e30020f9a6c1f6ed5828b2444e4b92fa5801e15c3bece8e25a
+DIST syslog-ng-3.38.1.tar.gz 5405048 BLAKE2B 7819cbe0caab7f580ca9f71181c84d64da838a238a6f8b8b79c8816e37e5691e72e1284de57d5066d3c681d8751950e5a32d65a1b1af4e064dd82f2c59899fe3 SHA512 3a3ef5c72d8c211ed2914791380061dcd48ea1ea95f636a1a8649dc5dee731a11e9ae000a37cbeeba624f4053b623b697e6c7f945a81153106c2365f4f09a847
+EBUILD syslog-ng-3.34.1.ebuild 4889 BLAKE2B 1ae23a11a372441c56a361cdba6592551ac19ecb1595fdb8c30024ecade0139957c1c40df19444627e72d1498bf7665ae9212855bc244a57e76007298208a3f2 SHA512 62b1b068ecb483509e24233ded2d04478e98c218928e2cfb4cf13fca6cee98438fbe1fb4e5a85df3e6b839e0313e6555d5dfc405f93ee2698e30da3d7950ea41
+EBUILD syslog-ng-3.35.1.ebuild 4890 BLAKE2B bba9a0ec5902ed72742980909971a79f4ee4bc1cb4eaaf0db620be55b17680a7d8878a931d68889b42d7451b9b36035bf61b0a7b941f3d8f07972c3dd7221e14 SHA512 152d923c2909be1353093320ecd29b47c330fd81374bf51c2c454b0cb65bff192713a21859be25a0c5412a5ef7731affa56b7e6054082f5503e6b11c784f4d61
+EBUILD syslog-ng-3.36.1.ebuild 4899 BLAKE2B 2aefb6ee7b9f68bc1b9021866b648c0d03565709cb05b400c5133e1156dad43297277dce06ef9555c5797579650eca6444be6f68fcfc55d80c9fc82248a2493f SHA512 78b06fc516246d452ed5ff88f216ea1fc74e63719d2008fbe60be26946daec59d9aed57498c5882dde1eacfba1b5dc3b45b081b4772a699fd860441d0078a068
+EBUILD syslog-ng-3.37.1.ebuild 4912 BLAKE2B 42364de5ecdd051138ef0552363850348ff27cd61daaf862ab40857ecf51ece29fca8f2dc81f3c360c0f1d8c606fd3d7a1ab3baab097f52ac3c3c2696fccc009 SHA512 88539999285634ffb27146492ff342b310ecab24bf50e46fdc6715e8c9b73d8cf8356abef882f371c3074b8e769a4276f4a381559f1258f2e10bcde3ffdde2c0
+EBUILD syslog-ng-3.38.1.ebuild 4912 BLAKE2B 42364de5ecdd051138ef0552363850348ff27cd61daaf862ab40857ecf51ece29fca8f2dc81f3c360c0f1d8c606fd3d7a1ab3baab097f52ac3c3c2696fccc009 SHA512 88539999285634ffb27146492ff342b310ecab24bf50e46fdc6715e8c9b73d8cf8356abef882f371c3074b8e769a4276f4a381559f1258f2e10bcde3ffdde2c0
+MISC metadata.xml 1285 BLAKE2B 91f0ecae07c9131f516a2b9dd6b71d021c84cde055ec58b21734b36f540f65b02452ac20dffaac4a3edc8942ad9a1a1afc3c9837ea4775d40d0d8b3d41083316 SHA512 80924020dccf9bd8d1a83d995af57644eaab761204e2b75a3ef997a2b7582506ba25f476b6203446d116af841629520adfa1cfe443c6e1547755e72956161eb2
diff --git a/app-admin/syslog-ng/metadata.xml b/app-admin/syslog-ng/metadata.xml
index ba670d623e06..d14d65a0a573 100644
--- a/app-admin/syslog-ng/metadata.xml
+++ b/app-admin/syslog-ng/metadata.xml
@@ -22,6 +22,6 @@
 		<flag name="spoof-source">Enable support for spoofed source addresses</flag>
 	</use>
 	<upstream>
-		<remote-id type="github">balabit/syslog-ng</remote-id>
+		<remote-id type="github">syslog-ng/syslog-ng</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-admin/syslog-ng/syslog-ng-3.34.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.34.1.ebuild
index 1f9d4085ac77..d6092f450695 100644
--- a/app-admin/syslog-ng/syslog-ng-3.34.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.34.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ inherit autotools python-single-r1 systemd
 
 MY_PV_MM=$(ver_cut 1-2)
 DESCRIPTION="syslog replacement with advanced filtering features"
-HOMEPAGE="https://syslog-ng.com/open-source-log-management"
+HOMEPAGE="https://www.syslog-ng.com/products/open-source-log-management/"
 SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2+ LGPL-2.1+"
diff --git a/app-admin/syslog-ng/syslog-ng-3.35.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.35.1.ebuild
index e90b2ae809a2..370e085506e5 100644
--- a/app-admin/syslog-ng/syslog-ng-3.35.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.35.1.ebuild
@@ -8,7 +8,7 @@ inherit autotools python-single-r1 systemd
 
 MY_PV_MM=$(ver_cut 1-2)
 DESCRIPTION="syslog replacement with advanced filtering features"
-HOMEPAGE="https://syslog-ng.com/open-source-log-management"
+HOMEPAGE="https://www.syslog-ng.com/products/open-source-log-management/"
 SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2+ LGPL-2.1+"
diff --git a/app-admin/syslog-ng/syslog-ng-3.36.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.36.1.ebuild
index 18cd7826fd7b..bc68263f9a85 100644
--- a/app-admin/syslog-ng/syslog-ng-3.36.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.36.1.ebuild
@@ -8,7 +8,7 @@ inherit autotools python-single-r1 systemd
 
 MY_PV_MM=$(ver_cut 1-2)
 DESCRIPTION="syslog replacement with advanced filtering features"
-HOMEPAGE="https://syslog-ng.com/open-source-log-management"
+HOMEPAGE="https://www.syslog-ng.com/products/open-source-log-management/"
 SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2+ LGPL-2.1+"
diff --git a/app-admin/syslog-ng/syslog-ng-3.37.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.37.1.ebuild
index 6914d08d03e8..29cc2377063b 100644
--- a/app-admin/syslog-ng/syslog-ng-3.37.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.37.1.ebuild
@@ -8,7 +8,7 @@ inherit autotools python-single-r1 systemd
 
 MY_PV_MM=$(ver_cut 1-2)
 DESCRIPTION="syslog replacement with advanced filtering features"
-HOMEPAGE="https://syslog-ng.com/open-source-log-management"
+HOMEPAGE="https://www.syslog-ng.com/products/open-source-log-management/"
 SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2+ LGPL-2.1+"
diff --git a/app-admin/syslog-ng/syslog-ng-3.38.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.38.1.ebuild
new file mode 100644
index 000000000000..29cc2377063b
--- /dev/null
+++ b/app-admin/syslog-ng/syslog-ng-3.38.1.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+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/products/open-source-log-management/"
+SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd"
+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/eventlog
+	amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] )
+	caps? ( sys-libs/libcap )
+	dbi? ( >=dev-db/libdbi-0.9.0 )
+	geoip2? ( dev-libs/libmaxminddb:= )
+	http? ( net-misc/curl )
+	json? ( >=dev-libs/json-c-0.9:= )
+	kafka? ( >=dev-libs/librdkafka-1.0.0:= )
+	mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
+	python? ( ${PYTHON_DEPS} )
+	redis? ( >=dev-libs/hiredis-0.11.0:= )
+	smtp? ( net-libs/libesmtp:= )
+	snmp? ( net-analyzer/net-snmp:0= )
+	spoof-source? ( net-libs/libnet:1.1= )
+	systemd? ( sys-apps/systemd:= )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	dev-libs/openssl:0="
+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
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	local f
+
+	use python && python_fix_shebang .
+
+	# remove bundled libs
+	rm -r lib/ivykis || die
+
+	# drop scl modules requiring json
+	if use !json; then
+		sed -i -r '/cim|elasticsearch|ewmm|graylog2|loggly|logmatic|netskope|nodejs|osquery|slack/d' scl/Makefile.am || die
+	fi
+
+	# drop scl modules requiring http
+	if use !http; then
+		sed -i -r '/slack|telegram/d' scl/Makefile.am || die
+	fi
+
+	# use gentoo default path
+	if use systemd; then
+		sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \
+			-i contrib/systemd/syslog-ng@default || die
+	fi
+
+	for f in syslog-ng.logrotate.hardened.in syslog-ng.logrotate.in; do
+		sed \
+			-e "s#@GENTOO_RESTART@#$(usex systemd "systemctl kill -s HUP syslog-ng@default" \
+				"/etc/init.d/syslog-ng reload")#g" \
+			"${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
+	done
+
+	for f in syslog-ng.conf.gentoo.hardened.in \
+			syslog-ng.conf.gentoo.in; do
+		sed -e "s/@SYSLOGNG_VERSION@/${MY_PV_MM}/g" "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
+	done
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--disable-docs
+		--disable-java
+		--disable-java-modules
+		--disable-riemann
+		--enable-manpages
+		--localstatedir=/var/lib/syslog-ng
+		--sysconfdir=/etc/syslog-ng
+		--with-embedded-crypto
+		--with-ivykis=system
+		--with-module-dir=/usr/$(get_libdir)/syslog-ng
+		--with-pidfile-dir=/var/run
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		$(use_enable amqp)
+		$(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client)
+		$(use_enable caps linux-caps)
+		$(use_enable dbi sql)
+		$(use_enable geoip2)
+		$(use_enable http)
+		$(use_enable ipv6)
+		$(use_enable json)
+		$(use_enable kafka)
+		$(use_enable mongodb)
+		$(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options")
+		$(use_enable pacct)
+		$(use_enable python)
+		$(use_enable redis)
+		$(use_enable smtp)
+		$(use_enable snmp afsnmp)
+		$(use_enable spoof-source)
+		$(use_enable systemd)
+		$(use_enable tcpd tcp-wrapper)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	# Install default configuration
+	insinto /etc/default
+	doins contrib/systemd/syslog-ng@default
+
+	insinto /etc/syslog-ng
+	newins "${T}/syslog-ng.conf.gentoo" syslog-ng.conf
+
+	insinto /etc/logrotate.d
+	newins "${T}/syslog-ng.logrotate" syslog-ng
+
+	newinitd "${FILESDIR}/syslog-ng.rc" syslog-ng
+	newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng
+	keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
+	find "${D}" -name '*.la' -delete || die
+
+	use python && python_optimize
+}
+
+pkg_postinst() {
+	# bug #355257
+	if ! has_version app-admin/logrotate ; then
+		elog "It is highly recommended that app-admin/logrotate be emerged to"
+		elog "manage the log files.  ${PN} installs a file in /etc/logrotate.d"
+		elog "for logrotate to use."
+	fi
+
+	if use systemd; then
+		ewarn "The service file for systemd has changed to support multiple instances."
+		ewarn "To start the default instance issue:"
+		ewarn "# systemctl start syslog-ng@default"
+	fi
+}