diff options
Diffstat (limited to 'app-admin/rsyslog')
-rw-r--r-- | app-admin/rsyslog/Manifest | 14 | ||||
-rw-r--r-- | app-admin/rsyslog/files/rsyslog-8.2110.0-skip-omfwd_fast_imuxsock-test.patch | 29 | ||||
-rw-r--r-- | app-admin/rsyslog/files/rsyslog-8.2112.0-pr5024-configure.patch | 44 | ||||
-rw-r--r-- | app-admin/rsyslog/metadata.xml | 97 | ||||
-rw-r--r-- | app-admin/rsyslog/rsyslog-8.2102.0.ebuild | 481 | ||||
-rw-r--r-- | app-admin/rsyslog/rsyslog-8.2104.0.ebuild | 482 | ||||
-rw-r--r-- | app-admin/rsyslog/rsyslog-8.2106.0.ebuild | 483 | ||||
-rw-r--r-- | app-admin/rsyslog/rsyslog-8.2402.0.ebuild (renamed from app-admin/rsyslog/rsyslog-8.2110.0.ebuild) | 85 | ||||
-rw-r--r-- | app-admin/rsyslog/rsyslog-8.2404.0.ebuild (renamed from app-admin/rsyslog/rsyslog-8.2108.0.ebuild) | 93 |
9 files changed, 217 insertions, 1591 deletions
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest index dd06b0ad5bf3..2e797aee8216 100644 --- a/app-admin/rsyslog/Manifest +++ b/app-admin/rsyslog/Manifest @@ -1,10 +1,4 @@ -DIST rsyslog-8.2102.0.tar.gz 3123684 BLAKE2B f5c4e00d68ec82ed3f7b89dd5e888bebda9c4eb38185dfd8ecd96c1bf77380385aaddac73ab1de8364e1239a3de746f160c18b0f135d006f473f9e40be2c18a1 SHA512 281b0e5d5cb548c39a6e514e5fd5b1bdbe8ca0bdd9234f4fea581ed7679f76d2d75b65d14c3c5e799f86f91600074ff75b467aa1ff27cdbec0f4197261c5aec0 -DIST rsyslog-8.2104.0.tar.gz 3175254 BLAKE2B ed772d4e460105b8406305574fdbe4aeca7ba57ba975b78f91d279460fee0faa767fcda3d2d8a4ba6d543bf9e920f9b7cf5ddf9e4d3ccfc9ae3b08c318a6c5b0 SHA512 15ded57f32259bb12b3378d10bc2d4d6eff39623f1195357dafa58e5c1154aedc0d60ff0746599707f380cf3bfc5ca955f15f1213572fa447cc333d479e0eefc -DIST rsyslog-8.2106.0.tar.gz 3180745 BLAKE2B a949c36e0c5251fa3cd7748387990b667564561a5fcf0250bb19ebf62bf88f367814f86d743c64e0b5e5a184e2160ec0c2cd2600ac0ffc655e41d651495e9311 SHA512 309bba7e53f0dc6462f8cac781f567ce879f31bc020b233e80aa4461cc4c6e9279ca1c65c910ce3015fcab9ed663020db84ff4073c03a436b5be66e57a99164f -DIST rsyslog-8.2108.0.tar.gz 3204178 BLAKE2B d120f2b20521a40fbe985a4ba751edd51ed5917fcd0db5d7abb35ecada3ada31f99d34f74cd3278736356e8f09f13b79ca2166e4732676a97655c189d257e3fa SHA512 95096660bc93f7808d22c39549d7429deb340ef8d706f08dc8be35f48d1c7e3d389907fdf18ba04dd54fb59c9780fdb267eef7985184f0e5932bf11f46c5423b -DIST rsyslog-8.2110.0.tar.gz 3217225 BLAKE2B df239609b7a5e08d2a5b1ab5823d45868ac75e1359876e032d4de633165878310f43bfacabab2df4b5657789f77dd2d93814d2fe2aa39e18b267b9bb9234c975 SHA512 b3ec40a272e1fee3034fb24a21ae6c773878b013c04bd01279f6b3bba65a98287c3497a3c4c3e46f8c91311117b3dc491a11a7e193f7ee0347b769c4162b48aa -DIST rsyslog-doc-8.2102.0.tar.gz 6419104 BLAKE2B 134c7ccde6f7435b35840fa37f5774223ac1ebd7dc10db961900a7b1600483156518433c7f70d0981e96ea750e1916ab53e346abacf58066bf141e85c719ae00 SHA512 a5dc4fb9bd8892fac693c5692b926c8d7d9fa36667d6b4c6eccba750713af88d4317f6232efc2a16de38c2e58c4a8bc4d04c9ebb2e7ebc3b0878d53eef20dd2e -DIST rsyslog-doc-8.2104.0.tar.gz 6451275 BLAKE2B cb8a38b28caec17babd190e463070b862071a75c4c63a7208e56f039f84ae7a5c6045112697c61635d328e56d9427f692e67a9d6fefc94b59ad28481210f1481 SHA512 6c898fa606190c5cf214822503f060b1692cd907731858736a395511b66d7b0d1cf6dfcc90c4cecbe21b099197ae2187db53d719f44f85f26a1bd34971539d36 -DIST rsyslog-doc-8.2106.0.tar.gz 6500747 BLAKE2B d004af40dfc82577fe262993b10497cbf50142295ccfc046126e0d8cc85dd964cca7798732d2f41ef9d776096b3ec99a8c835bb037a78c9030ea6cd596d1e057 SHA512 04c205ea463f7487baedf60d0469f3752edfb60a0833954a3f208d52ed6495152c785a4a8ea47396ac85b581ced0657f7b51d313c2d4295e26d547b996ff4ca3 -DIST rsyslog-doc-8.2108.0.tar.gz 6527584 BLAKE2B b7974d2f723603017f1c725f820e03f355af1805d77143e6ff9eeb02e54a991ba4c143fc45b48b3e1625328e68113df36d71abd0763983a8db655081c5d81abc SHA512 d4ca8c91cbdd7be458083ffec9d933e5d1e175dff93fdf9274f5ca444c9cfe8710349c16de6edfd3e12cf97fc889a9e71059ef1d0b85fda4ed335fb107b98a9f -DIST rsyslog-doc-8.2110.0.tar.gz 6533014 BLAKE2B 16670903ddbbc14ef5ebc726964d1fa879849294401825a4e2c65e0ca06924830c2c882b98ab6eb6c2f639dfcf683b8c7659b49965b4280d441935126364ce9c SHA512 f0081b28d7394af30d4e1873a040208ec358d45c7336c69e99e2d6d4a2aae86a25a65d3c803b6570668e24625e50e01d5af3f9fa90f1c8cc82b45b1b6bd7a7e0 +DIST rsyslog-8.2402.0.tar.gz 3404026 BLAKE2B fc33244f0e4699d446ffab19aa8078ac49518b1722a5d7e72e57d7768ef42565bc3fa54b6c594e857715b5d5439ef675811eee888c81aadec3d1e05d5416c51e SHA512 dea9a14abc6ea25b3e5b676eda6a772c0c6266afd95eea0446ea85b29b2f98c058e1495cbdc16dba1c78d5d0919980e4fdfc13ef597082e7f3bf8b6be4cb5723 +DIST rsyslog-8.2404.0.tar.gz 3408657 BLAKE2B 67170f1ba4ad61bd79088a313ee9b093ecaab512ce24ca56cfe605d4589276406abe593d791736ecb7b2f44be998b3836173272eb5dd69f7bc9ea8d5b49d462e SHA512 fda8032ab7f9cb6c46693edeb95d2b47ab7673836ff44d0686bbbd5a3759885f65a80e1a311c809c2332a19559b0297ac7d8e59e5f828372839f67dbf362e6b1 +DIST rsyslog-doc-8.2402.0.tar.gz 6525910 BLAKE2B 20bc3398db00cc2a0e92b610032cb86bcf17b71b31f70a47213b608c7ea9a1a81e9aad5caa74b7f23f0a28fdab7ef3627ec89f5910d535ac1ade5408b3300939 SHA512 dfffb6138cff6121020648c7ed20cec7c881020af956295f88ea297c3198ed6dd49a7fbcb651164c6a774520391d00743a3c34c7acc5f705b668c8048c289eea +DIST rsyslog-doc-8.2404.0.tar.gz 6568723 BLAKE2B 4bc522f9146754a9ebae5f5f7ffb87cfa2da3d9b0832b902c73896d788a061ad4b99cd269b4fb8fc42917311ea5621dfd398428046c53883e9bba859252172ec SHA512 ea88fcf81fb45be515f1b8e7699efabba98eb7e5fcd2d5046424c303db95926a36baa1215143c05e39b9a86dcfdbc73c5c3a76dee382d7b8f1916653169df264 diff --git a/app-admin/rsyslog/files/rsyslog-8.2110.0-skip-omfwd_fast_imuxsock-test.patch b/app-admin/rsyslog/files/rsyslog-8.2110.0-skip-omfwd_fast_imuxsock-test.patch deleted file mode 100644 index 88b4a6f6c6c0..000000000000 --- a/app-admin/rsyslog/files/rsyslog-8.2110.0-skip-omfwd_fast_imuxsock-test.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 440fd1d51c5aa7763d3d810b542a7e373a6738eb Mon Sep 17 00:00:00 2001 -From: Michael Biebl <biebl@debian.org> -Date: Tue, 19 Oct 2021 23:00:50 +0200 -Subject: [PATCH] testbench: skip omfwd_fast_imuxsock.sh if liblogging-stdlog - is not available - -Fixes #4712 ---- - tests/omfwd_fast_imuxsock.sh | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/tests/omfwd_fast_imuxsock.sh b/tests/omfwd_fast_imuxsock.sh -index bb35b58d18..10f9f19c18 100755 ---- a/tests/omfwd_fast_imuxsock.sh -+++ b/tests/omfwd_fast_imuxsock.sh -@@ -4,6 +4,13 @@ - . ${srcdir:=.}/diag.sh init - skip_platform "SunOS" "We have no ATOMIC BUILTINS, so OverallQueueSize counting of imdiag is NOT threadsafe and the counting will fail on SunOS" - -+./syslog_caller -fsyslog_inject-l -m0 > /dev/null 2>&1 -+no_liblogging_stdlog=$? -+if [ $no_liblogging_stdlog -ne 0 ];then -+ echo "liblogging-stdlog not available - skipping test" -+ exit 77 -+fi -+ - # export RSYSLOG_DEBUG="debug nologfuncflow noprintmutexaction nostdout" - export NUMMESSAGES=100000 - diff --git a/app-admin/rsyslog/files/rsyslog-8.2112.0-pr5024-configure.patch b/app-admin/rsyslog/files/rsyslog-8.2112.0-pr5024-configure.patch new file mode 100644 index 000000000000..eae9fbc4d024 --- /dev/null +++ b/app-admin/rsyslog/files/rsyslog-8.2112.0-pr5024-configure.patch @@ -0,0 +1,44 @@ +From e3c750b98564bc66b50ae35e91f5222c441f8b75 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Maciej=20Bar=C4=87?= <xgqt@gentoo.org> +Date: Wed, 16 Nov 2022 15:17:31 +0100 +Subject: [PATCH] configure.ac: remove bashisms +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +replace [[ ]] with test and == with = + +Signed-off-by: Maciej Barć <xgqt@gentoo.org> +--- + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 3a43681d72..6e66ec904b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1138,13 +1138,13 @@ AC_ARG_ENABLE(gnutls-tests, + no) enable_gnutls_tests="no" ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-gnutls-tests) ;; + esac], +- [if [[ "$enable_gnutls" == "yes" ]]; then ++ [if test "x$enable_gnutls" = "xyes"; then + enable_gnutls_tests=yes + else + enable_gnutls_tests=no + fi] + ) +-if [[ "$enable_gnutls_tests" == "yes" ]] && [[ "$enable_gnutls" != "yes" ]]; then ++if test "x$enable_gnutls_tests" = "xyes" && test "x$enable_gnutls" != "xyes"; then + AC_MSG_WARN([gnutls-tests can not be enabled without gnutls support. Disabling gnutls tests...]) + enable_gnutls_tests="no" + fi +@@ -1852,7 +1852,7 @@ AC_ARG_ENABLE(imfile-tests, + esac], + [enable_imfile_tests=yes] + ) +-if [[ "$enable_imfile_tests" == "yes" ]] && [[ "$enable_imfile" != "yes" ]]; then ++if test "x$enable_imfile_tests" = "xyes" && test "x$enable_imfile" != "xyes"; then + AC_MSG_WARN([imfile-tests can not be enabled without imfile support. Disabling imfile tests...]) + enable_imfile_tests="no" + fi diff --git a/app-admin/rsyslog/metadata.xml b/app-admin/rsyslog/metadata.xml index bc281d24c94e..7a2ccda8e2a1 100644 --- a/app-admin/rsyslog/metadata.xml +++ b/app-admin/rsyslog/metadata.xml @@ -1,46 +1,59 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> + <pkgmetadata> - <maintainer type="person"> - <email>whissi@gentoo.org</email> - <name>Thomas Deutschmann</name> - </maintainer> - <use> - <flag name="clickhouse">Build the ClickHouse output module (requires <pkg>net-misc/curl</pkg>)</flag> - <flag name="curl">Enable http_request() function in RainerScript (requires <pkg>net-misc/curl</pkg>)</flag> - <flag name="dbi">Build the general database output module (requires <pkg>dev-db/libdbi</pkg>)</flag> - <flag name="elasticsearch">Build the Elasticsearch output module (requires <pkg>net-misc/curl</pkg>)</flag> - <flag name="gcrypt">Add support for encrypted log files using <pkg>dev-libs/libgcrypt</pkg></flag> - <flag name="gnutls">Build the GnuTLS network stream driver (requires <pkg>net-libs/gnutls</pkg>)</flag> - <flag name="imhttp">Build the http input module (requires <pkg>www-servers/civetweb</pkg>)</flag> - <flag name="impcap">Build the pcap input module (requires <pkg>net-libs/libpcap</pkg>)</flag> - <flag name="kafka">Build the Apache Kafka input/output module (requires <pkg>dev-libs/librdkafka</pkg>)</flag> - <flag name="kerberos">Build the GSSAPI input and output module (requires <pkg>virtual/krb5</pkg>)</flag> - <flag name="kubernetes">Build the kubernetes modify plugin (requires <pkg>net-misc/curl</pkg>)</flag> - <flag name="mdblookup">Build the MaxMind DB lookup message modify plugin using <pkg>dev-libs/libmaxminddb</pkg></flag> - <flag name="mongodb">Build the MongoDB output module (requires <pkg>dev-libs/mongo-c-driver</pkg>)</flag> - <flag name="mysql">Build the MySQL database output module (requires <pkg>virtual/mysql</pkg>)</flag> - <flag name="normalize">Build the normalize modify module (requires <pkg>dev-libs/libee</pkg> and <pkg>dev-libs/liblognorm</pkg>)</flag> - <flag name="omhttp">Build the http output module (requires <pkg>net-misc/curl</pkg>)</flag> - <flag name="omhttpfs">Build the httpfs output module (requires <pkg>net-misc/curl</pkg>)</flag> - <flag name="omudpspoof">Build the udpspoof output module (requires <pkg>net-libs/libnet</pkg>)</flag> - <flag name="openssl">Build the OpenSSL network stream driver (requires <pkg>dev-libs/openssl</pkg>)</flag> - <flag name="postgres">Build the PostgreSQL database output module (requires <pkg>dev-db/postgresql</pkg>)</flag> - <flag name="rabbitmq">Build the RabbitMQ output module (requires <pkg>net-libs/rabbitmq-c</pkg>)</flag> - <flag name="redis">Build the Redis output module using (requires <pkg>dev-libs/hiredis</pkg>)</flag> - <flag name="relp">Build the Reliable Event Logging Protocol (RELP) output module (requires <pkg>dev-libs/librelp</pkg>)</flag> - <flag name="rfc3195">Build the rfc3195 input module (requires <pkg>dev-libs/liblogging</pkg>)</flag> - <flag name="rfc5424hmac">Build the rfc5424hmac modify module (requires <pkg>dev-libs/openssl</pkg>)</flag> - <flag name="snmp">Build the snmp modify and output module (requires <pkg>net-analyzer/net-snmp</pkg>)</flag> - <flag name="ssl">Add support for encrypted client/server communication (requires <pkg>net-libs/gnutls</pkg>)</flag> - <flag name="systemd">Build the journal input and output module (requires <pkg>sys-apps/systemd</pkg>)</flag> - <flag name="uuid">Include UUIDs in messages (requires <pkg>sys-apps/util-linux</pkg>)</flag> - <flag name="usertools">Installs the user tools (rsgtutil, rscryutil...) corresponding to the set USE flags</flag> - <flag name="xxhash">Enable xxHash support in fmhash module (requires <pkg>dev-libs/xxhash</pkg>)</flag> - <flag name="zeromq">Build the ZeroMQ input and output modules (requires <pkg>net-libs/czmq</pkg>)</flag> - </use> - <upstream> - <bugs-to>https://github.com/rsyslog/rsyslog/issues</bugs-to> - <remote-id type="cpe">cpe:/a:rsyslog:rsyslog</remote-id> - </upstream> + <maintainer type="person"> + <email>xgqt@gentoo.org</email> + <name>Maciej Barć</name> + </maintainer> + <longdescription> + Rsyslog is a rocket-fast system for log processing. It offers + high-performance, great security features and a modular design. While it + started as a regular syslogd, rsyslog has evolved into a kind of swiss army + knife of logging, being able to accept inputs from a wide variety of + sources, transform them, and output to the results to diverse destinations. + Rsyslog can deliver over one million messages per second to local + destinations when limited processing is applied (based on v7, December + 2013). Even with remote destinations and more elaborate processing the + performance is usually considered "stunning". + </longdescription> + <use> + <flag name="clickhouse">Build the ClickHouse output module (requires <pkg>net-misc/curl</pkg>)</flag> + <flag name="curl">Enable http_request() function in RainerScript (requires <pkg>net-misc/curl</pkg>)</flag> + <flag name="dbi">Build the general database output module (requires <pkg>dev-db/libdbi</pkg>)</flag> + <flag name="elasticsearch">Build the Elasticsearch output module (requires <pkg>net-misc/curl</pkg>)</flag> + <flag name="gcrypt">Add support for encrypted log files using <pkg>dev-libs/libgcrypt</pkg></flag> + <flag name="gnutls">Build the GnuTLS network stream driver (requires <pkg>net-libs/gnutls</pkg>)</flag> + <flag name="imhttp">Build the http input module (requires <pkg>www-servers/civetweb</pkg>)</flag> + <flag name="impcap">Build the pcap input module (requires <pkg>net-libs/libpcap</pkg>)</flag> + <flag name="kafka">Build the Apache Kafka input/output module (requires <pkg>dev-libs/librdkafka</pkg>)</flag> + <flag name="kerberos">Build the GSSAPI input and output module (requires <pkg>virtual/krb5</pkg>)</flag> + <flag name="kubernetes">Build the kubernetes modify plugin (requires <pkg>net-misc/curl</pkg>)</flag> + <flag name="mdblookup">Build the MaxMind DB lookup message modify plugin using <pkg>dev-libs/libmaxminddb</pkg></flag> + <flag name="mongodb">Build the MongoDB output module (requires <pkg>dev-libs/mongo-c-driver</pkg>)</flag> + <flag name="mysql">Build the MySQL database output module (requires <pkg>virtual/mysql</pkg>)</flag> + <flag name="normalize">Build the normalize modify module (requires <pkg>dev-libs/libee</pkg> and <pkg>dev-libs/liblognorm</pkg>)</flag> + <flag name="omhttp">Build the http output module (requires <pkg>net-misc/curl</pkg>)</flag> + <flag name="omhttpfs">Build the httpfs output module (requires <pkg>net-misc/curl</pkg>)</flag> + <flag name="omudpspoof">Build the udpspoof output module (requires <pkg>net-libs/libnet</pkg>)</flag> + <flag name="openssl">Build the OpenSSL network stream driver (requires <pkg>dev-libs/openssl</pkg>)</flag> + <flag name="postgres">Build the PostgreSQL database output module (requires <pkg>dev-db/postgresql</pkg>)</flag> + <flag name="rabbitmq">Build the RabbitMQ output module (requires <pkg>net-libs/rabbitmq-c</pkg>)</flag> + <flag name="redis">Build the Redis output module using (requires <pkg>dev-libs/hiredis</pkg>)</flag> + <flag name="relp">Build the Reliable Event Logging Protocol (RELP) output module (requires <pkg>dev-libs/librelp</pkg>)</flag> + <flag name="rfc3195">Build the rfc3195 input module (requires <pkg>dev-libs/liblogging</pkg>)</flag> + <flag name="rfc5424hmac">Build the rfc5424hmac modify module (requires <pkg>dev-libs/openssl</pkg>)</flag> + <flag name="snmp">Build the snmp modify and output module (requires <pkg>net-analyzer/net-snmp</pkg>)</flag> + <flag name="ssl">Add support for encrypted client/server communication (requires <pkg>net-libs/gnutls</pkg>)</flag> + <flag name="systemd">Build the journal input and output module (requires <pkg>sys-apps/systemd</pkg>)</flag> + <flag name="uuid">Include UUIDs in messages (requires <pkg>sys-apps/util-linux</pkg>)</flag> + <flag name="usertools">Installs the user tools (rsgtutil, rscryutil...) corresponding to the set USE flags</flag> + <flag name="xxhash">Enable xxHash support in fmhash module (requires <pkg>dev-libs/xxhash</pkg>)</flag> + <flag name="zeromq">Build the ZeroMQ input and output modules (requires <pkg>net-libs/czmq</pkg>)</flag> + </use> + <upstream> + <bugs-to>https://github.com/rsyslog/rsyslog/issues/</bugs-to> + <remote-id type="cpe">cpe:/a:rsyslog:rsyslog</remote-id> + <remote-id type="github">rsyslog/rsyslog</remote-id> + </upstream> </pkgmetadata> diff --git a/app-admin/rsyslog/rsyslog-8.2102.0.ebuild b/app-admin/rsyslog/rsyslog-8.2102.0.ebuild deleted file mode 100644 index 09a86a219fb9..000000000000 --- a/app-admin/rsyslog/rsyslog-8.2102.0.ebuild +++ /dev/null @@ -1,481 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -PYTHON_COMPAT=( python3_{7..9} ) - -inherit autotools linux-info python-any-r1 systemd - -DESCRIPTION="An enhanced multi-threaded syslogd with database support and more" -HOMEPAGE="https://www.rsyslog.com/" - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git" - - DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git" - - inherit git-r3 -else - KEYWORDS="amd64 arm arm64 ~hppa x86" - - SRC_URI=" - https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz - doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz ) - " -fi - -LICENSE="GPL-3 LGPL-3 Apache-2.0" -SLOT="0" - -IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp" -IUSE+=" impcap jemalloc kafka kerberos kubernetes mdblookup" -IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl" -IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl" -IUSE+=" systemd test usertools +uuid xxhash zeromq" - -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - kubernetes? ( normalize ) - ssl? ( || ( gnutls openssl ) ) -" - -BDEPEND=">=sys-devel/autoconf-archive-2015.02.24 - virtual/pkgconfig - elibc_musl? ( sys-libs/queue-standalone ) - test? ( - jemalloc? ( <sys-libs/libfaketime-0.9.7 ) - !jemalloc? ( sys-libs/libfaketime ) - ${PYTHON_DEPS} - )" - -RDEPEND=" - >=dev-libs/libfastjson-0.99.8:= - >=dev-libs/libestr-0.1.9 - >=sys-libs/zlib-1.2.5 - curl? ( >=net-misc/curl-7.35.0 ) - dbi? ( >=dev-db/libdbi-0.8.3 ) - elasticsearch? ( >=net-misc/curl-7.35.0 ) - gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) - imhttp? ( www-servers/civetweb ) - impcap? ( net-libs/libpcap ) - jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) - kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) - kerberos? ( virtual/krb5 ) - kubernetes? ( >=net-misc/curl-7.35.0 ) - mdblookup? ( dev-libs/libmaxminddb:= ) - mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) - mysql? ( dev-db/mysql-connector-c:= ) - normalize? ( - >=dev-libs/liblognorm-2.0.3:= - ) - clickhouse? ( >=net-misc/curl-7.35.0 ) - omhttpfs? ( >=net-misc/curl-7.35.0 ) - omudpspoof? ( >=net-libs/libnet-1.1.6 ) - postgres? ( >=dev-db/postgresql-8.4.20:= ) - rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) - redis? ( >=dev-libs/hiredis-0.11.0:= ) - relp? ( >=dev-libs/librelp-1.2.17:= ) - rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) - rfc5424hmac? ( - >=dev-libs/openssl-0.9.8y:0= - ) - snmp? ( >=net-analyzer/net-snmp-5.7.2 ) - ssl? ( - gnutls? ( >=net-libs/gnutls-2.12.23:0= ) - openssl? ( - dev-libs/openssl:0= - ) - ) - systemd? ( >=sys-apps/systemd-234 ) - uuid? ( sys-apps/util-linux:0= ) - xxhash? ( dev-libs/xxhash:= ) - zeromq? ( - >=net-libs/czmq-4:=[drafts] - )" -DEPEND="${RDEPEND} - test? ( - >=dev-libs/liblogging-1.0.1[stdlog] - )" - -if [[ ${PV} == "9999" ]]; then - BDEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )" - BDEPEND+=" >=sys-devel/flex-2.5.39-r1" - BDEPEND+=" >=sys-devel/bison-2.4.3" - BDEPEND+=" >=dev-python/docutils-0.12" -fi - -CONFIG_CHECK="~INOTIFY_USER" -WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!" - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_unpack() { - if [[ ${PV} == "9999" ]]; then - git-r3_fetch - git-r3_checkout - else - unpack ${P}.tar.gz - fi - - if use doc; then - if [[ ${PV} == "9999" ]]; then - local _EGIT_BRANCH= - if [[ -n "${EGIT_BRANCH}" ]]; then - # Cannot use rsyslog commits/branches for documentation repository - _EGIT_BRANCH=${EGIT_BRANCH} - unset EGIT_BRANCH - fi - - git-r3_fetch "${DOC_REPO_URI}" - git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs - - if [[ -n "${_EGIT_BRANCH}" ]]; then - # Restore previous EGIT_BRANCH information - EGIT_BRANCH=${_EGIT_BRANCH} - fi - else - cd "${S}" || die "Cannot change dir into '${S}'" - mkdir docs || die "Failed to create docs directory" - cd docs || die "Failed to change dir into '${S}/docs'" - unpack ${PN}-doc-${PV}.tar.gz - fi - fi -} - -src_prepare() { - default - - # https://github.com/rsyslog/rsyslog/issues/3626 - sed -i \ - -e '\|^#!/bin/bash$|a exit 77' \ - tests/mmkubernetes-cache-expir*.sh \ - || die "Failed to disabled known test failure mmkubernetes-cache-expir*.sh" - - eautoreconf -} - -src_configure() { - # Maintainer notes: - # * Guardtime support is missing because libgt isn't yet available - # in portage. - # * Hadoop's HDFS file system output module is currently not - # supported in Gentoo because nobody is able to test it - # (JAVA dependency). - # * dev-libs/hiredis doesn't provide pkg-config (see #504614, - # upstream PR 129 and 136) so we need to export HIREDIS_* - # variables because rsyslog's build system depends on pkg-config. - - if use redis; then - export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis" - export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include" - fi - - local myeconfargs=( - --disable-debug-symbols - --disable-generate-man-pages - --without-valgrind-testbench - --disable-liblogging-stdlog - $(use_enable test testbench) - $(use_enable test libfaketime) - $(use_enable test extended-tests) - # Input Plugins without dependencies - --enable-imbatchreport - --enable-imdiag - --enable-imfile - --enable-improg - --enable-impstats - --enable-imptcp - # Message Modificiation Plugins without dependencies - --enable-mmanon - --enable-mmaudit - --enable-mmcount - --enable-mmfields - --enable-mmjsonparse - --enable-mmpstrucdata - --enable-mmrm1stspace - --enable-mmsequence - --enable-mmtaghostname - --enable-mmutf8fix - # Output Modification Plugins without dependencies - --enable-mail - --enable-omprog - --enable-omruleset - --enable-omstdout - --enable-omuxsock - # Misc - --enable-fmhash - $(use_enable xxhash fmhash-xxhash) - --enable-pmaixforwardedfrom - --enable-pmciscoios - --enable-pmcisconames - --enable-pmdb2diag - --enable-pmlastmsg - $(use_enable normalize pmnormalize) - --enable-pmnull - --enable-pmpanngfw - --enable-pmsnare - # DB - $(use_enable dbi libdbi) - $(use_enable mongodb ommongodb) - $(use_enable mysql) - $(use_enable postgres pgsql) - $(use_enable redis omhiredis) - # Debug - $(use_enable debug) - $(use_enable debug diagtools) - $(use_enable debug valgrind) - # Misc - $(use_enable clickhouse) - $(use_enable curl fmhttp) - $(use_enable elasticsearch) - $(use_enable gcrypt libgcrypt) - $(use_enable imhttp) - $(use_enable impcap) - $(use_enable jemalloc) - $(use_enable kafka imkafka) - $(use_enable kafka omkafka) - $(use_enable kerberos gssapi-krb5) - $(use_enable kubernetes mmkubernetes) - $(use_enable normalize mmnormalize) - $(use_enable mdblookup mmdblookup) - $(use_enable omhttp) - $(use_enable omhttpfs) - $(use_enable omudpspoof) - $(use_enable rabbitmq omrabbitmq) - $(use_enable relp) - $(use_enable rfc3195) - $(use_enable rfc5424hmac mmrfc5424addhmac) - $(use_enable snmp) - $(use_enable snmp mmsnmptrapd) - $(use_enable gnutls) - $(use_enable openssl) - $(use_enable systemd imjournal) - $(use_enable systemd omjournal) - $(use_enable usertools) - $(use_enable uuid) - $(use_enable zeromq imczmq) - $(use_enable zeromq omczmq) - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - ) - - econf "${myeconfargs[@]}" -} - -src_compile() { - default - - if use doc && [[ "${PV}" == "9999" ]]; then - einfo "Building documentation ..." - local doc_dir="${S}/docs" - cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!" - sphinx-build -b html source build || die "Building documentation failed!" - fi -} - -src_test() { - local _has_increased_ulimit= - - # Sometimes tests aren't executable (i.e. when added via patch) - einfo "Adjusting permissions of test scripts ..." - find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \ - die "Failed to adjust test scripts permission" - - if ulimit -n 3072; then - _has_increased_ulimit="true" - fi - - if ! emake --jobs 1 check; then - eerror "Test suite failed! :(" - - if [[ -z "${_has_increased_ulimit}" ]]; then - eerror "Probably because open file limit couldn't be set to 3072." - fi - - if has userpriv ${FEATURES}; then - eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \ - "before you submit a bug report." - fi - - fi -} - -src_install() { - local DOCS=( - AUTHORS - ChangeLog - "${FILESDIR}"/README.gentoo - ) - - use doc && local HTML_DOCS=( "${S}/docs/build/." ) - - default - - newconfd "${FILESDIR}/${PN}.confd-r1" ${PN} - newinitd "${FILESDIR}/${PN}.initd-r1" ${PN} - - systemd_newunit "${FILESDIR}/${PN}.service" ${PN}.service - - keepdir /var/empty/dev - keepdir /var/spool/${PN} - keepdir /etc/ssl/${PN} - keepdir /etc/${PN}.d - - insinto /etc - newins "${FILESDIR}/${PN}.conf" ${PN}.conf - - insinto /etc/rsyslog.d/ - newins "${FILESDIR}/50-default-r1.conf" 50-default.conf - - insinto /etc/logrotate.d/ - newins "${FILESDIR}/${PN}-r1.logrotate" ${PN} - - if use mysql; then - insinto /usr/share/${PN}/scripts/mysql - doins plugins/ommysql/createDB.sql - fi - - if use postgres; then - insinto /usr/share/${PN}/scripts/pgsql - doins plugins/ompgsql/createDB.sql - fi - - find "${ED}" -name '*.la' -delete || die -} - -pkg_postinst() { - local advertise_readme=0 - - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - - advertise_readme=1 - - if use mysql || use postgres; then - echo - elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:" - elog " /usr/share/doc/${PF}/scripts" - fi - - if use ssl; then - echo - elog "To create a default CA and certificates for your server and clients, run:" - elog " emerge --config =${PF}" - elog "on your logging server. You can run it several times," - elog "once for each logging client. The client certificates will be signed" - elog "using the CA certificate generated during the first run." - fi - fi - - if [[ ${advertise_readme} -gt 0 ]]; then - # We need to show the README file location - - echo "" - elog "Please read" - elog "" - elog " ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*" - elog "" - elog "for more details." - fi -} - -pkg_config() { - if ! use ssl; then - einfo "There is nothing to configure for rsyslog unless you" - einfo "used USE=ssl to build it." - return 0 - fi - - if ! hash certtool &>/dev/null; then - die "certtool not found! Is net-libs/gnutls[tools] is installed?" - fi - - # Make sure the certificates directory exists - local CERTDIR="${EROOT}/etc/ssl/${PN}" - if [[ ! -d "${CERTDIR}" ]]; then - mkdir "${CERTDIR}" || die - fi - einfo "Your certificates will be stored in ${CERTDIR}" - - # Create a default CA if needed - if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then - einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..." - certtool --generate-privkey \ - --outfile "${CERTDIR}/${PN}_ca.privkey.pem" || die - chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" - - cat > "${T}/${PF}.$$" <<- _EOF - cn = Portage automated CA - ca - cert_signing_key - expiration_days = 3650 - _EOF - - certtool --generate-self-signed \ - --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ - --outfile "${CERTDIR}/${PN}_ca.cert.pem" \ - --template "${T}/${PF}.$$" || die - chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" - - # Create the server certificate - echo - einfon "Please type the Common Name of the SERVER you wish to create a certificate for: " - read -r CN - - einfo "Creating private key and certificate for server ${CN}..." - certtool --generate-privkey \ - --outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die - chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" - - cat > "${T}/${PF}.$$" <<- _EOF - cn = ${CN} - tls_www_server - dns_name = ${CN} - expiration_days = 3650 - _EOF - - certtool --generate-certificate \ - --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ - --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ - --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ - --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ - --template "${T}/${PF}.$$" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" - - else - einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation." - fi - - # Create a client certificate - echo - einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: " - read -r CN - - einfo "Creating private key and certificate for client ${CN}..." - certtool --generate-privkey \ - --outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die - chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" - - cat > "${T}/${PF}.$$" <<- _EOF - cn = ${CN} - tls_www_client - dns_name = ${CN} - expiration_days = 3650 - _EOF - - certtool --generate-certificate \ - --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ - --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ - --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ - --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ - --template "${T}/${PF}.$$" || die - chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" - - rm -f "${T}/${PF}.$$" - - echo - einfo "Here is the documentation on how to encrypt your log traffic:" - einfo " https://www.rsyslog.com/doc/rsyslog_tls.html" -} diff --git a/app-admin/rsyslog/rsyslog-8.2104.0.ebuild b/app-admin/rsyslog/rsyslog-8.2104.0.ebuild deleted file mode 100644 index 731eb7f499cf..000000000000 --- a/app-admin/rsyslog/rsyslog-8.2104.0.ebuild +++ /dev/null @@ -1,482 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -PYTHON_COMPAT=( python3_{7..9} ) - -inherit autotools linux-info python-any-r1 systemd - -DESCRIPTION="An enhanced multi-threaded syslogd with database support and more" -HOMEPAGE="https://www.rsyslog.com/" - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git" - - DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git" - - inherit git-r3 -else - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86" - - SRC_URI=" - https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz - doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz ) - " -fi - -LICENSE="GPL-3 LGPL-3 Apache-2.0" -SLOT="0" - -IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp" -IUSE+=" impcap jemalloc kafka kerberos kubernetes mdblookup" -IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl" -IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl" -IUSE+=" systemd test usertools +uuid xxhash zeromq" - -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - kubernetes? ( normalize ) - ssl? ( || ( gnutls openssl ) ) -" - -BDEPEND=">=sys-devel/autoconf-archive-2015.02.24 - virtual/pkgconfig - elibc_musl? ( sys-libs/queue-standalone ) - test? ( - jemalloc? ( <sys-libs/libfaketime-0.9.7 ) - !jemalloc? ( sys-libs/libfaketime ) - ${PYTHON_DEPS} - )" - -RDEPEND=" - >=dev-libs/libfastjson-0.99.8:= - >=dev-libs/libestr-0.1.9 - >=sys-libs/zlib-1.2.5 - curl? ( >=net-misc/curl-7.35.0 ) - dbi? ( >=dev-db/libdbi-0.8.3 ) - elasticsearch? ( >=net-misc/curl-7.35.0 ) - gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) - imhttp? ( www-servers/civetweb ) - impcap? ( net-libs/libpcap ) - jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) - kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) - kerberos? ( virtual/krb5 ) - kubernetes? ( >=net-misc/curl-7.35.0 ) - mdblookup? ( dev-libs/libmaxminddb:= ) - mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) - mysql? ( dev-db/mysql-connector-c:= ) - normalize? ( - >=dev-libs/liblognorm-2.0.3:= - ) - clickhouse? ( >=net-misc/curl-7.35.0 ) - omhttpfs? ( >=net-misc/curl-7.35.0 ) - omudpspoof? ( >=net-libs/libnet-1.1.6 ) - postgres? ( >=dev-db/postgresql-8.4.20:= ) - rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) - redis? ( >=dev-libs/hiredis-0.11.0:= ) - relp? ( >=dev-libs/librelp-1.2.17:= ) - rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) - rfc5424hmac? ( - >=dev-libs/openssl-0.9.8y:0= - ) - snmp? ( >=net-analyzer/net-snmp-5.7.2 ) - ssl? ( - gnutls? ( >=net-libs/gnutls-2.12.23:0= ) - openssl? ( - dev-libs/openssl:0= - ) - ) - systemd? ( >=sys-apps/systemd-234 ) - uuid? ( sys-apps/util-linux:0= ) - xxhash? ( dev-libs/xxhash:= ) - zeromq? ( - >=net-libs/czmq-4:=[drafts] - )" -DEPEND="${RDEPEND} - test? ( - >=dev-libs/liblogging-1.0.1[stdlog] - )" - -if [[ ${PV} == "9999" ]]; then - BDEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )" - BDEPEND+=" >=sys-devel/flex-2.5.39-r1" - BDEPEND+=" >=sys-devel/bison-2.4.3" - BDEPEND+=" >=dev-python/docutils-0.12" -fi - -CONFIG_CHECK="~INOTIFY_USER" -WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!" - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_unpack() { - if [[ ${PV} == "9999" ]]; then - git-r3_fetch - git-r3_checkout - else - unpack ${P}.tar.gz - fi - - if use doc; then - if [[ ${PV} == "9999" ]]; then - local _EGIT_BRANCH= - if [[ -n "${EGIT_BRANCH}" ]]; then - # Cannot use rsyslog commits/branches for documentation repository - _EGIT_BRANCH=${EGIT_BRANCH} - unset EGIT_BRANCH - fi - - git-r3_fetch "${DOC_REPO_URI}" - git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs - - if [[ -n "${_EGIT_BRANCH}" ]]; then - # Restore previous EGIT_BRANCH information - EGIT_BRANCH=${_EGIT_BRANCH} - fi - else - cd "${S}" || die "Cannot change dir into '${S}'" - mkdir docs || die "Failed to create docs directory" - cd docs || die "Failed to change dir into '${S}/docs'" - unpack ${PN}-doc-${PV}.tar.gz - fi - fi -} - -src_prepare() { - default - - # https://github.com/rsyslog/rsyslog/issues/3626 - sed -i \ - -e '\|^#!/bin/bash$|a exit 77' \ - tests/mmkubernetes-cache-expir*.sh \ - || die "Failed to disabled known test failure mmkubernetes-cache-expir*.sh" - - eautoreconf -} - -src_configure() { - # Maintainer notes: - # * Guardtime support is missing because libgt isn't yet available - # in portage. - # * Hadoop's HDFS file system output module is currently not - # supported in Gentoo because nobody is able to test it - # (JAVA dependency). - # * dev-libs/hiredis doesn't provide pkg-config (see #504614, - # upstream PR 129 and 136) so we need to export HIREDIS_* - # variables because rsyslog's build system depends on pkg-config. - - if use redis; then - export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis" - export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include" - fi - - local myeconfargs=( - --disable-debug-symbols - --disable-generate-man-pages - --without-valgrind-testbench - --disable-liblogging-stdlog - $(use_enable test testbench) - $(use_enable test libfaketime) - $(use_enable test extended-tests) - # Input Plugins without dependencies - --enable-imbatchreport - --enable-imdiag - --enable-imfile - --enable-improg - --enable-impstats - --enable-imptcp - # Message Modificiation Plugins without dependencies - --enable-mmanon - --enable-mmaudit - --enable-mmcount - --enable-mmfields - --enable-mmjsonparse - --enable-mmpstrucdata - --enable-mmrm1stspace - --enable-mmsequence - --enable-mmtaghostname - --enable-mmutf8fix - # Output Modification Plugins without dependencies - --enable-mail - --enable-omprog - --enable-omruleset - --enable-omstdout - --enable-omuxsock - # Misc - --enable-fmhash - $(use_enable xxhash fmhash-xxhash) - --enable-pmaixforwardedfrom - --enable-pmciscoios - --enable-pmcisconames - --enable-pmdb2diag - --enable-pmlastmsg - $(use_enable normalize pmnormalize) - --enable-pmnull - --enable-pmpanngfw - --enable-pmsnare - # DB - $(use_enable dbi libdbi) - $(use_enable mongodb ommongodb) - $(use_enable mysql) - $(use_enable postgres pgsql) - $(use_enable redis imhiredis) - $(use_enable redis omhiredis) - # Debug - $(use_enable debug) - $(use_enable debug diagtools) - $(use_enable debug valgrind) - # Misc - $(use_enable clickhouse) - $(use_enable curl fmhttp) - $(use_enable elasticsearch) - $(use_enable gcrypt libgcrypt) - $(use_enable imhttp) - $(use_enable impcap) - $(use_enable jemalloc) - $(use_enable kafka imkafka) - $(use_enable kafka omkafka) - $(use_enable kerberos gssapi-krb5) - $(use_enable kubernetes mmkubernetes) - $(use_enable normalize mmnormalize) - $(use_enable mdblookup mmdblookup) - $(use_enable omhttp) - $(use_enable omhttpfs) - $(use_enable omudpspoof) - $(use_enable rabbitmq omrabbitmq) - $(use_enable relp) - $(use_enable rfc3195) - $(use_enable rfc5424hmac mmrfc5424addhmac) - $(use_enable snmp) - $(use_enable snmp mmsnmptrapd) - $(use_enable gnutls) - $(use_enable openssl) - $(use_enable systemd imjournal) - $(use_enable systemd omjournal) - $(use_enable usertools) - $(use_enable uuid) - $(use_enable zeromq imczmq) - $(use_enable zeromq omczmq) - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - ) - - econf "${myeconfargs[@]}" -} - -src_compile() { - default - - if use doc && [[ "${PV}" == "9999" ]]; then - einfo "Building documentation ..." - local doc_dir="${S}/docs" - cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!" - sphinx-build -b html source build || die "Building documentation failed!" - fi -} - -src_test() { - local _has_increased_ulimit= - - # Sometimes tests aren't executable (i.e. when added via patch) - einfo "Adjusting permissions of test scripts ..." - find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \ - die "Failed to adjust test scripts permission" - - if ulimit -n 3072; then - _has_increased_ulimit="true" - fi - - if ! emake --jobs 1 check; then - eerror "Test suite failed! :(" - - if [[ -z "${_has_increased_ulimit}" ]]; then - eerror "Probably because open file limit couldn't be set to 3072." - fi - - if has userpriv ${FEATURES}; then - eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \ - "before you submit a bug report." - fi - - fi -} - -src_install() { - local DOCS=( - AUTHORS - ChangeLog - "${FILESDIR}"/README.gentoo - ) - - use doc && local HTML_DOCS=( "${S}/docs/build/." ) - - default - - newconfd "${FILESDIR}/${PN}.confd-r1" ${PN} - newinitd "${FILESDIR}/${PN}.initd-r1" ${PN} - - systemd_newunit "${FILESDIR}/${PN}.service" ${PN}.service - - keepdir /var/empty/dev - keepdir /var/spool/${PN} - keepdir /etc/ssl/${PN} - keepdir /etc/${PN}.d - - insinto /etc - newins "${FILESDIR}/${PN}.conf" ${PN}.conf - - insinto /etc/rsyslog.d/ - newins "${FILESDIR}/50-default-r1.conf" 50-default.conf - - insinto /etc/logrotate.d/ - newins "${FILESDIR}/${PN}-r1.logrotate" ${PN} - - if use mysql; then - insinto /usr/share/${PN}/scripts/mysql - doins plugins/ommysql/createDB.sql - fi - - if use postgres; then - insinto /usr/share/${PN}/scripts/pgsql - doins plugins/ompgsql/createDB.sql - fi - - find "${ED}" -name '*.la' -delete || die -} - -pkg_postinst() { - local advertise_readme=0 - - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - - advertise_readme=1 - - if use mysql || use postgres; then - echo - elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:" - elog " /usr/share/doc/${PF}/scripts" - fi - - if use ssl; then - echo - elog "To create a default CA and certificates for your server and clients, run:" - elog " emerge --config =${PF}" - elog "on your logging server. You can run it several times," - elog "once for each logging client. The client certificates will be signed" - elog "using the CA certificate generated during the first run." - fi - fi - - if [[ ${advertise_readme} -gt 0 ]]; then - # We need to show the README file location - - echo "" - elog "Please read" - elog "" - elog " ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*" - elog "" - elog "for more details." - fi -} - -pkg_config() { - if ! use ssl; then - einfo "There is nothing to configure for rsyslog unless you" - einfo "used USE=ssl to build it." - return 0 - fi - - if ! hash certtool &>/dev/null; then - die "certtool not found! Is net-libs/gnutls[tools] is installed?" - fi - - # Make sure the certificates directory exists - local CERTDIR="${EROOT}/etc/ssl/${PN}" - if [[ ! -d "${CERTDIR}" ]]; then - mkdir "${CERTDIR}" || die - fi - einfo "Your certificates will be stored in ${CERTDIR}" - - # Create a default CA if needed - if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then - einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..." - certtool --generate-privkey \ - --outfile "${CERTDIR}/${PN}_ca.privkey.pem" || die - chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" - - cat > "${T}/${PF}.$$" <<- _EOF - cn = Portage automated CA - ca - cert_signing_key - expiration_days = 3650 - _EOF - - certtool --generate-self-signed \ - --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ - --outfile "${CERTDIR}/${PN}_ca.cert.pem" \ - --template "${T}/${PF}.$$" || die - chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" - - # Create the server certificate - echo - einfon "Please type the Common Name of the SERVER you wish to create a certificate for: " - read -r CN - - einfo "Creating private key and certificate for server ${CN}..." - certtool --generate-privkey \ - --outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die - chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" - - cat > "${T}/${PF}.$$" <<- _EOF - cn = ${CN} - tls_www_server - dns_name = ${CN} - expiration_days = 3650 - _EOF - - certtool --generate-certificate \ - --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ - --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ - --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ - --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ - --template "${T}/${PF}.$$" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" - - else - einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation." - fi - - # Create a client certificate - echo - einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: " - read -r CN - - einfo "Creating private key and certificate for client ${CN}..." - certtool --generate-privkey \ - --outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die - chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" - - cat > "${T}/${PF}.$$" <<- _EOF - cn = ${CN} - tls_www_client - dns_name = ${CN} - expiration_days = 3650 - _EOF - - certtool --generate-certificate \ - --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ - --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ - --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ - --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ - --template "${T}/${PF}.$$" || die - chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" - - rm -f "${T}/${PF}.$$" - - echo - einfo "Here is the documentation on how to encrypt your log traffic:" - einfo " https://www.rsyslog.com/doc/rsyslog_tls.html" -} diff --git a/app-admin/rsyslog/rsyslog-8.2106.0.ebuild b/app-admin/rsyslog/rsyslog-8.2106.0.ebuild deleted file mode 100644 index c03f64233c71..000000000000 --- a/app-admin/rsyslog/rsyslog-8.2106.0.ebuild +++ /dev/null @@ -1,483 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -PYTHON_COMPAT=( python3_{7..10} ) - -inherit autotools linux-info python-any-r1 systemd - -DESCRIPTION="An enhanced multi-threaded syslogd with database support and more" -HOMEPAGE="https://www.rsyslog.com/" - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git" - - DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git" - - inherit git-r3 -else - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86" - - SRC_URI=" - https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz - doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz ) - " -fi - -LICENSE="GPL-3 LGPL-3 Apache-2.0" -SLOT="0" - -IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp" -IUSE+=" impcap jemalloc kafka kerberos kubernetes mdblookup" -IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl" -IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl" -IUSE+=" systemd test usertools +uuid xxhash zeromq" - -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - kubernetes? ( normalize ) - ssl? ( || ( gnutls openssl ) ) -" - -BDEPEND=">=sys-devel/autoconf-archive-2015.02.24 - virtual/pkgconfig - elibc_musl? ( sys-libs/queue-standalone ) - test? ( - jemalloc? ( <sys-libs/libfaketime-0.9.7 ) - !jemalloc? ( sys-libs/libfaketime ) - ${PYTHON_DEPS} - )" - -RDEPEND=" - >=dev-libs/libfastjson-0.99.8:= - >=dev-libs/libestr-0.1.9 - >=sys-libs/zlib-1.2.5 - curl? ( >=net-misc/curl-7.35.0 ) - dbi? ( >=dev-db/libdbi-0.8.3 ) - elasticsearch? ( >=net-misc/curl-7.35.0 ) - gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) - imhttp? ( www-servers/civetweb ) - impcap? ( net-libs/libpcap ) - jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) - kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) - kerberos? ( virtual/krb5 ) - kubernetes? ( >=net-misc/curl-7.35.0 ) - mdblookup? ( dev-libs/libmaxminddb:= ) - mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) - mysql? ( dev-db/mysql-connector-c:= ) - normalize? ( - >=dev-libs/liblognorm-2.0.3:= - ) - clickhouse? ( >=net-misc/curl-7.35.0 ) - omhttpfs? ( >=net-misc/curl-7.35.0 ) - omudpspoof? ( >=net-libs/libnet-1.1.6 ) - postgres? ( >=dev-db/postgresql-8.4.20:= ) - rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) - redis? ( >=dev-libs/hiredis-0.11.0:= ) - relp? ( >=dev-libs/librelp-1.2.17:= ) - rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) - rfc5424hmac? ( - >=dev-libs/openssl-0.9.8y:0= - ) - snmp? ( >=net-analyzer/net-snmp-5.7.2 ) - ssl? ( - gnutls? ( >=net-libs/gnutls-2.12.23:0= ) - openssl? ( - dev-libs/openssl:0= - ) - ) - systemd? ( >=sys-apps/systemd-234 ) - uuid? ( sys-apps/util-linux:0= ) - xxhash? ( dev-libs/xxhash:= ) - zeromq? ( - >=net-libs/czmq-4:=[drafts] - )" -DEPEND="${RDEPEND} - test? ( - >=dev-libs/liblogging-1.0.1[stdlog] - )" - -if [[ ${PV} == "9999" ]]; then - BDEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )" - BDEPEND+=" >=sys-devel/flex-2.5.39-r1" - BDEPEND+=" >=sys-devel/bison-2.4.3" - BDEPEND+=" >=dev-python/docutils-0.12" -fi - -CONFIG_CHECK="~INOTIFY_USER" -WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!" - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_unpack() { - if [[ ${PV} == "9999" ]]; then - git-r3_fetch - git-r3_checkout - else - unpack ${P}.tar.gz - fi - - if use doc; then - if [[ ${PV} == "9999" ]]; then - local _EGIT_BRANCH= - if [[ -n "${EGIT_BRANCH}" ]]; then - # Cannot use rsyslog commits/branches for documentation repository - _EGIT_BRANCH=${EGIT_BRANCH} - unset EGIT_BRANCH - fi - - git-r3_fetch "${DOC_REPO_URI}" - git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs - - if [[ -n "${_EGIT_BRANCH}" ]]; then - # Restore previous EGIT_BRANCH information - EGIT_BRANCH=${_EGIT_BRANCH} - fi - else - cd "${S}" || die "Cannot change dir into '${S}'" - mkdir docs || die "Failed to create docs directory" - cd docs || die "Failed to change dir into '${S}/docs'" - unpack ${PN}-doc-${PV}.tar.gz - fi - fi -} - -src_prepare() { - default - - # https://github.com/rsyslog/rsyslog/issues/3626 - sed -i \ - -e '\|^#!/bin/bash$|a exit 77' \ - tests/mmkubernetes-cache-expir*.sh \ - || die "Failed to disabled known test failure mmkubernetes-cache-expir*.sh" - - eautoreconf -} - -src_configure() { - # Maintainer notes: - # * Guardtime support is missing because libgt isn't yet available - # in portage. - # * Hadoop's HDFS file system output module is currently not - # supported in Gentoo because nobody is able to test it - # (JAVA dependency). - # * dev-libs/hiredis doesn't provide pkg-config (see #504614, - # upstream PR 129 and 136) so we need to export HIREDIS_* - # variables because rsyslog's build system depends on pkg-config. - - if use redis; then - export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis" - export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include" - fi - - local myeconfargs=( - --disable-debug-symbols - --disable-generate-man-pages - --without-valgrind-testbench - --disable-liblogging-stdlog - $(use_enable test testbench) - $(use_enable test libfaketime) - $(use_enable test extended-tests) - # Input Plugins without dependencies - --enable-imbatchreport - --enable-imdiag - --enable-imfile - --enable-improg - --enable-impstats - --enable-imptcp - # Message Modificiation Plugins without dependencies - --enable-mmanon - --enable-mmaudit - --enable-mmcount - --enable-mmfields - --enable-mmjsonparse - --enable-mmpstrucdata - --enable-mmrm1stspace - --enable-mmsequence - --enable-mmtaghostname - --enable-mmutf8fix - # Output Modification Plugins without dependencies - --enable-mail - --enable-omprog - --enable-omruleset - --enable-omstdout - --enable-omuxsock - # Misc - --enable-fmhash - --enable-fmunflatten - $(use_enable xxhash fmhash-xxhash) - --enable-pmaixforwardedfrom - --enable-pmciscoios - --enable-pmcisconames - --enable-pmdb2diag - --enable-pmlastmsg - $(use_enable normalize pmnormalize) - --enable-pmnull - --enable-pmpanngfw - --enable-pmsnare - # DB - $(use_enable dbi libdbi) - $(use_enable mongodb ommongodb) - $(use_enable mysql) - $(use_enable postgres pgsql) - $(use_enable redis imhiredis) - $(use_enable redis omhiredis) - # Debug - $(use_enable debug) - $(use_enable debug diagtools) - $(use_enable debug valgrind) - # Misc - $(use_enable clickhouse) - $(use_enable curl fmhttp) - $(use_enable elasticsearch) - $(use_enable gcrypt libgcrypt) - $(use_enable imhttp) - $(use_enable impcap) - $(use_enable jemalloc) - $(use_enable kafka imkafka) - $(use_enable kafka omkafka) - $(use_enable kerberos gssapi-krb5) - $(use_enable kubernetes mmkubernetes) - $(use_enable normalize mmnormalize) - $(use_enable mdblookup mmdblookup) - $(use_enable omhttp) - $(use_enable omhttpfs) - $(use_enable omudpspoof) - $(use_enable rabbitmq omrabbitmq) - $(use_enable relp) - $(use_enable rfc3195) - $(use_enable rfc5424hmac mmrfc5424addhmac) - $(use_enable snmp) - $(use_enable snmp mmsnmptrapd) - $(use_enable gnutls) - $(use_enable openssl) - $(use_enable systemd imjournal) - $(use_enable systemd omjournal) - $(use_enable usertools) - $(use_enable uuid) - $(use_enable zeromq imczmq) - $(use_enable zeromq omczmq) - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - ) - - econf "${myeconfargs[@]}" -} - -src_compile() { - default - - if use doc && [[ "${PV}" == "9999" ]]; then - einfo "Building documentation ..." - local doc_dir="${S}/docs" - cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!" - sphinx-build -b html source build || die "Building documentation failed!" - fi -} - -src_test() { - local _has_increased_ulimit= - - # Sometimes tests aren't executable (i.e. when added via patch) - einfo "Adjusting permissions of test scripts ..." - find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \ - die "Failed to adjust test scripts permission" - - if ulimit -n 3072; then - _has_increased_ulimit="true" - fi - - if ! emake --jobs 1 check; then - eerror "Test suite failed! :(" - - if [[ -z "${_has_increased_ulimit}" ]]; then - eerror "Probably because open file limit couldn't be set to 3072." - fi - - if has userpriv ${FEATURES}; then - eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \ - "before you submit a bug report." - fi - - fi -} - -src_install() { - local DOCS=( - AUTHORS - ChangeLog - "${FILESDIR}"/README.gentoo - ) - - use doc && local HTML_DOCS=( "${S}/docs/build/." ) - - default - - newconfd "${FILESDIR}/${PN}.confd-r1" ${PN} - newinitd "${FILESDIR}/${PN}.initd-r1" ${PN} - - systemd_newunit "${FILESDIR}/${PN}.service" ${PN}.service - - keepdir /var/empty/dev - keepdir /var/spool/${PN} - keepdir /etc/ssl/${PN} - keepdir /etc/${PN}.d - - insinto /etc - newins "${FILESDIR}/${PN}.conf" ${PN}.conf - - insinto /etc/rsyslog.d/ - newins "${FILESDIR}/50-default-r1.conf" 50-default.conf - - insinto /etc/logrotate.d/ - newins "${FILESDIR}/${PN}-r1.logrotate" ${PN} - - if use mysql; then - insinto /usr/share/${PN}/scripts/mysql - doins plugins/ommysql/createDB.sql - fi - - if use postgres; then - insinto /usr/share/${PN}/scripts/pgsql - doins plugins/ompgsql/createDB.sql - fi - - find "${ED}" -name '*.la' -delete || die -} - -pkg_postinst() { - local advertise_readme=0 - - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - - advertise_readme=1 - - if use mysql || use postgres; then - echo - elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:" - elog " /usr/share/doc/${PF}/scripts" - fi - - if use ssl; then - echo - elog "To create a default CA and certificates for your server and clients, run:" - elog " emerge --config =${PF}" - elog "on your logging server. You can run it several times," - elog "once for each logging client. The client certificates will be signed" - elog "using the CA certificate generated during the first run." - fi - fi - - if [[ ${advertise_readme} -gt 0 ]]; then - # We need to show the README file location - - echo "" - elog "Please read" - elog "" - elog " ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*" - elog "" - elog "for more details." - fi -} - -pkg_config() { - if ! use ssl; then - einfo "There is nothing to configure for rsyslog unless you" - einfo "used USE=ssl to build it." - return 0 - fi - - if ! hash certtool &>/dev/null; then - die "certtool not found! Is net-libs/gnutls[tools] is installed?" - fi - - # Make sure the certificates directory exists - local CERTDIR="${EROOT}/etc/ssl/${PN}" - if [[ ! -d "${CERTDIR}" ]]; then - mkdir "${CERTDIR}" || die - fi - einfo "Your certificates will be stored in ${CERTDIR}" - - # Create a default CA if needed - if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then - einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..." - certtool --generate-privkey \ - --outfile "${CERTDIR}/${PN}_ca.privkey.pem" || die - chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" - - cat > "${T}/${PF}.$$" <<- _EOF - cn = Portage automated CA - ca - cert_signing_key - expiration_days = 3650 - _EOF - - certtool --generate-self-signed \ - --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ - --outfile "${CERTDIR}/${PN}_ca.cert.pem" \ - --template "${T}/${PF}.$$" || die - chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" - - # Create the server certificate - echo - einfon "Please type the Common Name of the SERVER you wish to create a certificate for: " - read -r CN - - einfo "Creating private key and certificate for server ${CN}..." - certtool --generate-privkey \ - --outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die - chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" - - cat > "${T}/${PF}.$$" <<- _EOF - cn = ${CN} - tls_www_server - dns_name = ${CN} - expiration_days = 3650 - _EOF - - certtool --generate-certificate \ - --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ - --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ - --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ - --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ - --template "${T}/${PF}.$$" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" - - else - einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation." - fi - - # Create a client certificate - echo - einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: " - read -r CN - - einfo "Creating private key and certificate for client ${CN}..." - certtool --generate-privkey \ - --outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die - chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" - - cat > "${T}/${PF}.$$" <<- _EOF - cn = ${CN} - tls_www_client - dns_name = ${CN} - expiration_days = 3650 - _EOF - - certtool --generate-certificate \ - --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ - --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ - --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ - --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ - --template "${T}/${PF}.$$" || die - chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" - - rm -f "${T}/${PF}.$$" - - echo - einfo "Here is the documentation on how to encrypt your log traffic:" - einfo " https://www.rsyslog.com/doc/rsyslog_tls.html" -} diff --git a/app-admin/rsyslog/rsyslog-8.2110.0.ebuild b/app-admin/rsyslog/rsyslog-8.2402.0.ebuild index 9dab13ad4b60..95315d04e1e0 100644 --- a/app-admin/rsyslog/rsyslog-8.2110.0.ebuild +++ b/app-admin/rsyslog/rsyslog-8.2402.0.ebuild @@ -1,27 +1,30 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="8" -PYTHON_COMPAT=( python3_{7..10} ) +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) inherit autotools linux-info python-any-r1 systemd DESCRIPTION="An enhanced multi-threaded syslogd with database support and more" -HOMEPAGE="https://www.rsyslog.com/" +HOMEPAGE="https://www.rsyslog.com/ + https://github.com/rsyslog/rsyslog/" -if [[ ${PV} == "9999" ]]; then +if [[ "${PV}" == *9999* ]]; then EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git" - DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git" inherit git-r3 else - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86" - SRC_URI=" https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz - doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz ) + doc? ( + https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz + ) " + + KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc x86" fi LICENSE="GPL-3 LGPL-3 Apache-2.0" @@ -40,9 +43,9 @@ REQUIRED_USE=" ssl? ( || ( gnutls openssl ) ) " -BDEPEND=">=sys-devel/autoconf-archive-2015.02.24 +BDEPEND=">=dev-build/autoconf-archive-2015.02.24 + sys-apps/lsb-release virtual/pkgconfig - elibc_musl? ( sys-libs/queue-standalone ) test? ( jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) @@ -78,7 +81,10 @@ RDEPEND=" omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) - redis? ( >=dev-libs/hiredis-0.11.0:= ) + redis? ( + >=dev-libs/hiredis-0.11.0:= + dev-libs/libevent[threads(+)] + ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( @@ -98,38 +104,42 @@ RDEPEND=" >=net-libs/czmq-4:=[drafts] )" -DEPEND="${RDEPEND}" +DEPEND=" + ${RDEPEND} + elibc_musl? ( sys-libs/queue-standalone ) +" -if [[ ${PV} == "9999" ]]; then +if [[ "${PV}" == "9999" ]]; then BDEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )" - BDEPEND+=" >=sys-devel/flex-2.5.39-r1" - BDEPEND+=" >=sys-devel/bison-2.4.3" + BDEPEND+=" >=app-alternatives/lex-2.5.39-r1" + BDEPEND+=" >=app-alternatives/yacc-2.4.3" BDEPEND+=" >=dev-python/docutils-0.12" fi -PATCHES=( "${FILESDIR}"/${P}-skip-omfwd_fast_imuxsock-test.patch ) - CONFIG_CHECK="~INOTIFY_USER" WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!" +PATCHES=( "${FILESDIR}/${PN}-8.2112.0-pr5024-configure.patch" ) + pkg_setup() { use test && python-any-r1_pkg_setup } src_unpack() { - if [[ ${PV} == "9999" ]]; then + if [[ "${PV}" == "9999" ]]; then git-r3_fetch git-r3_checkout else - unpack ${P}.tar.gz + unpack "${P}.tar.gz" fi if use doc; then - if [[ ${PV} == "9999" ]]; then + if [[ "${PV}" == "9999" ]]; then local _EGIT_BRANCH= if [[ -n "${EGIT_BRANCH}" ]]; then # Cannot use rsyslog commits/branches for documentation repository - _EGIT_BRANCH=${EGIT_BRANCH} + _EGIT_BRANCH="${EGIT_BRANCH}" + unset EGIT_BRANCH fi @@ -144,7 +154,8 @@ src_unpack() { cd "${S}" || die "Cannot change dir into '${S}'" mkdir docs || die "Failed to create docs directory" cd docs || die "Failed to change dir into '${S}/docs'" - unpack ${PN}-doc-${PV}.tar.gz + + unpack "${PN}-doc-${PV}.tar.gz" fi fi } @@ -152,11 +163,21 @@ src_unpack() { src_prepare() { default - # https://github.com/rsyslog/rsyslog/issues/3626 + # Bug: https://github.com/rsyslog/rsyslog/issues/3626 sed -i \ -e '\|^#!/bin/bash$|a exit 77' \ tests/mmkubernetes-cache-expir*.sh \ - || die "Failed to disabled known test failure mmkubernetes-cache-expir*.sh" + || die "Failed to disable known test failure mmkubernetes-cache-expir*.sh" + + sed -i \ + -e '\|^#!/bin/bash$|a exit 0' \ + tests/omprog-close-unresponsive*.sh \ + || die "Failed to disable test omprog-close-unresponsive*.sh" + + sed -i \ + -e '\|^#!/bin/bash$|a exit 0' \ + tests/uxsock_simple.sh \ + || die "Failed to disable test uxsock_simple.sh" eautoreconf } @@ -172,22 +193,24 @@ src_configure() { # upstream PR 129 and 136) so we need to export HIREDIS_* # variables because rsyslog's build system depends on pkg-config. - if use redis; then + if use redis ; then export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis" export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include" fi - local myeconfargs=( + local -a myeconfargs=( --disable-debug-symbols --disable-generate-man-pages --without-valgrind-testbench --disable-liblogging-stdlog + --disable-imfile-tests # Some imfile tests fail (noticed in version 8.2208.0) $(use_enable test testbench) $(use_enable test libfaketime) $(use_enable test extended-tests) # Input Plugins without dependencies --enable-imbatchreport --enable-imdiag + --enable-imdocker --enable-imfile --enable-improg --enable-impstats @@ -264,7 +287,6 @@ src_configure() { $(use_enable uuid) $(use_enable zeromq imczmq) $(use_enable zeromq omczmq) - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" ) econf "${myeconfargs[@]}" @@ -309,13 +331,13 @@ src_test() { } src_install() { - local DOCS=( + local -a DOCS=( AUTHORS ChangeLog "${FILESDIR}"/README.gentoo ) - use doc && local HTML_DOCS=( "${S}/docs/build/." ) + use doc && local -a HTML_DOCS=( "${S}/docs/build/." ) default @@ -388,9 +410,10 @@ pkg_postinst() { } pkg_config() { - if ! use ssl; then + if ! use ssl ; then einfo "There is nothing to configure for rsyslog unless you" einfo "used USE=ssl to build it." + return 0 fi diff --git a/app-admin/rsyslog/rsyslog-8.2108.0.ebuild b/app-admin/rsyslog/rsyslog-8.2404.0.ebuild index c03f64233c71..42bf291760e4 100644 --- a/app-admin/rsyslog/rsyslog-8.2108.0.ebuild +++ b/app-admin/rsyslog/rsyslog-8.2404.0.ebuild @@ -1,27 +1,30 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" -PYTHON_COMPAT=( python3_{7..10} ) +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) inherit autotools linux-info python-any-r1 systemd DESCRIPTION="An enhanced multi-threaded syslogd with database support and more" -HOMEPAGE="https://www.rsyslog.com/" +HOMEPAGE="https://www.rsyslog.com/ + https://github.com/rsyslog/rsyslog/" -if [[ ${PV} == "9999" ]]; then +if [[ "${PV}" == *9999* ]]; then EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git" - DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git" inherit git-r3 else - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86" - SRC_URI=" https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz - doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz ) + doc? ( + https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz + ) " + + KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc x86" fi LICENSE="GPL-3 LGPL-3 Apache-2.0" @@ -40,9 +43,9 @@ REQUIRED_USE=" ssl? ( || ( gnutls openssl ) ) " -BDEPEND=">=sys-devel/autoconf-archive-2015.02.24 +BDEPEND=">=dev-build/autoconf-archive-2015.02.24 + sys-apps/lsb-release virtual/pkgconfig - elibc_musl? ( sys-libs/queue-standalone ) test? ( jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) @@ -57,7 +60,11 @@ RDEPEND=" dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) - imhttp? ( www-servers/civetweb ) + imhttp? ( + dev-libs/apr-util + www-servers/civetweb + virtual/libcrypt:= + ) impcap? ( net-libs/libpcap ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) @@ -74,7 +81,10 @@ RDEPEND=" omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) - redis? ( >=dev-libs/hiredis-0.11.0:= ) + redis? ( + >=dev-libs/hiredis-0.11.0:= + dev-libs/libevent[threads(+)] + ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( @@ -93,39 +103,43 @@ RDEPEND=" zeromq? ( >=net-libs/czmq-4:=[drafts] )" -DEPEND="${RDEPEND} - test? ( - >=dev-libs/liblogging-1.0.1[stdlog] - )" -if [[ ${PV} == "9999" ]]; then +DEPEND=" + ${RDEPEND} + elibc_musl? ( sys-libs/queue-standalone ) +" + +if [[ "${PV}" == "9999" ]]; then BDEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )" - BDEPEND+=" >=sys-devel/flex-2.5.39-r1" - BDEPEND+=" >=sys-devel/bison-2.4.3" + BDEPEND+=" >=app-alternatives/lex-2.5.39-r1" + BDEPEND+=" >=app-alternatives/yacc-2.4.3" BDEPEND+=" >=dev-python/docutils-0.12" fi CONFIG_CHECK="~INOTIFY_USER" WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!" +PATCHES=( "${FILESDIR}/${PN}-8.2112.0-pr5024-configure.patch" ) + pkg_setup() { use test && python-any-r1_pkg_setup } src_unpack() { - if [[ ${PV} == "9999" ]]; then + if [[ "${PV}" == "9999" ]]; then git-r3_fetch git-r3_checkout else - unpack ${P}.tar.gz + unpack "${P}.tar.gz" fi if use doc; then - if [[ ${PV} == "9999" ]]; then + if [[ "${PV}" == "9999" ]]; then local _EGIT_BRANCH= if [[ -n "${EGIT_BRANCH}" ]]; then # Cannot use rsyslog commits/branches for documentation repository - _EGIT_BRANCH=${EGIT_BRANCH} + _EGIT_BRANCH="${EGIT_BRANCH}" + unset EGIT_BRANCH fi @@ -140,7 +154,8 @@ src_unpack() { cd "${S}" || die "Cannot change dir into '${S}'" mkdir docs || die "Failed to create docs directory" cd docs || die "Failed to change dir into '${S}/docs'" - unpack ${PN}-doc-${PV}.tar.gz + + unpack "${PN}-doc-${PV}.tar.gz" fi fi } @@ -148,11 +163,21 @@ src_unpack() { src_prepare() { default - # https://github.com/rsyslog/rsyslog/issues/3626 + # Bug: https://github.com/rsyslog/rsyslog/issues/3626 sed -i \ -e '\|^#!/bin/bash$|a exit 77' \ tests/mmkubernetes-cache-expir*.sh \ - || die "Failed to disabled known test failure mmkubernetes-cache-expir*.sh" + || die "Failed to disable known test failure mmkubernetes-cache-expir*.sh" + + sed -i \ + -e '\|^#!/bin/bash$|a exit 0' \ + tests/omprog-close-unresponsive*.sh \ + || die "Failed to disable test omprog-close-unresponsive*.sh" + + sed -i \ + -e '\|^#!/bin/bash$|a exit 0' \ + tests/uxsock_simple.sh \ + || die "Failed to disable test uxsock_simple.sh" eautoreconf } @@ -168,22 +193,24 @@ src_configure() { # upstream PR 129 and 136) so we need to export HIREDIS_* # variables because rsyslog's build system depends on pkg-config. - if use redis; then + if use redis ; then export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis" export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include" fi - local myeconfargs=( + local -a myeconfargs=( --disable-debug-symbols --disable-generate-man-pages --without-valgrind-testbench --disable-liblogging-stdlog + --disable-imfile-tests # Some imfile tests fail (noticed in version 8.2208.0) $(use_enable test testbench) $(use_enable test libfaketime) $(use_enable test extended-tests) # Input Plugins without dependencies --enable-imbatchreport --enable-imdiag + --enable-imdocker --enable-imfile --enable-improg --enable-impstats @@ -260,7 +287,6 @@ src_configure() { $(use_enable uuid) $(use_enable zeromq imczmq) $(use_enable zeromq omczmq) - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" ) econf "${myeconfargs[@]}" @@ -305,13 +331,13 @@ src_test() { } src_install() { - local DOCS=( + local -a DOCS=( AUTHORS ChangeLog "${FILESDIR}"/README.gentoo ) - use doc && local HTML_DOCS=( "${S}/docs/build/." ) + use doc && local -a HTML_DOCS=( "${S}/docs/build/." ) default @@ -384,9 +410,10 @@ pkg_postinst() { } pkg_config() { - if ! use ssl; then + if ! use ssl ; then einfo "There is nothing to configure for rsyslog unless you" einfo "used USE=ssl to build it." + return 0 fi |