diff options
author | V3n3RiX <venerix@koprulu.sector> | 2021-12-22 14:08:05 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2021-12-22 14:08:05 +0000 |
commit | 93a93e9a3b53c1a73142a305ea1f8136846942ee (patch) | |
tree | b9791a06ab3284e27b568412c59316c66240c682 /dev-util/strace/files/strace-5.12-detect-ipx-presence.patch | |
parent | 2771f79232c273bc2a57d23bf335dd81ccf6af28 (diff) |
gentoo resync : 22.12.2021
Diffstat (limited to 'dev-util/strace/files/strace-5.12-detect-ipx-presence.patch')
-rw-r--r-- | dev-util/strace/files/strace-5.12-detect-ipx-presence.patch | 141 |
1 files changed, 141 insertions, 0 deletions
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 + |