diff options
Diffstat (limited to 'app-admin')
-rw-r--r-- | app-admin/Manifest.gz | bin | 31692 -> 31690 bytes | |||
-rw-r--r-- | app-admin/syslog-ng/Manifest | 4 | ||||
-rw-r--r-- | app-admin/syslog-ng/syslog-ng-4.3.1.ebuild (renamed from app-admin/syslog-ng/syslog-ng-3.38.1.ebuild) | 40 |
3 files changed, 28 insertions, 16 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz Binary files differindex babca0a2494d..8264ce5a96c5 100644 --- a/app-admin/Manifest.gz +++ b/app-admin/Manifest.gz diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest index cf8b21eff96e..59ecef369f34 100644 --- a/app-admin/syslog-ng/Manifest +++ b/app-admin/syslog-ng/Manifest @@ -8,13 +8,13 @@ AUX syslog-ng.confd 1557 BLAKE2B 42b5b1593c877b7395a8470bdf19571705f0c586a1a3530 AUX syslog-ng.logrotate.hardened.in 1662 BLAKE2B 488ab7e26b081267bdeecd91013ce5118e79dca89567789be9b85f8712a0f8f11005c2459eb334ab5bdfab08c780063e7025a242330367f710717a79352e0d96 SHA512 1c19837570da6c77d49252303abe0ac91280c500bd82c1eab45c4c1534b83d758782dd576b12006bdd738508892d4b898ba29c0969aba536b333ab9b99e6bd83 AUX syslog-ng.logrotate.in 237 BLAKE2B dd2851749f3f56b2099442610fcd85cbfd50a52a8c1ae60726b312ea845f3f0b20e436a4e11a377b9faecb1fa3f0febc008ae262e56018775b82d923ba5f2340 SHA512 4e59f8537579caa249ebe12c53946266633972ac6805b7ccd684a5749deeb897783a4e74570ceec15311edb3531aa4278bba468058227ab4c664a697cc604376 AUX syslog-ng.rc 1891 BLAKE2B ff17e5b3a999813e869d3142ae6800b80a1569e7344f8b65a007d8f4978e1bbd4ce1f1e8f9daefb60c586aa58756d7d98ca59a869ae8e3f4addac732b6086ba5 SHA512 9e21637b684a48093d00ad9b5d4dbb79178ea8cc280cb03dbce235193e916bf3bd10b091a901cf13842f1c080b707a36efe8833bbde9d2721245598a3fe038df -DIST syslog-ng-3.38.1.tar.gz 5405048 BLAKE2B 7819cbe0caab7f580ca9f71181c84d64da838a238a6f8b8b79c8816e37e5691e72e1284de57d5066d3c681d8751950e5a32d65a1b1af4e064dd82f2c59899fe3 SHA512 3a3ef5c72d8c211ed2914791380061dcd48ea1ea95f636a1a8649dc5dee731a11e9ae000a37cbeeba624f4053b623b697e6c7f945a81153106c2365f4f09a847 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 -EBUILD syslog-ng-3.38.1.ebuild 4904 BLAKE2B 756015bb90e4d93608cd20d94406ae186bd9ac730a07c2dbd7e5034fc7b91edf5e4cb442fddfd0b6a0fc1f6e295f34bc85f28c2eee5d2c1417bdf0a8da3df76d SHA512 4ac6c11e784eb28abe38f7ddead8e02bfd5f3eca20d46d451fe9f968c3e1a4b17f5d0ff904e064b8d5be1fc8425e5ee8040a021b19ff9dd30908529fde7fe061 +DIST syslog-ng-4.3.1.tar.gz 6091641 BLAKE2B 7cd6b9831d7ad917ee3c7048d3944e9c9f8a100a51a08e4a9e93b117b7ed3725f91097c2e6e9a377c33ab28d92cdb1b3e6ac301d3cf75d84552dcd93e0fe7aa8 SHA512 571f6080765983326ee912f2a7e87cdc8527296ef555a0b16589c04ed332c0db58e24c70251dc39b1c79151ca7d463e6409835df99aa45c19734d7003a69ce61 EBUILD syslog-ng-4.0.1.ebuild 5111 BLAKE2B 93f949e74187f2754b7ffda3e79f0044c1720792dd9bc7a300582b543ea3982b6ba21ebaa1fb93d6df4616d66afb339e3ca404d836df58e216a5915b4c7eb470 SHA512 1296f81b5d8c520adc0b1fe647bdee75a8cf3b481d3e3a841c79ed48db1cad5e29f99965615b18e518b11d0110b810d4c1ff2088f6473c3a338d55dc2671427e EBUILD syslog-ng-4.1.1-r1.ebuild 5196 BLAKE2B 40f06ee661e9b74b3dc6497e79c2e74f8daa16744bb68bd50dfc9dd1aeb9691920e3f1a944049489ee442e89fad0b89c56b052ad2234ec3c85b41a3dbc670c0b SHA512 408226a572889d7f3361cc7265123861e959ae1dcb8bb81ddc7240894a557c241d1ec90ac6694f809552365aa55e86585e6b621e95e36768700f5a66f80fa2d2 EBUILD syslog-ng-4.1.1-r2.ebuild 5205 BLAKE2B d746d3f854cbfc13e03d5328a652e16513c9c5d29a7e2322e952f417be799e290f9f72748e418ee17398975355aee59f3f15805023d3a37471c5c6d5080cad11 SHA512 fc7f76046edabad88d1712f6ea9e734294afb18dafacb2ae61aeab465334ff939416b485a2449d5fe40d94031c19501e28d2718b3157f2ee1cd0d5df55e76a80 EBUILD syslog-ng-4.2.0.ebuild 5234 BLAKE2B dca59c8d09c785239ab6a69a8a12a8c4fad70803a1f16c425cbac715a78749aff791da1f6a06a3d4ee0cf80fe76a5e61d52631f2c2702b432cd661e775fcef14 SHA512 cbcc3e7c67c675549825dd42a33c268ae490d59c169963d6cf59a3cde988cde88645a8cf465ffbd2b36a23f94b748daf59a32fa26c5382780d89480eb5887e93 +EBUILD syslog-ng-4.3.1.ebuild 5209 BLAKE2B 3dc528256875924e6a360d232f779c7eab472455b6834d68002e2dee502e97bcc00aabc0f076117180cb70b442fc4999543ab6834cefc35c9e94daf2d7149315 SHA512 514e2adf336f017a3a22c6474e425c57103ad10356674d5d3b3d78f5ac59fe1b4ce53ff4ffe29acf1eb6e08b95083d54ed9386b0440f5b1b0f683381f16e9532 MISC metadata.xml 1285 BLAKE2B 91f0ecae07c9131f516a2b9dd6b71d021c84cde055ec58b21734b36f540f65b02452ac20dffaac4a3edc8942ad9a1a1afc3c9837ea4775d40d0d8b3d41083316 SHA512 80924020dccf9bd8d1a83d995af57644eaab761204e2b75a3ef997a2b7582506ba25f476b6203446d116af841629520adfa1cfe443c6e1547755e72956161eb2 diff --git a/app-admin/syslog-ng/syslog-ng-3.38.1.ebuild b/app-admin/syslog-ng/syslog-ng-4.3.1.ebuild index 4c8f2a77d56d..fd1617c0fa08 100644 --- a/app-admin/syslog-ng/syslog-ng-3.38.1.ebuild +++ b/app-admin/syslog-ng/syslog-ng-4.3.1.ebuild @@ -3,18 +3,17 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) 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" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="amqp caps dbi geoip2 http json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) test? ( python )" RESTRICT="!test? ( test )" @@ -22,7 +21,8 @@ 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 + dev-libs/openssl:0= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) caps? ( sys-libs/libcap ) @@ -32,14 +32,18 @@ RDEPEND=" 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? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/setuptools[${PYTHON_USEDEP}] + ') + ) 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 ) - dev-libs/openssl:0=" + tcpd? ( >=sys-apps/tcp-wrappers-7.6 )" DEPEND="${RDEPEND} test? ( dev-libs/criterion )" BDEPEND=" @@ -61,6 +65,10 @@ 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 @@ -89,9 +97,9 @@ src_prepare() { "${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 + 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 done default @@ -99,11 +107,15 @@ 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 @@ -111,6 +123,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) @@ -118,7 +131,6 @@ src_configure() { $(use_enable dbi sql) $(use_enable geoip2) $(use_enable http) - $(use_enable ipv6) $(use_enable json) $(use_enable kafka) $(use_enable mongodb) @@ -161,7 +173,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 |