Accepting request 103454 from security:netfilter
- Update to new upstream release 3.2.0 * L2TPv3 support * netem additions for loss models, improved RED options OBS-URL: https://build.opensuse.org/request/show/103454 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/iproute2?expand=0&rev=52
This commit is contained in:
Stephan Kulow
Git OBS Bridge
commit
6a0cd52df4
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:83469db5a2f1e9ed629f84a1023931915f47bc42df4be66159ebdd22a1889847
|
||||
size 356388
|
||||
3
iproute2-3.2.0.tar.xz
Normal file
3
iproute2-3.2.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:59bc1c67a18653f989792a31eda5607a87689b9e6041f2d47ea8b5fe4842cb4d
|
||||
size 373804
|
||||
@ -1,35 +0,0 @@
|
||||
From: Jan Engelhardt <jengelh@medozas.de>
|
||||
Date: 2011-06-01 00:52:29+0200
|
||||
Upstream: not sent yet
|
||||
|
||||
libxtables6 (iptables-1.4.11) had to change the signature of
|
||||
xtables_merge_options to avoid invoking undefined behavior.
|
||||
|
||||
---
|
||||
tc/m_xt.c | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
Index: iproute2-2.6.38/tc/m_xt.c
|
||||
===================================================================
|
||||
--- iproute2-2.6.38.orig/tc/m_xt.c
|
||||
+++ iproute2-2.6.38/tc/m_xt.c
|
||||
@@ -162,7 +162,8 @@ static int parse_ipt(struct action_util
|
||||
return -1;
|
||||
}
|
||||
tcipt_globals.opts =
|
||||
- xtables_merge_options(tcipt_globals.opts,
|
||||
+ xtables_merge_options(tcipt_globals.orig_opts,
|
||||
+ tcipt_globals.opts,
|
||||
m->extra_opts,
|
||||
&m->option_offset);
|
||||
} else {
|
||||
@@ -307,7 +308,8 @@ print_ipt(struct action_util *au,FILE *
|
||||
}
|
||||
|
||||
tcipt_globals.opts =
|
||||
- xtables_merge_options(tcipt_globals.opts,
|
||||
+ xtables_merge_options(tcipt_globals.orig_opts,
|
||||
+ tcipt_globals.opts,
|
||||
m->extra_opts,
|
||||
&m->option_offset);
|
||||
} else {
|
||||
@ -1,42 +0,0 @@
|
||||
From: Jan Engelhardt <jengelh@medozas.de>
|
||||
Date: 2011-09-24 23:37:34.405739159 +0200
|
||||
Upstream: not sent yet
|
||||
|
||||
Any tests involving iptables _MUST_ utilize pkg-config to find the
|
||||
proper locations of the installation.
|
||||
|
||||
---
|
||||
configure | 2 +-
|
||||
tc/Makefile | 4 ++--
|
||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
Index: iproute2-2.6.39/configure
|
||||
===================================================================
|
||||
--- iproute2-2.6.39.orig/configure
|
||||
+++ iproute2-2.6.39/configure
|
||||
@@ -49,7 +49,7 @@ int main(int argc, char **argv)
|
||||
|
||||
EOF
|
||||
|
||||
-if gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl -lxtables >/dev/null 2>&1
|
||||
+if gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL $(pkg-config xtables --cflags --libs) -ldl >/dev/null 2>&1
|
||||
then
|
||||
echo "TC_CONFIG_XT:=y" >>Config
|
||||
echo "using xtables"
|
||||
Index: iproute2-2.6.39/tc/Makefile
|
||||
===================================================================
|
||||
--- iproute2-2.6.39.orig/tc/Makefile
|
||||
+++ iproute2-2.6.39/tc/Makefile
|
||||
@@ -124,10 +124,10 @@ q_atm.so: q_atm.c
|
||||
$(CC) $(CFLAGS) $(LDFLAGS) -shared -fpic -o q_atm.so q_atm.c -latm
|
||||
|
||||
m_xt.so: m_xt.c
|
||||
- $(CC) $(CFLAGS) $(LDFLAGS) -shared -fpic -o m_xt.so m_xt.c -lxtables
|
||||
+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -fpic -o m_xt.so m_xt.c $$(pkg-config xtables --cflags --libs)
|
||||
|
||||
m_xt_old.so: m_xt_old.c
|
||||
- $(CC) $(CFLAGS) $(LDFLAGS) -shared -fpic -o m_xt_old.so m_xt_old.c -lxtables
|
||||
+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -fpic -o m_xt_old.so m_xt_old.c $$(pkg-config xtables --cflags --libs)
|
||||
|
||||
%.yacc.c: %.y
|
||||
$(YACC) $(YACCFLAGS) -o $@ $<
|
||||
@ -1,26 +0,0 @@
|
||||
From: Jan Engelhardt <jengelh@medozas.de>
|
||||
Date: 2011-06-01 00:52:07+0200
|
||||
Upsteam: has not been sent yet
|
||||
|
||||
Requesting the xt action never succeeded because it registered
|
||||
using the wrong name.
|
||||
|
||||
---
|
||||
tc/m_xt.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
Index: iproute2-2.6.37/tc/m_xt.c
|
||||
===================================================================
|
||||
--- iproute2-2.6.37.orig/tc/m_xt.c
|
||||
+++ iproute2-2.6.37/tc/m_xt.c
|
||||
@@ -343,8 +343,8 @@ print_ipt(struct action_util *au,FILE *
|
||||
return 0;
|
||||
}
|
||||
|
||||
-struct action_util ipt_action_util = {
|
||||
- .id = "ipt",
|
||||
+struct action_util xt_action_util = {
|
||||
+ .id = "xt",
|
||||
.parse_aopt = parse_ipt,
|
||||
.print_aopt = print_ipt,
|
||||
};
|
||||
@ -1,3 +1,20 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Jan 14 03:04:36 UTC 2012 - jengelh@medozas.de
|
||||
|
||||
- Update to new upstream release 3.2.0
|
||||
* L2TPv3 support
|
||||
* netem additions for loss models, improved RED options
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Dec 31 20:57:22 UTC 2011 - jengelh@medozas.de
|
||||
|
||||
- Update to new upstream release 3.1.0
|
||||
* ip: Add processless network namespace support
|
||||
* tc: Add QFQ scheduler
|
||||
* ss: display closed UDP sockets on `ss -ul`
|
||||
* ss: report ecnseen
|
||||
* Add L2TP support
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 21 20:25:56 UTC 2011 - jengelh@medozas.de
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package iproute2
|
||||
#
|
||||
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -15,41 +15,48 @@
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
|
||||
Name: iproute2
|
||||
Group: Productivity/Networking/Routing
|
||||
Provides: iproute
|
||||
Version: 2.6.39
|
||||
Release: 1
|
||||
Provides: iproute = %version
|
||||
Version: 3.2.0
|
||||
Release: 0
|
||||
Summary: Linux network configuration utilities
|
||||
URL: http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2
|
||||
# Using GPL-2.0 instead of GPL-2.0+ because of tc_skbedit.h and tc/q_multiq.c
|
||||
License: GPL-2.0
|
||||
Group: Productivity/Networking/Routing
|
||||
Url: http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2
|
||||
# Using GPL-2.0 instead of GPL-2.0+ because of tc_skbedit.h and tc/q_multiq.c
|
||||
|
||||
#DL-URL: http://kernel.org/pub/linux/utils/net/iproute2/iproute2-3.2.0.tar.bz2
|
||||
#Git-Clone: git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2
|
||||
Source0: %name-%version.tar.xz
|
||||
# PATCH-FIX-UPSTREAM iproute2-libdir-1.diff
|
||||
# PATCH-FIX-UPSTREAM iproute2-libdir-1.diff status=unknown
|
||||
Patch0: iproute2-libdir-1.diff
|
||||
# PATCH-??-OPENSUSE iproute2-HZ.diff
|
||||
# PATCH-??-OPENSUSE iproute2-HZ.diff status=noidea
|
||||
Patch1: iproute2-HZ.diff
|
||||
# PATCH-FIX-UPSTREAM iproute2-xt.diff
|
||||
Patch4: iproute2-xt.diff
|
||||
# PATCH-FIX-UPSTREAM iproute2-libxtables6.diff
|
||||
Patch5: iproute2-libxtables6.diff
|
||||
# PATCH-FIX-UPSTREAM iproute2-xt-detect.diff
|
||||
Patch6: iproute2-xt-detect.diff
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: bison db-devel flex
|
||||
BuildRequires: libpng-devel libtiff-devel pkgconfig >= 0.19
|
||||
BuildRequires: xorg-x11-devel xz
|
||||
BuildRequires: bison
|
||||
BuildRequires: db-devel
|
||||
BuildRequires: flex
|
||||
BuildRequires: libpng-devel
|
||||
BuildRequires: libtiff-devel
|
||||
BuildRequires: pkgconfig >= 0.21
|
||||
BuildRequires: xorg-x11-devel
|
||||
BuildRequires: xz
|
||||
%if 0%{?suse_version}
|
||||
BuildRequires: ghostscript-x11 sgmltool texlive-latex
|
||||
BuildRequires: ghostscript-x11
|
||||
BuildRequires: sgmltool
|
||||
BuildRequires: texlive-latex
|
||||
%endif
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
BuildRequires: ghostscript linuxdoc-tools sgml-common tetex-dvips tetex-latex
|
||||
BuildRequires: ghostscript
|
||||
BuildRequires: linuxdoc-tools
|
||||
BuildRequires: sgml-common
|
||||
BuildRequires: tetex-dvips
|
||||
BuildRequires: tetex-latex
|
||||
%endif
|
||||
%define with_xt 1
|
||||
%if 0%{?with_xt}
|
||||
BuildRequires: iptables-devel >= 1.4.11
|
||||
BuildRequires: pkgconfig(libnl-1)
|
||||
BuildRequires: pkgconfig(xtables) >= 1.4.11
|
||||
%endif
|
||||
|
||||
%description
|
||||
@ -60,20 +67,20 @@ distribution has used this package for network setup since SuSE Linux
|
||||
|
||||
%package -n libnetlink-devel
|
||||
Summary: A Higher Level Interface to the Netlink Service
|
||||
License: GPL-2.0+
|
||||
Group: Development/Libraries/C and C++
|
||||
Provides: libnetlink = %version-%release
|
||||
License: GPL-2.0+
|
||||
|
||||
%description -n libnetlink-devel
|
||||
libnetlink provides a higher level interface to rtnetlink(7).
|
||||
|
||||
%package doc
|
||||
Summary: Documentation to iproute2
|
||||
License: GPL-2.0+
|
||||
Group: Documentation
|
||||
%if 0%{?suse_version} >= 1130
|
||||
BuildArch: noarch
|
||||
%endif
|
||||
License: GPL-2.0+
|
||||
|
||||
%description doc
|
||||
This package contains the PDF documentation from iproute2,
|
||||
@ -88,7 +95,6 @@ tar -xf "%{S:0}" --use=xz;
|
||||
%endif
|
||||
%patch0
|
||||
%patch1
|
||||
%patch -P 4 -P 5 -P 6 -p1
|
||||
find . -name *.orig -print0 | xargs -r0 rm -v
|
||||
|
||||
%build
|
||||
@ -115,10 +121,11 @@ rm %buildroot%_sbindir/ifcfg
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc README* RELNOTES
|
||||
%doc README*
|
||||
%_sbindir/*
|
||||
/sbin/*
|
||||
/bin/ip
|
||||
%_mandir/man7/*
|
||||
%_mandir/man8/*
|
||||
%dir %_sysconfdir/iproute2
|
||||
%config(noreplace) %_sysconfdir/iproute2/*
|
||||
@ -130,7 +137,7 @@ rm %buildroot%_sbindir/ifcfg
|
||||
%defattr(-,root,root)
|
||||
%doc doc/api-ip6-flowlabels.pdf doc/arpd.pdf doc/ip-cref.pdf
|
||||
%doc doc/ip-tunnels.pdf doc/nstat.pdf doc/rtstat.pdf doc/ss.pdf
|
||||
%doc ChangeLog examples/ ip/ifcfg ip/routef ip/routel
|
||||
%doc examples/ ip/ifcfg ip/routef ip/routel
|
||||
|
||||
%files -n libnetlink-devel
|
||||
%defattr(-,root,root)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user