jengelh/iproute2
SHA256
1
0
Fork 0
forked from pool/iproute2
Code Pull Requests Activity

Accepting request 1074785 from security:netfilter

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/1074785
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/iproute2?expand=0&rev=133
This commit is contained in:
Dominique Leuenberger 2023-03-29 21:25:55 +00:00 committed by Git OBS Bridge
commit f9657ff0b5
3 changed files with 6 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
iproute2.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 20 21:21:52 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
- Delete xfrm-support-displaying-transformations-used-for-Mob.patch
(mip6d-ng is abandoned too)
-------------------------------------------------------------------
Tue Mar 7 14:14:56 UTC 2023 - Jan Engelhardt <jengelh@inai.de>

1
iproute2.spec
View File

@ -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

53
xfrm-support-displaying-transformations-used-for-Mob.patch
View File

@ -1,53 +0,0 @@
From: Jan Engelhardt <jengelh@inai.de>
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,