mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-11 06:56:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

net-analyzer/tcpdump: Sync with Gentoo

Browse Source 
It's from Gentoo commit 78213a89b4a602460bf81ba5fab8eed561091ade.
This commit is contained in:
Krzesimir Nowak 2024-08-08 13:51:06 +02:00
parent 860464ae1a
commit ca8f7b6e74
6 changed files with 60 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sdk_container/src/third_party/portage-stable/net-analyzer/tcpdump/Manifest vendored
View File

@ -1,2 +1,2 @@
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.4.tar.gz 1903612 BLAKE2B f100e10774574ef04a770bc30d4e2d06fd0f1f16a7b2c88848be6e8290cc4838666ff378d9f78fdc418f4ffab9716a11214edc3588c292cb5ff39636cd7cfd2d SHA512 cb51e19574707d07c0de90dd4c301955897f2c9f2a69beb7162c08f59189f55625346d1602c8d66ab2b4c626ea4b0df1f08ed8734d2d7f536d0a7840c2d6d8df
DIST tcpdump-4.99.4.tar.gz.sig 442 BLAKE2B 2ee35036d86f643b378591c0eb93d8a0f08cb2f0e3638bde25515d550b40fef1bf0eb6c876d4d6512fa795041b0703954ca884c646c4af8771b4bc4049e7609a SHA512 bec395f0f595a37121bc144bac133f3fb31c6c1007cdadf061e4437d6fe2406c0cb0d5b68b5c63e03b932c783bfb58f0af0b7e8a58bb81beb9de6a0d681620e8

22
sdk_container/src/third_party/portage-stable/net-analyzer/tcpdump/files/tcpdump-4.99.4-lfs.patch vendored Normal file
View File

@ -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

22
sdk_container/src/third_party/portage-stable/net-analyzer/tcpdump/files/tcpdump-9999-lfs.patch vendored Normal file
View File

@ -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

4
sdk_container/src/third_party/portage-stable/net-analyzer/tcpdump/metadata.xml vendored
View File

@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>zlogene@gentoo.org</email>
<name>Mikle Kolyada</name>
</maintainer>
<maintainer type="person">
<email>sam@gentoo.org</email>
<name>Sam James</name>

18
sdk_container/src/third_party/portage-stable/net-analyzer/tcpdump/tcpdump-4.99.1.ebuild → sdk_container/src/third_party/portage-stable/net-analyzer/tcpdump/tcpdump-4.99.4-r1.ebuild vendored
View File

@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
EAPI=8
inherit autotools
@ -13,13 +13,11 @@ if [[ ${PV} == *9999* ]] ; then
EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump"
else
VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/tcpdump.asc
VERIFY_SIG_OPENPGP_KEY_PATH=/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 )"
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
@ -28,10 +26,7 @@ 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
@ -42,7 +37,7 @@ RDEPEND="
)
smi? ( net-libs/libsmi )
ssl? (
>=dev-libs/openssl-0.9.6m:0=
>=dev-libs/openssl-0.9.6m:=
)
suid? (
acct-group/pcap
@ -63,6 +58,7 @@ fi
PATCHES=(
"${FILESDIR}"/${PN}-9999-libdir.patch
"${FILESDIR}"/${PN}-4.99.4-lfs.patch
)
src_prepare() {

15
sdk_container/src/third_party/portage-stable/net-analyzer/tcpdump/tcpdump-9999.ebuild vendored
View File

@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
EAPI=8
inherit autotools
@ -13,22 +13,20 @@ if [[ ${PV} == *9999* ]] ; then
EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump"
else
VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/tcpdump.asc
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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
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"
RESTRICT="!test? ( test )"
RDEPEND="
>=net-libs/libpcap-1.10.1
@ -39,7 +37,7 @@ RDEPEND="
)
smi? ( net-libs/libsmi )
ssl? (
>=dev-libs/openssl-0.9.6m:0=
>=dev-libs/openssl-0.9.6m:=
)
suid? (
acct-group/pcap
@ -60,6 +58,7 @@ fi
PATCHES=(
"${FILESDIR}"/${PN}-9999-libdir.patch
"${FILESDIR}"/${PN}-9999-lfs.patch
)
src_prepare() {