Version bump to fix esfq/wrr registering with tc #73104 by David Pufer.

diff --git a/sys-apps/iproute2/ChangeLog b/sys-apps/iproute2/ChangeLog
index 789ebdb9baad6edbb328b9d1ef9ed64e9b739231..38a4de8401ddd1593d390e39deb51edd9a031dfb 100644 (file)
--- a/sys-apps/iproute2/ChangeLog
+++ b/sys-apps/iproute2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/iproute2
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.18 2004/12/01 14:52:37 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.19 2004/12/05 08:55:22 vapier Exp $
+
+*iproute2-2.6.9.20041019-r1 (05 Dec 2004)
+
+  05 Dec 2004; Mike Frysinger <vapier@gentoo.org>
+  files/2.6.9.20041019-esqf.patch, files/2.6.9.20041019-wrr.patch,
+  +iproute2-2.6.9.20041019-r1.ebuild, -iproute2-2.6.9.20041019.ebuild:
+  Version bump to fix esfq/wrr registering with tc #73104 by David Pufer.
 
   01 Dec 2004; Gustavo Zacarias <gustavoz@gentoo.org>
   iproute2-2.6.9.20040831.ebuild:

diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 5ef498549b4c5e9a0f91c5ced4eb72b1e91b4cba..ecca632cdf2cbea80466038740afd9f05a7a41b5 100644 (file)
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1,14 +1,24 @@
-MD5 0f4f3c754b02d81a3cc19540b07d9b85 ChangeLog 6823
-MD5 0c93c8279072ba9e3f42dd3d1374bd86 iproute2-2.6.7.20040608-r1.ebuild 2359
-MD5 a3070cf8b3b6ce69367e8a2c91be2e63 iproute2-2.6.9.20040831.ebuild 1568
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3bad272180082ab8883d4646f2843ecd ChangeLog 7127
 MD5 d0dad7daa0e6d356fc35f778fed36006 metadata.xml 225
-MD5 bbd830d87f5dccf1be8d9ea3761185b6 iproute2-2.6.9.20041019.ebuild 1685
+MD5 a3070cf8b3b6ce69367e8a2c91be2e63 iproute2-2.6.9.20040831.ebuild 1568
+MD5 0c93c8279072ba9e3f42dd3d1374bd86 iproute2-2.6.7.20040608-r1.ebuild 2359
+MD5 094848ac6b50b352f774296cfd17ba68 iproute2-2.6.9.20041019-r1.ebuild 1688
 MD5 d3a321fa8b70eef6df11d7343a14fd02 files/2.4.7.20020116-hfsc.patch 9507
+MD5 85a4bb7c64d1e7f589dab363ee5a3ceb files/2.6.9.20041019-wrr.patch 14144
+MD5 80a86a410222a70517482394f7b9689c files/2.6.9.20041019-esqf.patch 5623
+MD5 f9d5951d63104d862180994be31e96a2 files/digest-iproute2-2.6.9.20040831 75
 MD5 d0071e387038661c76eefb2c8e6b5c46 files/2.6.7.20040608-misc-deb-fixes.patch 632
 MD5 24a69d69fb222231a8d0f4358743190f files/2.6.7.20040608-misc-gentoo-fixes.patch 3970
-MD5 e9826ddf5fac917b17fa8e25684d68ea files/2.6.9.20040831-make-install.patch 504
 MD5 efc13e1a9a4a7bd080305d540ff5d48d files/digest-iproute2-2.6.7.20040608-r1 75
-MD5 f9d5951d63104d862180994be31e96a2 files/digest-iproute2-2.6.9.20040831 75
-MD5 deb459fabf0d9909a32bf6119ea78565 files/2.6.9.20041019-esqf.patch 5581
-MD5 0f263904ce8e53b9760a6efee3d5bff3 files/2.6.9.20041019-wrr.patch 14074
-MD5 6f4ba4510f9e089d154a317e3975f5f7 files/digest-iproute2-2.6.9.20041019 73
+MD5 e9826ddf5fac917b17fa8e25684d68ea files/2.6.9.20040831-make-install.patch 504
+MD5 6f4ba4510f9e089d154a317e3975f5f7 files/digest-iproute2-2.6.9.20041019-r1 73
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBss0RroRuSHgZdywRAmvDAJ9QELpdCHmKwGnZ7ccFvBchjLyXMwCePARR
+qRB0VblPgbtF+Pwfxx8eOzM=
+=TjQT
+-----END PGP SIGNATURE-----

diff --git a/sys-apps/iproute2/files/2.6.9.20041019-esqf.patch b/sys-apps/iproute2/files/2.6.9.20041019-esqf.patch
index 9a77b942a6e257df2687b14adffe8a014aafa6a9..6ab40a51dc0e81e4a4ba965873437195e3fc3cac 100644 (file)
--- a/sys-apps/iproute2/files/2.6.9.20041019-esqf.patch
+++ b/sys-apps/iproute2/files/2.6.9.20041019-esqf.patch
@@ -46,7 +46,7 @@ diff -Naur iproute2-2.6.9.orig/tc/Makefile iproute2-2.6.9.esqf/tc/Makefile
 diff -Naur iproute2-2.6.9.orig/tc/q_esfq.c iproute2-2.6.9.esqf/tc/q_esfq.c
 --- iproute2-2.6.9.orig/tc/q_esfq.c    1969-12-31 16:00:00.000000000 -0800
 +++ iproute2-2.6.9.esqf/tc/q_esfq.c    2004-10-26 02:49:58.969905912 -0700
-@@ -0,0 +1,169 @@
+@@ -0,0 +1,168 @@
 +/*
 + * q_esfq.c           ESFQ.
 + *
@@ -210,9 +210,8 @@ diff -Naur iproute2-2.6.9.orig/tc/q_esfq.c iproute2-2.6.9.esqf/tc/q_esfq.c
 +
 +
 +struct qdisc_util esfq_util = {
-+      NULL,
-+      "esfq",
-+      esfq_parse_opt,
-+      esfq_print_opt,
-+      esfq_print_xstats,
++      .id = "esfq",
++      .parse_qopt = esfq_parse_opt,
++      .print_qopt = esfq_print_opt,
++      .print_xstats = esfq_print_xstats,
 +};

diff --git a/sys-apps/iproute2/files/2.6.9.20041019-wrr.patch b/sys-apps/iproute2/files/2.6.9.20041019-wrr.patch
index d2c16f1b9fc48cf156b1e96e36e120925eb61c42..890b3cdef605dd77ac484654ffd2993bf72c1a6c 100644 (file)
--- a/sys-apps/iproute2/files/2.6.9.20041019-wrr.patch
+++ b/sys-apps/iproute2/files/2.6.9.20041019-wrr.patch
@@ -134,7 +134,7 @@ diff -Naur iproute2-2.6.9.orig/tc/Makefile iproute2-2.6.9.wrr/tc/Makefile
 diff -Naur iproute2-2.6.9.orig/tc/q_wrr.c iproute2-2.6.9.wrr/tc/q_wrr.c
 --- iproute2-2.6.9.orig/tc/q_wrr.c     1969-12-31 16:00:00.000000000 -0800
 +++ iproute2-2.6.9.wrr/tc/q_wrr.c      2004-10-26 02:52:12.655006743 -0700
-@@ -0,0 +1,323 @@
+@@ -0,0 +1,322 @@
 +#include <stdio.h>
 +#include <stdlib.h>
 +#include <unistd.h>
@@ -450,11 +450,10 @@ diff -Naur iproute2-2.6.9.orig/tc/q_wrr.c iproute2-2.6.9.wrr/tc/q_wrr.c
 +
 +
 +struct qdisc_util wrr_util = {
-+      NULL,
-+      "wrr",
-+      wrr_parse_opt,
-+      wrr_print_opt,
-+      wrr_print_xstats,
-+      wrr_parse_copt,
-+      wrr_print_copt
++      .id = "wrr",
++      .parse_qopt = wrr_parse_opt,
++      .print_qopt = wrr_print_opt,
++      .print_xstats = wrr_print_xstats,
++      .parse_copt = wrr_parse_copt,
++      .print_copt = wrr_print_copt
 +};

diff --git a/sys-apps/iproute2/files/digest-iproute2-2.6.9.20041019 b/sys-apps/iproute2/files/digest-iproute2-2.6.9.20041019-r1
similarity index 100%
rename from sys-apps/iproute2/files/digest-iproute2-2.6.9.20041019
rename to sys-apps/iproute2/files/digest-iproute2-2.6.9.20041019-r1

diff --git a/sys-apps/iproute2/iproute2-2.6.9.20041019.ebuild b/sys-apps/iproute2/iproute2-2.6.9.20041019-r1.ebuild
similarity index 96%
rename from sys-apps/iproute2/iproute2-2.6.9.20041019.ebuild
rename to sys-apps/iproute2/iproute2-2.6.9.20041019-r1.ebuild
index b20a6b6d8a122f0af47235643ce6262de703b993..db36b616e08e22a3adbc7c8fdb18db145661916e 100644 (file)
--- a/sys-apps/iproute2/iproute2-2.6.9.20041019.ebuild
+++ b/sys-apps/iproute2/iproute2-2.6.9.20041019-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.9.20041019.ebuild,v 1.1 2004/11/30 22:08:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.9.20041019-r1.ebuild,v 1.1 2004/12/05 08:55:22 vapier Exp $
 
 inherit eutils toolchain-funcs