commit: 726a3e8a3b165aa58fe320f434da8235c2b5d6c9 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon May 1 13:28:23 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon May 1 13:28:23 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=726a3e8a
net-analyzer/tcpdump: drop 4.99.1-r1, 4.99.2 Signed-off-by: Sam James <sam <AT> gentoo.org> 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-4.99.2.ebuild | 103 -------------------- 4 files changed, 271 deletions(-) diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest index 1b6e578d252e..1e50dbda86fd 100644 --- a/net-analyzer/tcpdump/Manifest +++ b/net-analyzer/tcpdump/Manifest @@ -1,7 +1,3 @@ -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 -DIST tcpdump-4.99.2.tar.gz 1897480 BLAKE2B be13fbf493478270c8ebc034a3c1467907a008ce2ed9632a87b7d7b9104b9fda248cd535da7313a1c3d57ca21f324c25593812590b96ec334c474d1ce06f3fd5 SHA512 7986e7517441872d4461da23dc546c01e23449108974458a4e5e493db6f066f9e7da801623a6c43cfa2079ac3d409f813d1ffde2ecc12b6dba661dae0693b735 -DIST tcpdump-4.99.2.tar.gz.sig 442 BLAKE2B 011c93803a1c339f9ce46dedb8e3420d77c5362575061c9b852647d8e8de6936079150240b444f660a84b9e45337960b8878e7c4de1f4e6ad2fff16225811d24 SHA512 33704e9b2ece65ca8a1fbf8234088e561f132a561ac859da32c7fb4d4caaeabd9a4b50ac8f939e48c18e672dade9393c7e56bc838ec8ac9828be5360e99e5692 DIST tcpdump-4.99.3.tar.gz 1901814 BLAKE2B 8e8adda6df40f3a79cbeb80bd01d43834e0b3ec44c8227bda2260b43ea0852f76beb02199120cca16adae0d793841cf684e7e276e520f49479a1b04ab1dc4821 SHA512 e1442e923d89f367cfe403dc460d0d46e19a241470d56b30b7a411bedd8d21a78c428f20ffe725cbb4fa5068f7dcc5c93d206e1a8d53feb9bccc6f0cda8bf0f9 DIST tcpdump-4.99.3.tar.gz.sig 442 BLAKE2B 97dbac4534f9b9daf0ab89d6a230835690737827330d4a6f15e7450bd8aed24af2bc097bf41511bb40534687623ffe63fb766c5e344ce66483c9dd5f34427155 SHA512 a7dfd95c11fa9066740552acc9ebfa1c674ba9242dfb6dddf27658845245b8677b4c2da392cfe1447f32b929e108e9ff5326a94cdc0be9502a05e0efc15a5934 DIST tcpdump-4.99.4.tar.gz 1903612 BLAKE2B f100e10774574ef04a770bc30d4e2d06fd0f1f16a7b2c88848be6e8290cc4838666ff378d9f78fdc418f4ffab9716a11214edc3588c292cb5ff39636cd7cfd2d SHA512 cb51e19574707d07c0de90dd4c301955897f2c9f2a69beb7162c08f59189f55625346d1602c8d66ab2b4c626ea4b0df1f08ed8734d2d7f536d0a7840c2d6d8df 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 deleted file mode 100644 index ed8a353d8c98..000000000000 --- a/net-analyzer/tcpdump/files/tcpdump-4.99.1-clang15-configure.patch +++ /dev/null @@ -1,57 +0,0 @@ -https://github.com/the-tcpdump-group/tcpdump/pull/1007 - -From 4fa4e8db882b6298f5504d866665441ba7594df3 Mon Sep 17 00:00:00 2001 -From: Sam James <[email protected]> -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 <[email protected]> ---- a/configure.ac -+++ b/configure.ac -@@ -87,8 +87,11 @@ if test "x$with_smi" != "xno" ; then - AC_TRY_RUN( - [ - /* libsmi available check */ -+#include <stdio.h> -+#include <stdlib.h> -+#include <string.h> - #include <smi.h> --main() -+int main() - { - int current, revision, age, n; - const int required = 2; -@@ -264,6 +267,7 @@ AC_COMPILE_IFELSE( - [ - AC_LANG_SOURCE( - [[ -+#include <string.h> - /* AF_INET6 available check */ - #include <sys/types.h> - #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 <netdb.h> -+ #include <netinet/ether.h> -+ #include <stdlib.h> - #include <sys/types.h> - #include <sys/param.h> - #include <sys/socket.h> - diff --git a/net-analyzer/tcpdump/tcpdump-4.99.1-r1.ebuild b/net-analyzer/tcpdump/tcpdump-4.99.1-r1.ebuild deleted file mode 100644 index 071975347aa4..000000000000 --- a/net-analyzer/tcpdump/tcpdump-4.99.1-r1.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# 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-4.99.2.ebuild b/net-analyzer/tcpdump/tcpdump-4.99.2.ebuild deleted file mode 100644 index 23a741b12925..000000000000 --- a/net-analyzer/tcpdump/tcpdump-4.99.2.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2023 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 - - 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="+drop-root +smi +ssl +samba suid test" -REQUIRED_USE="test? ( samba )" - -# 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 -) - -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." -}
