From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Jan 2020 15:51:32 +0000 Subject: gentoo resync : 15.01.2020 --- net-analyzer/tcpdump/Manifest | 4 +- .../tcpdump/files/tcpdump-9999-libdir.patch | 19 +++++ net-analyzer/tcpdump/tcpdump-4.9.3-r1.ebuild | 91 ++++++++++++++++++++++ net-analyzer/tcpdump/tcpdump-9999.ebuild | 7 +- 4 files changed, 118 insertions(+), 3 deletions(-) create mode 100644 net-analyzer/tcpdump/files/tcpdump-9999-libdir.patch create mode 100644 net-analyzer/tcpdump/tcpdump-4.9.3-r1.ebuild (limited to 'net-analyzer/tcpdump') diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest index ea9735b41903..649e56a42519 100644 --- a/net-analyzer/tcpdump/Manifest +++ b/net-analyzer/tcpdump/Manifest @@ -1,4 +1,6 @@ +AUX tcpdump-9999-libdir.patch 505 BLAKE2B 903bbbd4d860053168c92a3bf2ef76bf8ab32a45da05d0b47894368d39d2c8432f68ff47740d30c34868a60e6e300e08a1a1b5b8e17bb9519c945e39f81014a6 SHA512 eb12b115c8c6f0a2b7bb84712fe3dda5ddde3e6acb56d00000e97abc007b26a1411ddf6be793205bf7c76ccecc3915c417124870326745e3896ae6963bb42341 DIST tcpdump-4.9.3.tar.gz 2333119 BLAKE2B 21e13fc40d98cfac0bbd5513580cf98313df1f8fea24c48f045f70d494aea3e75230b8481049660c109f9179015c3164f3e3b31acc76c0bfb1f2da5039f1834e SHA512 3aec673f78b996a4df884b1240e5d0a26a2ca81ee7aca8a2e6d50255bb53476e008a5ced4409e278a956710d8a4d31d85bbb800c9f1aab92b0b1046b59292a22 +EBUILD tcpdump-4.9.3-r1.ebuild 1930 BLAKE2B 27db7633b2afaf4d15024e1493d828a13a291ec94379a311173c2adef25f58b2dc207f3f665c4c7f7a54c006332bb94580f98d290d5508aafde63329e6b9ff78 SHA512 68c84a450281cfbcf079cc1b5087f8867632ae65754cf9d70d253ab2a68f45dfca2562edcb5f5e772dad0261644a1b2ae80e2531e10f3580109449688d910b1a EBUILD tcpdump-4.9.3.ebuild 1972 BLAKE2B 212f414d858a2b428777373768e08d51bb3d57be9a8d3434bc84b96975dfaeccd527af5d12aae8151a5ef162f429fd9830b3e069c65226eefe88cf04a1de0146 SHA512 f4c2e94bdad0b57fa985b836c59ab02ad86b04b67a1bfac68d08a673dbabfd9272054af6d46e9f823f5aaf0fd4da8435f21ad15b2bd0ca67e15a34f60a8f62f9 -EBUILD tcpdump-9999.ebuild 2218 BLAKE2B 049cdbd3abe9ad3d425f0825b15103d0054dead44e5740401744dec360b053710a74b4ac3579ca0f3cfce32dd5298e7934fc78b4e7d30455fb685973012a16bc SHA512 94a8dacb7b1b93cb30f1b7976634628829e26fd9d68173bc7d597c51710b281afd7bdeffcab63478ea39caaea67c104b25b6df788d13d07b2984469718ac3d03 +EBUILD tcpdump-9999.ebuild 2243 BLAKE2B 2e86614481c991ecf8e087bfcdce3bf22f203589456a7279c38446d321efbd10bf3912845d0334175a296b762154d12ad510ce5b94c3facdf9778823e26e9cee SHA512 2a7dbdfdbb19b19e1f3d30da1f843a070a1d19f929a6509a99d843ebc8fd5c644cbb58f37b93c72e8ad8937938fddd1a893dfd3df526b5a1d0ad49a531746eb1 MISC metadata.xml 639 BLAKE2B 2bbc5e38a9e172b7aa6dc69d211311d263007bb0da6e268cb9de953f0f862de3562b12e2ba3be267963ed2ef78254e7622951ab997550d78eb56fb057621e3ab SHA512 b765372f84fc597e257acf7d7e7daa5d9b220831ceb041851a9ef08da0fd419f36b12244cae9da0c3ef2b1b5c3fae9e4d234818ab4d58caf209c2c22604de392 diff --git a/net-analyzer/tcpdump/files/tcpdump-9999-libdir.patch b/net-analyzer/tcpdump/files/tcpdump-9999-libdir.patch new file mode 100644 index 000000000000..852ea6b6c132 --- /dev/null +++ b/net-analyzer/tcpdump/files/tcpdump-9999-libdir.patch @@ -0,0 +1,19 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -371,7 +371,7 @@ + + 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 +@@ -891,7 +891,6 @@ + # 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.3-r1.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.3-r1.ebuild new file mode 100644 index 000000000000..2fc6154ef964 --- /dev/null +++ b/net-analyzer/tcpdump/tcpdump-4.9.3-r1.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +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" +RESTRICT="!test? ( 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? ( + >=net-libs/libpcap-1.9.1 + dev-lang/perl + ) +" + +pkg_setup() { + if use drop-root || use suid; then + enewgroup tcpdump + enewuser tcpdump -1 -1 -1 tcpdump + fi +} + +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 "${ESYSROOT}/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-9999.ebuild b/net-analyzer/tcpdump/tcpdump-9999.ebuild index 52faf660b30f..53e77a2204b0 100644 --- a/net-analyzer/tcpdump/tcpdump-9999.ebuild +++ b/net-analyzer/tcpdump/tcpdump-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -36,10 +36,13 @@ DEPEND=" ${RDEPEND} drop-root? ( virtual/pkgconfig ) test? ( - || ( app-arch/sharutils sys-freebsd/freebsd-ubin ) + >=net-libs/libpcap-1.9.1 dev-lang/perl ) " +PATCHES=( + "${FILESDIR}"/${PN}-9999-libdir.patch +) pkg_setup() { if use drop-root || use suid; then -- cgit v1.2.3