From c5c46b1d7e37836e9cd3875d1ef17a4a9881d82ad96bb1a2c8958457cd139e09 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 22 Feb 2015 11:47:38 +0000 Subject: [PATCH] iproute2-3.19 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=95 --- iproute2-3.18.0.tar.sign | Bin 543 -> 0 bytes iproute2-3.18.0.tar.xz | 3 --- iproute2-3.19.0.tar.sign | Bin 0 -> 543 bytes iproute2-3.19.0.tar.xz | 3 +++ iproute2-doc.changes | 13 ++++++++++ iproute2-doc.spec | 4 +-- iproute2.changes | 14 +++++++++++ iproute2.spec | 18 ++++++++------ kernel_xfrm6_raw.patch | 51 +++++++++++++++++++++++++++++++++++++++ 9 files changed, 94 insertions(+), 12 deletions(-) delete mode 100644 iproute2-3.18.0.tar.sign delete mode 100644 iproute2-3.18.0.tar.xz create mode 100644 iproute2-3.19.0.tar.sign create mode 100644 iproute2-3.19.0.tar.xz create mode 100644 kernel_xfrm6_raw.patch diff --git a/iproute2-3.18.0.tar.sign b/iproute2-3.18.0.tar.sign deleted file mode 100644 index 4e1502afff1fec0fbfb8951972d47b33e703cb964723f8aef9fcb64512bf687e..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 543 zcmV+)0^t3L0vrSY0SEvF1p-u?ARzz>2@rs%e_)l( z`&VX5!kW7VTh2~Asxt#wGaWN1a>?!twVL7qQ-|x7cRz__h+Nj z=ULA=j%T}VF_4J-X1S5K;KprwH;;F(ZAtl(gxzGDn2IcuZ^x~dJRmev&gO4sAAJQg z)BCELnY7F$Ou{_=YB4HJm1Rqjs-$ChZ?;?Bl!#l?^{2bh_>jiuvfnJr5mm5}M#w_K zwG$?u+}s8XhyKp6ls&|Zn6b0EJJH&eb;{K?(9AM=lXB2jE0(myMG5KzMQe@>0V^||3S12%FdF$UT! z1x{sa#zWs2RO=|xoqdA!pG`)?diIJ6{{S0xQ~R^6QOPDU0Dj38D?XSAy?@^f$bbd` zD|l`RoL5*CooGw!c>XLGI3X{`E2W-El#k_t5v9$gMM>2n?YFyRqR-_>}T7$N}*f%Cvx?yEG*d huGJ6$4^by`CVj#q!HzhUXKlsZ5$ANky>MJviQNij4J`lw diff --git a/iproute2-3.18.0.tar.xz b/iproute2-3.18.0.tar.xz deleted file mode 100644 index 188721e..0000000 --- a/iproute2-3.18.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d5a182154abd0749b1df7d1649115a32c65f559951477396203b1f514dbff1df -size 448396 diff --git a/iproute2-3.19.0.tar.sign b/iproute2-3.19.0.tar.sign new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..324308b9d0f26d957a95c900184c3f6b2049de0e4d227d76866059bcf57e50ad GIT binary patch literal 543 zcmV+)0^t3L0vrSY0SEvF1p-vskk|kU2@rs%e_)l(ZOH;Gkle^lLC-KR|hzwCUg|_-?|MH2__(iMQ zi~AjrZsqz2WDo_b**>6yGjFy=!2)Pq4*t$#?#!_wON;(*wTgz zDr(z0Q6}aGW22KTM!GR5(?wbedBsOw*JfEuzT=?wJU{gp*?WRxq9Y0&(!>~0z93m% zp^2LIJm;~ioh)gM)w>#Y2!?gNYY-gN@v= 1.4.11 %endif %endif Provides: iproute = %version-%release +Provides: %name(xfrm6_raw) = %version-%release %description -This package provides the tools ip, tc, and rtmon needed to use the new -and advanced routing options of the Linux kernel. The SUSE Linux -distribution has used this package for network setup since SuSE Linux -8.0. +iproute2 is a collection of user-space utilities to set up networking +under Linux from the command-line. It can inspect and configure, +among other things: interface paramters, IP addresses, routing, +tunnels, bridges, packet transformations (IPsec, etc.), and Quality +of Service. %package -n libnetlink-devel Summary: A Higher Level Interface to the Netlink Service @@ -67,7 +70,7 @@ Group: Development/Libraries/C and C++ Provides: libnetlink = %version-%release %description -n libnetlink-devel -libnetlink provides a higher level interface to rtnetlink(7). +libnetlink provides a higher-level interface to rtnetlink(7). %prep %setup -qn %name-%rversion @@ -78,6 +81,7 @@ libnetlink provides a higher level interface to rtnetlink(7). %if 0%{?sles_version} == 11 %patch -P 4 -p1 %endif +%patch -P 5 -p1 find . -name *.orig -delete %build diff --git a/kernel_xfrm6_raw.patch b/kernel_xfrm6_raw.patch new file mode 100644 index 0000000..4491684 --- /dev/null +++ b/kernel_xfrm6_raw.patch @@ -0,0 +1,51 @@ +From: Jan Engelhardt +Date: 2015-01-21 22:57:10.562539816 +0100 + +xfrm: support displaying transformations used for Mobile IPv6 + +Patch taken from mip6d-ng c397c3b4a16bb2e31a86f6c5e344a1278d1577c5 +and included in openSUSE so as to facilitate mip6d-ng. + +--- + ip/ipxfrm.c | 2 +- + ip/xfrm_policy.c | 1 + + ip/xfrm_state.c | 1 + + 3 files changed, 3 insertions(+), 1 deletion(-) + +Index: iproute2-3.18.0/ip/ipxfrm.c +=================================================================== +--- iproute2-3.18.0.orig/ip/ipxfrm.c ++++ iproute2-3.18.0/ip/ipxfrm.c +@@ -115,7 +115,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 } + }; + +Index: iproute2-3.18.0/ip/xfrm_policy.c +=================================================================== +--- iproute2-3.18.0.orig/ip/xfrm_policy.c ++++ iproute2-3.18.0/ip/xfrm_policy.c +@@ -93,6 +93,7 @@ static void usage(void) + fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_ESP)); + fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_AH)); + fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_COMP)); ++ fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_IPV6)); + fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_ROUTING)); + fprintf(stderr, "%s\n", strxf_xfrmproto(IPPROTO_DSTOPTS)); + fprintf(stderr, "MODE := transport | tunnel | beet | ro | in_trigger\n"); +Index: iproute2-3.18.0/ip/xfrm_state.c +=================================================================== +--- iproute2-3.18.0.orig/ip/xfrm_state.c ++++ iproute2-3.18.0/ip/xfrm_state.c +@@ -73,6 +73,7 @@ static void usage(void) + fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_ESP)); + fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_AH)); + fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_COMP)); ++ fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_IPV6)); + fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_ROUTING)); + fprintf(stderr, "%s\n", strxf_xfrmproto(IPPROTO_DSTOPTS)); + fprintf(stderr, "ALGO-LIST := [ ALGO-LIST ] ALGO\n");