* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/tcpdump/, net-analyzer/tcpdump/files/
@ 2019-10-20 9:32 Jeroen Roovers
0 siblings, 0 replies; 4+ messages in thread
From: Jeroen Roovers @ 2019-10-20 9:32 UTC (permalink / raw
To: gentoo-commits
commit: 207fabf6ce392e5e85eef580116afc553739f92b
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 20 09:32:30 2019 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Oct 20 09:32:44 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=207fabf6
net-analyzer/tcpdump: Old
Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
net-analyzer/tcpdump/Manifest | 1 -
.../tcpdump/files/tcpdump-4.9.2-includedir.patch | 65 -------------
net-analyzer/tcpdump/tcpdump-4.9.2-r1.ebuild | 106 ---------------------
net-analyzer/tcpdump/tcpdump-4.9.2.ebuild | 99 -------------------
4 files changed, 271 deletions(-)
diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index 59c9ed32885..96c3fad37e2 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -1,2 +1 @@
-DIST tcpdump-4.9.2.tar.gz 2298386 BLAKE2B b7e90d1091affa6f4734a622f23565976b0cb5be8c0afa12656f52acea29384306f2875477dc180b5dc60110a57e0f30f5654ba27dac9f03ff610ca0548de0a7 SHA512 e1bc19a5867d6e3628f3941bdf3ec831bf13784f1233ca1bccc46aac1702f47ee9357d7ff0ca62cddf211b3c8884488c21144cabddd92c861e32398cd8f7c44b
DIST tcpdump-4.9.3.tar.gz 2333119 BLAKE2B 21e13fc40d98cfac0bbd5513580cf98313df1f8fea24c48f045f70d494aea3e75230b8481049660c109f9179015c3164f3e3b31acc76c0bfb1f2da5039f1834e SHA512 3aec673f78b996a4df884b1240e5d0a26a2ca81ee7aca8a2e6d50255bb53476e008a5ced4409e278a956710d8a4d31d85bbb800c9f1aab92b0b1046b59292a22
diff --git a/net-analyzer/tcpdump/files/tcpdump-4.9.2-includedir.patch b/net-analyzer/tcpdump/files/tcpdump-4.9.2-includedir.patch
deleted file mode 100644
index 0f74fa9a8a3..00000000000
--- a/net-analyzer/tcpdump/files/tcpdump-4.9.2-includedir.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -534,40 +534,6 @@
- if test $libpcap = FAIL ; then
- AC_MSG_ERROR(see the INSTALL doc for more info)
- fi
-- dnl
-- dnl Some versions of Red Hat Linux put "pcap.h" in
-- dnl "/usr/include/pcap"; had the LBL folks done so,
-- dnl that would have been a good idea, but for
-- dnl the Red Hat folks to do so just breaks source
-- dnl compatibility with other systems.
-- dnl
-- dnl We work around this by assuming that, as we didn't
-- dnl find a local libpcap, libpcap is in /usr/lib or
-- dnl /usr/local/lib and that the corresponding header
-- dnl file is under one of those directories; if we don't
-- dnl find it in either of those directories, we check to
-- dnl see if it's in a "pcap" subdirectory of them and,
-- dnl if so, add that subdirectory to the "-I" list.
-- dnl
-- dnl (We now also put pcap.h in /usr/include/pcap, but we
-- dnl leave behind a /usr/include/pcap.h that includes it,
-- dnl so you can still just include <pcap.h>.)
-- dnl
-- AC_MSG_CHECKING(for extraneous pcap header directories)
-- if test \( ! -r /usr/local/include/pcap.h \) -a \
-- \( ! -r /usr/include/pcap.h \); then
-- if test -r /usr/local/include/pcap/pcap.h; then
-- d="/usr/local/include/pcap"
-- elif test -r /usr/include/pcap/pcap.h; then
-- d="/usr/include/pcap"
-- fi
-- fi
-- if test -z "$d" ; then
-- AC_MSG_RESULT(not found)
-- else
-- $2="-I$d $$2"
-- AC_MSG_RESULT(found -- -I$d added)
-- fi
- fi
- else
- $1=$libpcap
-@@ -1351,11 +1351,4 @@
- -f "$1/$tmplib/libcrypto.dylib" \); then
- ac_cv_ssleay_path="$1"
- fi
--
-- #
-- # Make sure we have the headers as well.
-- #
-- if test -d "$1/include/openssl" -a -f "$1/include/openssl/des.h"; then
-- incdir="-I$1/include"
-- fi
- ])
---- a/configure.in
-+++ b/configure.in
-@@ -908,7 +908,6 @@
- # Put the subdirectories of the libcrypto root directory
- # at the front of the header and library search path.
- #
-- CFLAGS="-I$withval/include $CFLAGS"
- LIBS="-L$withval/lib $LIBS"
- fi
- ],[
diff --git a/net-analyzer/tcpdump/tcpdump-4.9.2-r1.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.2-r1.ebuild
deleted file mode 100644
index 193cb91dd2e..00000000000
--- a/net-analyzer/tcpdump/tcpdump-4.9.2-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic toolchain-funcs user
-
-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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="+drop-root libressl smi ssl samba suid test"
-
-RDEPEND="
- drop-root? ( sys-libs/libcap-ng )
- net-libs/libpcap
- smi? ( net-libs/libsmi )
- ssl? (
- !libressl? ( >=dev-libs/openssl-0.9.6m:0= )
- libressl? ( dev-libs/libressl:= )
- )
-"
-DEPEND="
- ${RDEPEND}
- drop-root? ( virtual/pkgconfig )
- test? (
- || ( app-arch/sharutils sys-freebsd/freebsd-ubin )
- dev-lang/perl
- )
-"
-PATCHES=(
- "${FILESDIR}"/${PN}-4.9.2-includedir.patch
-)
-
-pkg_setup() {
- if use drop-root || use suid; then
- enewgroup tcpdump
- enewuser tcpdump -1 -1 -1 tcpdump
- fi
-}
-
-src_prepare() {
- default
-
- mv aclocal.m4 acinclude.m4 || die
-
- eautoreconf
-
- sed -i -e '/^eapon1/d;' tests/TESTLIST || die
-
- # bug 630394
- sed -i -e '/^nbns-valgrind/d' tests/TESTLIST || die
-}
-
-src_configure() {
- if use drop-root; then
- append-cppflags -DHAVE_CAP_NG_H
- export LIBS=$( $(tc-getPKG_CONFIG) --libs libcap-ng )
- fi
-
- econf \
- $(use_enable samba smb) \
- $(use_with drop-root chroot '') \
- $(use_with smi) \
- $(use_with ssl crypto "${EPREFIX}/usr") \
- $(usex drop-root "--with-user=tcpdump" "")
-}
-
-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:tcpdump /usr/sbin/tcpdump
- fperms 4110 /usr/sbin/tcpdump
- fi
-}
-
-pkg_preinst() {
- if use drop-root || use suid; then
- enewgroup tcpdump
- enewuser tcpdump -1 -1 -1 tcpdump
- fi
-}
-
-pkg_postinst() {
- use suid && elog "To let normal users run tcpdump add them into tcpdump group."
-}
diff --git a/net-analyzer/tcpdump/tcpdump-4.9.2.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.2.ebuild
deleted file mode 100644
index 632d82283d9..00000000000
--- a/net-analyzer/tcpdump/tcpdump-4.9.2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic toolchain-funcs user
-
-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 ~sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+drop-root libressl smi ssl samba suid test"
-
-RDEPEND="
- drop-root? ( sys-libs/libcap-ng )
- net-libs/libpcap
- smi? ( net-libs/libsmi )
- ssl? (
- !libressl? ( >=dev-libs/openssl-0.9.6m:0= )
- libressl? ( dev-libs/libressl:= )
- )
-"
-DEPEND="
- ${RDEPEND}
- drop-root? ( virtual/pkgconfig )
- test? (
- || ( app-arch/sharutils sys-freebsd/freebsd-ubin )
- dev-lang/perl
- )
-"
-
-pkg_setup() {
- if use drop-root || use suid; then
- enewgroup tcpdump
- enewuser tcpdump -1 -1 -1 tcpdump
- fi
-}
-
-src_prepare() {
- default
-
- sed -i -e '/^eapon1/d;' tests/TESTLIST || die
-
- # bug 630394
- sed -i -e '/^nbns-valgrind/d' tests/TESTLIST || die
-}
-
-src_configure() {
- if use drop-root; then
- append-cppflags -DHAVE_CAP_NG_H
- export LIBS=$( $(tc-getPKG_CONFIG) --libs libcap-ng )
- fi
-
- econf \
- $(use_enable samba smb) \
- $(use_with drop-root chroot '') \
- $(use_with smi) \
- $(use_with ssl crypto "${EPREFIX}/usr") \
- $(usex drop-root "--with-user=tcpdump" "")
-}
-
-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:tcpdump /usr/sbin/tcpdump
- fperms 4110 /usr/sbin/tcpdump
- fi
-}
-
-pkg_preinst() {
- if use drop-root || use suid; then
- enewgroup tcpdump
- enewuser tcpdump -1 -1 -1 tcpdump
- fi
-}
-
-pkg_postinst() {
- use suid && elog "To let normal users run tcpdump add them into tcpdump group."
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/tcpdump/, net-analyzer/tcpdump/files/
@ 2022-02-20 5:51 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2022-02-20 5:51 UTC (permalink / raw
To: gentoo-commits
commit: e9925658f0ade000d6529fcf03f7876c36320bb4
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 20 05:43:17 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 20 05:43:17 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9925658
net-analyzer/tcpdump: drop 4.9.3-r4, 4.99.0
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-analyzer/tcpdump/Manifest | 3 -
.../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 ---------------------
4 files changed, 257 deletions(-)
diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index a8460aafccec..713c659ac15d 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -1,5 +1,2 @@
-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
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 <guy@alum.mit.edu>
-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."
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/tcpdump/, net-analyzer/tcpdump/files/
@ 2023-05-01 13:36 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2023-05-01 13:36 UTC (permalink / raw
To: gentoo-commits
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 <sam@gentoo.org>
-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 <sam@gentoo.org>
---- 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."
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/tcpdump/, net-analyzer/tcpdump/files/
@ 2023-07-27 7:35 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2023-07-27 7:35 UTC (permalink / raw
To: gentoo-commits
commit: e570a6b3de1540389fb45a1af263be3a426269df
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 27 07:35:20 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jul 27 07:35:38 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e570a6b3
net-analyzer/tcpdump: build with LFS
Closes: https://bugs.gentoo.org/911176
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../tcpdump/files/tcpdump-4.99.4-lfs.patch | 22 ++++++++++++++++++++++
net-analyzer/tcpdump/files/tcpdump-9999-lfs.patch | 22 ++++++++++++++++++++++
...dump-4.99.4.ebuild => tcpdump-4.99.4-r1.ebuild} | 1 +
net-analyzer/tcpdump/tcpdump-9999.ebuild | 1 +
4 files changed, 46 insertions(+)
diff --git a/net-analyzer/tcpdump/files/tcpdump-4.99.4-lfs.patch b/net-analyzer/tcpdump/files/tcpdump-4.99.4-lfs.patch
new file mode 100644
index 000000000000..b38c2c24b108
--- /dev/null
+++ b/net-analyzer/tcpdump/files/tcpdump-4.99.4-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 <sam@gentoo.org>
+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 <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -30,7 +30,7 @@ if test "$ac_cv_prog_cc_c99" = "no"; then
+ fi
+ AC_LBL_C_INIT(V_CCOPT, V_INCLS)
+ AC_LBL_C_INLINE
+-
++AC_SYS_LARGEFILE
+ AC_CHECK_HEADERS(fcntl.h rpc/rpc.h rpc/rpcent.h net/if.h)
+
+ case "$host_os" in
diff --git a/net-analyzer/tcpdump/files/tcpdump-9999-lfs.patch b/net-analyzer/tcpdump/files/tcpdump-9999-lfs.patch
new file mode 100644
index 000000000000..396614ef3ad2
--- /dev/null
+++ b/net-analyzer/tcpdump/files/tcpdump-9999-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 <sam@gentoo.org>
+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 <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -30,7 +30,7 @@ if test "$ac_cv_prog_cc_c99" = "no"; then
+ fi
+ AC_LBL_C_INIT(V_CCOPT, V_INCLS)
+ AC_C_INLINE
+-
++AC_SYS_LARGEFILE
+ AC_CHECK_HEADERS(fcntl.h rpc/rpc.h rpc/rpcent.h net/if.h)
+
+ case "$host_os" in
diff --git a/net-analyzer/tcpdump/tcpdump-4.99.4.ebuild b/net-analyzer/tcpdump/tcpdump-4.99.4-r1.ebuild
similarity index 98%
rename from net-analyzer/tcpdump/tcpdump-4.99.4.ebuild
rename to net-analyzer/tcpdump/tcpdump-4.99.4-r1.ebuild
index 9d57fbcf31bb..3e0d26c1ea52 100644
--- a/net-analyzer/tcpdump/tcpdump-4.99.4.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.99.4-r1.ebuild
@@ -58,6 +58,7 @@ fi
PATCHES=(
"${FILESDIR}"/${PN}-9999-libdir.patch
+ "${FILESDIR}"/${PN}-4.99.4-lfs.patch
)
src_prepare() {
diff --git a/net-analyzer/tcpdump/tcpdump-9999.ebuild b/net-analyzer/tcpdump/tcpdump-9999.ebuild
index 8d03b876b291..ac1d9b041bd1 100644
--- a/net-analyzer/tcpdump/tcpdump-9999.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-9999.ebuild
@@ -58,6 +58,7 @@ fi
PATCHES=(
"${FILESDIR}"/${PN}-9999-libdir.patch
+ "${FILESDIR}"/${PN}-9999-lfs.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-07-27 7:35 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-27 7:35 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/tcpdump/, net-analyzer/tcpdump/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-05-01 13:36 Sam James
2022-02-20 5:51 Sam James
2019-10-20 9:32 Jeroen Roovers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox