strace: Remove 5.0 to 5.14

strace maintains backwards compatibility with older kernels so there is
no need to keep multiple versions of strace. Versions 5.0 to 5.14
weren't present in the crosstool-ng-1.24 release so remove them directly
instead of marking them as obsolete.

Signed-off-by: Chris Packham <judge.packham@gmail.com>
This commit is contained in:
Chris Packham 2022-02-16 20:44:22 +13:00
parent 3a80ddda77
commit 71fad07b71
27 changed files with 0 additions and 187 deletions

View File

@ -1,4 +0,0 @@
md5 strace-5.0.tar.xz 8499d66e5c467fd391c272dd82f0b691
sha1 strace-5.0.tar.xz 203d94e56dbfed066039ba61994dfee192a69515
sha256 strace-5.0.tar.xz 3b7ad77eb2b81dc6078046a9cc56eed5242b67b63748e7fc28f7c2daf4e647da
sha512 strace-5.0.tar.xz cba3280ada27ef434eda54d0e150f04ab89ad227d67b29bd0993f9ac7747eb32b0e49af8cc493b92eab99c0848ec8dc6bbd9b1db423abd53f19129dacbddf265

View File

View File

@ -1,4 +0,0 @@
md5 strace-5.1.tar.xz 8c7c4866beeecf3a964934cc6e5d49c9
sha1 strace-5.1.tar.xz 6474260dcc66aa1f591acee31ae6a1a457b34656
sha256 strace-5.1.tar.xz f5a341b97d7da88ee3760626872a4899bf23cf8dee56901f114be5b1837a9a8b
sha512 strace-5.1.tar.xz dfbfa97650f0c42d088a3c5ff9715a05a31e579742fb2874c225b6e3c26b0d49c2427489080e971ee2cabb0fe744ff2464b3524c5adae0b3d5843583018de074

View File

View File

@ -1,4 +0,0 @@
md5 strace-5.10.tar.xz 5f9f87f9afa282e7512f67a129287d6c
sha1 strace-5.10.tar.xz 8b5ced312f379806406a0ee6551fbe373c55e738
sha256 strace-5.10.tar.xz fe3982ea4cd9aeb3b4ba35f6279f0b577a37175d3282be24b9a5537b56b8f01c
sha512 strace-5.10.tar.xz 1baa41b6d52f2e40e42a22850beee1ae278fafe712796694631898f06a7540d8f2c3fa70807e0062734f0976ebbd0824457c733ccda248f017c218387366ed48

View File

View File

@ -1,4 +0,0 @@
md5 strace-5.11.tar.xz f5a317fd535465cf9130d0547661f5c4
sha1 strace-5.11.tar.xz 1b7a533a45b9ca351d7a14702c044b917d11e979
sha256 strace-5.11.tar.xz ffe340b10c145a0f85734271e9cce56457d23f21a7ea5931ab32f8cf4e793879
sha512 strace-5.11.tar.xz 688bec8d620c7ca701561ed7479e42687cc30737f944b82201731d827775cd2864787ecca7c93ba149b06d5d654d9f6bd109a977f8138bab34339cd5930828f0

View File

View File

@ -1,135 +0,0 @@
From d8eb6a06192d982977b3ff12b6d1ca69beaa7bb3 Mon Sep 17 00:00:00 2001
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
---
configure.ac | 1 +
src/net.c | 5 -----
src/sockaddr.c | 16 ++++++++++------
src/xlat/sock_ipx_options.in | 2 +-
tests/net-sockaddr.c | 10 +++++++++-
5 files changed, 21 insertions(+), 13 deletions(-)
--- a/configure.ac
+++ b/configure.ac
@@ -423,6 +423,7 @@
elf.h
gcov.h
iconv.h
+ linux/ipx.h
mqueue.h
netinet/sctp.h
netipx/ipx.h
--- 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"
--- 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"
@@ -42,6 +36,16 @@
#define SIZEOF_SA_FAMILY sizeof_field(struct sockaddr, sa_family)
+#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;
+};
+
const size_t arp_hardware_types_size = ARRAY_SIZE(arp_hardware_types) - 1;
const size_t ethernet_protocols_size = ARRAY_SIZE(ethernet_protocols) - 1;
--- a/src/xlat/sock_ipx_options.in
+++ b/src/xlat/sock_ipx_options.in
@@ -1 +1 @@
-IPX_TYPE
+IPX_TYPE 1
--- 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 @@
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 @@
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 @@
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();

View File

@ -1,4 +0,0 @@
md5 strace-5.14.tar.xz 36c1c17f31855617b7898d2fd5abb9e2
sha1 strace-5.14.tar.xz 6625b01b18c3940cd926c85e4d1feb10f162973d
sha256 strace-5.14.tar.xz 901bee6db5e17debad4530dd9ffb4dc9a96c4a656edbe1c3141b7cb307b11e73
sha512 strace-5.14.tar.xz 3e147521773d900167809db9feeb148e8ba116f90dd634311941ea335eb7bd8b73ab9e641bd2dcfe899ab41c19a841e203dc771ec3000ae01452d22ecdc43c5a

View File

View File

@ -1,4 +0,0 @@
md5 strace-5.2.tar.xz b9c02b07dcde5125498ce7da69b77baf
sha1 strace-5.2.tar.xz 64eb4d62f055bde0c6b00be3137c5cae64e16841
sha256 strace-5.2.tar.xz d513bc085609a9afd64faf2ce71deb95b96faf46cd7bc86048bc655e4e4c24d2
sha512 strace-5.2.tar.xz 41bea20215fa80ad90a5d49c41944e02774e715efda5e563b3714e5800933a5fca4a2392634193cf49c0752321a39e0c185bdbc9cfb8ee053b09a6bd5723da35

View File

View File

@ -1,4 +0,0 @@
md5 strace-5.3.tar.xz 84f5e72de813c9b1bb6057ee8ab428d8
sha1 strace-5.3.tar.xz 86810613dd9ce1b2ccccb09a01074a74e098f0a5
sha256 strace-5.3.tar.xz 6c131198749656401fe3efd6b4b16a07ea867e8f530867ceae8930bbc937a047
sha512 strace-5.3.tar.xz 02b80a8abedb14e40235709733953005210cd328daba59cb594745e7ed3851d155546ccccdb3e43835aa75eee89f023324e542e15154bbc3269e37fd23433e2a

View File

View File

@ -1,4 +0,0 @@
md5 strace-5.4.tar.xz b2b58f05eb3c5c0bf9d1e26003b4d698
sha1 strace-5.4.tar.xz a73590b4489deb832d969a51850ce564677c7e46
sha256 strace-5.4.tar.xz f7d00514d51290b6db78ad7a9de709baf93caa5981498924cbc9a744cfd2a741
sha512 strace-5.4.tar.xz 4ddba2ec4457a2257c18b26dca851e49a275813c4eb3069379a93fcc60228f9b63a3dee9e3719ae606a7cc61d55ab21ce147327223903c302c061e381097a8d7

View File

View File

@ -1,4 +0,0 @@
md5 strace-5.5.tar.xz dbce2e84632b39a4ed86b9fc60447af9
sha1 strace-5.5.tar.xz ebacd8fb078aabc2e4a856657bac299589641d28
sha256 strace-5.5.tar.xz 9f58958c8e59ea62293d907d10572e352b582bd7948ed21aa28ebb47e5bf30ff
sha512 strace-5.5.tar.xz 317fe6341000b452cf038433c2a9a7bcdc8ce736e97b242673ce066dd9dbd3b2c3435a014b529429fdf2ac8af5c3a72d62971b293d007b7d3efcbb684c216231

View File

View File

@ -1,4 +0,0 @@
md5 strace-5.6.tar.xz f8e0394d4e537b3faadf0a72f5d1d17e
sha1 strace-5.6.tar.xz 03e0de09e76964c366c85d2af1b6955f626b477d
sha256 strace-5.6.tar.xz 189968eeae06ed9e20166ec55a830943c84374676a457c9fe010edc7541f1b01
sha512 strace-5.6.tar.xz 58c8a250e55a018206bee9468ea057c087d5d5bb523339ea3c01e0a19d8f84c95bd1398d66a6dca6ada45c6535aa44b776713a2bb080eebaa734ffb926ac5b38

View File

View File

@ -1,4 +0,0 @@
md5 strace-5.7.tar.xz 8c35b8ebf187b2ec18209bd7bbd16e7a
sha1 strace-5.7.tar.xz 95c9d5aa664982d53ce1e5ab058d8fb73e200f0c
sha256 strace-5.7.tar.xz b284b59f9bcd95b9728cea5bd5c0edc5ebe360af73dc76fbf6334f11c777ccd8
sha512 strace-5.7.tar.xz aef481238196204495cf9507cd48ce30af799f79904478e6be57a267311a999c868f18540cc1e025f5e486730cfe9ccb256f528f6f796d204a7347ebdf2042f1

View File

View File

@ -1,4 +0,0 @@
md5 strace-5.8.tar.xz 1a808c5917f0d91169e377c90faee6dd
sha1 strace-5.8.tar.xz 0e60844b68a6097d46053488facbd3c40484af27
sha256 strace-5.8.tar.xz df4a669f7fff9cc302784085bd4b72fab216a426a3f72c892b28a537b71e7aa9
sha512 strace-5.8.tar.xz 633c3daa2dd3d273839cbb8ebd7f6512a38b39af0d0d89f4676c2067e199f346615406d85e3e13f9e4da8dbeb62095185895ffae986eb99b64775a4287e38f4c

View File

View File

@ -1,4 +0,0 @@
md5 strace-5.9.tar.xz fef7264b3501c6af86224c685751d0c6
sha1 strace-5.9.tar.xz 3b86b7c84d73415245c6b4cfa0944699dcc61c74
sha256 strace-5.9.tar.xz 39473eb8465546c3e940fb663cb381eba5613160c7302794699d194a4d5d66d9
sha512 strace-5.9.tar.xz f28d5dcceccb44557b39ed6f295f3250662804dc3ad79959bfadffcecc9b736e532c7c90dc89ebf9d07eb3e02a5ace231605851148ca09d41c8c60dc1ff68206

View File