From f9b20425c941bc7dce3854331d3e0165373f78fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Tue, 12 Aug 2008 13:07:16 +0000 Subject: [PATCH] - update to 2.6.26 - clean patches --- .cvsignore | 3 +- iproute-ip-man.patch | 12 +++--- iproute.spec | 29 ++++++------- iproute2-2.6.16-ip_resolve_crash.patch | 14 ------ iproute2-2.6.25-aead.patch | 18 ++++---- iproute2-2.6.25-segfault.patch | 6 +-- iproute2-2.6.25-xfrmsegfault.patch | 15 ------- iproute2-2.6.9-kernel.patch | 12 +++--- iproute2-movelib.patch | 28 ++++++------ iproute2-ss050901-opt_flags.patch | 6 +-- iproute2-tex.patch | 60 -------------------------- sources | 3 +- 12 files changed, 57 insertions(+), 149 deletions(-) delete mode 100644 iproute2-2.6.16-ip_resolve_crash.patch delete mode 100644 iproute2-2.6.25-xfrmsegfault.patch delete mode 100644 iproute2-tex.patch diff --git a/.cvsignore b/.cvsignore index e445030..b54b712 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -iproute-doc-2.6.22.tar.gz -iproute2-2.6.25.tar.bz2 +iproute2-2.6.26.tar.bz2 diff --git a/iproute-ip-man.patch b/iproute-ip-man.patch index 8be523e..38c191d 100644 --- a/iproute-ip-man.patch +++ b/iproute-ip-man.patch @@ -1,7 +1,7 @@ -diff -up iproute-2.6.25/iproute2-2.6.25/man/man8/ip.8.ua iproute-2.6.25/iproute2-2.6.25/man/man8/ip.8 ---- iproute-2.6.25/iproute2-2.6.25/man/man8/ip.8.ua 2007-10-16 23:27:42.000000000 +0200 -+++ iproute-2.6.25/iproute2-2.6.25/man/man8/ip.8 2007-10-31 09:29:10.000000000 +0100 -@@ -176,6 +176,8 @@ replace " | " monitor " } " +diff -up iproute-2.6.26/iproute2-2.6.26/man/man8/ip.8.mm iproute-2.6.26/iproute2-2.6.26/man/man8/ip.8 +--- iproute-2.6.26/iproute2-2.6.26/man/man8/ip.8.mm 2008-07-25 22:46:07.000000000 +0200 ++++ iproute-2.6.26/iproute2-2.6.26/man/man8/ip.8 2008-08-12 14:24:01.000000000 +0200 +@@ -190,6 +190,8 @@ replace " | " monitor " } " .IR NUMBER " ] [ " .B cwnd .IR NUMBER " ] [ " @@ -10,12 +10,12 @@ diff -up iproute-2.6.25/iproute2-2.6.25/man/man8/ip.8.ua iproute-2.6.25/iproute2 .B ssthresh .IR REALM " ] [ " .B realms -@@ -1102,6 +1104,11 @@ the clamp for congestion window. It is +@@ -1480,6 +1482,11 @@ the clamp for congestion window. It is flag is not used. .TP +.BI initcwnd " NUMBER " -+The maximum initial congestion window (cwnd) size in MSS of a ++the maximum initial congestion window (cwnd) size in MSS of a +TCP connection. + +.TP diff --git a/iproute.spec b/iproute.spec index 7262875..ba0af2b 100644 --- a/iproute.spec +++ b/iproute.spec @@ -3,20 +3,18 @@ Summary: Advanced IP routing and network device configuration tools Name: iproute -Version: 2.6.25 -Release: 5%{?dist} +Version: 2.6.26 +Release: 1%{?dist} Group: Applications/System Source: http://developer.osdl.org/dev/iproute2/download/iproute2-%{version}.tar.bz2 #Source1: iproute-doc-2.6.22.tar.gz URL: http://linux-net.osdl.org/index.php/Iproute2 Patch1: iproute2-2.6.9-kernel.patch Patch2: iproute2-ss050901-opt_flags.patch -Patch3: iproute2-2.6.16-ip_resolve_crash.patch -Patch4: iproute-ip-man.patch -Patch5: iproute2-movelib.patch -Patch6: iproute2-tex.patch -Patch7: iproute2-2.6.25-aead.patch -Patch8: iproute2-2.6.25-segfault.patch +Patch3: iproute-ip-man.patch +Patch4: iproute2-movelib.patch +Patch5: iproute2-2.6.25-aead.patch +Patch6: iproute2-2.6.25-segfault.patch License: GPLv2+ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -32,13 +30,10 @@ capabilities of the Linux 2.4.x and 2.6.x kernel. %setup -q -c iproute-%{version} %patch1 -p1 -b .kernel %patch2 -p1 -b .opt_flags -#%patch3 -p1 -b .ip_resolve -%patch4 -p1 -%patch5 -p1 -b .movelib -#remove tex for the while -#%patch6 -p1 -b .wotex -%patch7 -p1 -b .aead -%patch8 -p1 -b .seg +%patch3 -p1 +%patch4 -p1 -b .movelib +%patch5 -p1 -b .aead +%patch6 -p1 -b .seg %build export LIBDIR=%{_libdir} @@ -114,6 +109,10 @@ EOF %config(noreplace) %{_sysconfdir}/sysconfig/cbq/* %changelog +* Tue Aug 12 2008 Marcela Maslanova - 2.6.26-1 +- update to 2.6.26 +- clean patches + * Tue Jul 22 2008 Marcela Maslanova - 2.6.25-5 - fix iproute2-2.6.25-segfault.patch diff --git a/iproute2-2.6.16-ip_resolve_crash.patch b/iproute2-2.6.16-ip_resolve_crash.patch deleted file mode 100644 index b258c88..0000000 --- a/iproute2-2.6.16-ip_resolve_crash.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up iproute-2.6.25/iproute2-2.6.25/lib/utils.c.ee iproute-2.6.25/iproute2-2.6.25/lib/utils.c ---- iproute-2.6.25/iproute2-2.6.25/lib/utils.c.ee 2007-10-16 23:27:42.000000000 +0200 -+++ iproute-2.6.25/iproute2-2.6.25/lib/utils.c 2007-10-31 09:26:20.000000000 +0100 -@@ -503,8 +503,8 @@ char *resolve_address(const char *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; -+ - for (n = nht[hash]; n; n = n->next) { - if (n->addr.family == af && - n->addr.bytelen == len && diff --git a/iproute2-2.6.25-aead.patch b/iproute2-2.6.25-aead.patch index 5a52c0f..2da688b 100644 --- a/iproute2-2.6.25-aead.patch +++ b/iproute2-2.6.25-aead.patch @@ -1,6 +1,6 @@ -diff -up iproute-2.6.25/iproute2-2.6.25/include/linux/xfrm.h.aead iproute-2.6.25/iproute2-2.6.25/include/linux/xfrm.h ---- iproute-2.6.25/iproute2-2.6.25/include/linux/xfrm.h.aead 2008-04-17 19:12:54.000000000 +0200 -+++ iproute-2.6.25/iproute2-2.6.25/include/linux/xfrm.h 2008-04-22 08:38:15.000000000 +0200 +diff -up iproute-2.6.25/iproute2-2.6.26/include/linux/xfrm.h.aead iproute-2.6.26/iproute2-2.6.26/include/linux/xfrm.h +--- iproute-2.6.26/iproute2-2.6.26/include/linux/xfrm.h.aead 2008-04-17 19:12:54.000000000 +0200 ++++ iproute-2.6.26/iproute2-2.6.26/include/linux/xfrm.h 2008-04-22 08:38:15.000000000 +0200 @@ -426,12 +426,14 @@ struct xfrm_user_migrate { __u16 new_family; }; @@ -16,9 +16,9 @@ diff -up iproute-2.6.25/iproute2-2.6.25/include/linux/xfrm.h.aead iproute-2.6.25 enum xfrm_nlgroups { XFRMNLGRP_NONE, -diff -up iproute-2.6.25/iproute2-2.6.25/ip/ipxfrm.c.aead iproute-2.6.25/iproute2-2.6.25/ip/ipxfrm.c ---- iproute-2.6.25/iproute2-2.6.25/ip/ipxfrm.c.aead 2008-04-17 19:12:54.000000000 +0200 -+++ iproute-2.6.25/iproute2-2.6.25/ip/ipxfrm.c 2008-04-21 14:40:16.000000000 +0200 +diff -up iproute-2.6.26/iproute2-2.6.26/ip/ipxfrm.c.aead iproute-2.6.26/iproute2-2.6.26/ip/ipxfrm.c +--- iproute-2.6.26/iproute2-2.6.26/ip/ipxfrm.c.aead 2008-04-17 19:12:54.000000000 +0200 ++++ iproute-2.6.26/iproute2-2.6.26/ip/ipxfrm.c 2008-04-21 14:40:16.000000000 +0200 @@ -154,7 +154,8 @@ const char *strxf_xfrmproto(__u8 proto) static const struct typeent algo_types[]= { @@ -86,9 +86,9 @@ diff -up iproute-2.6.25/iproute2-2.6.25/ip/ipxfrm.c.aead iproute-2.6.25/iproute2 if (tb[XFRMA_ALG_CRYPT]) { struct rtattr *rta = tb[XFRMA_ALG_CRYPT]; xfrm_algo_print((struct xfrm_algo *) RTA_DATA(rta), -diff -up iproute-2.6.25/iproute2-2.6.25/ip/xfrm_state.c.aead iproute-2.6.25/iproute2-2.6.25/ip/xfrm_state.c ---- iproute-2.6.25/iproute2-2.6.25/ip/xfrm_state.c.aead 2008-04-17 19:12:54.000000000 +0200 -+++ iproute-2.6.25/iproute2-2.6.25/ip/xfrm_state.c 2008-04-21 14:40:16.000000000 +0200 +diff -up iproute-2.6.26/iproute2-2.6.26/ip/xfrm_state.c.aead iproute-2.6.26/iproute2-2.6.26/ip/xfrm_state.c +--- iproute-2.6.26/iproute2-2.6.26/ip/xfrm_state.c.aead 2008-04-17 19:12:54.000000000 +0200 ++++ iproute-2.6.26/iproute2-2.6.26/ip/xfrm_state.c 2008-04-21 14:40:16.000000000 +0200 @@ -88,8 +88,10 @@ static void usage(void) fprintf(stderr, "ENCAP-TYPE := espinudp | espinudp-nonike\n"); diff --git a/iproute2-2.6.25-segfault.patch b/iproute2-2.6.25-segfault.patch index 6dd0900..48a680d 100644 --- a/iproute2-2.6.25-segfault.patch +++ b/iproute2-2.6.25-segfault.patch @@ -1,6 +1,6 @@ -diff -up iproute-2.6.25/iproute2-2.6.25/ip/xfrm_state.c.seg iproute-2.6.25/iproute2-2.6.25/ip/xfrm_state.c ---- iproute-2.6.25/iproute2-2.6.25/ip/xfrm_state.c.seg 2008-07-21 17:23:12.000000000 +0200 -+++ iproute-2.6.25/iproute2-2.6.25/ip/xfrm_state.c 2008-07-22 09:27:12.000000000 +0200 +diff -up iproute-2.6.26/iproute2-2.6.26/ip/xfrm_state.c.seg iproute-2.6.26/iproute2-2.6.26/ip/xfrm_state.c +--- iproute-2.6.26/iproute2-2.6.26/ip/xfrm_state.c.seg 2008-07-21 17:23:12.000000000 +0200 ++++ iproute-2.6.26/iproute2-2.6.26/ip/xfrm_state.c 2008-07-22 09:27:12.000000000 +0200 @@ -158,12 +158,16 @@ static int xfrm_algo_parse(struct xfrm_a buf[j] = val; } diff --git a/iproute2-2.6.25-xfrmsegfault.patch b/iproute2-2.6.25-xfrmsegfault.patch deleted file mode 100644 index 4467b2f..0000000 --- a/iproute2-2.6.25-xfrmsegfault.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up iproute-2.6.25/iproute2-2.6.25/ip/xfrm_state.c.seg iproute-2.6.25/iproute2-2.6.25/ip/xfrm_state.c ---- iproute-2.6.25/iproute2-2.6.25/ip/xfrm_state.c.seg 2008-07-04 13:22:13.000000000 +0200 -+++ iproute-2.6.25/iproute2-2.6.25/ip/xfrm_state.c 2008-07-04 13:30:51.000000000 +0200 -@@ -162,8 +162,9 @@ static int xfrm_algo_parse(struct xfrm_a - if (len > 0) { - if (len > max) - invarg("\"ALGOKEY\" makes buffer overflow\n", key); -- -- strncpy(buf, key, len); -+ else -+ invarg("\"ALGOKEY\" is invalid", key); -+ /* strncpy(buf, key, len); */ - } - } - diff --git a/iproute2-2.6.9-kernel.patch b/iproute2-2.6.9-kernel.patch index 6bb934c..8df74b3 100644 --- a/iproute2-2.6.9-kernel.patch +++ b/iproute2-2.6.9-kernel.patch @@ -1,10 +1,10 @@ -diff -up iproute-2.6.25/iproute2-2.6.25/Makefile.old iproute-2.6.25/iproute2-2.6.25/Makefile ---- iproute-2.6.25/iproute2-2.6.25/Makefile.old 2007-10-16 23:27:42.000000000 +0200 -+++ iproute-2.6.25/iproute2-2.6.25/Makefile 2007-10-31 09:22:41.000000000 +0100 -@@ -3,6 +3,7 @@ SBINDIR=/usr/sbin +diff -up iproute-2.6.26/iproute2-2.6.26/Makefile.kernel iproute-2.6.26/iproute2-2.6.26/Makefile +--- iproute-2.6.26/iproute2-2.6.26/Makefile.kernel 2008-07-25 22:46:07.000000000 +0200 ++++ iproute-2.6.26/iproute2-2.6.26/Makefile 2008-08-12 14:19:58.000000000 +0200 +@@ -3,6 +3,7 @@ SBINDIR=/sbin CONFDIR=/etc/iproute2 - DOCDIR=/usr/share/doc/iproute2 - MANDIR=/usr/share/man + DOCDIR=/share/doc/iproute2 + MANDIR=/share/man +KERNEL_INCLUDE=/usr/include # Path to db_185.h include diff --git a/iproute2-movelib.patch b/iproute2-movelib.patch index 4bc3fbf..58b883c 100644 --- a/iproute2-movelib.patch +++ b/iproute2-movelib.patch @@ -1,27 +1,27 @@ -diff -up iproute-2.6.25/iproute2-2.6.25/netem/Makefile.lib iproute-2.6.25/iproute2-2.6.25/netem/Makefile ---- iproute-2.6.25/iproute2-2.6.25/netem/Makefile.lib 2007-10-16 23:27:42.000000000 +0200 -+++ iproute-2.6.25/iproute2-2.6.25/netem/Makefile 2007-10-31 09:31:07.000000000 +0100 -@@ -19,9 +19,9 @@ stats: stats.c +diff -up iproute-2.6.26/iproute2-2.6.26/netem/Makefile.lib iproute-2.6.26/iproute2-2.6.26/netem/Makefile +--- iproute-2.6.26/iproute2-2.6.26/netem/Makefile.lib 2008-07-25 22:46:07.000000000 +0200 ++++ iproute-2.6.26/iproute2-2.6.26/netem/Makefile 2008-08-12 14:31:54.000000000 +0200 +@@ -20,9 +20,9 @@ stats: stats.c $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm install: all -- mkdir -p $(DESTDIR)/usr/lib/tc -+ mkdir -p $(DESTDIR)/usr/share/tc +- mkdir -p $(DESTDIR)/lib/tc ++ mkdir -p $(DESTDIR)/share/tc for i in $(DISTDATA); \ -- do install -m 755 $$i $(DESTDIR)/usr/lib/tc; \ -+ do install -m 755 $$i $(DESTDIR)/usr/share/tc; \ +- do install -m 755 $$i $(DESTDIR)/lib/tc; \ ++ do install -m 755 $$i $(DESTDIR)/share/tc; \ done clean: -diff -up iproute-2.6.25/iproute2-2.6.25/tc/tc_util.c.lib iproute-2.6.25/iproute2-2.6.25/tc/tc_util.c ---- iproute-2.6.25/iproute2-2.6.25/tc/tc_util.c.lib 2007-10-16 23:27:42.000000000 +0200 -+++ iproute-2.6.25/iproute2-2.6.25/tc/tc_util.c 2007-10-31 09:33:00.000000000 +0100 -@@ -30,7 +30,7 @@ const char *get_tc_lib(void) +diff -up iproute-2.6.26/iproute2-2.6.26/tc/tc_util.c.lib iproute-2.6.26/iproute2-2.6.26/tc/tc_util.c +--- iproute-2.6.26/iproute2-2.6.26/tc/tc_util.c.lib 2008-07-25 22:46:07.000000000 +0200 ++++ iproute-2.6.26/iproute2-2.6.26/tc/tc_util.c 2008-08-12 14:32:54.000000000 +0200 +@@ -34,7 +34,7 @@ const char *get_tc_lib(void) lib_dir = getenv("TC_LIB_DIR"); if (!lib_dir) -- lib_dir = "/usr/lib/tc"; -+ lib_dir = "/usr/share/tc"; +- lib_dir = DESTDIR "/lib/tc"; ++ lib_dir = DESTDIR "/share/tc"; return lib_dir; } diff --git a/iproute2-ss050901-opt_flags.patch b/iproute2-ss050901-opt_flags.patch index c6a4788..c23f857 100644 --- a/iproute2-ss050901-opt_flags.patch +++ b/iproute2-ss050901-opt_flags.patch @@ -1,6 +1,6 @@ -diff -up iproute-2.6.25/iproute2-2.6.25/Makefile.ble iproute-2.6.25/iproute2-2.6.25/Makefile ---- iproute-2.6.25/iproute2-2.6.25/Makefile.ble 2007-10-31 09:22:41.000000000 +0100 -+++ iproute-2.6.25/iproute2-2.6.25/Makefile 2007-10-31 09:24:09.000000000 +0100 +diff -up iproute-2.6.26/iproute2-2.6.26/Makefile.opt iproute-2.6.26/iproute2-2.6.26/Makefile +--- iproute-2.6.26/iproute2-2.6.26/Makefile.opt 2008-08-12 14:19:58.000000000 +0200 ++++ iproute-2.6.26/iproute2-2.6.26/Makefile 2008-08-12 14:21:42.000000000 +0200 @@ -22,7 +22,7 @@ ADDLIB+=ipx_ntop.o ipx_pton.o CC = gcc diff --git a/iproute2-tex.patch b/iproute2-tex.patch deleted file mode 100644 index 922d7aa..0000000 --- a/iproute2-tex.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff -up iproute-2.6.23/iproute2-2.6.25/Makefile.old iproute-2.6.23/iproute2-2.6.25/Makefile -diff -up iproute-2.6.23/iproute2-2.6.25/doc/Makefile.old iproute-2.6.23/iproute2-2.6.25/doc/Makefile ---- iproute-2.6.23/iproute2-2.6.25/doc/Makefile.old 2007-10-16 23:27:42.000000000 +0200 -+++ iproute-2.6.23/iproute2-2.6.25/doc/Makefile 2008-02-06 13:22:59.000000000 +0100 -@@ -1,55 +0,0 @@ --PSFILES=ip-cref.ps ip-tunnels.ps api-ip6-flowlabels.ps ss.ps nstat.ps arpd.ps rtstat.ps --# tc-cref.ps --# api-rtnl.tex api-pmtudisc.tex api-news.tex --# iki-netdev.ps iki-neighdst.ps -- -- --LATEX=latex --DVIPS=dvips --SGML2DVI=sgml2latex --output=dvi --SGML2HTML=sgml2html -s 0 --LPR=lpr -Zsduplex --SHELL=bash --PAGESIZE=a4 --PAGESPERPAGE=2 -- --HTMLFILES=$(subst .sgml,.html,$(shell echo *.sgml)) --DVIFILES=$(subst .ps,.dvi,$(PSFILES)) -- -- --all: pstwocol -- --pstwocol: $(PSFILES) -- --html: $(HTMLFILES) -- --dvi: $(DVIFILES) -- --print: $(PSFILES) -- $(LPR) $(PSFILES) -- --%.dvi: %.sgml -- $(SGML2DVI) $< -- --%.dvi: %.tex -- @set -e; pass=2; echo "Running LaTeX $<"; \ -- while [ `$(LATEX) $< &1 | \ -- grep -c '^\(LaTeX Warning: Label(s) may\|No file \|! Emergency stop\)'` -ge 1 ]; do \ -- if [ $$pass -gt 3 ]; then \ -- echo "Seems, something is wrong. Try by hands." ; exit 1 ; \ -- fi; \ -- echo "Re-running LaTeX $<, $${pass}d pass"; pass=$$[$$pass + 1]; \ -- done -- --%.ps: %.dvi -- $(DVIPS) $< -o $@ -- --%.html: %.sgml -- $(SGML2HTML) $< -- --install: -- install -m 0644 $(shell echo *.tex) $(DESTDIR)$(DOCDIR) -- install -m 0644 $(shell echo *.sgml) $(DESTDIR)$(DOCDIR) -- --clean: -- rm -f *.aux *.log *.toc $(PSFILES) $(DVIFILES) *.html diff --git a/sources b/sources index a655bbf..c69fe31 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -cb9cbad7f77d93284112e6adf62587a2 iproute-doc-2.6.22.tar.gz -5737bade2f5e03fad0e2c81da91e551e iproute2-2.6.25.tar.bz2 +7d221e735cba05709341cd46401c4ecd iproute2-2.6.26.tar.bz2