rpms/iproute/F-9 .cvsignore, 1.25, 1.26 iproute-ip-man.patch, 1.3, 1.4 iproute.spec, 1.82, 1.83 iproute2-2.6.25-aead.patch, 1.1, 1.2 iproute2-2.6.9-kernel.patch, 1.3, 1.4 iproute2-movelib.patch, 1.3, 1.4 iproute2-ss050901-opt_flags.patch, 1.5, 1.6 sources, 1.25, 1.26 iproute2-2.6.16-ip_resolve_crash.patch, 1.3, NONE iproute2-tex.patch, 1.2, NONE
Marcela Mašláňová (mmaslano)
fedora-extras-commits at redhat.com
Tue Aug 12 13:14:26 UTC 2008
- Previous message (by thread): rpms/iproute/devel .cvsignore, 1.25, 1.26 iproute-ip-man.patch, 1.3, 1.4 iproute.spec, 1.86, 1.87 iproute2-2.6.25-aead.patch, 1.2, 1.3 iproute2-2.6.25-segfault.patch, 1.1, 1.2 iproute2-2.6.9-kernel.patch, 1.3, 1.4 iproute2-movelib.patch, 1.3, 1.4 iproute2-ss050901-opt_flags.patch, 1.5, 1.6 sources, 1.25, 1.26 iproute2-2.6.16-ip_resolve_crash.patch, 1.3, NONE iproute2-2.6.25-xfrmsegfault.patch, 1.2, NONE iproute2-tex.patch, 1.2, NONE
- Next message (by thread): rpms/kdegraphics/devel kdegraphics-4.1.0-printing-review-crash.patch, NONE, 1.1 kdegraphics.spec, 1.160, 1.161
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mmaslano
Update of /cvs/pkgs/rpms/iproute/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15292
Modified Files:
.cvsignore iproute-ip-man.patch iproute.spec
iproute2-2.6.25-aead.patch iproute2-2.6.9-kernel.patch
iproute2-movelib.patch iproute2-ss050901-opt_flags.patch
sources
Removed Files:
iproute2-2.6.16-ip_resolve_crash.patch iproute2-tex.patch
Log Message:
* Tue Aug 12 2008 Marcela Maslanova <mmaslano at redhat.com> - 2.6.26-1
- update to 2.6.26
- clean patches
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/F-9/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore 29 Apr 2008 11:12:04 -0000 1.25
+++ .cvsignore 12 Aug 2008 13:13:55 -0000 1.26
@@ -1,2 +1 @@
-iproute-doc-2.6.22.tar.gz
-iproute2-2.6.25.tar.bz2
+iproute2-2.6.26.tar.bz2
iproute-ip-man.patch:
Index: iproute-ip-man.patch
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/F-9/iproute-ip-man.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- iproute-ip-man.patch 29 Apr 2008 11:12:04 -0000 1.3
+++ iproute-ip-man.patch 12 Aug 2008 13:13:55 -0000 1.4
@@ -1,7 +1,7 @@
-diff -up iproute-2.6.25/iproute2-2.6.23/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 @@
.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
Index: iproute.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/F-9/iproute.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- iproute.spec 29 Apr 2008 11:12:04 -0000 1.82
+++ iproute.spec 12 Aug 2008 13:13:55 -0000 1.83
@@ -3,7 +3,7 @@
Summary: Advanced IP routing and network device configuration tools
Name: iproute
-Version: 2.6.25
+Version: 2.6.26
Release: 1%{?dist}
Group: Applications/System
Source: http://developer.osdl.org/dev/iproute2/download/iproute2-%{version}.tar.bz2
@@ -11,11 +11,10 @@
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
+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)
@@ -31,12 +30,10 @@
%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
+%patch3 -p1
+%patch4 -p1 -b .movelib
+%patch5 -p1 -b .aead
+%patch6 -p1 -b .seg
%build
export LIBDIR=%{_libdir}
@@ -112,6 +109,10 @@
%config(noreplace) %{_sysconfdir}/sysconfig/cbq/*
%changelog
+* Tue Aug 12 2008 Marcela Maslanova <mmaslano at redhat.com> - 2.6.26-1
+- update to 2.6.26
+- clean patches
+
* Tue Apr 29 2008 Marcela Maslanova <mmaslano at redhat.com> - 2.6.25-1
- update source for 444520
- add patch for support AEAD
iproute2-2.6.25-aead.patch:
Index: iproute2-2.6.25-aead.patch
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/F-9/iproute2-2.6.25-aead.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iproute2-2.6.25-aead.patch 29 Apr 2008 11:12:04 -0000 1.1
+++ iproute2-2.6.25-aead.patch 12 Aug 2008 13:13:55 -0000 1.2
@@ -1,15 +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
-@@ -277,7 +277,7 @@ enum xfrm_attr_type_t {
- XFRMA_LASTUSED,
- XFRMA_POLICY_TYPE, /* struct xfrm_userpolicy_type */
- XFRMA_MIGRATE,
-- XFRMA_ALG_AEAD, /* struct xfrm_algo_aead */
-+ XFRMA_ALG_AEAD, /* struct xfrm_algo_aead */
- __XFRMA_MAX
-
- #define XFRMA_MAX (__XFRMA_MAX - 1)
+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;
};
@@ -25,9 +16,9 @@
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[]= {
@@ -95,9 +86,9 @@
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");
iproute2-2.6.9-kernel.patch:
Index: iproute2-2.6.9-kernel.patch
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/F-9/iproute2-2.6.9-kernel.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- iproute2-2.6.9-kernel.patch 29 Apr 2008 11:12:04 -0000 1.3
+++ iproute2-2.6.9-kernel.patch 12 Aug 2008 13:13:55 -0000 1.4
@@ -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
iproute2-movelib.patch:
Index: iproute2-movelib.patch
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/F-9/iproute2-movelib.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- iproute2-movelib.patch 29 Apr 2008 11:12:04 -0000 1.3
+++ iproute2-movelib.patch 12 Aug 2008 13:13:55 -0000 1.4
@@ -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;
}
iproute2-ss050901-opt_flags.patch:
Index: iproute2-ss050901-opt_flags.patch
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/F-9/iproute2-ss050901-opt_flags.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- iproute2-ss050901-opt_flags.patch 29 Apr 2008 11:12:04 -0000 1.5
+++ iproute2-ss050901-opt_flags.patch 12 Aug 2008 13:13:55 -0000 1.6
@@ -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
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/F-9/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources 29 Apr 2008 11:12:04 -0000 1.25
+++ sources 12 Aug 2008 13:13:55 -0000 1.26
@@ -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
--- iproute2-2.6.16-ip_resolve_crash.patch DELETED ---
--- iproute2-tex.patch DELETED ---
- Previous message (by thread): rpms/iproute/devel .cvsignore, 1.25, 1.26 iproute-ip-man.patch, 1.3, 1.4 iproute.spec, 1.86, 1.87 iproute2-2.6.25-aead.patch, 1.2, 1.3 iproute2-2.6.25-segfault.patch, 1.1, 1.2 iproute2-2.6.9-kernel.patch, 1.3, 1.4 iproute2-movelib.patch, 1.3, 1.4 iproute2-ss050901-opt_flags.patch, 1.5, 1.6 sources, 1.25, 1.26 iproute2-2.6.16-ip_resolve_crash.patch, 1.3, NONE iproute2-2.6.25-xfrmsegfault.patch, 1.2, NONE iproute2-tex.patch, 1.2, NONE
- Next message (by thread): rpms/kdegraphics/devel kdegraphics-4.1.0-printing-review-crash.patch, NONE, 1.1 kdegraphics.spec, 1.160, 1.161
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list