mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-23 16:49:10 -07:00
dev-util/strace: drop 5.12-r1, 5.14-r1, 5.16
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
@@ -1,5 +1,2 @@
|
||||
DIST strace-5.12.tar.xz 2009060 BLAKE2B 9a7a07e5d2d38c8b456f54d0e1d7c776066b20327fa08d562e426a7096f708dffa00f0c2121683fa71f7029db958d450c5a6abf5ae5970dc02732f5aa7cef591 SHA512 289cf82da4c69270458953b45d09c8eb05a6624898d3ac493c3ec293cd5ad07205084ad0af021dab2be9c0dc53f0301816113a746d96c78780b79231a185e7c9
|
||||
DIST strace-5.14.tar.xz 2067020 BLAKE2B 479ecf5e66e26e722d108c905130f482c411857db234ac013bf3568905c0f7b896f001ba6da2cabccd0a987c7802aebec9c6298decb691de125e8154c28e1c6f SHA512 3e147521773d900167809db9feeb148e8ba116f90dd634311941ea335eb7bd8b73ab9e641bd2dcfe899ab41c19a841e203dc771ec3000ae01452d22ecdc43c5a
|
||||
DIST strace-5.15.tar.xz 2248664 BLAKE2B fff08e49552ad1208b658f91e37c540cc7315ac255aba2e69db5bfeb942114b865f1114a45663481f1ab967db45d187bdbcf70ffe80449169df0c37ff82a1a94 SHA512 67251792ad0fb7f44013c3ae5e5b757106223c9d123d349e31de7565e0f2bfdc6bbd46a9c269e58508bd288ee70f104f8e2185f2203bd91431c5c776db0d9384
|
||||
DIST strace-5.16.tar.xz 2265944 BLAKE2B 0c0fb133e8642c30a8c706ba23c2d0976ff4e6662a1d07c6cd3cb70aaa980020d54220fe0baddcb70e3c3eb24bc2a8733e4b52ef4e99da5c11ed852c192a5c21 SHA512 db5993ece5600d928a42dedd2d5c8efec5b9195becb5fe6913f58f4e2f486d80f1700d63d1e67b591d4e6b13d19c4fcc0c52a4d0fa57c5a5a2ea73c4edd0f817
|
||||
DIST strace-5.17.tar.xz 2281220 BLAKE2B 27e7dc19302c58144b0a7d8de41f717760b8e3cde4ab56892045727597bbfc894bf8f137aee476548c2d16d1e9c8005f931f31a5d2f8bfc4ce5565c2aa01f1ec SHA512 1b63cf7e6e339333b9d24fa20232409192abc815f2ebe2e336ef4acc039cd06c976b3c12e9ce993491a0e6b86c26b90ceba962f580e894b1ff5ab9863bdfcc44
|
||||
|
||||
@@ -1,141 +0,0 @@
|
||||
From: Eugene Syromyatnikov <evgsyr@gmail.com>
|
||||
Date: Wed, 3 Nov 2021 00:48:59 +0100
|
||||
Subject: [PATCH] Avoid relying on presence of ipx.h
|
||||
|
||||
After Linux has broken UAPI in commit v5.15-rc1~157^2~207, it is well
|
||||
possible that neither kernel nor libc (such as musl, for example)
|
||||
provides an IPX-related header. Avoid relying on its presence
|
||||
in the strace's code and conditionalise the relevant checks in the tests.
|
||||
|
||||
* configure.ac (AC_CHECK_HEADERS): Add linux/ipx.h.
|
||||
* src/net.c: Remove <netipx/ipx.h>/<linux/ipx.h> includes.
|
||||
* src/sockaddr.c: Likewise.
|
||||
(IPX_NODE_LEN): New macro constant.
|
||||
(struct sockaddr_ipx): New type definition.
|
||||
* src/xlat/sock_ipx_options.in (IPX_TYPE): Provide a fallback value.
|
||||
* tests/net-sockaddr.c [!HAVE_LINUX_IPX_H]: Do not include
|
||||
<linux/ipx.h>.
|
||||
[!HAVE_LINUX_IPX_H && HAVE_NETIPX_IPX_H]: Include <netipx/ipx.h>.
|
||||
[!(HAVE_LINUX_IPX_H || defined HAVE_NETIPX_IPX_H)] (check_ipx): Do not
|
||||
define.
|
||||
(main) [!(HAVE_LINUX_IPX_H || defined HAVE_NETIPX_IPX_H)]: Do not call
|
||||
check_ipx.
|
||||
|
||||
Closes: https://github.com/strace/strace/issues/201
|
||||
---
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 2771c0f82..3c7fcb91e 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -423,6 +423,7 @@ AC_CHECK_HEADERS(m4_normalize([
|
||||
elf.h
|
||||
gcov.h
|
||||
iconv.h
|
||||
+ linux/ipx.h
|
||||
mqueue.h
|
||||
netinet/sctp.h
|
||||
netipx/ipx.h
|
||||
diff --git a/src/net.c b/src/net.c
|
||||
index b23911a97..bbc52e15f 100644
|
||||
--- a/src/net.c
|
||||
+++ b/src/net.c
|
||||
@@ -28,11 +28,6 @@
|
||||
#include <arpa/inet.h>
|
||||
#include <net/if.h>
|
||||
#include <asm/types.h>
|
||||
-#ifdef HAVE_NETIPX_IPX_H
|
||||
-# include <netipx/ipx.h>
|
||||
-#else
|
||||
-# include <linux/ipx.h>
|
||||
-#endif
|
||||
|
||||
#include <linux/ip_vs.h>
|
||||
#include "netlink.h"
|
||||
diff --git a/src/sockaddr.c b/src/sockaddr.c
|
||||
index 8b2b0afaf..e1dc09b71 100644
|
||||
--- a/src/sockaddr.c
|
||||
+++ b/src/sockaddr.c
|
||||
@@ -24,12 +24,6 @@
|
||||
#include <linux/if_ether.h>
|
||||
#include <linux/x25.h>
|
||||
|
||||
-#ifdef HAVE_NETIPX_IPX_H
|
||||
-# include <netipx/ipx.h>
|
||||
-#else
|
||||
-# include <linux/ipx.h>
|
||||
-#endif
|
||||
-
|
||||
#include "xlat/addrfams.h"
|
||||
#include "xlat/arp_hardware_types.h"
|
||||
#include "xlat/ethernet_protocols.h"
|
||||
@@ -45,6 +39,16 @@
|
||||
const size_t arp_hardware_types_size = ARRAY_SIZE(arp_hardware_types) - 1;
|
||||
const size_t ethernet_protocols_size = ARRAY_SIZE(ethernet_protocols) - 1;
|
||||
|
||||
+#define IPX_NODE_LEN 6
|
||||
+struct sockaddr_ipx {
|
||||
+ uint16_t sipx_family;
|
||||
+ uint16_t sipx_port;
|
||||
+ uint32_t sipx_network;
|
||||
+ unsigned char sipx_node[IPX_NODE_LEN];
|
||||
+ uint8_t sipx_type;
|
||||
+ unsigned char sipx_zero;
|
||||
+};
|
||||
+
|
||||
static void
|
||||
print_sockaddr_data_un(struct tcb *tcp, const void *const buf, const int addrlen)
|
||||
{
|
||||
diff --git a/src/xlat/sock_ipx_options.in b/src/xlat/sock_ipx_options.in
|
||||
index eba97fd71..b09be117e 100644
|
||||
--- a/src/xlat/sock_ipx_options.in
|
||||
+++ b/src/xlat/sock_ipx_options.in
|
||||
@@ -1 +1 @@
|
||||
-IPX_TYPE
|
||||
+IPX_TYPE 1
|
||||
diff --git a/tests/net-sockaddr.c b/tests/net-sockaddr.c
|
||||
index f1f9b01cd..c8049fd68 100644
|
||||
--- a/tests/net-sockaddr.c
|
||||
+++ b/tests/net-sockaddr.c
|
||||
@@ -24,7 +24,11 @@
|
||||
#include <linux/if_ether.h>
|
||||
#include <linux/if_packet.h>
|
||||
#include <linux/x25.h>
|
||||
-#include <linux/ipx.h>
|
||||
+#if defined HAVE_LINUX_IPX_H
|
||||
+# include <linux/ipx.h>
|
||||
+#elif defined HAVE_NETIPX_IPX_H
|
||||
+# include <netipx/ipx.h>
|
||||
+#endif
|
||||
#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
|
||||
# include <bluetooth/bluetooth.h>
|
||||
# include <bluetooth/hci.h>
|
||||
@@ -269,6 +273,7 @@ check_in6(void)
|
||||
printf("connect(-1, %p, %u) = %d EBADF (%m)\n", in6, len, ret);
|
||||
}
|
||||
|
||||
+#if defined HAVE_LINUX_IPX_H || defined HAVE_NETIPX_IPX_H
|
||||
static void
|
||||
check_ipx(void)
|
||||
{
|
||||
@@ -295,6 +300,7 @@ check_ipx(void)
|
||||
c_ipx.sipx_node[4], c_ipx.sipx_node[5],
|
||||
c_ipx.sipx_type, len, ret);
|
||||
}
|
||||
+#endif /* HAVE_LINUX_IPX_H || defined HAVE_NETIPX_IPX_H */
|
||||
|
||||
/* for a bit more compact AX.25 address definitions */
|
||||
#define AX25_ADDR(c_, s_) \
|
||||
@@ -773,7 +779,9 @@ main(void)
|
||||
check_un();
|
||||
check_in();
|
||||
check_in6();
|
||||
+#if defined HAVE_LINUX_IPX_H || defined HAVE_NETIPX_IPX_H
|
||||
check_ipx();
|
||||
+#endif
|
||||
check_ax25();
|
||||
check_x25();
|
||||
check_nl();
|
||||
--
|
||||
2.32.0
|
||||
|
||||
@@ -1,108 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit autotools flag-o-matic toolchain-funcs
|
||||
|
||||
if [[ ${PV} == "9999" ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/strace/strace.git"
|
||||
inherit git-r3
|
||||
else
|
||||
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
|
||||
fi
|
||||
|
||||
DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
|
||||
HOMEPAGE="https://strace.io/"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE="aio perl selinux static unwind elfutils"
|
||||
|
||||
REQUIRED_USE="?? ( unwind elfutils )"
|
||||
|
||||
BDEPEND="
|
||||
virtual/pkgconfig
|
||||
"
|
||||
LIB_DEPEND="
|
||||
unwind? ( sys-libs/libunwind[static-libs(+)] )
|
||||
elfutils? ( dev-libs/elfutils[static-libs(+)] )
|
||||
selinux? ( sys-libs/libselinux[static-libs(+)] )
|
||||
"
|
||||
# strace only uses the header from libaio to decode structs
|
||||
DEPEND="
|
||||
static? ( ${LIB_DEPEND} )
|
||||
aio? ( >=dev-libs/libaio-0.3.106 )
|
||||
sys-kernel/linux-headers
|
||||
"
|
||||
RDEPEND="
|
||||
!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
|
||||
perl? ( dev-lang/perl )
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-5.11-static.patch"
|
||||
"${FILESDIR}/${PN}-5.12-detect-ipx-presence.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
eautoreconf
|
||||
|
||||
if [[ ! -e configure ]] ; then
|
||||
# git generation
|
||||
sed /autoreconf/d -i bootstrap || die
|
||||
./bootstrap || die
|
||||
eautoreconf
|
||||
[[ ! -e CREDITS ]] && cp CREDITS{.in,}
|
||||
fi
|
||||
|
||||
filter-lfs-flags # configure handles this sanely
|
||||
|
||||
export ac_cv_header_libaio_h=$(usex aio)
|
||||
use elibc_musl && export ac_cv_header_stdc=no
|
||||
|
||||
# Stub out the -k test since it's known to be flaky. #545812
|
||||
sed -i '1iexit 77' tests*/strace-k.test || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# Set up the default build settings, and then use the names strace expects.
|
||||
tc-export_build_env BUILD_{CC,CPP}
|
||||
local v bv
|
||||
for v in CC CPP {C,CPP,LD}FLAGS ; do
|
||||
bv="BUILD_${v}"
|
||||
export "${v}_FOR_BUILD=${!bv}"
|
||||
done
|
||||
|
||||
# Don't require mpers support on non-multilib systems. #649560
|
||||
local myeconfargs=(
|
||||
--disable-gcc-Werror
|
||||
--enable-mpers=check
|
||||
$(use_enable static)
|
||||
$(use_with unwind libunwind)
|
||||
$(use_with elfutils libdw)
|
||||
$(use_with selinux libselinux)
|
||||
)
|
||||
econf "${myeconfargs[@]}"
|
||||
}
|
||||
|
||||
src_test() {
|
||||
if has usersandbox ${FEATURES} ; then
|
||||
ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." #643044
|
||||
return 0
|
||||
fi
|
||||
|
||||
default
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
if use perl ; then
|
||||
exeinto /usr/bin
|
||||
doexe src/strace-graph
|
||||
fi
|
||||
dodoc CREDITS
|
||||
}
|
||||
@@ -1,108 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit autotools flag-o-matic toolchain-funcs
|
||||
|
||||
if [[ ${PV} == "9999" ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/strace/strace.git"
|
||||
inherit git-r3
|
||||
else
|
||||
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
|
||||
fi
|
||||
|
||||
DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
|
||||
HOMEPAGE="https://strace.io/"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE="aio perl selinux static unwind elfutils"
|
||||
|
||||
REQUIRED_USE="?? ( unwind elfutils )"
|
||||
|
||||
BDEPEND="
|
||||
virtual/pkgconfig
|
||||
"
|
||||
LIB_DEPEND="
|
||||
unwind? ( sys-libs/libunwind[static-libs(+)] )
|
||||
elfutils? ( dev-libs/elfutils[static-libs(+)] )
|
||||
selinux? ( sys-libs/libselinux[static-libs(+)] )
|
||||
"
|
||||
# strace only uses the header from libaio to decode structs
|
||||
DEPEND="
|
||||
static? ( ${LIB_DEPEND} )
|
||||
aio? ( >=dev-libs/libaio-0.3.106 )
|
||||
sys-kernel/linux-headers
|
||||
"
|
||||
RDEPEND="
|
||||
!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
|
||||
perl? ( dev-lang/perl )
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-5.11-static.patch"
|
||||
"${FILESDIR}/${PN}-5.12-detect-ipx-presence.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
eautoreconf
|
||||
|
||||
if [[ ! -e configure ]] ; then
|
||||
# git generation
|
||||
sed /autoreconf/d -i bootstrap || die
|
||||
./bootstrap || die
|
||||
eautoreconf
|
||||
[[ ! -e CREDITS ]] && cp CREDITS{.in,}
|
||||
fi
|
||||
|
||||
filter-lfs-flags # configure handles this sanely
|
||||
|
||||
export ac_cv_header_libaio_h=$(usex aio)
|
||||
use elibc_musl && export ac_cv_header_stdc=no
|
||||
|
||||
# Stub out the -k test since it's known to be flaky. #545812
|
||||
sed -i '1iexit 77' tests*/strace-k.test || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# Set up the default build settings, and then use the names strace expects.
|
||||
tc-export_build_env BUILD_{CC,CPP}
|
||||
local v bv
|
||||
for v in CC CPP {C,CPP,LD}FLAGS ; do
|
||||
bv="BUILD_${v}"
|
||||
export "${v}_FOR_BUILD=${!bv}"
|
||||
done
|
||||
|
||||
# Don't require mpers support on non-multilib systems. #649560
|
||||
local myeconfargs=(
|
||||
--disable-gcc-Werror
|
||||
--enable-mpers=check
|
||||
$(use_enable static)
|
||||
$(use_with unwind libunwind)
|
||||
$(use_with elfutils libdw)
|
||||
$(use_with selinux libselinux)
|
||||
)
|
||||
econf "${myeconfargs[@]}"
|
||||
}
|
||||
|
||||
src_test() {
|
||||
if has usersandbox ${FEATURES} ; then
|
||||
ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." #643044
|
||||
return 0
|
||||
fi
|
||||
|
||||
default
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
if use perl ; then
|
||||
exeinto /usr/bin
|
||||
doexe src/strace-graph
|
||||
fi
|
||||
dodoc CREDITS
|
||||
}
|
||||
@@ -1,108 +0,0 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit autotools flag-o-matic toolchain-funcs
|
||||
|
||||
if [[ ${PV} == "9999" ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/strace/strace.git"
|
||||
inherit git-r3
|
||||
else
|
||||
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
|
||||
fi
|
||||
|
||||
DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
|
||||
HOMEPAGE="https://strace.io/"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE="aio perl selinux static unwind elfutils"
|
||||
REQUIRED_USE="?? ( unwind elfutils )"
|
||||
|
||||
BDEPEND="virtual/pkgconfig"
|
||||
LIB_DEPEND="
|
||||
unwind? ( sys-libs/libunwind[static-libs(+)] )
|
||||
elfutils? ( dev-libs/elfutils[static-libs(+)] )
|
||||
selinux? ( sys-libs/libselinux[static-libs(+)] )
|
||||
"
|
||||
# strace only uses the header from libaio to decode structs
|
||||
DEPEND="
|
||||
static? ( ${LIB_DEPEND} )
|
||||
aio? ( >=dev-libs/libaio-0.3.106 )
|
||||
sys-kernel/linux-headers
|
||||
"
|
||||
RDEPEND="
|
||||
!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
|
||||
perl? ( dev-lang/perl )
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-5.11-static.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
eautoreconf
|
||||
|
||||
if [[ ! -e configure ]] ; then
|
||||
# git generation
|
||||
sed /autoreconf/d -i bootstrap || die
|
||||
./bootstrap || die
|
||||
eautoreconf
|
||||
[[ ! -e CREDITS ]] && cp CREDITS{.in,}
|
||||
fi
|
||||
|
||||
# Stub out the -k test since it's known to be flaky. bug #545812
|
||||
sed -i '1iexit 77' tests*/strace-k.test || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# Set up the default build settings, and then use the names strace expects.
|
||||
tc-export_build_env BUILD_{CC,CPP}
|
||||
local v bv
|
||||
for v in CC CPP {C,CPP,LD}FLAGS ; do
|
||||
bv="BUILD_${v}"
|
||||
export "${v}_FOR_BUILD=${!bv}"
|
||||
done
|
||||
|
||||
filter-lfs-flags # configure handles this sanely
|
||||
|
||||
export ac_cv_header_libaio_h=$(usex aio)
|
||||
use elibc_musl && export ac_cv_header_stdc=no
|
||||
|
||||
local myeconfargs=(
|
||||
--disable-gcc-Werror
|
||||
|
||||
# Don't require mpers support on non-multilib systems. #649560
|
||||
--enable-mpers=check
|
||||
|
||||
$(use_enable static)
|
||||
$(use_with unwind libunwind)
|
||||
$(use_with elfutils libdw)
|
||||
$(use_with selinux libselinux)
|
||||
)
|
||||
econf "${myeconfargs[@]}"
|
||||
}
|
||||
|
||||
src_test() {
|
||||
if has usersandbox ${FEATURES} ; then
|
||||
# bug #643044
|
||||
ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..."
|
||||
return 0
|
||||
fi
|
||||
|
||||
default
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
if use perl ; then
|
||||
exeinto /usr/bin
|
||||
doexe src/strace-graph
|
||||
fi
|
||||
dodoc CREDITS
|
||||
}
|
||||
Reference in New Issue
Block a user