diff --git a/iproute2-4.5.0.tar.sign b/iproute2-4.5.0.tar.sign deleted file mode 100644 index 26be837..0000000 Binary files a/iproute2-4.5.0.tar.sign and /dev/null differ diff --git a/iproute2-4.5.0.tar.xz b/iproute2-4.5.0.tar.xz deleted file mode 100644 index 19b85ea..0000000 --- a/iproute2-4.5.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3f15292f53e465cb5bd6652961343ca64eb6936309ae75be5d5a541435bc494a -size 554500 diff --git a/iproute2-4.6.0.tar.sign b/iproute2-4.6.0.tar.sign new file mode 100644 index 0000000..d51a8a7 Binary files /dev/null and b/iproute2-4.6.0.tar.sign differ diff --git a/iproute2-4.6.0.tar.xz b/iproute2-4.6.0.tar.xz new file mode 100644 index 0000000..ffd3db7 --- /dev/null +++ b/iproute2-4.6.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:74fc6a8ad085be095a159f8158bbaf385b42af9e101619f233f1ae466829d406 +size 570960 diff --git a/iproute2-doc.spec b/iproute2-doc.spec index c7831fb..26b4f19 100644 --- a/iproute2-doc.spec +++ b/iproute2-doc.spec @@ -17,9 +17,9 @@ Name: iproute2-doc -Version: 4.5 +Version: 4.6 Release: 0 -%define rversion 4.5.0 +%define rversion 4.6.0 Summary: Documentation to iproute2 License: GPL-2.0+ Group: Documentation/Other diff --git a/iproute2.changes b/iproute2.changes index cf4dadb..448ee79 100644 --- a/iproute2.changes +++ b/iproute2.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Sat May 21 08:21:36 UTC 2016 - jengelh@inai.de + +- Update to new upstream release 4.6 +* vxlan: add support to set flow label +* tc, bpf: add new csum and tunnel signatures +* tc, bpf: further improve error reporting +* tc, bpf: add support for map pre/allocation +* ip link: Add support for kernel side filtering +* tc: introduce IFE action +* add devlink tool +* iplink: display IFLA_PHYS_PORT_NAME + ------------------------------------------------------------------- Sat Mar 26 19:01:48 UTC 2016 - jengelh@inai.de diff --git a/iproute2.spec b/iproute2.spec index ffd240a..cd417f2 100644 --- a/iproute2.spec +++ b/iproute2.spec @@ -17,9 +17,9 @@ Name: iproute2 -Version: 4.5 +Version: 4.6 Release: 0 -%define rversion 4.5.0 +%define rversion 4.6.0 Summary: Linux network configuration utilities License: GPL-2.0 Group: Productivity/Networking/Routing @@ -70,6 +70,14 @@ Provides: libnetlink = %version-%release libnetlink provides a higher-level interface to rtnetlink(7). New programs should use libmnl-devel instead. +%package bash-completion +Summary: Bash completion for iproute +License: GPL-2.0+ +Group: System/Shells + +%description bash-completion +bash command line completion support for iproute. + %prep %setup -qn %name-%rversion %patch -P 1 -P 2 -p1 @@ -85,30 +93,30 @@ find . -name *.orig -delete %build # build with -fPIC. For details see # https://bugzilla.novell.com/show_bug.cgi?id=388021 -xt_libdir="$(pkg-config xtables --variable=xtlibdir)"; -xt_cflags="$(pkg-config xtables --cflags)"; +xt_libdir="$(pkg-config xtables --variable=xtlibdir)" +xt_cflags="$(pkg-config xtables --cflags)" make %{?_smp_mflags} LIBDIR="%_libdir" CCOPTS="-D_GNU_SOURCE %optflags -Wstrict-prototypes -Wno-error -fPIC -DXT_LIB_DIR=\\\"$xt_libdir\\\" $xt_cflags" %install -b="%buildroot"; +b="%buildroot" install -d "$b"/{etc/,sbin/,usr/{sbin,share/man/man{3,8}}} install -d "$b"/{/usr/include,%_libdir,/usr/share} make install DESTDIR="$b" LIBDIR="%_libdir" \ - MODDESTDIR="$b/%_libdir/tc" DOCDIR="%_docdir/%name"; + MODDESTDIR="$b/%_libdir/tc" DOCDIR="%_docdir/%name" # We have m_xt -rm -f "$b/%_libdir/tc/m_ipt.so"; -install -pm0644 "lib/libnetlink.a" "$b/%_libdir/"; -chmod -x "$b/%_libdir/libnetlink.a"; -install -pm0644 "include/libnetlink.h" "$b/%_includedir/"; -chmod -x "$b/%_includedir/libnetlink.h"; +rm -f "$b/%_libdir/tc/m_ipt.so" +install -pm0644 "lib/libnetlink.a" "$b/%_libdir/" +chmod -x "$b/%_libdir/libnetlink.a" +install -pm0644 "include/libnetlink.h" "$b/%_includedir/" +chmod -x "$b/%_includedir/libnetlink.h" #UsrMerge -ln -s "%_sbindir/ip" "$b/sbin"; -mkdir -p "$b/bin"; -ln -sf "%_sbindir/ip" "$b/bin/ip"; +ln -s "%_sbindir/ip" "$b/sbin" +mkdir -p "$b/bin" +ln -sf "%_sbindir/ip" "$b/bin/ip" #EndUsrMerge -rm "$b/%_sbindir/ifcfg"; +rm "$b/%_sbindir/ifcfg" -mkdir -p "$b/%_docdir/%name"; +mkdir -p "$b/%_docdir/%name" # packaged in iproute2-doc: rm -rf $b/%_docdir/%name/* cp -an README* COPYING "$b/%_docdir/%name/" @@ -136,4 +144,8 @@ cp -an README* COPYING "$b/%_docdir/%name/" %_mandir/man3/libnetlink* %_libdir/lib* +%files bash-completion +%defattr(-,root,root) +%_datadir/bash-completion/ + %changelog diff --git a/kernel_xfrm6_raw.patch b/kernel_xfrm6_raw.patch index 4491684..1226883 100644 --- a/kernel_xfrm6_raw.patch +++ b/kernel_xfrm6_raw.patch @@ -12,12 +12,12 @@ and included in openSUSE so as to facilitate mip6d-ng. ip/xfrm_state.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) -Index: iproute2-3.18.0/ip/ipxfrm.c +Index: iproute2-4.6.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[]= { +--- iproute2-4.6.0.orig/ip/ipxfrm.c ++++ iproute2-4.6.0/ip/ipxfrm.c +@@ -114,7 +114,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 }, @@ -25,10 +25,10 @@ Index: iproute2-3.18.0/ip/ipxfrm.c { NULL, -1 } }; -Index: iproute2-3.18.0/ip/xfrm_policy.c +Index: iproute2-4.6.0/ip/xfrm_policy.c =================================================================== ---- iproute2-3.18.0.orig/ip/xfrm_policy.c -+++ iproute2-3.18.0/ip/xfrm_policy.c +--- iproute2-4.6.0.orig/ip/xfrm_policy.c ++++ iproute2-4.6.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)); @@ -37,11 +37,11 @@ Index: iproute2-3.18.0/ip/xfrm_policy.c 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 +Index: iproute2-4.6.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) +--- iproute2-4.6.0.orig/ip/xfrm_state.c ++++ iproute2-4.6.0/ip/xfrm_state.c +@@ -72,6 +72,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));