gentoo resync : 22.12.2021

4 files changed, 147 insertions, 3 deletions

diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index 0cbe755e7b83..2a65669c86bb 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -1,9 +1,10 @@
 AUX strace-5.11-static.patch 5306 BLAKE2B 24150fcdf0ff75c4698542914bcd0fd39df9794f39ce0d16dac6dc3b689365e124d8d77a75a8fe81caff9432679563d84ffd31add74edb4c8f83aec28ff2f078 SHA512 bbeecbfd73109d21732acdaa28d5b4c82b23b7165f09e78e62cad68f9ac63dfb4c7a1c2eb8bdc642dda9f07d62e286ab46a2be236b5f03e1e6f9920f3093ede8
+AUX strace-5.12-detect-ipx-presence.patch 3902 BLAKE2B bc61d359e670462daafa88951b7edce1a35e9cc2196bb21e3f8e4d3808c248ec90bb560740a6cf48420546802b94ac314c1411b9df0147992f1809c09a77271b SHA512 08c8f6af6377a08dc5a852a32b6a2ddebe2545d41f8a72046155125f14a380b6836757f52a40337384bbdfc9c1180d104ac35cff3d7a3b9e9c5f51d6bd2ef5c2
 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
-EBUILD strace-5.12-r1.ebuild 2429 BLAKE2B 4d257cb5a891064a0dfb24ec69567b72cb3952e380ebcb69b0e2b8af6ae19fabe6508bdcec3a6c711b8a1ad10c7ae27eae9121dc18d990694edc2845725be138 SHA512 65629ee3a380a6ca9aca597f628d4e8e7c0caea6cc8b6e5f0d1529ca171bba24107ae3bc6b57177555055240a8b31c10d77ae6d0c4fb1f0c4d160901ae613fd6
-EBUILD strace-5.14-r1.ebuild 2437 BLAKE2B 13ebd8db417683989394b244d639a9b62d297849c09189cc5dfd6c49eae0adf0da128efcfb817c95e5e1828150c9d1d550c8e21769490ff8a9cce877d44f6f28 SHA512 30049cf1f1dda579d8c21dac484698c8a1b25f2e13f8e85cef9fca621b1f9da84e0fa336a7f5680d43c4cf68476fedbaa02c7ee5a98f0af405ca8cbd9e6582ee
+EBUILD strace-5.12-r1.ebuild 2481 BLAKE2B a306eb30dcc7685c9637572d61e29fce39d1618e2d5ac38bcffffca953d65ab89847af3df7de80596af9b18484f5116db89b58420d11bdbaf2d002c6ad126a35 SHA512 82347d065e746dbe4e3f5fc8f39b302daa5cacc2296c67032b16db2f2d3dc44f9ae3b1a003cd597be14f1edbcb34cc4d8f945994206550f3f21976e9f25e4775
+EBUILD strace-5.14-r1.ebuild 2481 BLAKE2B a306eb30dcc7685c9637572d61e29fce39d1618e2d5ac38bcffffca953d65ab89847af3df7de80596af9b18484f5116db89b58420d11bdbaf2d002c6ad126a35 SHA512 82347d065e746dbe4e3f5fc8f39b302daa5cacc2296c67032b16db2f2d3dc44f9ae3b1a003cd597be14f1edbcb34cc4d8f945994206550f3f21976e9f25e4775
 EBUILD strace-5.15.ebuild 2449 BLAKE2B cf34ec837986a9272c8f74b2b21bcae953bd2e4d6cb19258b93f2536642e12b770f541f5b9318220712e4c932e49bf57119d3b1cdf8139a75bbb1a04554615d2 SHA512 43194e23793515412488e219b72599f3cdb40b68b662ccbb2e650e106d7ba7f7952fe96e226098298055f89e94c2807e8ac2c1e333ca264b57c7823347db7566
 EBUILD strace-9999.ebuild 2437 BLAKE2B 13ebd8db417683989394b244d639a9b62d297849c09189cc5dfd6c49eae0adf0da128efcfb817c95e5e1828150c9d1d550c8e21769490ff8a9cce877d44f6f28 SHA512 30049cf1f1dda579d8c21dac484698c8a1b25f2e13f8e85cef9fca621b1f9da84e0fa336a7f5680d43c4cf68476fedbaa02c7ee5a98f0af405ca8cbd9e6582ee
 MISC metadata.xml 761 BLAKE2B 261db0087db2a12c260efcd80bae1dcabd1b518c7b7d65a7ce4cbd5a2fcf878af3787985d629b43dac0944fe97f7f78df964082c5dbc52da06360ec112a0e7f0 SHA512 dfe6bb1b1149f51947c964d55396c10df38ad68dd987ae3df66b1850b812717d282d41e59a38f35863d22eb7391b7be636b5272e361641c26622618c2cbff19e
diff --git a/dev-util/strace/files/strace-5.12-detect-ipx-presence.patch b/dev-util/strace/files/strace-5.12-detect-ipx-presence.patch
new file mode 100644
index 000000000000..37bab4399329
--- /dev/null
+++ b/dev-util/strace/files/strace-5.12-detect-ipx-presence.patch
@@ -0,0 +1,141 @@
+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
+
diff --git a/dev-util/strace/strace-5.12-r1.ebuild b/dev-util/strace/strace-5.12-r1.ebuild
index 98210d8944bf..d6e2d267ba84 100644
--- a/dev-util/strace/strace-5.12-r1.ebuild
+++ b/dev-util/strace/strace-5.12-r1.ebuild
@@ -43,6 +43,7 @@ RDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-5.11-static.patch"
+	"${FILESDIR}/${PN}-5.12-detect-ipx-presence.patch"
 )
 
 src_prepare() {
diff --git a/dev-util/strace/strace-5.14-r1.ebuild b/dev-util/strace/strace-5.14-r1.ebuild
index 035be39c8354..d6e2d267ba84 100644
--- a/dev-util/strace/strace-5.14-r1.ebuild
+++ b/dev-util/strace/strace-5.14-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	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"
+	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"
@@ -43,6 +43,7 @@ RDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-5.11-static.patch"
+	"${FILESDIR}/${PN}-5.12-detect-ipx-presence.patch"
 )
 
 src_prepare() {