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

Upgrade: iproute-2.6.23 Change patches according to new version of iproute.

Browse Source
This commit is contained in:
Marcela Mašláňová 2007-10-31 13:56:07 +00:00
parent bbf753a391
commit 3c9bd5e91f
8 changed files with 43 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
iproute2-2.6.22-070710.tar.gz iproute2-2.6.23.tar.bz2

7
iproute-ip-man.patch
View File

@ -1,5 +1,6 @@
--- iproute2-2.6.16-060323/man/man8/ip.8.old 2006-01-03 20:25:29.000000000 +0100 diff -up iproute-2.6.23/iproute2-2.6.23/man/man8/ip.8.ua iproute-2.6.23/iproute2-2.6.23/man/man8/ip.8
+++ iproute2-2.6.16-060323/man/man8/ip.8 2006-10-02 15:13:05.000000000 +0200 --- iproute-2.6.23/iproute2-2.6.23/man/man8/ip.8.ua 2007-10-16 23:27:42.000000000 +0200
+++ iproute-2.6.23/iproute2-2.6.23/man/man8/ip.8 2007-10-31 09:29:10.000000000 +0100
@@ -176,6 +176,8 @@ replace " | " monitor " } " @@ -176,6 +176,8 @@ replace " | " monitor " } "
.IR NUMBER " ] [ " .IR NUMBER " ] [ "
.B cwnd .B cwnd
@ -9,7 +10,7 @@
.B ssthresh .B ssthresh
.IR REALM " ] [ " .IR REALM " ] [ "
.B realms .B realms
@@ -1080,6 +1079,11 @@ the clamp for congestion window. It is @@ -1102,6 +1104,11 @@ the clamp for congestion window. It is
flag is not used. flag is not used.
.TP .TP

21
iproute.spec
View File

@ -1,18 +1,19 @@
%define date_version 070710 ##%define date_version 070710
%define cbq_version v0.7.3 %define cbq_version v0.7.3
Summary: Advanced IP routing and network device configuration tools Summary: Advanced IP routing and network device configuration tools
Name: iproute Name: iproute
Version: 2.6.22 Version: 2.6.23
Release: 5%{?dist} Release: 1%{?dist}
Group: Applications/System Group: Applications/System
Source: http://developer.osdl.org/dev/iproute2/download/iproute2-%{version}-%{date_version}.tar.gz Source: http://developer.osdl.org/dev/iproute2/download/iproute2-%{version}.tar.bz2
URL: http://linux-net.osdl.org/index.php/Iproute2 URL: http://linux-net.osdl.org/index.php/Iproute2
Patch1: iproute2-2.6.9-kernel.patch Patch1: iproute2-2.6.9-kernel.patch
Patch2: iproute2-ss050901-opt_flags.patch Patch2: iproute2-ss050901-opt_flags.patch
Patch3: iproute2-2.6.16-ip_resolve_crash.patch Patch3: iproute2-2.6.16-ip_resolve_crash.patch
Patch4: iproute-ip-man.patch Patch4: iproute-ip-man.patch
Patch5: iproute2-movelib.patch Patch5: iproute2-movelib.patch
Patch6: TCP_RTO_MIN.patch
License: GPLv2+ License: GPLv2+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -25,16 +26,18 @@ example) which are designed to use the advanced networking
capabilities of the Linux 2.4.x and 2.6.x kernel. capabilities of the Linux 2.4.x and 2.6.x kernel.
%prep %prep
%setup -q -c iproute-%{version}-%{date_version} %setup -q -c iproute-%{version}
%patch1 -p1 -b .kernel %patch1 -p1 -b .kernel
%patch2 -p1 -b .opt_flags %patch2 -p1 -b .opt_flags
%patch3 -p1 -b .ip_resolve %patch3 -p1 -b .ip_resolve
%patch4 -p1 %patch4 -p1
%patch5 -p1 -b .movelib %patch5 -p1 -b .movelib
%patch6 -p1 -b .tcprtomin
%build %build
export LIBDIR=%{_libdir} export LIBDIR=%{_libdir}
cd iproute2-%{version}
make %{?_smp_mflags} make %{?_smp_mflags}
make -C doc make -C doc
@ -47,6 +50,7 @@ mkdir -p $RPM_BUILD_ROOT/sbin \
$RPM_BUILD_ROOT/%{_sysconfdir}/iproute2 \ $RPM_BUILD_ROOT/%{_sysconfdir}/iproute2 \
$RPM_BUILD_ROOT%{_datadir}/tc $RPM_BUILD_ROOT%{_datadir}/tc
cd iproute2-%{version}
install -m 755 ip/ip ip/ifcfg ip/rtmon tc/tc $RPM_BUILD_ROOT/sbin install -m 755 ip/ip ip/ifcfg ip/rtmon tc/tc $RPM_BUILD_ROOT/sbin
install -m 755 misc/ss misc/nstat misc/rtacct misc/lnstat misc/arpd $RPM_BUILD_ROOT%{_sbindir} install -m 755 misc/ss misc/nstat misc/rtacct misc/lnstat misc/arpd $RPM_BUILD_ROOT%{_sbindir}
#install -m 755 tc/q_netem.so $RPM_BUILD_ROOT%{_libdir}/tc #install -m 755 tc/q_netem.so $RPM_BUILD_ROOT%{_libdir}/tc
@ -79,8 +83,8 @@ EOF
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%dir %{_sysconfdir}/iproute2 %dir %{_sysconfdir}/iproute2
%doc README.decnet README.iproute2+tc RELNOTES examples/README.cbq %doc iproute2-%{version}/README.decnet iproute2-%{version}/README.iproute2+tc iproute2-%{version}/RELNOTES iproute2-%{version}/examples/README.cbq
%doc doc/*.ps examples %doc iproute2-%{version}/doc/*.ps iproute2-%{version}/examples
/sbin/* /sbin/*
%{_mandir}/man8/* %{_mandir}/man8/*
%attr(644,root,root) %config(noreplace) %{_sysconfdir}/iproute2/* %attr(644,root,root) %config(noreplace) %{_sysconfdir}/iproute2/*
@ -91,6 +95,9 @@ EOF
%config(noreplace) %{_sysconfdir}/sysconfig/cbq/* %config(noreplace) %{_sysconfdir}/sysconfig/cbq/*
%changelog %changelog
* Tue Oct 31 2007 Marcela Maslanova <mmaslano@redhat.com> - 2.6.23-1
- new version from upstrem 2.3.23
* Tue Oct 23 2007 Marcela Maslanova <mmaslano@redhat.com> - 2.6.22-5 * Tue Oct 23 2007 Marcela Maslanova <mmaslano@redhat.com> - 2.6.22-5
- move files from /usr/lib/tc to /usr/share/tc - move files from /usr/lib/tc to /usr/share/tc
- remove listing files twice - remove listing files twice

11
iproute2-2.6.16-ip_resolve_crash.patch
View File

@ -1,11 +1,14 @@
--- iproute2-2.6.16-060323/lib/utils.c.crash 2005-09-01 21:21:50.000000000 +0200 diff -up iproute-2.6.23/iproute2-2.6.23/lib/utils.c.ee iproute-2.6.23/iproute2-2.6.23/lib/utils.c
+++ iproute2-2.6.16-060323/lib/utils.c 2006-09-19 13:47:26.000000000 +0200 --- iproute-2.6.23/iproute2-2.6.23/lib/utils.c.ee 2007-10-16 23:27:42.000000000 +0200
@@ -439,7 +439,7 @@ +++ iproute-2.6.23/iproute2-2.6.23/lib/utils.c 2007-10-31 09:26:20.000000000 +0100
@@ -503,8 +503,8 @@ char *resolve_address(const char *addr,
len = 4; len = 4;
} }
- hash = addr[len-1] ^ addr[len-2] ^ addr[len-3] ^ addr[len-4]; - hash = addr[len-1] ^ addr[len-2] ^ addr[len-3] ^ addr[len-4];
-
+ hash = (addr[len-1] ^ addr[len-2] ^ addr[len-3] ^ addr[len-4]) & 0xff; + hash = (addr[len-1] ^ addr[len-2] ^ addr[len-3] ^ addr[len-4]) & 0xff;
+
for (n = nht[hash]; n; n = n->next) { for (n = nht[hash]; n; n = n->next) {
if (n->addr.family == af && if (n->addr.family == af &&
n->addr.bytelen == len &&

9
iproute2-2.6.9-kernel.patch
View File

@ -1,8 +1,9 @@
--- iproute2-2.6.9/Makefile.kernel 2004-09-01 12:42:33.000000000 +0200 diff -up iproute-2.6.23/iproute2-2.6.23/Makefile.old iproute-2.6.23/iproute2-2.6.23/Makefile
+++ iproute2-2.6.9/Makefile 2004-09-01 12:48:19.076463088 +0200 --- iproute-2.6.23/iproute2-2.6.23/Makefile.old 2007-10-16 23:27:42.000000000 +0200
@@ -3,6 +3,7 @@ +++ iproute-2.6.23/iproute2-2.6.23/Makefile 2007-10-31 09:22:41.000000000 +0100
@@ -3,6 +3,7 @@ SBINDIR=/usr/sbin
CONFDIR=/etc/iproute2 CONFDIR=/etc/iproute2
DOCDIR=/usr/doc/iproute2 DOCDIR=/usr/share/doc/iproute2
MANDIR=/usr/share/man MANDIR=/usr/share/man
+KERNEL_INCLUDE=/usr/include +KERNEL_INCLUDE=/usr/include

13
iproute2-movelib.patch
View File

@ -1,6 +1,6 @@
diff -up iproute-2.6.22/netem/Makefile.old iproute-2.6.22/netem/Makefile diff -up iproute-2.6.23/iproute2-2.6.23/netem/Makefile.lib iproute-2.6.23/iproute2-2.6.23/netem/Makefile
--- iproute-2.6.22/netem/Makefile.old 2007-07-11 03:34:14.000000000 +0200 --- iproute-2.6.23/iproute2-2.6.23/netem/Makefile.lib 2007-10-16 23:27:42.000000000 +0200
+++ iproute-2.6.22/netem/Makefile 2007-10-23 09:11:25.000000000 +0200 +++ iproute-2.6.23/iproute2-2.6.23/netem/Makefile 2007-10-31 09:31:07.000000000 +0100
@@ -19,9 +19,9 @@ stats: stats.c @@ -19,9 +19,9 @@ stats: stats.c
$(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
@ -13,10 +13,9 @@ diff -up iproute-2.6.22/netem/Makefile.old iproute-2.6.22/netem/Makefile
done done
clean: clean:
diff -up iproute-2.6.22/tc/q_netem.c.old iproute-2.6.22/tc/q_netem.c diff -up iproute-2.6.23/iproute2-2.6.23/tc/tc_util.c.lib iproute-2.6.23/iproute2-2.6.23/tc/tc_util.c
diff -up iproute-2.6.22/tc/tc_util.c.old iproute-2.6.22/tc/tc_util.c --- iproute-2.6.23/iproute2-2.6.23/tc/tc_util.c.lib 2007-10-16 23:27:42.000000000 +0200
--- iproute-2.6.22/tc/tc_util.c.old 2007-07-11 03:34:14.000000000 +0200 +++ iproute-2.6.23/iproute2-2.6.23/tc/tc_util.c 2007-10-31 09:33:00.000000000 +0100
+++ iproute-2.6.22/tc/tc_util.c 2007-10-23 10:47:29.000000000 +0200
@@ -30,7 +30,7 @@ const char *get_tc_lib(void) @@ -30,7 +30,7 @@ const char *get_tc_lib(void)
lib_dir = getenv("TC_LIB_DIR"); lib_dir = getenv("TC_LIB_DIR");

7
iproute2-ss050901-opt_flags.patch
View File

@ -1,6 +1,7 @@
--- iproute2-ss050901/Makefile.opt_flags 2005-09-23 11:49:01.000000000 +0200 diff -up iproute-2.6.23/iproute2-2.6.23/Makefile.ble iproute-2.6.23/iproute2-2.6.23/Makefile
+++ iproute2-ss050901/Makefile 2005-09-23 11:49:31.000000000 +0200 --- iproute-2.6.23/iproute2-2.6.23/Makefile.ble 2007-10-31 09:22:41.000000000 +0100
@@ -22,7 +22,7 @@ +++ iproute-2.6.23/iproute2-2.6.23/Makefile 2007-10-31 09:24:09.000000000 +0100
@@ -22,7 +22,7 @@ ADDLIB+=ipx_ntop.o ipx_pton.o
CC = gcc CC = gcc
HOSTCC = gcc HOSTCC = gcc

2
sources
View File

@ -1 +1 @@
20ef2767896a0f156b6fbabd47936f79 iproute2-2.6.22-070710.tar.gz 2e59da739ef19990408cf0a5cb0cae3e iproute2-2.6.23.tar.bz2