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 <[email protected]> +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 <[email protected]> +--- 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 <[email protected]> +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 <[email protected]> +--- 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() {
