rpms/iproute/FC-5 iproute2-2.6.16-flags.patch, NONE, 1.1 iproute2-2.6.16-initcwnd-correct-order.patch, NONE, 1.1 iproute2-2.6.16-libdir.patch, NONE, 1.1 .cvsignore, 1.17, 1.18 iproute.spec, 1.47, 1.48 sources, 1.17, 1.18
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Sep 8 09:39:41 UTC 2006
Author: rvokal
Update of /cvs/dist/rpms/iproute/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv6125
Modified Files:
.cvsignore iproute.spec sources
Added Files:
iproute2-2.6.16-flags.patch
iproute2-2.6.16-initcwnd-correct-order.patch
iproute2-2.6.16-libdir.patch
Log Message:
- add LOWER_UP and DORMANT flags (#202199)
- improve handling of initcwnd value (#179719)
- fix BuildRequires: flex (#193403)
- upgrade to 2.6.16-060323
- don't hardcode /usr/lib in tc (#186607)
iproute2-2.6.16-flags.patch:
ipaddress.c | 2 ++
1 files changed, 2 insertions(+)
--- NEW FILE iproute2-2.6.16-flags.patch ---
--- iproute2-2.6.17-000000/ip/ipaddress.c.old 2006-08-21 13:31:30.000000000 +0200
+++ iproute2-2.6.17-000000/ip/ipaddress.c 2006-08-21 13:41:33.000000000 +0200
@@ -97,6 +97,8 @@
_PF(PORTSEL);
_PF(NOTRAILERS);
_PF(UP);
+ _PF(LOWER_UP);
+ _PF(DORMANT);
#undef _PF
if (flags)
fprintf(fp, "%x", flags);
iproute2-2.6.16-initcwnd-correct-order.patch:
iproute.c | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
--- NEW FILE iproute2-2.6.16-initcwnd-correct-order.patch ---
--- iproute2-2.6.16-060323/ip/iproute.c.initcwnd 2005-10-13 00:49:50.000000000 +0200
+++ iproute2-2.6.16-060323/ip/iproute.c 2006-06-26 10:23:27.000000000 +0200
@@ -59,8 +59,8 @@
fprintf(stderr, "NH := [ via ADDRESS ] [ dev STRING ] [ weight NUMBER ] NHFLAGS\n");
fprintf(stderr, "OPTIONS := FLAGS [ mtu NUMBER ] [ advmss NUMBER ]\n");
fprintf(stderr, " [ rtt NUMBER ] [ rttvar NUMBER ]\n");
- fprintf(stderr, " [ window NUMBER] [ cwnd NUMBER ] [ ssthresh NUMBER ]\n");
- fprintf(stderr, " [ realms REALM ]\n");
+ fprintf(stderr, " [ window NUMBER] [ cwnd NUMBER ] [ initcwnd NUMBER ]\n");
+ fprintf(stderr, " [ ssthresh NUMBER ] [ realms REALM ]\n");
fprintf(stderr, "TYPE := [ unicast | local | broadcast | multicast | throw |\n");
fprintf(stderr, " unreachable | prohibit | blackhole | nat ]\n");
fprintf(stderr, "TABLE_ID := [ local | main | default | all | NUMBER ]\n");
@@ -487,6 +487,15 @@
mxlock = *(unsigned*)RTA_DATA(mxrta[RTAX_LOCK]);
for (i=2; i<=RTAX_MAX; i++) {
+
+ /*
+ * "hoplimit" and "features" are not supported in
+ * userspace yet, but they are present in kernel's
+ * RTM_METRICS array in include/linux/rtnetlink.h,
+ * so putting placeholders in here for now so we
+ * can match the position of initcwnd in this
+ * structure: */
+
static char *mx_names[] =
{
"mtu",
@@ -497,6 +506,9 @@
"cwnd",
"advmss",
"reordering",
+ "hoplimit",
+ "initcwnd",
+ "features",
};
static int hz;
if (mxrta[i] == NULL)
@@ -794,6 +806,16 @@
if (get_unsigned(&win, *argv, 0))
invarg("\"cwnd\" value is invalid\n", *argv);
rta_addattr32(mxrta, sizeof(mxbuf), RTAX_CWND, win);
+ } else if (matches(*argv, "initcwnd") == 0) {
+ unsigned win;
+ NEXT_ARG();
+ if (strcmp(*argv, "lock") == 0) {
+ mxlock |= (1<<RTAX_INITCWND);
+ NEXT_ARG();
+ }
+ if (get_unsigned(&win, *argv, 0))
+ invarg("\"initcwnd\" value is invalid\n", *argv);
+ rta_addattr32(mxrta, sizeof(mxbuf), RTAX_INITCWND, win);
} else if (matches(*argv, "rttvar") == 0) {
unsigned win;
NEXT_ARG();
iproute2-2.6.16-libdir.patch:
Makefile | 2 +-
q_netem.c | 4 ++++
tc.c | 10 ++++++++--
3 files changed, 13 insertions(+), 3 deletions(-)
--- NEW FILE iproute2-2.6.16-libdir.patch ---
--- iproute2-2.6.16-060323/tc/Makefile.libdir 2005-07-06 00:11:37.000000000 +0200
+++ iproute2-2.6.16-060323/tc/Makefile 2006-03-27 07:09:28.000000000 +0200
@@ -42,7 +42,7 @@
TCLIB += tc_cbq.o
TCLIB += tc_estimator.o
-CFLAGS += -DCONFIG_GACT -DCONFIG_GACT_PROB
+CFLAGS += -DCONFIG_GACT -DCONFIG_GACT_PROB -DLIBDIR=\"$(LIBDIR)\"
TCSO :=
TCSO += q_netem.so
--- iproute2-2.6.16-060323/tc/q_netem.c.libdir 2005-12-10 01:01:02.000000000 +0100
+++ iproute2-2.6.16-060323/tc/q_netem.c 2006-03-27 07:09:28.000000000 +0200
@@ -60,7 +60,11 @@
char *line = NULL;
char name[128];
+ #ifdef LIBDIR
+ snprintf(name, sizeof(name), "%s/tc/%s.dist", LIBDIR, type);
+ #else
snprintf(name, sizeof(name), "/usr/lib/tc/%s.dist", type);
+ #endif
if ((f = fopen(name, "r")) == NULL) {
fprintf(stderr, "No distribution data for %s (%s: %s)\n",
type, name, strerror(errno));
--- iproute2-2.6.16-060323/tc/tc.c.libdir 2005-10-07 18:33:21.000000000 +0200
+++ iproute2-2.6.16-060323/tc/tc.c 2006-03-27 07:11:53.000000000 +0200
@@ -98,8 +98,11 @@
for (q = qdisc_list; q; q = q->next)
if (strcmp(q->id, str) == 0)
return q;
-
+ #ifdef LIBDIR
+ snprintf(buf, sizeof(buf), "%s/tc/q_%s.so", LIBDIR, str);
+ #else
snprintf(buf, sizeof(buf), "/usr/lib/tc/q_%s.so", str);
+ #endif
dlh = dlopen(buf, RTLD_LAZY);
if (!dlh) {
/* look in current binary, only open once */
@@ -144,8 +147,11 @@
for (q = filter_list; q; q = q->next)
if (strcmp(q->id, str) == 0)
return q;
-
+ #ifdef LIBDIR
+ snprintf(buf, sizeof(buf), "%s/tc/f_%s.so", LIBDIR, str);
+ #else
snprintf(buf, sizeof(buf), "/usr/lib/tc/f_%s.so", str);
+ #endif
dlh = dlopen(buf, RTLD_LAZY);
if (dlh == NULL) {
dlh = BODY;
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/iproute/FC-5/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore 17 Jan 2006 18:06:01 -0000 1.17
+++ .cvsignore 8 Sep 2006 09:39:39 -0000 1.18
@@ -1 +1 @@
-iproute2-2.6.15-060110.tar.gz
+iproute2-2.6.16-060323.tar.gz
Index: iproute.spec
===================================================================
RCS file: /cvs/dist/rpms/iproute/FC-5/iproute.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- iproute.spec 24 Feb 2006 08:19:14 -0000 1.47
+++ iproute.spec 8 Sep 2006 09:39:39 -0000 1.48
@@ -1,21 +1,25 @@
-%define date_version 060110
+%define date_version 060323
%define cbq_version v0.7.3
Summary: Advanced IP routing and network device configuration tools.
Name: iproute
-Version: 2.6.15
-Release: 2
+Version: 2.6.16
+Release: 1%{?dist}
Group: Applications/System
Source: http://developer.osdl.org/dev/iproute2/download/iproute2-%{version}-%{date_version}.tar.gz
URL: http://linux-net.osdl.org/index.php/Iproute2
-Patch1: iproute2-2.4.7-rt_config.patch
+#Patch1: iproute2-2.4.7-rt_config.patch
Patch2: iproute2-2.6.9-kernel.patch
Patch5: iproute2-ss050901-opt_flags.patch
Patch7: iproute2-051007-add_tunnel.patch
+Patch8: iproute2-2.6.16-libdir.patch
+Patch9: iproute2-2.6.16-initcwnd-correct-order.patch
+Patch10: iproute2-2.6.16-flags.patch
License: GNU GPL
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildPrereq: tetex-latex tetex-dvips psutils linuxdoc-tools db4-devel bison
+BuildRequires: flex
Obsoletes: shapecfg
%description
@@ -25,12 +29,17 @@
%prep
%setup -q -n iproute2-%{version}-%{date_version}
-%patch1 -p1
+#%patch1 -p1
%patch2 -p1 -b .kernel
%patch5 -p1 -b .opt_flags
%patch7 -p1 -b .tunnel_add
+%patch8 -p1 -b .libdir
+%patch9 -p1 -b .initcwnd
+%patch10 -p1 -b .flags
%build
+export LIBDIR=%{_libdir}
+
make
make -C doc
@@ -87,6 +96,13 @@
%config(noreplace) /etc/sysconfig/cbq/*
%changelog
+* Mon Aug 21 2006 Radek Vokál <rvokal at redhat.com> - 2.6.16-1.fc5
+- add LOWER_UP and DORMANT flags (#202199)
+- improve handling of initcwnd value (#179719)
+- fix BuildRequires: flex (#193403)
+- upgrade to 2.6.16-060323
+- don't hardcode /usr/lib in tc (#186607)
+
* Wed Feb 22 2006 Radek Vokál <rvokal at redhat.com> - 2.6.15-2
- own /usr/lib/tc (#181953)
- obsoletes shapecfg (#182284)
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/iproute/FC-5/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources 17 Jan 2006 18:06:02 -0000 1.17
+++ sources 8 Sep 2006 09:39:39 -0000 1.18
@@ -1 +1 @@
-04f57a6d366d36426d276178b600f5c5 iproute2-2.6.15-060110.tar.gz
+f31d4516b35bbfeaa72c762f5959e97c iproute2-2.6.16-060323.tar.gz
More information about the fedora-cvs-commits
mailing list