From a6850a7c91d8e43925c805c61b7f90ef3b6532e30808b70b30fe61b0073ad983 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 20 Mar 2023 21:23:11 +0000 Subject: [PATCH] - Delete xfrm-support-displaying-transformations-used-for-Mob.patch OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=238 --- iproute2.changes | 6 +++ iproute2.spec | 1 - ...playing-transformations-used-for-Mob.patch | 53 ------------------- 3 files changed, 6 insertions(+), 54 deletions(-) delete mode 100644 xfrm-support-displaying-transformations-used-for-Mob.patch diff --git a/iproute2.changes b/iproute2.changes index 2475682..00d65f0 100644 --- a/iproute2.changes +++ b/iproute2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 20 21:21:52 UTC 2023 - Jan Engelhardt + +- Delete xfrm-support-displaying-transformations-used-for-Mob.patch + (mip6d-ng is abandoned too) + ------------------------------------------------------------------- Tue Mar 7 14:14:56 UTC 2023 - Jan Engelhardt diff --git a/iproute2.spec b/iproute2.spec index c0eb5f1..687a5d8 100644 --- a/iproute2.spec +++ b/iproute2.spec @@ -36,7 +36,6 @@ Source9: %name.keyring Patch1: adjust-installation-directories-for-openSUSE-SLE.patch Patch2: use-sysconf-_SC_CLK_TCK-if-HZ-undefined.patch Patch3: add-explicit-typecast-to-avoid-gcc-warning.patch -Patch4: xfrm-support-displaying-transformations-used-for-Mob.patch Patch6: split-link-and-compile-steps-for-binaries.patch BuildRequires: bison BuildRequires: db-devel diff --git a/xfrm-support-displaying-transformations-used-for-Mob.patch b/xfrm-support-displaying-transformations-used-for-Mob.patch deleted file mode 100644 index f131b5c..0000000 --- a/xfrm-support-displaying-transformations-used-for-Mob.patch +++ /dev/null @@ -1,53 +0,0 @@ -From: Jan Engelhardt -Subject: xfrm: support displaying transformations used for Mobile IPv6 -Patch-mainline: No - -Patch taken from mip6d-ng c397c3b4a16bb2e31a86f6c5e344a1278d1577c5 -and included in openSUSE so as to facilitate mip6d-ng. ---- - ip/ipxfrm.c | 2 +- - ip/xfrm_policy.c | 3 ++- - ip/xfrm_state.c | 3 ++- - 3 files changed, 5 insertions(+), 3 deletions(-) - ---- a/ip/ipxfrm.c -+++ b/ip/ipxfrm.c -@@ -103,7 +103,7 @@ struct typeent { - static const struct typeent xfrmproto_types[] = { - { "esp", IPPROTO_ESP }, { "ah", IPPROTO_AH }, { "comp", IPPROTO_COMP }, - { "route2", IPPROTO_ROUTING }, { "hao", IPPROTO_DSTOPTS }, -- { "ipsec-any", IPSEC_PROTO_ANY }, -+ { "ipsec-any", IPSEC_PROTO_ANY }, { "ipv6", IPPROTO_IPV6 }, - { NULL, -1 } - }; - ---- a/ip/xfrm_policy.c -+++ b/ip/xfrm_policy.c -@@ -97,10 +97,11 @@ static void usage(void) - "ID := [ src ADDR ] [ dst ADDR ] [ proto XFRM-PROTO ] [ spi SPI ]\n" - "XFRM-PROTO := "); - fprintf(stderr, -- "%s | %s | %s | %s | %s\n", -+ "%s | %s | %s | %s | %s | %s\n", - strxf_xfrmproto(IPPROTO_ESP), - strxf_xfrmproto(IPPROTO_AH), - strxf_xfrmproto(IPPROTO_COMP), -+ strxf_xfrmproto(IPPROTO_IPV6), - strxf_xfrmproto(IPPROTO_ROUTING), - strxf_xfrmproto(IPPROTO_DSTOPTS)); - fprintf(stderr, ---- a/ip/xfrm_state.c -+++ b/ip/xfrm_state.c -@@ -76,10 +76,11 @@ static void usage(void) - "ID := [ src ADDR ] [ dst ADDR ] [ proto XFRM-PROTO ] [ spi SPI ]\n" - "XFRM-PROTO := "); - fprintf(stderr, -- "%s | %s | %s | %s | %s\n", -+ "%s | %s | %s | %s | %s | %s\n", - strxf_xfrmproto(IPPROTO_ESP), - strxf_xfrmproto(IPPROTO_AH), - strxf_xfrmproto(IPPROTO_COMP), -+ strxf_xfrmproto(IPPROTO_IPV6), - strxf_xfrmproto(IPPROTO_ROUTING), - strxf_xfrmproto(IPPROTO_DSTOPTS)); - fprintf(stderr,