Accepting request 397556 from security:netfilter

- Update to new upstream release 4.6
[supersede:
require bash-completion for iproute2-bash-completion]

OBS-URL: https://build.opensuse.org/request/show/397556
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/iproute2?expand=0&rev=84
This commit is contained in:
Dominique Leuenberger 2016-05-26 21:53:04 +00:00 committed by Git OBS Bridge
commit f78e745a40
9 changed files with 72 additions and 33 deletions

Binary file not shown.

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3f15292f53e465cb5bd6652961343ca64eb6936309ae75be5d5a541435bc494a
size 554500

BIN
iproute2-4.6.0.tar.sign Normal file

Binary file not shown.

3
iproute2-4.6.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:74fc6a8ad085be095a159f8158bbaf385b42af9e101619f233f1ae466829d406
size 570960

View File

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

View File

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

View File

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

View File

@ -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,15 @@ 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
Requires: bash-completion
%description bash-completion
bash command line completion support for iproute.
%prep
%setup -qn %name-%rversion
%patch -P 1 -P 2 -p1
@ -85,30 +94,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 +145,8 @@ cp -an README* COPYING "$b/%_docdir/%name/"
%_mandir/man3/libnetlink*
%_libdir/lib*
%files bash-completion
%defattr(-,root,root)
%_datadir/bash-completion/
%changelog

View File

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