From 4cbcc855382a06088e2f016f62cafdbcb7e40665 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Mar 2022 00:40:44 +0000 Subject: gentoo resync : 20.03.2022 --- net-analyzer/tcpdump/Manifest | 10 +- .../files/tcpdump-4.9.3-CVE-2020-8037.patch | 63 ------------ net-analyzer/tcpdump/tcpdump-4.9.3-r4.ebuild | 85 ----------------- net-analyzer/tcpdump/tcpdump-4.99.0.ebuild | 106 --------------------- net-analyzer/tcpdump/tcpdump-4.99.1.ebuild | 5 +- net-analyzer/tcpdump/tcpdump-9999.ebuild | 5 +- 6 files changed, 6 insertions(+), 268 deletions(-) delete mode 100644 net-analyzer/tcpdump/files/tcpdump-4.9.3-CVE-2020-8037.patch delete mode 100644 net-analyzer/tcpdump/tcpdump-4.9.3-r4.ebuild delete mode 100644 net-analyzer/tcpdump/tcpdump-4.99.0.ebuild (limited to 'net-analyzer/tcpdump') diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest index 130d7f4eed0b..3e03a2ea2909 100644 --- a/net-analyzer/tcpdump/Manifest +++ b/net-analyzer/tcpdump/Manifest @@ -1,12 +1,6 @@ -AUX tcpdump-4.9.3-CVE-2020-8037.patch 1732 BLAKE2B f9ebe8862e6316443bec5b3103882eca6298104e64a7e121c81129367a984c6580e1be480e7aa263dfdf664d04547ea6cead7e16866978dffa33c2dba7c13dcb SHA512 f53b5557ad2c68c28bbd6121b637ade43937ce4956fa9c2c8b187e8c62726c018509eb728f7f7479d078c9018f091f64114944b2d6106e6214662899f880445a AUX tcpdump-9999-libdir.patch 505 BLAKE2B 903bbbd4d860053168c92a3bf2ef76bf8ab32a45da05d0b47894368d39d2c8432f68ff47740d30c34868a60e6e300e08a1a1b5b8e17bb9519c945e39f81014a6 SHA512 eb12b115c8c6f0a2b7bb84712fe3dda5ddde3e6acb56d00000e97abc007b26a1411ddf6be793205bf7c76ccecc3915c417124870326745e3896ae6963bb42341 -DIST tcpdump-4.9.3.tar.gz 2333119 BLAKE2B 21e13fc40d98cfac0bbd5513580cf98313df1f8fea24c48f045f70d494aea3e75230b8481049660c109f9179015c3164f3e3b31acc76c0bfb1f2da5039f1834e SHA512 3aec673f78b996a4df884b1240e5d0a26a2ca81ee7aca8a2e6d50255bb53476e008a5ced4409e278a956710d8a4d31d85bbb800c9f1aab92b0b1046b59292a22 -DIST tcpdump-4.99.0-upstream.tar.gz 2008080 BLAKE2B 389939ea501edf66b7bb809c835feffebf15f30fbba559ce40963733a79ca271982336884acd7ff3d078decb1aaea0616d98091199918b520ef3d1fe0f194431 SHA512 03a434ec41c0026f237bc1e7a928b7ce67dbc342a8d982caded93d987bd356faf706a9d884231bd94f5e2a8580499fe95a28728e37a6672e371a1501ec5d6f79 -DIST tcpdump-4.99.0-upstream.tar.gz.sig 442 BLAKE2B a6cafbccdc1ecfb236a643b72114411e173cc898cda41edeac0c9755e48980f2d44f54c1f52b23dd992890b5aaa57e19430a600662e623832ccc62bfb7ac6fb4 SHA512 545770f09bec2f4ab3e723ab8582f1256eb0cb774ac2f329de17a45ee8256faea49469b796e17250d10c0455b305d39283c9b1d8b3c5a06c47a0d8088c874803 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.9.3-r4.ebuild 1700 BLAKE2B 807df788ac7f23cfe14a7c8116607bdb8bbdf346df552feeb8b72bd23f6f4867b8701e2b72ff585be5f5a658c12cb1dc955d205437bf9ec80e5e969c9aa7103b SHA512 4f1ea4403015d9b0e01c155f0df4695c4e71a997ac2e35334f3cb2f9cdff6f79dc23e29a963d9305c3d946b98dbd59ee45a22e91c0de13bdac502511bf1b65ef -EBUILD tcpdump-4.99.0.ebuild 2306 BLAKE2B 51e64fa4328031af8cbb2e9cf12b5e5d62fb26557913f0f0b4ea852eb84d386b324fcdb6883b97e17a7468e0deb452e0ba139841a0235d880e02b0bfafa82b1f SHA512 d16178ff054b69ef611ef457ae713a66a89ccde5e71db25670ad0d8bfbf778c2077074f79fe423ab551d6834fbd0e141b57500feef311dab0a48216a39fc1f48 -EBUILD tcpdump-4.99.1.ebuild 2347 BLAKE2B 9f986b438a62f514ebff61f73ef799ecba63321fc51b1f6b5b77a1a920df4dfd0b0c7e0f857cfbd6ce060af2dbdc333b8cdc66b7e06acc3f691c8c90963ee135 SHA512 4a68ffa9e9a4ec85f1e4b208d1d99603bb0a020a11285640554cd0efd534f19a3568d5cdb327f78786108b78b6fe82750760251e26c1d104e59512bf98638a5d -EBUILD tcpdump-9999.ebuild 2151 BLAKE2B 226eff7cc104f92a92540b5cc7cec51eb35b1a464e9212a85efd6b7bfab931c41cf03fc6f29b326aead2a93d0518e5cba793a85716f1decf499b88adc6aaebef SHA512 9f148b2b06db1df1a82bc1334dfdfcd4535fb3e4293c0f0183682bb43a78436ac164d64800e7653e8f741b74775e37a2cdc60cfc2fdbb47de0cc806ca60d8311 +EBUILD tcpdump-4.99.1.ebuild 2329 BLAKE2B 4dc8d991e0d6b479565d8fe7d59f9f6cf519b65a22226cf0ec25447f640ac9237b4db65cf92cb2f0462c9c6eb17d7c441b0c7649a782100ba5a983cfaf2fe182 SHA512 d4122ee6542f6555f85a6609b8ec787b3e3362c8037e234691d1039a19204f555b2e08a43e2c4f316245812d8296762dd8d8e9207e38c573cbbfc77192a2be80 +EBUILD tcpdump-9999.ebuild 2133 BLAKE2B ea2847f868a097d49e941ee3146376694b4800f7ec08081c7e3d527caa7fb9cab0ce0a498dfa56a2e930bbf280bafdefad4d9b27303f6bf5b4dbaf411ddbab63 SHA512 859f01e2a1301ea04efd0cd97fa1d9f3c2af724774c8e53f79ea6a6c2187b1d9392b0782174b0d41d59c4dac11ea909074552dc07c682cb82805e2c024df0463 MISC metadata.xml 701 BLAKE2B 0e637bc6e801996414b02cc17023641e07a7b81c4b50b6535fd4668f3fc7e3750f3cfa2e138e5c3c5d1fce8b2b89543f99cbee499c0ecf0960862e5a6f5c86bd SHA512 f891a980cb348222d83103a746354374beef485d9072cfe61eb1a6285dd5b282200490ffe8c7b953ef30958316e12a24dfe86b0c11bf7b7519c61f68d0f27737 diff --git a/net-analyzer/tcpdump/files/tcpdump-4.9.3-CVE-2020-8037.patch b/net-analyzer/tcpdump/files/tcpdump-4.9.3-CVE-2020-8037.patch deleted file mode 100644 index 2852845eb748..000000000000 --- a/net-analyzer/tcpdump/files/tcpdump-4.9.3-CVE-2020-8037.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 32027e199368dad9508965aae8cd8de5b6ab5231 Mon Sep 17 00:00:00 2001 -From: Guy Harris -Date: Sat, 18 Apr 2020 14:04:59 -0700 -Subject: [PATCH] PPP: When un-escaping, don't allocate a too-large buffer. - -The buffer should be big enough to hold the captured data, but it -doesn't need to be big enough to hold the entire on-the-network packet, -if we haven't captured all of it. - -(backported from commit e4add0b010ed6f2180dcb05a13026242ed935334) ---- - print-ppp.c | 18 ++++++++++++++---- - 1 file changed, 14 insertions(+), 4 deletions(-) - -diff --git a/print-ppp.c b/print-ppp.c -index 891761728..33fb03412 100644 ---- a/print-ppp.c -+++ b/print-ppp.c -@@ -1367,19 +1367,29 @@ print_bacp_config_options(netdissect_options *ndo, - return 0; - } - -+/* -+ * Un-escape RFC 1662 PPP in HDLC-like framing, with octet escapes. -+ * The length argument is the on-the-wire length, not the captured -+ * length; we can only un-escape the captured part. -+ */ - static void - ppp_hdlc(netdissect_options *ndo, - const u_char *p, int length) - { -+ u_int caplen = ndo->ndo_snapend - p; - u_char *b, *t, c; - const u_char *s; -- int i, proto; -+ u_int i; -+ int proto; - const void *se; - -+ if (caplen == 0) -+ return; -+ - if (length <= 0) - return; - -- b = (u_char *)malloc(length); -+ b = (u_char *)malloc(caplen); - if (b == NULL) - return; - -@@ -1388,10 +1398,10 @@ ppp_hdlc(netdissect_options *ndo, - * Do this so that we dont overwrite the original packet - * contents. - */ -- for (s = p, t = b, i = length; i > 0 && ND_TTEST(*s); i--) { -+ for (s = p, t = b, i = caplen; i != 0; i--) { - c = *s++; - if (c == 0x7d) { -- if (i <= 1 || !ND_TTEST(*s)) -+ if (i <= 1) - break; - i--; - c = *s++ ^ 0x20; diff --git a/net-analyzer/tcpdump/tcpdump-4.9.3-r4.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.3-r4.ebuild deleted file mode 100644 index 2a3d3a399dae..000000000000 --- a/net-analyzer/tcpdump/tcpdump-4.9.3-r4.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="A tool for network monitoring and data acquisition" -HOMEPAGE="https://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpdump" -SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="+drop-root smi ssl samba suid test" -RESTRICT="!test? ( test )" - -RDEPEND=" - net-libs/libpcap - 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? ( - >=net-libs/libpcap-1.9.1 - dev-lang/perl - ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-9999-libdir.patch - "${FILESDIR}"/${PN}-4.9.3-CVE-2020-8037.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.0.ebuild b/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild deleted file mode 100644 index e58bf2bc9cf6..000000000000 --- a/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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 ~mips ppc ppc64 ~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 - 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? ( - >=net-libs/libpcap-1.9.1 - 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." -} diff --git a/net-analyzer/tcpdump/tcpdump-4.99.1.ebuild b/net-analyzer/tcpdump/tcpdump-4.99.1.ebuild index 06157bef920b..6dc1d3f43826 100644 --- a/net-analyzer/tcpdump/tcpdump-4.99.1.ebuild +++ b/net-analyzer/tcpdump/tcpdump-4.99.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -34,7 +34,7 @@ RESTRICT="!test? ( test )" #RESTRICT="test" RDEPEND=" - net-libs/libpcap + >=net-libs/libpcap-1.10.1 drop-root? ( acct-group/pcap acct-user/pcap @@ -52,7 +52,6 @@ RDEPEND=" DEPEND=" ${RDEPEND} test? ( - >=net-libs/libpcap-1.9.1 dev-lang/perl ) " diff --git a/net-analyzer/tcpdump/tcpdump-9999.ebuild b/net-analyzer/tcpdump/tcpdump-9999.ebuild index 7fb2b1d8d0c3..ac9b01e80aa8 100644 --- a/net-analyzer/tcpdump/tcpdump-9999.ebuild +++ b/net-analyzer/tcpdump/tcpdump-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -31,7 +31,7 @@ REQUIRED_USE="test? ( samba )" RESTRICT="test" RDEPEND=" - net-libs/libpcap + >=net-libs/libpcap-1.10.1 drop-root? ( acct-group/pcap acct-user/pcap @@ -49,7 +49,6 @@ RDEPEND=" DEPEND=" ${RDEPEND} test? ( - >=net-libs/libpcap-1.9.1 dev-lang/perl ) " -- cgit v1.2.3