# ChangeLog for net-misc/cbqinit
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cbqinit/ChangeLog,v 1.11 2004/12/29 03:33:17 ciaranm Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cbqinit/ChangeLog,v 1.12 2005/11/15 00:47:32 vapier Exp $
+
+*cbqinit-0.7.3-r1 (15 Nov 2005)
+
+ 15 Nov 2005; Mike Frysinger <vapier@gentoo.org>
+ +files/cbqinit-0.7.3-gentoo.patch, files/rc_cbqinit-r1,
+ +cbqinit-0.7.3-r1.ebuild:
+ Clean up ebuild, add a patch from Fedora, and add back in missing KEYWORDS
+ along with arm love.
29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
Change encoding to UTF-8 for GLEP 31 compliance
-MD5 1a2c2ee6175e52dfc28806551ed83926 cbqinit-0.7.ebuild 1104
-MD5 0d9a87777264dcb56aa9ef37498dbe29 ChangeLog 1489
-MD5 d83f5d9ad43d6404ddf47dcf18064a46 cbqinit-0.7.3.ebuild 1199
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ee6a465dd210fd74fefff067e01ddb1c ChangeLog 1758
MD5 b3eef38201071f9bcfc3064ba27e4278 cbqinit-0.7.2.ebuild 1211
+MD5 e2f8861d1a792b0dedc714105fa79538 cbqinit-0.7.3-r1.ebuild 860
+MD5 d83f5d9ad43d6404ddf47dcf18064a46 cbqinit-0.7.3.ebuild 1199
+MD5 1a2c2ee6175e52dfc28806551ed83926 cbqinit-0.7.ebuild 1104
+MD5 36312b31d2218761e171ebcaf2db04e8 files/cbq-1280.My_first_shaper.sample 79
+MD5 ed9e439af4639ccb33d22aa3be1e6dcf files/cbqinit-0.7.3-gentoo.patch 1904
MD5 20829547e7a1bb95dcbe6b56119650dd files/digest-cbqinit-0.7 57
-MD5 1e272f674fd1bd74d9508f4a50b74ab5 files/digest-cbqinit-0.7.3 59
-MD5 2f93290d9afb2bfe82da2a3f93a051f3 files/rc_cbqinit-r1 185
MD5 fa0a999eda33e423e9f27ad78dc8208e files/digest-cbqinit-0.7.2 59
+MD5 1e272f674fd1bd74d9508f4a50b74ab5 files/digest-cbqinit-0.7.3 59
+MD5 1e272f674fd1bd74d9508f4a50b74ab5 files/digest-cbqinit-0.7.3-r1 59
MD5 bf58f1ad519fe89dc6c6b90eabb3c860 files/rc_cbqinit 188
-MD5 36312b31d2218761e171ebcaf2db04e8 files/cbq-1280.My_first_shaper.sample 79
+MD5 2325b9a2bb95d33fe41ee40a511ec8bf files/rc_cbqinit-r1 504
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDeTBsgIKl8Uu19MoRAqCJAJ9vN02d0FYAfM9vR3NhiiE7AgqmqgCbB9Qc
+mNXUlvPZYthrMhu/kSB0Q/M=
+=As3l
+-----END PGP SIGNATURE-----
--- /dev/null
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cbqinit/cbqinit-0.7.3-r1.ebuild,v 1.1 2005/11/15 00:47:32 vapier Exp $
+
+inherit eutils
+
+DESCRIPTION="Sets up class-based queue traffic control (QoS) with iproute2"
+HOMEPAGE="http://www.sourceforge.net/projects/cbqinit"
+SRC_URI="mirror://sourceforge/cbqinit/cbq.init-v${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="sys-apps/iproute2"
+DEPEND=""
+
+S=${WORKDIR}
+
+src_unpack() {
+ cp "${DISTDIR}"/cbq.init-v${PV} "${S}"/cbqinit || die
+ grep '^#' cbqinit > README
+ epatch "${FILESDIR}"/${P}-gentoo.patch
+}
+
+src_install() {
+ dosbin cbqinit || die
+ newinitd "${FILESDIR}"/rc_cbqinit-r1 cbqinit
+ dodoc "${FILESDIR}"/cbq-1280.My_first_shaper.sample README
+}
--- /dev/null
+Use Gentoo friendly config paths and incorporate
+cbq-0.7.1-avpkt-enhancement.patch from Fedora
+
+--- cbqinit
++++ cbqinit
+@@ -484,8 +484,8 @@
+ PRIO_REALM_DEFAULT=${PRIO_REALM:-300}
+
+ ### Default CBQ_PATH & CBQ_CACHE settings
+-CBQ_PATH=${CBQ_PATH:-/etc/sysconfig/cbq}
+-CBQ_CACHE=${CBQ_CACHE:-/var/cache/cbq.init}
++CBQ_PATH=${CBQ_PATH:-/etc/cbqinit}
++CBQ_CACHE=${CBQ_CACHE:-/var/cache/cbqinit}
+
+ ### Uncomment to enable logfile for debugging
+ #CBQ_DEBUG="/var/run/cbq-$1"
+@@ -501,6 +501,9 @@
+ CBQ_WORDS="$CBQ_WORDS|PRIO_MARK|PRIO_RULE|PRIO_REALM|BUFFER"
+ CBQ_WORDS="$CBQ_WORDS|LIMIT|PEAK|MTU|QUANTUM|PERTURB"
+
++### Source AVPKT if it exists
++[ -r "${CBQ_PATH}/avpkt" ] && . "${CBQ_PATH}/avpkt"
++AVPKT=${AVPKT:-1000}
+
+ #############################################################################
+ ############################# SUPPORT FUNCTIONS #############################
+@@ -749,7 +752,7 @@
+
+ ### Setup root qdisc + class for device
+ tc qdisc add dev $dev root handle 1 cbq \
+- bandwidth $DEVBWDT avpkt 1000 cell 8
++ bandwidth $DEVBWDT avpkt $AVPKT cell 8
+
+ ### Set weight of the root class if set
+ [ -n "$DEVWGHT" ] &&
+@@ -766,7 +769,7 @@
+ ### Create the class
+ tc class add dev $DEVICE parent 1:$PARENT classid 1:$CLASS cbq \
+ bandwidth $BANDWIDTH rate $RATE weight $WEIGHT prio $PRIO \
+- allot 1514 cell 8 maxburst 20 avpkt 1000 $BOUNDED $ISOLATED ||
++ allot 1514 cell 8 maxburst 20 avpkt $AVPKT $BOUNDED $ISOLATED ||
+ cbq_fail_off "failed to add class $CLASS with parent $PARENT on $DEVICE!"
+
+ ### Create leaf qdisc if set
+@@ -940,7 +943,7 @@
+ ### Replace CBQ class
+ tc class replace dev $DEVICE classid 1:$CLASS cbq \
+ bandwidth $BANDWIDTH rate $NEW_RATE weight $NEW_WGHT prio $PRIO \
+- allot 1514 cell 8 maxburst 20 avpkt 1000 $BOUNDED $ISOLATED
++ allot 1514 cell 8 maxburst 20 avpkt $AVPKT $BOUNDED $ISOLATED
+
+ ### Replace leaf qdisc (if any)
+ if [ "$LEAF" = "tbf" ]; then
--- /dev/null
+MD5 c319f136059aadf7b3f0a38a12f3f3e0 cbq.init-v0.7.3 33438
#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
depend() {
need net
}
+checkconfig() {
+ if [ ! -d /etc/cbqinit ] ; then
+ eerror "You need to create some config files in /etc/cbqinit first"
+ eerror "Please read the README file"
+ return 1
+ fi
+
+ return 0
+}
+
start() {
+ checkconfig || return 1
ebegin "Starting cbqinit"
/usr/sbin/cbqinit start
eend $?
projects / gentoo.git / commitdiff