Author: arekm Date: Tue Mar 20 06:11:39 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 3.3.0
---- Files affected:
packages/iproute2:
esfq-iproute2.patch (1.3 -> 1.4) , iproute2-build.patch (1.13 -> 1.14) ,
iproute2.spec (1.214 -> 1.215)
---- Diffs:
================================================================
Index: packages/iproute2/esfq-iproute2.patch
diff -u packages/iproute2/esfq-iproute2.patch:1.3
packages/iproute2/esfq-iproute2.patch:1.4
--- packages/iproute2/esfq-iproute2.patch:1.3 Thu May 17 20:50:58 2007
+++ packages/iproute2/esfq-iproute2.patch Tue Mar 20 07:11:33 2012
@@ -1,13 +1,9 @@
diff -Naur iproute2-2.6.19-061214.orig/include/linux/pkt_sched.h
iproute2-2.6.19-061214/include/linux/pkt_sched.h
--- iproute2-2.6.19-061214.orig/include/linux/pkt_sched.h 2006-12-14
15:04:12.000000000 -0800
+++ iproute2-2.6.19-061214/include/linux/pkt_sched.h 2007-02-13
23:18:29.000000000 -0800
-@@ -146,8 +146,40 @@
- *
- * The only reason for this is efficiency, it is possible
- * to change these parameters in compile time.
-+ *
-+ * If you need to play with these values use esfq instead.
- */
+@@ -193,6 +193,36 @@ struct tc_sfq_xstats {
+ __s32 allot;
+ };
+/* ESFQ section */
+
@@ -31,17 +27,17 @@
+
+struct tc_esfq_qopt
+{
-+ unsigned quantum; /* Bytes per round allocated to flow */
-+ int perturb_period; /* Period of hash perturbation */
-+ __u32 limit; /* Maximal packets in queue */
-+ unsigned divisor; /* Hash divisor */
-+ unsigned flows; /* Maximal number of flows */
++ unsigned quantum; /* Bytes per round allocated to flow */
++ int perturb_period; /* Period of hash perturbation */
++ __u32 limit; /* Maximal packets in queue */
++ unsigned divisor; /* Hash divisor */
++ unsigned flows; /* Maximal number of flows */
+ unsigned hash_kind; /* Hash function to use for flow
identification */
+};
+
/* RED section */
- enum
+ enum {
diff -Naur iproute2-2.6.19-061214.orig/tc/Makefile
iproute2-2.6.19-061214/tc/Makefile
--- iproute2-2.6.19-061214.orig/tc/Makefile 2006-12-14 15:04:12.000000000
-0800
+++ iproute2-2.6.19-061214/tc/Makefile 2007-02-11 11:56:13.000000000 -0800
================================================================
Index: packages/iproute2/iproute2-build.patch
diff -u packages/iproute2/iproute2-build.patch:1.13
packages/iproute2/iproute2-build.patch:1.14
--- packages/iproute2/iproute2-build.patch:1.13 Tue Dec 29 09:42:53 2009
+++ packages/iproute2/iproute2-build.patch Tue Mar 20 07:11:33 2012
@@ -1,33 +1,3 @@
-diff -urNbB iproute2-2.6.14-051107.org/configure
iproute2-2.6.14-051107/configure
---- iproute2-2.6.14-051107.org/configure 2005-01-18 00:26:46.000000000
+0100
-+++ iproute2-2.6.14-051107/configure 2005-11-10 16:04:15.024922750 +0100
-@@ -5,7 +5,7 @@
-
- function check_atm
- {
--cat >/tmp/atmtest.c <<EOF
-+cat >atmtest.c <<EOF
- #include <atm.h>
- int main(int argc, char **argv) {
- struct atm_qos qos;
-@@ -16,7 +16,7 @@
- return 0;
- }
- EOF
--gcc -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm >/dev/null 2>&1
-+gcc -I$INCLUDE -o atmtest atmtest.c -latm >/dev/null 2>&1
- if [ $? -eq 0 ]
- then
- echo "TC_CONFIG_ATM:=y" >>Config
-@@ -21,7 +21,7 @@
- else
- echo no
- fi
--rm -f /tmp/atmtest.c /tmp/atmtest
-+rm -f atmtest*
- }
-
- function check_xt
diff -urNbB iproute2-2.6.14-051107.org/Makefile iproute2-2.6.14-051107/Makefile
--- iproute2-2.6.14-051107.org/Makefile 2005-07-09 00:08:47.000000000
+0200
+++ iproute2-2.6.14-051107/Makefile 2005-11-10 16:04:15.024922750 +0100
================================================================
Index: packages/iproute2/iproute2.spec
diff -u packages/iproute2/iproute2.spec:1.214
packages/iproute2/iproute2.spec:1.215
--- packages/iproute2/iproute2.spec:1.214 Sat Feb 18 11:47:44 2012
+++ packages/iproute2/iproute2.spec Tue Mar 20 07:11:33 2012
@@ -16,12 +16,12 @@
Summary(pl.UTF-8): Narzędzie do konfigurowania sieci
Summary(pt_BR.UTF-8): Ferramentas para roteamento avançado e configuração de
interfaces de rede
Name: iproute2
-Version: 3.2.0
+Version: 3.3.0
Release: 1
License: GPL v2+
Group: Networking/Admin
Source0:
http://kernel.org/pub/linux/utils/net/iproute2/%{name}-%{version}.tar.xz
-# Source0-md5: 6f814291cc3d7f4312cf8c2c052da5f1
+# Source0-md5: 39a7ff2c5149475c710365954e2ce49b
Patch0: %{name}-build.patch
Patch1: %{name}-arp.patch
Patch3: %{name}-iptables.patch
@@ -247,6 +247,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.215 2012/03/20 06:11:33 arekm
+- up to 3.3.0
+
Revision 1.214 2012/02/18 10:47:44 qboosh
- document libnl1 BR
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iproute2/esfq-iproute2.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iproute2/iproute2-build.patch?r1=1.13&r2=1.14&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iproute2/iproute2.spec?r1=1.214&r2=1.215&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
