From 20b6ab983b55b022c6e4af317154089e18ad41cb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 2 Sep 2024 12:28:17 +0100 Subject: gentoo auto-resync : 02:09:2024 - 12:28:17 --- net-analyzer/Manifest.gz | Bin 43319 -> 43319 bytes net-analyzer/tcpdump/Manifest | 7 +- .../tcpdump/files/tcpdump-4.99.5-lfs.patch | 22 +++++ .../tcpdump/files/tcpdump-4.99.5-libdir.patch | 29 ++++++ net-analyzer/tcpdump/tcpdump-4.99.5.ebuild | 101 +++++++++++++++++++++ net-analyzer/tcpdump/tcpdump-9999.ebuild | 24 ++--- 6 files changed, 167 insertions(+), 16 deletions(-) create mode 100644 net-analyzer/tcpdump/files/tcpdump-4.99.5-lfs.patch create mode 100644 net-analyzer/tcpdump/files/tcpdump-4.99.5-libdir.patch create mode 100644 net-analyzer/tcpdump/tcpdump-4.99.5.ebuild (limited to 'net-analyzer') diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz index ff2ebfba5c5a..91d5af46f655 100644 Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest index f61254a1002b..e83d2b5984b8 100644 --- a/net-analyzer/tcpdump/Manifest +++ b/net-analyzer/tcpdump/Manifest @@ -1,8 +1,13 @@ AUX tcpdump-4.99.4-lfs.patch 661 BLAKE2B 87d1d52e5fe63b90de82e9a51d0021b5d26e23afa184049cf971c9b1ed68049c093f6066fca47cc997e6bb18b6e289898b6c42b5eadd2e1e711910b4d5f8e911 SHA512 6b7ba2353955fcb318b4195c46cc6bb599ff5ec42b6b4240d26e8e248cc8d917d2023d152dfbaf983a5a642c3d272803dc20838c7387685aa8b2d8226685a6f7 +AUX tcpdump-4.99.5-lfs.patch 672 BLAKE2B 5781011a5366c5353e36b5da475dbaa964255246f13608e8aeef23554d7eb0884102b3867849eb2208d19d52cb3c5c19bd1942e8495dca7fcd9da3b9b8bfb856 SHA512 ee0ccd7ea4598b915fd0a335b0e3b21c35426e75728325399524b6565b06de72a88345191dc1f20170678bda2ff5e5e0de6bae2dea63831332cdae39b8a0c82b +AUX tcpdump-4.99.5-libdir.patch 923 BLAKE2B 68658abc0422930f60466923b917d76cb8d36238791558a1b076e3cae0ce0e1cc454bfab70d6d9967a1365a29641d1e99d550cd3bd936567a7a50b15abee885a SHA512 250e0f01cb43ed5d6fcdfda9ca1c22d9500a5917c1656290c6af6e74c36ff4c4595a39c8002eaf36bfa5ff912383d922280f902f09a61d6f0d3a1c1614d0f181 AUX tcpdump-9999-lfs.patch 657 BLAKE2B 9bf52b97b048cab5e2ca3411b6ab0705b3f8482ece3189eca4653598d2396a27697c9e1dba12e91069df104ad01163b8e96542a57dbd61cb8e37769270758ebe SHA512 586d873f6493d8c69379d897f459c3aa001edceb831909c31dfbdafa3377e40d063ee1d1d5539c2fe4d23f94993991cc3c4dba08118526bac0df23c7a9c5359d AUX tcpdump-9999-libdir.patch 505 BLAKE2B 903bbbd4d860053168c92a3bf2ef76bf8ab32a45da05d0b47894368d39d2c8432f68ff47740d30c34868a60e6e300e08a1a1b5b8e17bb9519c945e39f81014a6 SHA512 eb12b115c8c6f0a2b7bb84712fe3dda5ddde3e6acb56d00000e97abc007b26a1411ddf6be793205bf7c76ccecc3915c417124870326745e3896ae6963bb42341 DIST tcpdump-4.99.4.tar.gz 1903612 BLAKE2B f100e10774574ef04a770bc30d4e2d06fd0f1f16a7b2c88848be6e8290cc4838666ff378d9f78fdc418f4ffab9716a11214edc3588c292cb5ff39636cd7cfd2d SHA512 cb51e19574707d07c0de90dd4c301955897f2c9f2a69beb7162c08f59189f55625346d1602c8d66ab2b4c626ea4b0df1f08ed8734d2d7f536d0a7840c2d6d8df DIST tcpdump-4.99.4.tar.gz.sig 442 BLAKE2B 2ee35036d86f643b378591c0eb93d8a0f08cb2f0e3638bde25515d550b40fef1bf0eb6c876d4d6512fa795041b0703954ca884c646c4af8771b4bc4049e7609a SHA512 bec395f0f595a37121bc144bac133f3fb31c6c1007cdadf061e4437d6fe2406c0cb0d5b68b5c63e03b932c783bfb58f0af0b7e8a58bb81beb9de6a0d681620e8 +DIST tcpdump-4.99.5.tar.gz 2045086 BLAKE2B 754c25eafe84754465356042faa1369678655aa93d1b736c259ca9a6bd1e18c44784ae136dc6a3e64af9903c05c29e1379aafd7badc0e129c5a29ae908db13ff SHA512 69bc52ef7af7fd562370adf2e95cb592aad6193df9ab1708de52ac86a4c1cff72e8b256a739b435c324ee2df61051abde7d2659bc40f061d7c4fbcab1dcaa2e2 +DIST tcpdump-4.99.5.tar.gz.sig 442 BLAKE2B 8742616147e2965ea6879b471662669f1942cdb8892834ac3ebfd4a6f610bde1a091bb85dc8c0836b26d1db7036d072608d7242ee4ddfbf590a07beb584a67cc SHA512 e36d2023973335cb95e91cb13414f6c0e6386175ed88fdeb2c0afabf7c39ad43f138d13b18ff2e88b142aad5147d37ddc03c3111e9d4d22bf3697e0acc30905c EBUILD tcpdump-4.99.4-r1.ebuild 2145 BLAKE2B 71bc5c64aa8ac2ebc2a8c46cd1df8b388634927b3cc48d42db4361f12d667acefe5f049090bcf0e8fef4cb7bcb66f8e238a936a3fd218feec728b9692222f818 SHA512 e2e53cda31b1968260393300700a756841ba630c2eccc1b9423a84dc399c0a42e57994e0a19bea16364fac63c2bb4a1bac8c7075dc393765ba977e620a7f4707 -EBUILD tcpdump-9999.ebuild 2150 BLAKE2B b6734f26bbdc5a1fe7d97fb6787fdf612b006cd88279a39bb4174fee2a60f1a1ff9d3023af9946ce4b982e967538162e63a4b1df50cb9cd5738d99c8d25aa020 SHA512 dc321fb86336bd33d900c74f9583c6ac2c8d7a2c4706d79df8f09f452199826b04fdf799e08e528626530c4fa57385ed916044d0cd63aa2c28b68c8df89f56db +EBUILD tcpdump-4.99.5.ebuild 2094 BLAKE2B fb59b0322551aa2353733b4c96159aac487a7febcd07474200dbb34bbdef724e92d9bed6357880d585d8aedb6b4ebe452940d80e2855368ac69ed2dd7a1cbf93 SHA512 b8eb7af410999eeb0309926de83041f079ffe08a6e5bea32fc02ae87870a178c4affd01346c3383afaed857f3259578747b3462148f36974cfe92f68e07e5d9f +EBUILD tcpdump-9999.ebuild 2002 BLAKE2B 65bb493e9412b20022062b29b4a4fe5023283dfbe5c35fe5de5baa20bb2a315794f66ac61572530e7d407c0bdb0b2ebd2d558456d7c6ddd0f210b47ed2c45d8b SHA512 ba76739ce3ea3e070a089cc368a41800978a0a6b7025d9e9e46170bce0148262bf606cd0b1ed2617e53e818f5ab2445caba6efc605427b7303ad5b7c857f84fe MISC metadata.xml 593 BLAKE2B 7b4608973227459d0700d2f402e583a8cad512ca898287c2b32c71f42f6674a2c27cdc94d60e4af6fbe0df1478b8c2a2e0832d249adefbb7768ca1db0f3650b4 SHA512 45196d5f82e8bd5b26e2327a9a85ff7e49daabc5f396d7183a8cd6f3fbabef0d84014e355aa257c861487570f695ec07698e783624447d8d5120a03bbcf0fcd3 diff --git a/net-analyzer/tcpdump/files/tcpdump-4.99.5-lfs.patch b/net-analyzer/tcpdump/files/tcpdump-4.99.5-lfs.patch new file mode 100644 index 000000000000..0be1d7a75aaf --- /dev/null +++ b/net-analyzer/tcpdump/files/tcpdump-4.99.5-lfs.patch @@ -0,0 +1,22 @@ +https://github.com/the-tcpdump-group/tcpdump/pull/1068 + +From 54278acb038f0d16ed75cdddb35fd2813a7cdcef Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Thu, 27 Jul 2023 08:31:53 +0100 +Subject: [PATCH] configure.ac: use AC_SYS_LARGEFILE + +This enables 64-bit off_t where it's opt-in (e.g. glibc) on 32-bit platforms. + +Bug: https://bugs.gentoo.org/911176 +Signed-off-by: Sam James +--- a/configure.ac ++++ b/configure.ac +@@ -31,6 +31,8 @@ fi + AC_LBL_C_INIT(V_CCOPT, V_INCLS) + AC_LBL_C_INLINE + ++AC_SYS_LARGEFILE ++ + AC_CHECK_HEADERS(rpc/rpc.h rpc/rpcent.h net/if.h) + # + # Get the size of a void *, to know whether this is a 32-bit or 64-bit build. diff --git a/net-analyzer/tcpdump/files/tcpdump-4.99.5-libdir.patch b/net-analyzer/tcpdump/files/tcpdump-4.99.5-libdir.patch new file mode 100644 index 000000000000..c7448fb311c1 --- /dev/null +++ b/net-analyzer/tcpdump/files/tcpdump-4.99.5-libdir.patch @@ -0,0 +1,29 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -427,7 +427,7 @@ fi + + if test "$ipv6" = "yes" -a "$ipv6lib" != "none"; then + if test -d $ipv6libdir -a -f $ipv6libdir/lib$ipv6lib.a; then +- LIBS="-L$ipv6libdir -l$ipv6lib $LIBS" ++ LIBS="-l$ipv6lib $LIBS" + echo "You have $ipv6lib library, using it" + else + if test "$ipv6trylibc" = "yes"; then +@@ -1168,7 +1168,7 @@ return 0; + # + AC_LBL_SAVE_CHECK_STATE + CFLAGS="$CFLAGS -I$libcrypto_root/include" +- LIBS="$LIBS -L$libcrypto_root/lib -lcrypto" ++ LIBS="$LIBS -lcrypto" + AC_MSG_CHECKING(whether we have a system OpenSSL/libressl that we can use) + AC_LINK_IFELSE([AC_LANG_PROGRAM( + [[ +@@ -1182,7 +1182,7 @@ return 0; + AC_MSG_RESULT(yes) + HAVE_LIBCRYPTO=yes + LIBCRYPTO_CFLAGS="-I$libcrypto_root/include" +- LIBCRYPTO_LIBS="-L$libcrypto_root/lib -lcrypto" ++ LIBCRYPTO_LIBS="-lcrypto" + ], + AC_MSG_RESULT(no)) + AC_LBL_RESTORE_CHECK_STATE diff --git a/net-analyzer/tcpdump/tcpdump-4.99.5.ebuild b/net-analyzer/tcpdump/tcpdump-4.99.5.ebuild new file mode 100644 index 000000000000..00d989c63d4a --- /dev/null +++ b/net-analyzer/tcpdump/tcpdump-4.99.5.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2024 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=/usr/share/openpgp-keys/tcpdump.asc + inherit verify-sig + + SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz" + SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.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="+caps +smi +ssl +samba suid test" +REQUIRED_USE="test? ( samba )" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=net-libs/libpcap-1.10.1 + caps? ( + acct-group/pcap + acct-user/pcap + sys-libs/libcap-ng + ) + smi? ( net-libs/libsmi ) + ssl? ( + >=dev-libs/openssl-0.9.6m:= + ) + suid? ( + acct-group/pcap + acct-user/pcap + ) +" +DEPEND=" + ${RDEPEND} + test? ( + dev-lang/perl + ) +" +BDEPEND="caps? ( virtual/pkgconfig )" + +if [[ ${PV} != *9999* ]] ; then + BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-tcpdump-20240901 )" +fi + +PATCHES=( + "${FILESDIR}"/${PN}-4.99.5-libdir.patch + "${FILESDIR}"/${PN}-4.99.5-lfs.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + $(use_enable samba smb) \ + $(use_with caps cap-ng) \ + $(use_with smi) \ + $(use_with ssl crypto "${ESYSROOT}/usr") \ + $(usex caps "--with-user=pcap" "") +} + +src_test() { + if [[ ${EUID} -ne 0 ]] || ! use caps ; then + emake check + else + ewarn "If you want to run the test suite, make sure you either" + ewarn "set FEATURES=userpriv or set USE=-caps" + 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 6d223129b9ed..fc0d793f2a15 100644 --- a/net-analyzer/tcpdump/tcpdump-9999.ebuild +++ b/net-analyzer/tcpdump/tcpdump-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -24,13 +24,13 @@ fi LICENSE="BSD" SLOT="0" -IUSE="+drop-root +smi +ssl +samba suid test" +IUSE="+caps +smi +ssl +samba suid test" REQUIRED_USE="test? ( samba )" RESTRICT="!test? ( test )" RDEPEND=" >=net-libs/libpcap-1.10.1 - drop-root? ( + caps? ( acct-group/pcap acct-user/pcap sys-libs/libcap-ng @@ -50,17 +50,12 @@ DEPEND=" dev-lang/perl ) " -BDEPEND="drop-root? ( virtual/pkgconfig )" +BDEPEND="caps? ( virtual/pkgconfig )" if [[ ${PV} != *9999* ]] ; then - BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-tcpdump )" + BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-tcpdump-20240901 )" fi -PATCHES=( - "${FILESDIR}"/${PN}-9999-libdir.patch - "${FILESDIR}"/${PN}-9999-lfs.patch -) - src_prepare() { default eautoreconf @@ -69,19 +64,18 @@ src_prepare() { src_configure() { econf \ $(use_enable samba smb) \ - $(use_with drop-root cap-ng) \ - $(use_with drop-root chroot '') \ + $(use_with caps cap-ng) \ $(use_with smi) \ $(use_with ssl crypto "${ESYSROOT}/usr") \ - $(usex drop-root "--with-user=pcap" "") + $(usex caps "--with-user=pcap" "") } src_test() { - if [[ ${EUID} -ne 0 ]] || ! use drop-root ; then + if [[ ${EUID} -ne 0 ]] || ! use caps ; 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" + ewarn "set FEATURES=userpriv or set USE=-caps" fi } -- cgit v1.2.3