Hello community,
here is the log from the commit of package iproute2 for openSUSE:Leap:15.2
checked in at 2020-05-04 08:22:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/iproute2 (Old)
and /work/SRC/openSUSE:Leap:15.2/.iproute2.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "iproute2"
Mon May 4 08:22:22 2020 rev:30 rq:799248 version:5.3
Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/iproute2/iproute2.changes 2020-01-19
15:47:06.705689300 +0100
+++ /work/SRC/openSUSE:Leap:15.2/.iproute2.new.2738/iproute2.changes
2020-05-04 08:22:22.652328527 +0200
@@ -1,0 +2,21 @@
+Fri Apr 24 13:11:04 UTC 2020 - Michal Kubecek <mkube...@suse.cz>
+
+- follow-up fixes backported from upstream (bsc#1160242):
+ ip-fix-link-type-and-vlan-oneline-output.patch
+ ip-xfrm-Fix-help-messages.patch
+ ip-link-xstats-fix-TX-IGMP-reports-string.patch
+ erspan-set-erspan_ver-to-1-by-default.patch
+ xfrm-not-try-to-delete-ipcomp-states-when-using-dele.patch
+ nexthop-fix-error-reporting-in-filter-dump.patch
+- refresh:
+ xfrm-support-displaying-transformations-used-for-Mob.patch
+- fix duplicated patch metadata:
+ introduce-print_masked_u16-and-print_masked_u32.patch
+
+-------------------------------------------------------------------
+Wed Apr 8 05:59:55 UTC 2020 - Thorsten Kukuk <ku...@suse.com>
+
+- Move arpd into own subpackage to avoid libdb dependency
+ [jsc#SLE-12189]
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ iproute2.spec ++++++
--- /var/tmp/diff_new_pack.rfhINI/_old 2020-05-04 08:22:23.108329504 +0200
+++ /var/tmp/diff_new_pack.rfhINI/_new 2020-05-04 08:22:23.112329512 +0200
@@ -84,6 +84,18 @@
%description bash-completion
bash command line completion support for iproute.
+%package arpd
+Summary: Userspace ARP daemon
+License: GPL-2.0-only
+Group: Productivity/Networking/Routing
+Provides: iproute2:/usr/sbin/arpd
+
+%description arpd
+The arpd daemon collects gratuitous ARP information, saving it on
+local disk and feeding it to the kernel on demand to avoid redundant
+broadcasting due to limited standard size (512..1024 entries,
+depending on type) of the kernel ARP cache.
+
%prep
%setup -qn %name-%rversion -a 3
chmod a+rx %{SOURCE5} %{SOURCE6}
@@ -130,12 +142,14 @@
%_bindir/routel
%_bindir/ss
%_sbindir/*
+%exclude %_sbindir/arpd
#UsrMerge
/sbin/*
/bin/ip
#EndUsrMerge
%_mandir/man7/*
%_mandir/man8/*
+%exclude %_mandir/man8/arpd.8*
%dir %_sysconfdir/iproute2
%config(noreplace) %_sysconfdir/iproute2/*
%_libdir/tc/
@@ -153,4 +167,8 @@
%defattr(-,root,root)
%_datadir/bash-completion/
+%files arpd
+%_sbindir/arpd
+%_mandir/man8/arpd.8*
+
%changelog
++++++ patches.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/patches/erspan-set-erspan_ver-to-1-by-default.patch
new/patches/erspan-set-erspan_ver-to-1-by-default.patch
--- old/patches/erspan-set-erspan_ver-to-1-by-default.patch 1970-01-01
01:00:00.000000000 +0100
+++ new/patches/erspan-set-erspan_ver-to-1-by-default.patch 2020-04-24
15:17:32.000000000 +0200
@@ -0,0 +1,54 @@
+From: Xin Long <lucien....@gmail.com>
+Date: Tue, 18 Feb 2020 11:50:20 +0800
+Subject: erspan: set erspan_ver to 1 by default
+Patch-mainline: v5.6.0
+Git-commit: 83c543af872e38654326671f6b504257d98c4489
+References: bsc#1160242
+
+Commit 289763626721 ("erspan: add erspan version II support")
+breaks the command:
+
+ # ip link add erspan1 type erspan key 1 seq erspan 123 \
+ local 10.1.0.2 remote 10.1.0.1
+
+as erspan_ver is set to 0 by default, then IFLA_GRE_ERSPAN_INDEX
+won't be set in gre_parse_opt().
+
+ # ip -d link show erspan1
+ ...
+ erspan remote 10.1.0.1 local 10.1.0.2 ... erspan_index 0 erspan_ver 1
+ ^^^^^^^^^^^^^^
+
+This patch is to change to set erspan_ver to 1 by default.
+
+Fixes: 289763626721 ("erspan: add erspan version II support")
+Signed-off-by: Xin Long <lucien....@gmail.com>
+Acked-by: William Tu <u9012...@gmail.com>
+Signed-off-by: Stephen Hemminger <step...@networkplumber.org>
+---
+ ip/link_gre.c | 2 +-
+ ip/link_gre6.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/ip/link_gre.c
++++ b/ip/link_gre.c
+@@ -94,7 +94,7 @@ static int gre_parse_opt(struct link_util *lu, int argc,
char **argv,
+ __u8 metadata = 0;
+ __u32 fwmark = 0;
+ __u32 erspan_idx = 0;
+- __u8 erspan_ver = 0;
++ __u8 erspan_ver = 1;
+ __u8 erspan_dir = 0;
+ __u16 erspan_hwid = 0;
+
+--- a/ip/link_gre6.c
++++ b/ip/link_gre6.c
+@@ -106,7 +106,7 @@ static int gre_parse_opt(struct link_util *lu, int argc,
char **argv,
+ __u8 metadata = 0;
+ __u32 fwmark = 0;
+ __u32 erspan_idx = 0;
+- __u8 erspan_ver = 0;
++ __u8 erspan_ver = 1;
+ __u8 erspan_dir = 0;
+ __u16 erspan_hwid = 0;
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches/introduce-print_masked_u16-and-print_masked_u32.patch
new/patches/introduce-print_masked_u16-and-print_masked_u32.patch
--- old/patches/introduce-print_masked_u16-and-print_masked_u32.patch
2020-01-08 16:39:56.000000000 +0100
+++ new/patches/introduce-print_masked_u16-and-print_masked_u32.patch
2020-04-24 15:17:32.000000000 +0200
@@ -5,9 +5,6 @@
Git-commit: c8a494314c400eb023d7555933ba8ab40345519b (partial)
References: bsc#1159986
-Patch-mainline: v5.4.0
-Git-commit: c8a494314c400eb023d7555933ba8ab40345519b
-
These will be needed for a subsequent patch but we do not want to include
the whole upstream commit.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches/ip-fix-link-type-and-vlan-oneline-output.patch
new/patches/ip-fix-link-type-and-vlan-oneline-output.patch
--- old/patches/ip-fix-link-type-and-vlan-oneline-output.patch 1970-01-01
01:00:00.000000000 +0100
+++ new/patches/ip-fix-link-type-and-vlan-oneline-output.patch 2020-04-24
15:17:32.000000000 +0200
@@ -0,0 +1,54 @@
+From: Vladis Dronov <vdro...@redhat.com>
+Date: Sun, 19 Jan 2020 02:12:51 +0100
+Subject: ip: fix link type and vlan oneline output
+Patch-mainline: v5.5.0
+Git-commit: 970db267a0fb5036b28b2d9d4f53cb4be267ffd5
+References: bsc#1160242
+
+Move link type printing in print_linkinfo() so multiline output does not
+break link options line. Add oneline support for vlan's ingress and egress
+qos maps.
+
+Before the fix:
+
+5: veth90.4000@veth90: <BROADCAST,MULTICAST,M-DOWN> mtu 1500 qdisc noop state
DOWN mode DEFAULT group default qlen 1000
+ link/ether 26:9a:05:af:db:00 brd ff:ff:ff:ff:ff:ff promiscuity 0 minmtu 0
maxmtu 65535
+ vlan protocol 802.1Q id 4000 <REORDER_HDR> the option line
is broken ^^^
+ ingress-qos-map { 1:2 }
+ egress-qos-map { 2:1 } addrgenmode eui64 numtxqueues 1 numrxqueues 1
gso_max_size 65536 gso_max_segs 65535
+
+5: veth90.4000@veth90: <BROADCAST,MULTICAST,M-DOWN> mtu 1500 qdisc noop state
DOWN mode DEFAULT group default qlen 1000\ link/ether 26:9a:05:af:db:00 brd
ff:ff:ff:ff:ff:ff promiscuity 0 minmtu 0 maxmtu 65535 \ vlan protocol 802.1Q
id 4000 <REORDER_HDR>
+ ingress-qos-map { 1:2 } <<< a multiline output despite -oneline
+ egress-qos-map { 2:1 } addrgenmode eui64 numtxqueues 1 numrxqueues 1
gso_max_size 65536 gso_max_segs 65535
+
+After the fix:
+
+5: veth90.4000@veth90: <BROADCAST,MULTICAST,M-DOWN> mtu 1500 qdisc noop state
DOWN mode DEFAULT group default qlen 1000
+ link/ether 26:9a:05:af:db:00 brd ff:ff:ff:ff:ff:ff promiscuity 0 minmtu 0
maxmtu 65535 addrgenmode eui64 numtxqueues 1 numrxqueues 1 gso_max_size 65536
gso_max_segs 65535
+ vlan protocol 802.1Q id 4000 <REORDER_HDR>
+ ingress-qos-map { 1:2 }
+ egress-qos-map { 2:1 }
+
+5: veth90.4000@veth90: <BROADCAST,MULTICAST,M-DOWN> mtu 1500 qdisc noop state
DOWN mode DEFAULT group default qlen 1000\ link/ether 26:9a:05:af:db:00 brd
ff:ff:ff:ff:ff:ff promiscuity 0 minmtu 0 maxmtu 65535 addrgenmode eui64
numtxqueues 1 numrxqueues 1 gso_max_size 65536 gso_max_segs 65535 \ vlan
protocol 802.1Q id 4000 <REORDER_HDR> \ ingress-qos-map { 1:2 } \
egress-qos-map { 2:1 }
+
+Fixes: 5c302d518f10 ("vlan support")
+Link: https://bugzilla.kernel.org/show_bug.cgi?id=206241
+Reported-by: George Shuklin <george.shuk...@gmail.com>
+Signed-off-by: Vladis Dronov <vdro...@redhat.com>
+Signed-off-by: Stephen Hemminger <step...@networkplumber.org>
+---
+ ip/iplink_vlan.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/ip/iplink_vlan.c
++++ b/ip/iplink_vlan.c
+@@ -183,7 +183,8 @@ static void vlan_print_map(FILE *f,
+ int rem;
+
+ open_json_array(PRINT_JSON, name_json);
+- print_string(PRINT_FP, NULL, "\n %s { ", name_fp);
++ print_nl();
++ print_string(PRINT_FP, NULL, " %s { ", name_fp);
+
+ rem = RTA_PAYLOAD(attr);
+ for (i = RTA_DATA(attr); RTA_OK(i, rem); i = RTA_NEXT(i, rem)) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches/ip-link-xstats-fix-TX-IGMP-reports-string.patch
new/patches/ip-link-xstats-fix-TX-IGMP-reports-string.patch
--- old/patches/ip-link-xstats-fix-TX-IGMP-reports-string.patch 1970-01-01
01:00:00.000000000 +0100
+++ new/patches/ip-link-xstats-fix-TX-IGMP-reports-string.patch 2020-04-24
15:17:32.000000000 +0200
@@ -0,0 +1,28 @@
+From: Andrea Claudi <acla...@redhat.com>
+Date: Wed, 29 Jan 2020 15:31:11 +0100
+Subject: ip link: xstats: fix TX IGMP reports string
+Patch-mainline: v5.6.0
+Git-commit: 5cdeb77cd6ec26f0a7103dfb21494a6a43903206
+References: bsc#1160242
+
+This restore the string format we have before jsonification, adding a
+missing space between v2 and v3 on TX IGMP reports string.
+
+Fixes: a9bc23a79227a ("ip: bridge: add xstats json support")
+Signed-off-by: Andrea Claudi <acla...@redhat.com>
+Signed-off-by: Stephen Hemminger <step...@networkplumber.org>
+---
+ ip/iplink_bridge.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/ip/iplink_bridge.c
++++ b/ip/iplink_bridge.c
+@@ -742,7 +742,7 @@ static void bridge_print_stats_attr(struct rtattr *attr,
int ifindex)
+ print_string(PRINT_FP, NULL, "%-16s ", "");
+ print_u64(PRINT_ANY, "tx_v1", "TX: v1 %llu ",
+ mstats->igmp_v1reports[BR_MCAST_DIR_TX]);
+- print_u64(PRINT_ANY, "tx_v2", "v2 %llu",
++ print_u64(PRINT_ANY, "tx_v2", "v2 %llu ",
+ mstats->igmp_v2reports[BR_MCAST_DIR_TX]);
+ print_u64(PRINT_ANY, "tx_v3", "v3 %llu\n",
+ mstats->igmp_v3reports[BR_MCAST_DIR_TX]);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/patches/ip-xfrm-Fix-help-messages.patch
new/patches/ip-xfrm-Fix-help-messages.patch
--- old/patches/ip-xfrm-Fix-help-messages.patch 1970-01-01 01:00:00.000000000
+0100
+++ new/patches/ip-xfrm-Fix-help-messages.patch 2020-04-24 15:17:32.000000000
+0200
@@ -0,0 +1,94 @@
+From: Andrea Claudi <acla...@redhat.com>
+Date: Wed, 29 Jan 2020 15:56:40 +0100
+Subject: ip-xfrm: Fix help messages
+Patch-mainline: v5.6.0
+Git-commit: 38dd041bfe773e481ebf9c8250e49c665af2e215
+References: bsc#1160242
+
+After commit 8589eb4efdf2a ("treewide: refactor help messages") help
+messages for xfrm state and policy are broken, printing many times the
+same protocol in UPSPEC section:
+
+$ ip xfrm state help
+[...]
+UPSPEC := proto { { tcp | tcp | tcp | tcp } [ sport PORT ] [ dport PORT ] |
+ { icmp | icmp | icmp } [ type NUMBER ] [ code NUMBER ] |
+ gre [ key { DOTTED-QUAD | NUMBER } ] | PROTO }
+
+This happens because strxf_proto function is non-reentrant and gets called
+multiple times in the same fprintf instruction.
+
+This commit fix the issue avoiding calls to strxf_proto() with a constant
+param, just hardcoding strings for protocol names.
+
+Fixes: 8589eb4efdf2a ("treewide: refactor help messages")
+Signed-off-by: Andrea Claudi <acla...@redhat.com>
+Signed-off-by: Stephen Hemminger <step...@networkplumber.org>
+---
+ ip/xfrm_policy.c | 21 +++------------------
+ ip/xfrm_state.c | 24 +++---------------------
+ 2 files changed, 6 insertions(+), 39 deletions(-)
+
+--- a/ip/xfrm_policy.c
++++ b/ip/xfrm_policy.c
+@@ -66,24 +66,9 @@ static void usage(void)
+ "Usage: ip xfrm policy count\n"
+ "Usage: ip xfrm policy set [ hthresh4 LBITS RBITS ] [ hthresh6
LBITS RBITS ]\n"
+ "SELECTOR := [ src ADDR[/PLEN] ] [ dst ADDR[/PLEN] ] [ dev DEV
] [ UPSPEC ]\n"
+- "UPSPEC := proto { { ");
+- fprintf(stderr, "%s | %s | %s | %s } ",
+- strxf_proto(IPPROTO_TCP),
+- strxf_proto(IPPROTO_UDP),
+- strxf_proto(IPPROTO_SCTP),
+- strxf_proto(IPPROTO_DCCP));
+- fprintf(stderr,
+- "[ sport PORT ] [ dport PORT ] |\n"
+- " { %s | %s | %s } ",
+- strxf_proto(IPPROTO_ICMP),
+- strxf_proto(IPPROTO_ICMPV6),
+- strxf_proto(IPPROTO_MH));
+- fprintf(stderr,
+- "[ type NUMBER ] [ code NUMBER ] |\n"
+- " %s",
+- strxf_proto(IPPROTO_GRE));
+- fprintf(stderr,
+- " [ key { DOTTED-QUAD | NUMBER } ] | PROTO }\n"
++ "UPSPEC := proto { { tcp | udp | sctp | dccp } [ sport PORT ] [
dport PORT ] |\n"
++ " { icmp | ipv6-icmp | mobility-header } [
type NUMBER ] [ code NUMBER ] |\n"
++ " gre [ key { DOTTED-QUAD | NUMBER } ] | PROTO
}\n"
+ "DIR := in | out | fwd\n"
+ "PTYPE := main | sub\n"
+ "ACTION := allow | block\n"
+--- a/ip/xfrm_state.c
++++ b/ip/xfrm_state.c
+@@ -106,27 +106,9 @@ static void usage(void)
+ "EXTRA-FLAG-LIST := [ EXTRA-FLAG-LIST ] EXTRA-FLAG\n"
+ "EXTRA-FLAG := dont-encap-dscp\n"
+ "SELECTOR := [ src ADDR[/PLEN] ] [ dst ADDR[/PLEN] ] [ dev DEV
] [ UPSPEC ]\n"
+- "UPSPEC := proto { { ");
+- fprintf(stderr,
+- "%s | %s | %s | %s",
+- strxf_proto(IPPROTO_TCP),
+- strxf_proto(IPPROTO_UDP),
+- strxf_proto(IPPROTO_SCTP),
+- strxf_proto(IPPROTO_DCCP));
+- fprintf(stderr,
+- " } [ sport PORT ] [ dport PORT ] |\n"
+- " { ");
+- fprintf(stderr,
+- "%s | %s | %s",
+- strxf_proto(IPPROTO_ICMP),
+- strxf_proto(IPPROTO_ICMPV6),
+- strxf_proto(IPPROTO_MH));
+- fprintf(stderr,
+- " } [ type NUMBER ] [ code NUMBER ] |\n");
+- fprintf(stderr,
+- " %s", strxf_proto(IPPROTO_GRE));
+- fprintf(stderr,
+- " [ key { DOTTED-QUAD | NUMBER } ] | PROTO }\n"
++ "UPSPEC := proto { { tcp | udp | sctp | dccp } [ sport PORT ] [
dport PORT ] |\n"
++ " { icmp | ipv6-icmp | mobility-header } [
type NUMBER ] [ code NUMBER ] |\n"
++ " gre [ key { DOTTED-QUAD | NUMBER } ] | PROTO
}\n"
+ "LIMIT-LIST := [ LIMIT-LIST ] limit LIMIT\n"
+ "LIMIT := { time-soft | time-hard | time-use-soft |
time-use-hard } SECONDS |\n"
+ " { byte-soft | byte-hard } SIZE | { packet-soft |
packet-hard } COUNT\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches/nexthop-fix-error-reporting-in-filter-dump.patch
new/patches/nexthop-fix-error-reporting-in-filter-dump.patch
--- old/patches/nexthop-fix-error-reporting-in-filter-dump.patch
1970-01-01 01:00:00.000000000 +0100
+++ new/patches/nexthop-fix-error-reporting-in-filter-dump.patch
2020-04-24 15:17:32.000000000 +0200
@@ -0,0 +1,36 @@
+From: Andrea Claudi <acla...@redhat.com>
+Date: Tue, 10 Mar 2020 13:15:17 +0100
+Subject: nexthop: fix error reporting in filter dump
+Patch-mainline: v5.6.0
+Git-commit: d9b868436a6fce8986560178c6d1a78072e21861
+References: bsc#1160242
+
+nh_dump_filter is missing a return value check in two cases.
+Fix this simply adding an assignment to the proper variable.
+
+Fixes: 63df8e8543b03 ("Add support for nexthop objects")
+Signed-off-by: Andrea Claudi <acla...@redhat.com>
+Reviewed-by: David Ahern <dsah...@gmail.com>
+Signed-off-by: Stephen Hemminger <step...@networkplumber.org>
+---
+ ip/ipnexthop.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/ip/ipnexthop.c
++++ b/ip/ipnexthop.c
+@@ -58,13 +58,13 @@ static int nh_dump_filter(struct nlmsghdr *nlh, int reqlen)
+ }
+
+ if (filter.groups) {
+- addattr_l(nlh, reqlen, NHA_GROUPS, NULL, 0);
++ err = addattr_l(nlh, reqlen, NHA_GROUPS, NULL, 0);
+ if (err)
+ return err;
+ }
+
+ if (filter.master) {
+- addattr32(nlh, reqlen, NHA_MASTER, filter.master);
++ err = addattr32(nlh, reqlen, NHA_MASTER, filter.master);
+ if (err)
+ return err;
+ }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches/xfrm-not-try-to-delete-ipcomp-states-when-using-dele.patch
new/patches/xfrm-not-try-to-delete-ipcomp-states-when-using-dele.patch
--- old/patches/xfrm-not-try-to-delete-ipcomp-states-when-using-dele.patch
1970-01-01 01:00:00.000000000 +0100
+++ new/patches/xfrm-not-try-to-delete-ipcomp-states-when-using-dele.patch
2020-04-24 15:17:32.000000000 +0200
@@ -0,0 +1,43 @@
+From: Xin Long <lucien....@gmail.com>
+Date: Mon, 24 Feb 2020 09:57:01 -0500
+Subject: xfrm: not try to delete ipcomp states when using deleteall
+Patch-mainline: v5.6.0
+Git-commit: f9d696cf414c2c475764aa3b29cf288350f1e21f
+References: bsc#1160242
+
+In kernel space, ipcomp(sub) states used by main states are not
+allowed to be deleted by users, they would be freed only when
+all main states are destroyed and no one uses them.
+
+In user space, ip xfrm sta deleteall doesn't filter these ipcomp
+states out, and it causes errors:
+
+ # ip xfrm state add src 192.168.0.1 dst 192.168.0.2 spi 0x1000 \
+ proto comp comp deflate mode tunnel sel src 192.168.0.1 dst \
+ 192.168.0.2 proto gre
+ # ip xfrm sta deleteall
+ Failed to send delete-all request
+ : Operation not permitted
+
+This patch is to fix it by filtering ipcomp states with a check
+xsinfo->id.proto == IPPROTO_IPIP.
+
+Fixes: c7699875bee0 ("Import patch ipxfrm-20040707_2.diff")
+Signed-off-by: Xin Long <lucien....@gmail.com>
+Signed-off-by: Stephen Hemminger <step...@networkplumber.org>
+---
+ ip/xfrm_state.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/ip/xfrm_state.c
++++ b/ip/xfrm_state.c
+@@ -1131,6 +1131,9 @@ static int xfrm_state_keep(struct nlmsghdr *n, void *arg)
+ if (!xfrm_state_filter_match(xsinfo))
+ return 0;
+
++ if (xsinfo->id.proto == IPPROTO_IPIP)
++ return 0;
++
+ if (xb->offset > xb->size) {
+ fprintf(stderr, "State buffer overflow\n");
+ return -1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches/xfrm-support-displaying-transformations-used-for-Mob.patch
new/patches/xfrm-support-displaying-transformations-used-for-Mob.patch
--- old/patches/xfrm-support-displaying-transformations-used-for-Mob.patch
2020-01-08 16:39:56.000000000 +0100
+++ new/patches/xfrm-support-displaying-transformations-used-for-Mob.patch
2020-04-24 15:17:32.000000000 +0200
@@ -24,7 +24,7 @@
--- a/ip/xfrm_policy.c
+++ b/ip/xfrm_policy.c
-@@ -97,10 +97,11 @@ static void usage(void)
+@@ -82,10 +82,11 @@ static void usage(void)
"ID := [ src ADDR ] [ dst ADDR ] [ proto XFRM-PROTO ] [ spi SPI
]\n"
"XFRM-PROTO := ");
fprintf(stderr,
++++++ series.conf ++++++
--- /var/tmp/diff_new_pack.rfhINI/_old 2020-05-04 08:22:23.244329795 +0200
+++ /var/tmp/diff_new_pack.rfhINI/_new 2020-05-04 08:22:23.244329795 +0200
@@ -38,6 +38,14 @@
devlink-Fix-fmsg-nesting-in-non-JSON-output.patch
ip-xfrm-if_id-ve-value-is-error.patch
tc-fq_codel-fix-missing-statistic-in-JSON-output.patch
+ ip-fix-link-type-and-vlan-oneline-output.patch
+
+ # upstream 5.6
+ ip-xfrm-Fix-help-messages.patch
+ ip-link-xstats-fix-TX-IGMP-reports-string.patch
+ erspan-set-erspan_ver-to-1-by-default.patch
+ xfrm-not-try-to-delete-ipcomp-states-when-using-dele.patch
+ nexthop-fix-error-reporting-in-filter-dump.patch
# out of tree patches
adjust-installation-directories-for-openSUSE-SLE.patch
