rpms/iproute
7
0
Fork 0
Code Issues Pull Requests Releases Activity

3.4.0 bump

Browse Source
This commit is contained in:
Petr Šabata 2012-05-22 15:20:38 +02:00
parent 6fe1e8075e
commit 9efa18f549
10 changed files with 46 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -7,3 +7,4 @@ iproute2-2.6.35.tar.bz2
/iproute2-3.1.0.tar.bz2
/iproute2-3.2.0.tar.bz2
/iproute2-3.3.0.tar.gz
/iproute2-3.4.0.tar.gz

29
iproute.spec
View File

@ -1,24 +1,23 @@
%global cbq_version v0.7.3
Summary: Advanced IP routing and network device configuration tools
Name: iproute
Version: 3.3.0
Release: 2%{?dist}
Version: 3.4.0
Release: 1%{?dist}
Group: Applications/System
URL: http://kernel.org/pub/linux/utils/net/%{name}2/
Source0: http://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.gz
Source1: cbq-0000.example
Source2: avpkt
Patch0: man-pages.patch
Patch1: iproute2-2.6.29-kernel.patch
Patch2: iproute2-ss050901-opt_flags.patch
Patch3: iproute2-sharepath.patch
Patch1: iproute2-3.4.0-kernel.patch
Patch2: iproute2-3.4.0-optflags.patch
Patch3: iproute2-3.4.0-sharepath.patch
Patch4: iproute2-2.6.31-tc_modules.patch
Patch5: iproute2-2.6.29-IPPROTO_IP_for_SA.patch
Patch6: iproute2-example-cbq-service.patch
Patch7: iproute2-2.6.35-print-route.patch
Patch8: iproute2-print-route-u32.patch
Patch9: iproute2-2.6.39-create-peer-veth-without-a-name.patch
Patch10: iproute2-2.6.39-lnstat-dump-to-stdout.patch
Patch8: iproute2-2.6.39-create-peer-veth-without-a-name.patch
Patch9: iproute2-2.6.39-lnstat-dump-to-stdout.patch
License: GPLv2+ and Public Domain
BuildRequires: tex(latex) tex(dvips) linuxdoc-tools
BuildRequires: flex linux-atm-libs-devel psutils db4-devel bison
@ -62,9 +61,8 @@ sed -i "s/_VERSION_/%{version}/" man/man8/ss.8
%patch5 -p1 -b .ipproto
%patch6 -p1 -b .fix_cbq
%patch7 -p1 -b .print-route
%patch8 -p1 -b .print-route-u32
%patch9 -p1 -b .peer-veth-without-name
%patch10 -p1 -b .lnstat-dump-to-stdout
%patch8 -p1 -b .peer-veth-without-name
%patch9 -p1 -b .lnstat-dump-to-stdout
%build
export LIBDIR=/%{_libdir}
@ -127,11 +125,6 @@ iconv -f latin1 -t utf8 man/man8/ss.8 > man/man8/ss.8.utf8 &&
mv man/man8/ss.8.utf8 man/man8/ss.8
install -m644 man/man3/*.3 %{buildroot}%{_mandir}/man3
install -m644 man/man8/*.8 %{buildroot}%{_mandir}/man8
cd %{buildroot}%{_mandir}/man8
ln -s lnstat.8 ctstat.8
ln -s lnstat.8 rtstat.8
ln -s routel.8 routef.8
cd -
# Share files
for shared in \
@ -175,6 +168,10 @@ done
%{_includedir}/libnetlink.h
%changelog
* Tue May 22 2012 Petr Šabata <contyk@redhat.com> - 3.4.0-1
- 3.4.0 bump
- Drop the print route patch (included upstream)
* Mon Apr 30 2012 Petr Šabata <contyk@redhat.com> - 3.3.0-2
- Let's install rtmon too... (#814819)

11
iproute2-2.6.29-kernel.patch
View File

@ -1,11 +0,0 @@
diff -up iproute2-20091009/Makefile.kernel iproute2-20091009/Makefile
--- iproute2-20091009/Makefile.kernel 2009-09-21 10:26:11.000000000 +0200
+++ iproute2-20091009/Makefile 2009-10-09 12:27:03.687382422 +0200
@@ -6,6 +6,7 @@ CONFDIR=/etc/iproute2
DOCDIR=/share/doc/iproute2
MANDIR=/share/man
ARPDDIR=/var/lib/arpd
+KERNEL_INCLUDE=/usr/include
# Path to db_185.h include
DBM_INCLUDE:=$(ROOTDIR)/usr/include

12
iproute2-3.4.0-kernel.patch Normal file
View File

@ -0,0 +1,12 @@
diff --git a/Makefile b/Makefile
index c107955..1e15c72 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,7 @@ DATADIR=$(PREFIX)/share
DOCDIR=$(DATADIR)/doc/iproute2
MANDIR=$(DATADIR)/man
ARPDDIR=/var/lib/arpd
+KERNEL_INCLUDE=/usr/include
# Path to db_185.h include
DBM_INCLUDE:=$(ROOTDIR)/usr/include

13
iproute2-3.4.0-optflags.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/Makefile b/Makefile
index 1e15c72..945d3b3 100644
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@ HOSTCC = gcc
DEFINES += -D_GNU_SOURCE
CCOPTS = -O2
WFLAGS = -Wall -Wstrict-prototypes
-CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES)
+CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES) $(RPM_OPT_FLAGS)
YACCFLAGS = -d -t -v
SUBDIRS=lib ip tc misc netem genl man

11
iproute2-sharepath.patch → iproute2-3.4.0-sharepath.patch
View File

@ -1,14 +1,15 @@
diff -up iproute-2.6.29/iproute2-2.6.29/tc/tc_util.c.movelib iproute-2.6.29/iproute2-2.6.29/tc/tc_util.c
--- iproute2-2.6.29/tc/tc_util.c.movelib 2009-01-15 21:25:04.000000000 +0100
+++ iproute2-2.6.29/tc/tc_util.c 2009-02-04 08:58:36.000000000 +0100
diff --git a/tc/tc_util.c b/tc/tc_util.c
index 926ed08..33f6974 100644
--- a/tc/tc_util.c
+++ b/tc/tc_util.c
@@ -24,8 +24,8 @@
#include "utils.h"
#include "tc_util.h"
-#ifndef LIBDIR
-#define LIBDIR "/usr/lib/"
-#define LIBDIR "/usr/lib"
+#ifndef SHAREDIR
+#define SHAREDIR "/usr/share/"
+#define SHAREDIR "/usr/share"
#endif
const char *get_tc_lib(void)

20
iproute2-print-route-u32.patch
View File

@ -1,20 +0,0 @@
--- iproute2-2.6.35/ip/iproute.c 2010-08-31 13:01:39.151185561 +0200
+++ iproute2-print-route-u32.c 2010-08-31 13:41:04.072928779 +0200
@@ -368,7 +368,7 @@
abuf, sizeof(abuf)));
}
if (tb[RTA_PRIORITY])
- fprintf(fp, " metric %d ", *(__u32*)RTA_DATA(tb[RTA_PRIORITY]));
+ fprintf(fp, " metric %u ", *(__u32*)RTA_DATA(tb[RTA_PRIORITY]));
if (r->rtm_flags & RTNH_F_DEAD)
fprintf(fp, "dead ");
if (r->rtm_flags & RTNH_F_ONLINK)
@@ -487,7 +487,7 @@
if (i < sizeof(mx_names)/sizeof(char*) && mx_names[i])
fprintf(fp, " %s", mx_names[i]);
else
- fprintf(fp, " metric %d", i);
+ fprintf(fp, " metric %u", i);
if (mxlock & (1<<i))
fprintf(fp, " lock");

12
iproute2-ss050901-opt_flags.patch
View File

@ -1,12 +0,0 @@
diff -up iproute2-2.6.29/iproute2-2.6.29/Makefile.opt iproute2-2.6.29/iproute2-2.6.29/Makefile
--- iproute2-2.6.29/Makefile.opt 2008-08-12 14:19:58.000000000 +0200
+++ iproute2-2.6.29/Makefile 2008-08-12 14:21:42.000000000 +0200
@@ -22,7 +22,7 @@ ADDLIB+=ipx_ntop.o ipx_pton.o
CC = gcc
HOSTCC = gcc
-CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall
+CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall $(RPM_OPT_FLAGS)
CFLAGS = $(CCOPTS) -I../include $(DEFINES)
YACCFLAGS = -d -t -v

6
man-pages.patch
View File

@ -65,12 +65,6 @@ diff -up /dev/null iproute2-2.6.29/man/man8/ifcfg.8
+
+.SH SEE ALSO
+.BR ip-cref.dvi
diff -up /dev/null iproute2-2.6.29/man/man8/nstat.8
--- /dev/null 2009-09-22 09:26:40.270218984 +0200
+++ iproute2-2.6.29/man/man8/nstat.8 2009-09-24 14:03:05.416161849 +0200
@@ -0,0 +1 @@
+.so man8/rtacct.8
\ No newline at end of file
--- iproute2-2.6.35/man/man8/ss.8 2010-08-04 19:45:59.000000000 +0200
+++ iproute2-2.6.35/man/man8/ss.8.new 2010-10-11 14:47:06.084216018 +0200
@@ -114,7 +114,7 @@

2
sources
View File

@ -1 +1 @@
172f8bc6d1b5228d64a8e0f2260a3e0a iproute2-3.3.0.tar.gz
99d6b6fce6f862b1ac419c319957c2cc iproute2-3.4.0.tar.gz