From 81b8f20732954c4508baf2f77472b5435e3f851f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 14 Sep 2022 11:10:11 +0100 Subject: gentoo auto-resync : 14:09:2022 - 11:10:10 --- net-analyzer/Manifest.gz | Bin 45040 -> 45046 bytes net-analyzer/icinga2/Manifest | 2 +- net-analyzer/icinga2/icinga2-2.13.5.ebuild | 2 +- net-analyzer/nessus-agent-bin/Manifest | 4 +- .../nessus-agent-bin-10.1.4.ebuild | 70 -------------- .../nessus-agent-bin-10.2.0.ebuild | 71 ++++++++++++++ net-analyzer/tcpdump/Manifest | 4 +- .../files/tcpdump-4.99.1-clang15-configure.patch | 57 +++++++++++ net-analyzer/tcpdump/tcpdump-4.99.1-r1.ebuild | 107 +++++++++++++++++++++ net-analyzer/tcpdump/tcpdump-9999.ebuild | 2 +- 10 files changed, 243 insertions(+), 76 deletions(-) delete mode 100644 net-analyzer/nessus-agent-bin/nessus-agent-bin-10.1.4.ebuild create mode 100644 net-analyzer/nessus-agent-bin/nessus-agent-bin-10.2.0.ebuild create mode 100644 net-analyzer/tcpdump/files/tcpdump-4.99.1-clang15-configure.patch create mode 100644 net-analyzer/tcpdump/tcpdump-4.99.1-r1.ebuild (limited to 'net-analyzer') diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz index 51816462491e..3b2ad5202d11 100644 Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest index d8057f7655eb..4d2c641045b5 100644 --- a/net-analyzer/icinga2/Manifest +++ b/net-analyzer/icinga2/Manifest @@ -3,6 +3,6 @@ AUX icinga2.initd-3 2390 BLAKE2B 1ead1dd958d978324dfa043abcc58be7ed389207e2bf4dc DIST icinga2-2.13.4.tar.gz 9662432 BLAKE2B fdae71d081a646b2f70d768b43c56602221d585997a1fca96d2f6c30c27eb6344a443a1d12981c94542fdb77443b40be3c4ec87796a82bfcab1b53fe6b46e0ec SHA512 454eb03587c66de2697d0d604fab37ae4ce243653357cd3295998ab9b58287acefc27876e06e530b8bd6bb4d96c1289a1f05ef25f0b19573123a0cf1d99b5cfb DIST icinga2-2.13.5.tar.gz 9663739 BLAKE2B 9ce884cfd66eb6ab9a6977c8e751465bbec30605c0b62302850e2533ea5b3bfa003074807ad21a4338d37c41fac59454eb65edbca7ab7c4897ecd74a4d41ff1f SHA512 7ac8970292795b8675a8fdc25ee0a68c6fe506d7413fe9c3c61e90ca159bdf01af43343de2217cbb4b5e446139c97e8b115b4dcd10b8ef68e884a07b80669f5d EBUILD icinga2-2.13.4.ebuild 3983 BLAKE2B 0d4ac0f6455d2ff0193463bfa8472c5dbd8a7115b46efd7721e79b382a29cf0919cc87b85696b39299458fea6cd1739b23b855babc2ea63ec8a00b5a6d46cd03 SHA512 809bf739c2779af8102d3ef01fb34526997284f5446622a90a58de4116d60868688771c4f73eb2ef6ac8e8bce60569298d3c05ef45549760a63f699f8448032c -EBUILD icinga2-2.13.5.ebuild 3985 BLAKE2B 5f573b61590cdd31f5c3d18b0f58bc3f5639de5b2fa47462fe75b45f9b5d9c6efdf59816477accf950cbbe427f950dfb81a8e1f2990be8728e04a2012dc67595 SHA512 b53e41c683b2492e42f7ed0fc5f92ff1ead0e24e6fd4966b314f8d94af63468b7c71345017407e8f95c0f3ed340e58f4e6050c845f2c44f83abd07de0c05d058 +EBUILD icinga2-2.13.5.ebuild 3983 BLAKE2B 0d4ac0f6455d2ff0193463bfa8472c5dbd8a7115b46efd7721e79b382a29cf0919cc87b85696b39299458fea6cd1739b23b855babc2ea63ec8a00b5a6d46cd03 SHA512 809bf739c2779af8102d3ef01fb34526997284f5446622a90a58de4116d60868688771c4f73eb2ef6ac8e8bce60569298d3c05ef45549760a63f699f8448032c EBUILD icinga2-9999.ebuild 3985 BLAKE2B 5f573b61590cdd31f5c3d18b0f58bc3f5639de5b2fa47462fe75b45f9b5d9c6efdf59816477accf950cbbe427f950dfb81a8e1f2990be8728e04a2012dc67595 SHA512 b53e41c683b2492e42f7ed0fc5f92ff1ead0e24e6fd4966b314f8d94af63468b7c71345017407e8f95c0f3ed340e58f4e6050c845f2c44f83abd07de0c05d058 MISC metadata.xml 871 BLAKE2B ffd6aeebf603ed90bfa4cc34d557e947e435d204c84e062532cedecd3e811710d9bd39f9f43dd70afd575104be5661b5f7e7de3f79365a961d45f61835a602c6 SHA512 3ca0916252061c1705d194066a30a8fc19cfe4341911646b7ed797e131e02f40eeddc91c2449a5b049888be749d16a5103e70678e5d6c1604db0ac3fe9f4e0d7 diff --git a/net-analyzer/icinga2/icinga2-2.13.5.ebuild b/net-analyzer/icinga2/icinga2-2.13.5.ebuild index 2c5482fe5a8f..b95acf553b6c 100644 --- a/net-analyzer/icinga2/icinga2-2.13.5.ebuild +++ b/net-analyzer/icinga2/icinga2-2.13.5.ebuild @@ -7,7 +7,7 @@ inherit cmake systemd if [[ ${PV} != 9999 ]]; then SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~x86" + KEYWORDS="amd64 ~arm64 x86" else inherit git-r3 EGIT_REPO_URI="https://github.com/Icinga/icinga2.git" diff --git a/net-analyzer/nessus-agent-bin/Manifest b/net-analyzer/nessus-agent-bin/Manifest index c42dac2432d9..2557511bb410 100644 --- a/net-analyzer/nessus-agent-bin/Manifest +++ b/net-analyzer/nessus-agent-bin/Manifest @@ -1,4 +1,4 @@ AUX nessusagent.initd 563 BLAKE2B 63820368c95dc2358ff73843e239a084e21cea48bd4dfd170e486f0c702e7ec6be1581478f7c37dd12868dd3648dfd8f44b8ff47c85fdab0276a0c84b78eb7d1 SHA512 acc9a64e1cbff1119876f186aa6c40d6f5772c55a919914c410fed9e0974d2ce8fe5b965248aeae590ae5dd551ab530c59dad42c6f793d995193f9b8f9d89718 -DIST NessusAgent-10.1.4-es8.x86_64.rpm 13279708 BLAKE2B 43fa89a69c1a95249415bb6fa33e34c16d82348e20520b58cd00b63d2f5194dcbb3c89a8f40c78a5a454230139a00973e7f948562c6a3a0dea5fd6adca816b79 SHA512 ac5fec82774f6b431a1ae148d834260d394934ee6abdce969469fe3734dca85a1cae69fdd9157d8ed605a75493611357ea5fc834fd8fac920910d62d2bd05a96 -EBUILD nessus-agent-bin-10.1.4.ebuild 2361 BLAKE2B 4e904bc555536c60d4b6fe1ab1cecd86114d4a83036f3f443eefa931c85fc460b1beb8da670653aada62134b45b4ebf09cc9743ade35d006f30a999ca20ab2ed SHA512 f4ec7de4f4843d907b60d7989422a3d29b98b15a9a9050dcf151e20d0b4dd3bfa8eb71bae5d0ffe30e589c404e40176c5cb38ac0a27740fa5c258fba9128a1b0 +DIST NessusAgent-10.2.0-es8.x86_64.rpm 14581300 BLAKE2B b12ddf7a6b2d14f322ef22b66045d463ac482b3d6db3e351b2fde5f463266e3e97e14933c89c193a54615b748b065ea01de333b2d5a22a127d823edffaeba9b5 SHA512 d1c52b934eace8dc3d6c4d63089b7f7c4143ad55e2226155b9355262a0323129297723fff2664ddf2b201b2cd02d8668b7503668610d94162670dcd965fee917 +EBUILD nessus-agent-bin-10.2.0.ebuild 2404 BLAKE2B 9acd344ad2fb42649d244a50dc32b4ba3cbeda46dda39cdd09a43dc89920dc157c25536ca8d2d5b58d726217343d241c44c9226aeea7b646a86f298b6c72bf47 SHA512 e47b652629b74e0e15921f859b72c79a496a59d2452d4241782780cceb2054faabe537d1218542537ab8ed8f165212a54d5c668ec34f92121d9006ae997f3f73 MISC metadata.xml 354 BLAKE2B f3d046b6610423bd40c2cdbe29c8aa35d8111c56f6565d5b84aea31e03a8612b3a173965496833ec2ad2a38412b68d39f09d389e41797a0cda399758c85034a5 SHA512 1f4021d2781ddbccbbf0bf91492b50af18f142200bfc959a36b527941b9e8452a7814e12a1f720fcc62f6d069158cdb5093ae3760bc1b3b09d2cb73e4ab7f715 diff --git a/net-analyzer/nessus-agent-bin/nessus-agent-bin-10.1.4.ebuild b/net-analyzer/nessus-agent-bin/nessus-agent-bin-10.1.4.ebuild deleted file mode 100644 index 3b22d5b2779c..000000000000 --- a/net-analyzer/nessus-agent-bin/nessus-agent-bin-10.1.4.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit rpm systemd - -MY_P="NessusAgent-${PV}-es8" - -DESCRIPTION="A remote security scanner for Linux - agent component" -HOMEPAGE="https://www.tenable.com/" -SRC_URI="${MY_P}.x86_64.rpm" - -LICENSE="GPL-2 Nessus-EULA" -SLOT="0" -KEYWORDS="-* ~amd64" - -RESTRICT="mirror fetch strip" - -QA_PREBUILT="opt/nessus_agent/bin/nasl - opt/nessus_agent/bin/nessus-mkrand - opt/nessus_agent/lib/nessus/libjemalloc.so.* - opt/nessus_agent/lib/nessus/libnessus-glibc-fix.so - opt/nessus_agent/lib/nessus/iconv/*.so - opt/nessus_agent/sbin/nessus-check-signature - opt/nessus_agent/sbin/nessus-service - opt/nessus_agent/sbin/nessuscli - opt/nessus_agent/sbin/nessusd" - -S="${WORKDIR}" - -pkg_nofetch() { - einfo "Please download ${A} from ${HOMEPAGE}downloads/nessus-agents" - einfo "The archive should then be placed into your DISTDIR directory." -} - -src_install() { - # Using doins -r would strip executable bits from all binaries - cp -pPR "${S}"/opt "${D}"/ || die "Failed to copy files" - - # Make sure these originally empty directories do not vanish, - # Nessus will not run properly without them - keepdir /opt/nessus_agent/com/nessus/CA - keepdir /opt/nessus_agent/etc/nessus - keepdir /opt/nessus_agent/var/nessus/logs - keepdir /opt/nessus_agent/var/nessus/tmp - keepdir /opt/nessus_agent/var/nessus/users - - newinitd "${FILESDIR}"/nessusagent.initd nessusagent - systemd_dounit usr/lib/systemd/system/nessusagent.service -} - -pkg_postinst() { - # Actually update Nessus core components. According to upstream packages, - # harmless to invoke on fresh installations too - and it may make life easier - # for people who had restored Nessus state from backups, had it lying around - # from older installations and so on. - "${EROOT}"/opt/nessus_agent/sbin/nessuscli install "${EROOT}"/opt/nessus_agent/var/nessus/plugins-core.tar.gz - - if [[ -z "${REPLACING_VERSIONS}" ]]; then - elog "In order to link the agent to Tenable.io or an instance of Nessus Manager," - elog "obtain an appropriate linking key and run" - elog "" - elog " /opt/nessus_agent/sbin/nessuscli agent link --key= --host= --port= [optional parameters]" - elog "" - elog "This can be done before the agent is started." - else - elog "Please restart the nessusagent service to complete the update process" - fi -} diff --git a/net-analyzer/nessus-agent-bin/nessus-agent-bin-10.2.0.ebuild b/net-analyzer/nessus-agent-bin/nessus-agent-bin-10.2.0.ebuild new file mode 100644 index 000000000000..67bf24f29e08 --- /dev/null +++ b/net-analyzer/nessus-agent-bin/nessus-agent-bin-10.2.0.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit rpm systemd + +MY_P="NessusAgent-${PV}-es8" + +DESCRIPTION="A remote security scanner for Linux - agent component" +HOMEPAGE="https://www.tenable.com/" +SRC_URI="${MY_P}.x86_64.rpm" + +LICENSE="GPL-2 Nessus-EULA" +SLOT="0" +KEYWORDS="-* ~amd64" + +RESTRICT="mirror fetch strip" + +QA_PREBUILT="opt/nessus_agent/bin/nasl + opt/nessus_agent/bin/nessus-mkrand + opt/nessus_agent/lib/nessus/libjemalloc.so.* + opt/nessus_agent/lib/nessus/libnessus-glibc-fix.so + opt/nessus_agent/lib/nessus/iconv/*.so + opt/nessus_agent/sbin/nessus-agent-module + opt/nessus_agent/sbin/nessus-check-signature + opt/nessus_agent/sbin/nessus-service + opt/nessus_agent/sbin/nessuscli + opt/nessus_agent/sbin/nessusd" + +S="${WORKDIR}" + +pkg_nofetch() { + einfo "Please download ${A} from ${HOMEPAGE}downloads/nessus-agents" + einfo "The archive should then be placed into your DISTDIR directory." +} + +src_install() { + # Using doins -r would strip executable bits from all binaries + cp -pPR "${S}"/opt "${D}"/ || die "Failed to copy files" + + # Make sure these originally empty directories do not vanish, + # Nessus will not run properly without them + keepdir /opt/nessus_agent/com/nessus/CA + keepdir /opt/nessus_agent/etc/nessus + keepdir /opt/nessus_agent/var/nessus/logs + keepdir /opt/nessus_agent/var/nessus/tmp + keepdir /opt/nessus_agent/var/nessus/users + + newinitd "${FILESDIR}"/nessusagent.initd nessusagent + systemd_dounit usr/lib/systemd/system/nessusagent.service +} + +pkg_postinst() { + # Actually update Nessus core components. According to upstream packages, + # harmless to invoke on fresh installations too - and it may make life easier + # for people who had restored Nessus state from backups, had it lying around + # from older installations and so on. + "${EROOT}"/opt/nessus_agent/sbin/nessuscli install "${EROOT}"/opt/nessus_agent/var/nessus/plugins-core.tar.gz + + if [[ -z "${REPLACING_VERSIONS}" ]]; then + elog "In order to link the agent to Tenable.io or an instance of Nessus Manager," + elog "obtain an appropriate linking key and run" + elog "" + elog " /opt/nessus_agent/sbin/nessuscli agent link --key= --host= --port= [optional parameters]" + elog "" + elog "This can be done before the agent is started." + else + elog "Please restart the nessusagent service to complete the update process" + fi +} diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest index 3e03a2ea2909..2dc25ceceb9d 100644 --- a/net-analyzer/tcpdump/Manifest +++ b/net-analyzer/tcpdump/Manifest @@ -1,6 +1,8 @@ +AUX tcpdump-4.99.1-clang15-configure.patch 2723 BLAKE2B 29f5b08e7c11fbc7427ac8b22856544665b1f8d5ef9d7e228d4b2077ed76bcb81d5dc3f4e75b8c6d31dbe3f2408036adec0a014967e6773f2495966cb0428ce9 SHA512 19542ac98cb3f955ac2c7c42eca887bbc3011c474bef5659ade18d7aa8886bd3fd3db805760de676f210bf3347530962bdfb7c24b3bdd79a4aeff78c4bea8675 AUX tcpdump-9999-libdir.patch 505 BLAKE2B 903bbbd4d860053168c92a3bf2ef76bf8ab32a45da05d0b47894368d39d2c8432f68ff47740d30c34868a60e6e300e08a1a1b5b8e17bb9519c945e39f81014a6 SHA512 eb12b115c8c6f0a2b7bb84712fe3dda5ddde3e6acb56d00000e97abc007b26a1411ddf6be793205bf7c76ccecc3915c417124870326745e3896ae6963bb42341 DIST tcpdump-4.99.1-upstream.tar.gz 2014324 BLAKE2B 0a10fe68afdfe80d3e7e661352fcaf1c47702df27fbed959f52fb0ec81543a1d4ce6b0de16a8b081de48dd43e09a13f5e1f0fb11d7590f92cbff29dc511bea12 SHA512 53d31355e1a6ef5a65bb3bf72454169fc80adf973a327a5768840e6ccf0550fbeb3c8a41f959635076d871df0619680321910a3a97879607f481cdaa8b7ceda7 DIST tcpdump-4.99.1-upstream.tar.gz.sig 442 BLAKE2B 9a80b1796ef777bd06d0b8953fe1ff446431d0ff1dffcd58e29a0b771f6734f70f3f0da7c36a1eaa1b6e57719d79c601872a84b7734208a7e8951cad9aca86ee SHA512 b438643701efbbb5579d9d51ed48756a47dd644e0acb10b0edff6d04f3ae4cea6528b40820a656407b73f983b2a634e0165a6c8c0fca3b557394a14e2f2384ab +EBUILD tcpdump-4.99.1-r1.ebuild 2388 BLAKE2B 6b37884fdd8c186b93233a342e4c223a8cdcb1440477be63cd69b64b08e742a6c5b983cbc09cd0cd0a46575df6f892ba27f701838202667c2cf76a8f2d7b949d SHA512 fb3fe226c2766ec3d8d4413e605c37686648e34d3b3ffb7e20f441c535d98a0aa8809d0df6ecaa6322c6564260f106ce3cd4309012e0bf54293457e153a064d6 EBUILD tcpdump-4.99.1.ebuild 2329 BLAKE2B 4dc8d991e0d6b479565d8fe7d59f9f6cf519b65a22226cf0ec25447f640ac9237b4db65cf92cb2f0462c9c6eb17d7c441b0c7649a782100ba5a983cfaf2fe182 SHA512 d4122ee6542f6555f85a6609b8ec787b3e3362c8037e234691d1039a19204f555b2e08a43e2c4f316245812d8296762dd8d8e9207e38c573cbbfc77192a2be80 -EBUILD tcpdump-9999.ebuild 2133 BLAKE2B ea2847f868a097d49e941ee3146376694b4800f7ec08081c7e3d527caa7fb9cab0ce0a498dfa56a2e930bbf280bafdefad4d9b27303f6bf5b4dbaf411ddbab63 SHA512 859f01e2a1301ea04efd0cd97fa1d9f3c2af724774c8e53f79ea6a6c2187b1d9392b0782174b0d41d59c4dac11ea909074552dc07c682cb82805e2c024df0463 +EBUILD tcpdump-9999.ebuild 2133 BLAKE2B 2a41983b9ed30850a6dfcc5a91da5faaefaf0afbd88d4a98f6d3555c30fb6cbabc28c060c7f4405bdece1617fae374a1b38c945cb6565682da5718914ea6ac81 SHA512 f20fe488b097c450be2623d3fede6aabd49f1a463753c03a61cbf361f9aa4e07ae4430ae863927ca56dc6a74204874f131584fcc0b25702a6125e2ca53d00402 MISC metadata.xml 701 BLAKE2B 0e637bc6e801996414b02cc17023641e07a7b81c4b50b6535fd4668f3fc7e3750f3cfa2e138e5c3c5d1fce8b2b89543f99cbee499c0ecf0960862e5a6f5c86bd SHA512 f891a980cb348222d83103a746354374beef485d9072cfe61eb1a6285dd5b282200490ffe8c7b953ef30958316e12a24dfe86b0c11bf7b7519c61f68d0f27737 diff --git a/net-analyzer/tcpdump/files/tcpdump-4.99.1-clang15-configure.patch b/net-analyzer/tcpdump/files/tcpdump-4.99.1-clang15-configure.patch new file mode 100644 index 000000000000..ed8a353d8c98 --- /dev/null +++ b/net-analyzer/tcpdump/files/tcpdump-4.99.1-clang15-configure.patch @@ -0,0 +1,57 @@ +https://github.com/the-tcpdump-group/tcpdump/pull/1007 + +From 4fa4e8db882b6298f5504d866665441ba7594df3 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Mon, 12 Sep 2022 17:28:58 +0100 +Subject: [PATCH] configure.ac: fix configure tests broken with Clang 15 + (implicit function declarations) + +Clang 15 makes implicit function declarations fatal by default which +leads to some of tcpdump's configure tests silently failing/returning +the wrong result. + +This adds the needed #includes to various tests for the functions used, +resolving the following errors: +``` +net-analyzer/tcpdump-4.99.1/clang15.log:47:error: type specifier missing, defaults to 'int'; ISO C99 and later do not support implicit int [-Wimplicit-int] +net-analyzer/tcpdump-4.99.1/clang15.log:51:error: call to undeclared library function 'strcmp' with type 'int (const char *, const char *)'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] +net-analyzer/tcpdump-4.99.1/clang15.log:55:error: call to undeclared library function 'sscanf' with type 'int (const char *restrict, const char *restrict, ...)'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] +net-analyzer/tcpdump-4.99.1/clang15.log:68:error: call to undeclared library function 'memset' with type 'void *(void *, int, unsigned long)'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] +net-analyzer/tcpdump-4.99.1/clang15.log:112:error: call to undeclared function 'ether_ntohost'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] +net-analyzer/tcpdump-4.99.1/clang15.log:115:error: call to undeclared library function 'exit' with type 'void (int) __attribute__((noreturn))'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] +``` + +Signed-off-by: Sam James +--- a/configure.ac ++++ b/configure.ac +@@ -87,8 +87,11 @@ if test "x$with_smi" != "xno" ; then + AC_TRY_RUN( + [ + /* libsmi available check */ ++#include ++#include ++#include + #include +-main() ++int main() + { + int current, revision, age, n; + const int required = 2; +@@ -264,6 +267,7 @@ AC_COMPILE_IFELSE( + [ + AC_LANG_SOURCE( + [[ ++#include + /* AF_INET6 available check */ + #include + #ifdef _WIN32 +@@ -473,6 +477,8 @@ AC_CHECK_FUNCS(ether_ntohost, [ + AC_CACHE_CHECK(for buggy ether_ntohost, ac_cv_buggy_ether_ntohost, [ + AC_TRY_RUN([ + #include ++ #include ++ #include + #include + #include + #include + diff --git a/net-analyzer/tcpdump/tcpdump-4.99.1-r1.ebuild b/net-analyzer/tcpdump/tcpdump-4.99.1-r1.ebuild new file mode 100644 index 000000000000..9f6735a93cdc --- /dev/null +++ b/net-analyzer/tcpdump/tcpdump-4.99.1-r1.ebuild @@ -0,0 +1,107 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="A tool for network monitoring and data acquisition" +HOMEPAGE="https://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpdump" + +if [[ ${PV} == *9999* ]] ; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump" +else + VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/tcpdump.asc + inherit verify-sig + + # Note: drop -upstream on bump, this is just because we switched to the official + # distfiles for verify-sig + SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz -> ${P}-upstream.tar.gz" + SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig -> ${P}-upstream.tar.gz.sig )" + + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +fi + +LICENSE="BSD" +SLOT="0" +IUSE="+drop-root +smi +ssl +samba suid test" +REQUIRED_USE="test? ( samba )" + +RESTRICT="!test? ( test )" +# Assorted failures: bug #768498 +#RESTRICT="test" + +RDEPEND=" + >=net-libs/libpcap-1.10.1 + drop-root? ( + acct-group/pcap + acct-user/pcap + sys-libs/libcap-ng + ) + smi? ( net-libs/libsmi ) + ssl? ( + >=dev-libs/openssl-0.9.6m:0= + ) + suid? ( + acct-group/pcap + acct-user/pcap + ) +" +DEPEND=" + ${RDEPEND} + test? ( + dev-lang/perl + ) +" +BDEPEND="drop-root? ( virtual/pkgconfig )" + +if [[ ${PV} != *9999* ]] ; then + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-tcpdump )" +fi + +PATCHES=( + "${FILESDIR}"/${PN}-9999-libdir.patch + "${FILESDIR}"/${PN}-4.99.1-clang15-configure.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + $(use_enable samba smb) \ + $(use_with drop-root cap-ng) \ + $(use_with drop-root chroot '') \ + $(use_with smi) \ + $(use_with ssl crypto "${ESYSROOT}/usr") \ + $(usex drop-root "--with-user=pcap" "") +} + +src_test() { + if [[ ${EUID} -ne 0 ]] || ! use drop-root ; then + emake check + else + ewarn "If you want to run the test suite, make sure you either" + ewarn "set FEATURES=userpriv or set USE=-drop-root" + fi +} + +src_install() { + dosbin tcpdump + doman tcpdump.1 + dodoc *.awk + dodoc CHANGES CREDITS README.md + + if use suid ; then + fowners root:pcap /usr/sbin/tcpdump + fperms 4110 /usr/sbin/tcpdump + fi +} + +pkg_postinst() { + use suid && elog "To let normal users run tcpdump, add them to the pcap group." +} diff --git a/net-analyzer/tcpdump/tcpdump-9999.ebuild b/net-analyzer/tcpdump/tcpdump-9999.ebuild index ac9b01e80aa8..63bf6ed96b92 100644 --- a/net-analyzer/tcpdump/tcpdump-9999.ebuild +++ b/net-analyzer/tcpdump/tcpdump-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools -- cgit v1.2.3