pool/iproute2
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iproute2 3.1.0

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=39
This commit is contained in:
Jan Engelhardt 2011-12-31 21:12:38 +00:00 committed by Git OBS Bridge
parent 23311ab993
commit dd2d3fe874
5 changed files with 23 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
iproute2-2.6.39.tar.xz
View File

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

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

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

35
iproute2-libxtables6.diff
View File

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

10
iproute2.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
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

19
iproute2.spec
View File

@ -19,13 +19,15 @@
Name: iproute2
Group: Productivity/Networking/Routing
Provides: iproute
Version: 2.6.39
Release: 1
Provides: iproute = %version
Version: 3.1.0
Release: 0
Summary: Linux network configuration utilities
URL: http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2
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
#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
Patch0: iproute2-libdir-1.diff
@ -33,13 +35,11 @@ Patch0: iproute2-libdir-1.diff
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: libpng-devel libtiff-devel pkgconfig >= 0.23
BuildRequires: xorg-x11-devel xz
%if 0%{?suse_version}
BuildRequires: ghostscript-x11 sgmltool texlive-latex
@ -49,7 +49,7 @@ BuildRequires: ghostscript linuxdoc-tools sgml-common tetex-dvips tetex-latex
%endif
%define with_xt 1
%if 0%{?with_xt}
BuildRequires: iptables-devel >= 1.4.11
BuildRequires: pkgconfig(libnl-1) pkgconfig(xtables) >= 1.4.11
%endif
%description
@ -88,7 +88,7 @@ tar -xf "%{S:0}" --use=xz;
%endif
%patch0
%patch1
%patch -P 4 -P 5 -P 6 -p1
%patch -P 4 -P 6 -p1
find . -name *.orig -print0 | xargs -r0 rm -v
%build
@ -119,6 +119,7 @@ rm %buildroot%_sbindir/ifcfg
%_sbindir/*
/sbin/*
/bin/ip
%_mandir/man7/*
%_mandir/man8/*
%dir %_sysconfdir/iproute2
%config(noreplace) %_sysconfdir/iproute2/*