commit: 8c7dc635507f8bc00c9601630a0ffe5e2d004919 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Feb 6 07:33:58 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Feb 6 07:33:58 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c7dc635
Revert "app-admin/syslog-ng: drop 4.0.1, 4.1.1-r1, 4.1.1-r2" This reverts commit 808a63239296f90c10ba70820abfb1c55a8e4b25. Bug: https://bugs.gentoo.org/914364 Signed-off-by: Sam James <sam <AT> gentoo.org> app-admin/syslog-ng/Manifest | 2 + ...slog-ng-4.6.0.ebuild => syslog-ng-4.0.1.ebuild} | 50 ++++++++-------------- ...g-ng-4.6.0.ebuild => syslog-ng-4.1.1-r1.ebuild} | 41 +++++++----------- ...g-ng-4.6.0.ebuild => syslog-ng-4.1.1-r2.ebuild} | 37 ++++++---------- app-admin/syslog-ng/syslog-ng-4.6.0.ebuild | 2 +- 5 files changed, 51 insertions(+), 81 deletions(-) diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest index ec85b1c17dc2..6fa45b03cdb1 100644 --- a/app-admin/syslog-ng/Manifest +++ b/app-admin/syslog-ng/Manifest @@ -1,3 +1,5 @@ +DIST syslog-ng-4.0.1.tar.gz 5452824 BLAKE2B a5c0328f3c88a38dbc07bb7af2a74c0037a6679525a29fca58620a8ef6b05ec13f3942d26767aded0049376ed30ce6a525686501914648a509997c5de2b48eb4 SHA512 5f83ee3cc4935218feb19f3f5065a68099e3ee291d806ad8810499ded9f9ef3b326b4b22841cd736354ed6a2ebc1ce8ae73f6abe981aa6f64c42da9ee3b1e22f +DIST syslog-ng-4.1.1.tar.gz 5556174 BLAKE2B 3e1a9c394b8a88cc7b39a026950760cbc7796d67b62bb3c0f2970fd80c296e9bd75d1057fe81a0d22ac8488789d13607f19abc6aa38b3a38a30ff450ee66e3a0 SHA512 89abb7a53570b6f7c0dc76905c97d207447117f1db1aa0c0da97c17366ea833b6404f9c7fc318436fd01be2bab032eccca9712063a7c683780026e7e52493dc8 DIST syslog-ng-4.2.0.tar.gz 5763000 BLAKE2B 7dfa6a1aff896072cc742c6dba5dc1680955e06ce4400fde5b0ddecedd984c039a687f35286685d66e7a5580c7da94f00a14b10f6eb8c162233683bf170e37fb SHA512 85442b57b7934e8afbb4e7d8285ed1fd16aaad2a8d853e3765db4f885d88bee4910a3b5d271f1cbd100c2d3a3f81f1a4fe845bc948fe68c22d32bc9b730af04b DIST syslog-ng-4.3.1.tar.gz 6091641 BLAKE2B 7cd6b9831d7ad917ee3c7048d3944e9c9f8a100a51a08e4a9e93b117b7ed3725f91097c2e6e9a377c33ab28d92cdb1b3e6ac301d3cf75d84552dcd93e0fe7aa8 SHA512 571f6080765983326ee912f2a7e87cdc8527296ef555a0b16589c04ed332c0db58e24c70251dc39b1c79151ca7d463e6409835df99aa45c19734d7003a69ce61 DIST syslog-ng-4.4.0.tar.gz 6208437 BLAKE2B 4d719c980f40437661014aa607b01952039694cc1a7e3173efdf1ae682af0e5956098f23009bbbba941c12e26fef515fba0664b170810e654f82f4ae2ac2afc8 SHA512 1cf18c43321e523d0f49b25a4839fd10ec301b207da1b2c407df5167dba557ac0a7781b07f1c1e5d18241376966b8099d9e41dffa55030f6a8052388139c4107 diff --git a/app-admin/syslog-ng/syslog-ng-4.6.0.ebuild b/app-admin/syslog-ng/syslog-ng-4.0.1.ebuild similarity index 80% copy from app-admin/syslog-ng/syslog-ng-4.6.0.ebuild copy to app-admin/syslog-ng/syslog-ng-4.0.1.ebuild index 29c8bf7440b7..4ba1fa54003f 100644 --- a/app-admin/syslog-ng/syslog-ng-4.6.0.ebuild +++ b/app-admin/syslog-ng/syslog-ng-4.0.1.ebuild @@ -3,17 +3,18 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{9..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/syslog-ng/syslog-ng/releases/download/${P}/${P}.tar.gz"; +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 grpc http json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd" +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 )" @@ -21,40 +22,30 @@ RESTRICT="!test? ( test )" RDEPEND=" >=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.4 - >=dev-libs/libpcre2-10.0 - dev-libs/openssl:0= + >=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:= ) - grpc? ( - dev-libs/protobuf:= - net-libs/grpc:= - ) 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} - $(python_gen_cond_dep ' - dev-python/setuptools[${PYTHON_USEDEP}] - ') - ) + 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 ) + spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 )" + 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 - grpc? ( dev-libs/protobuf:= )" + app-alternatives/lex + 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" @@ -102,9 +93,9 @@ src_prepare() { "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die done - for f in syslog-ng.conf.gentoo.hardened.in-r1 \ - syslog-ng.conf.gentoo.in-r1; do - sed -e "s/@SYSLOGNG_VERSION@/$(ver_cut 1-2)/g" "${FILESDIR}/${f}" > "${T}/${f/.in-r1/}" || die + 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 @@ -112,15 +103,11 @@ src_prepare() { } src_configure() { - # Needs bison/flex. - unset YACC LEX - local myconf=( --disable-docs --disable-java --disable-java-modules --disable-riemann - --enable-ipv6 --enable-manpages --localstatedir=/var/lib/syslog-ng --sysconfdir=/etc/syslog-ng @@ -131,13 +118,12 @@ src_configure() { --with-python-packages=none --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" $(use_enable amqp) - $(use_with amqp librabbitmq-client system) + $(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client) $(use_enable caps linux-caps) $(use_enable dbi sql) $(use_enable geoip2) - $(use_enable grpc) - $(use_enable grpc cpp) $(use_enable http) + $(use_enable ipv6) $(use_enable json) $(use_enable kafka) $(use_enable mongodb) @@ -180,7 +166,7 @@ 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 "manage the log files. ${PN} installs a file in /etc/logrotate.d" elog "for logrotate to use." fi diff --git a/app-admin/syslog-ng/syslog-ng-4.6.0.ebuild b/app-admin/syslog-ng/syslog-ng-4.1.1-r1.ebuild similarity index 84% copy from app-admin/syslog-ng/syslog-ng-4.6.0.ebuild copy to app-admin/syslog-ng/syslog-ng-4.1.1-r1.ebuild index 29c8bf7440b7..e92f8f960cff 100644 --- a/app-admin/syslog-ng/syslog-ng-4.6.0.ebuild +++ b/app-admin/syslog-ng/syslog-ng-4.1.1-r1.ebuild @@ -3,17 +3,18 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{9..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/syslog-ng/syslog-ng/releases/download/${P}/${P}.tar.gz"; +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 grpc http json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd" +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 )" @@ -21,17 +22,12 @@ RESTRICT="!test? ( test )" RDEPEND=" >=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.4 - >=dev-libs/libpcre2-10.0 - dev-libs/openssl:0= + >=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:= ) - grpc? ( - dev-libs/protobuf:= - net-libs/grpc:= - ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) kafka? ( >=dev-libs/librdkafka-1.0.0:= ) @@ -45,16 +41,16 @@ RDEPEND=" redis? ( >=dev-libs/hiredis-0.11.0:= ) 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 )" + 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 - grpc? ( dev-libs/protobuf:= )" + app-alternatives/lex + 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" @@ -102,9 +98,9 @@ src_prepare() { "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die done - for f in syslog-ng.conf.gentoo.hardened.in-r1 \ - syslog-ng.conf.gentoo.in-r1; do - sed -e "s/@SYSLOGNG_VERSION@/$(ver_cut 1-2)/g" "${FILESDIR}/${f}" > "${T}/${f/.in-r1/}" || die + 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 @@ -112,15 +108,11 @@ src_prepare() { } src_configure() { - # Needs bison/flex. - unset YACC LEX - local myconf=( --disable-docs --disable-java --disable-java-modules --disable-riemann - --enable-ipv6 --enable-manpages --localstatedir=/var/lib/syslog-ng --sysconfdir=/etc/syslog-ng @@ -131,13 +123,12 @@ src_configure() { --with-python-packages=none --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" $(use_enable amqp) - $(use_with amqp librabbitmq-client system) + $(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client) $(use_enable caps linux-caps) $(use_enable dbi sql) $(use_enable geoip2) - $(use_enable grpc) - $(use_enable grpc cpp) $(use_enable http) + $(use_enable ipv6) $(use_enable json) $(use_enable kafka) $(use_enable mongodb) @@ -180,7 +171,7 @@ 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 "manage the log files. ${PN} installs a file in /etc/logrotate.d" elog "for logrotate to use." fi diff --git a/app-admin/syslog-ng/syslog-ng-4.6.0.ebuild b/app-admin/syslog-ng/syslog-ng-4.1.1-r2.ebuild similarity index 86% copy from app-admin/syslog-ng/syslog-ng-4.6.0.ebuild copy to app-admin/syslog-ng/syslog-ng-4.1.1-r2.ebuild index 29c8bf7440b7..48fa3d466610 100644 --- a/app-admin/syslog-ng/syslog-ng-4.6.0.ebuild +++ b/app-admin/syslog-ng/syslog-ng-4.1.1-r2.ebuild @@ -3,17 +3,18 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{9..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/syslog-ng/syslog-ng/releases/download/${P}/${P}.tar.gz"; +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 grpc http json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd" +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 )" @@ -21,17 +22,12 @@ RESTRICT="!test? ( test )" RDEPEND=" >=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.4 - >=dev-libs/libpcre2-10.0 - dev-libs/openssl:0= + >=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:= ) - grpc? ( - dev-libs/protobuf:= - net-libs/grpc:= - ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) kafka? ( >=dev-libs/librdkafka-1.0.0:= ) @@ -45,16 +41,16 @@ RDEPEND=" redis? ( >=dev-libs/hiredis-0.11.0:= ) 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 )" + 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 - grpc? ( dev-libs/protobuf:= )" + app-alternatives/lex + 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" @@ -104,7 +100,7 @@ src_prepare() { for f in syslog-ng.conf.gentoo.hardened.in-r1 \ syslog-ng.conf.gentoo.in-r1; do - sed -e "s/@SYSLOGNG_VERSION@/$(ver_cut 1-2)/g" "${FILESDIR}/${f}" > "${T}/${f/.in-r1/}" || die + sed -e "s/@SYSLOGNG_VERSION@/${MY_PV_MM}/g" "${FILESDIR}/${f}" > "${T}/${f/.in-r1/}" || die done default @@ -112,15 +108,11 @@ src_prepare() { } src_configure() { - # Needs bison/flex. - unset YACC LEX - local myconf=( --disable-docs --disable-java --disable-java-modules --disable-riemann - --enable-ipv6 --enable-manpages --localstatedir=/var/lib/syslog-ng --sysconfdir=/etc/syslog-ng @@ -131,13 +123,12 @@ src_configure() { --with-python-packages=none --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" $(use_enable amqp) - $(use_with amqp librabbitmq-client system) + $(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client) $(use_enable caps linux-caps) $(use_enable dbi sql) $(use_enable geoip2) - $(use_enable grpc) - $(use_enable grpc cpp) $(use_enable http) + $(use_enable ipv6) $(use_enable json) $(use_enable kafka) $(use_enable mongodb) @@ -180,7 +171,7 @@ 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 "manage the log files. ${PN} installs a file in /etc/logrotate.d" elog "for logrotate to use." fi diff --git a/app-admin/syslog-ng/syslog-ng-4.6.0.ebuild b/app-admin/syslog-ng/syslog-ng-4.6.0.ebuild index 29c8bf7440b7..7913301d52da 100644 --- a/app-admin/syslog-ng/syslog-ng-4.6.0.ebuild +++ b/app-admin/syslog-ng/syslog-ng-4.6.0.ebuild @@ -8,7 +8,7 @@ inherit autotools python-single-r1 systemd DESCRIPTION="syslog replacement with advanced filtering features" 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"; +SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"; LICENSE="GPL-2+ LGPL-2.1+" SLOT="0"
