Remove "-l 255" from ZEBRA_OPTS (#279763). Bump version and add doc USE flag.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

5 files changed, 26 insertions, 135 deletions

diff --git a/net-misc/quagga/ChangeLog b/net-misc/quagga/ChangeLog
index 6cb55d7318cd..2035a6fc7ba2 100644
--- a/net-misc/quagga/ChangeLog
+++ b/net-misc/quagga/ChangeLog
@@ -2,7 +2,13 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Copyright 2003-2004 DataCore GmbH
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/ChangeLog,v 1.83 2009/06/23 21:12:04 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/ChangeLog,v 1.84 2009/08/16 12:10:11 mrness Exp $
+
+*quagga-0.99.14 (16 Aug 2009)
+
+  16 Aug 2009; Alin Năstac <mrness@gentoo.org> files/zebra.conf,
+  -quagga-0.99.12.ebuild, -quagga-0.99.12-r1.ebuild, +quagga-0.99.14.ebuild:
+  Remove "-l 255" from ZEBRA_OPTS (#279763). Bump version and add doc USE flag.
 
 *quagga-0.99.13 (23 Jun 2009)
 
diff --git a/net-misc/quagga/Manifest b/net-misc/quagga/Manifest
index fe663eddab08..be059d010c78 100644
--- a/net-misc/quagga/Manifest
+++ b/net-misc/quagga/Manifest
@@ -8,25 +8,23 @@ AUX quagga.env 25 RMD160 2ea6666fbacfdcc125283dcd4a5f6bae089f5392 SHA1 42aad9b84
 AUX quagga.pam 975 RMD160 df2433b76a16f2c8747f9569e88ed90c9c1f2bae SHA1 bfcd1bbbd4162fd70541f0d754a0e5a818025bc9 SHA256 aa68ac97d7a951324bc3c4124a1c70f6fa88a45da860f636ac01cbcbfa36db70
 AUX ripd.init 900 RMD160 ef99fa34951c47a29b1147a9b1226692f239ec8b SHA1 b89e411a64013e88cfcd2f898025f66a9593445a SHA256 6212f0bb45d849087fdb6c0d4cbc3b0f3e651907cb844576c17d161dbf10fda5
 AUX ripngd.init 920 RMD160 7d484a8342cc1142fd8ee88080f8f9281fde3461 SHA1 5c31e1fecdea1a55461ea3550702bfd225b2101c SHA256 7183b0bbf9ab9144635fada4e03f73dd58bac246600ee7f007f06150db48d044
-AUX zebra.conf 371 RMD160 618332506925b73df1fa66b80cc6aea3a6cdebb3 SHA1 a4c7a7741a1900ab0c10e070715ee17568e57f40 SHA256 291bf052f3b1175c4c04c7ed7e3528acbd5143048da49b4fad3769ba2eedd26d
+AUX zebra.conf 84 RMD160 7846ce226c2d0081e27b64131104eacf51e2e4de SHA1 cb258fc8f0980401c5b991b0a8b37f12236956ca SHA256 c7fb777e480fcfbcf9aa9c931bf5f8b6d13d3b2dbe8478cba1a4571aa5baa586
 AUX zebra.init 1013 RMD160 1cb01c0b95fd8a49d442b2a0c1d900e1cee7d477 SHA1 462d7e255f01fb9615f99526976cef209ea332e7 SHA256 7eac27ca9661fb453a93b131bfbf69e409a06f65c2cedb83cdd55869d6871236
 DIST quagga-0.98.6-patches-20080708.tar.gz 21295 RMD160 d88c25bcc8e96e9b101638c1faf99cdad61baaa3 SHA1 24226a1a5b305b1e8b983831366eb65f81da090f SHA256 7b6dca8f58cb3f54a76a4d02c63505fa60b9554e03a58b8b9674f90b63dcefbe
 DIST quagga-0.98.6.tar.gz 2019992 RMD160 e15cd93b5d321660d7e29fc27174352967342879 SHA1 2234d1235f504e9dc5865cc8d5fd4e250bf43ed5 SHA256 a84e1aac4e666929abd1942fa8958d9ef0d0bbf605f47d5c2a09f6be716987a1
-DIST quagga-0.99.12-patches-20090513.tar.gz 13074 RMD160 dc4b496c9ffe605bc20b775e5a49c34a193f2655 SHA1 27764b63c0d432f16aa8327bd3ae479b9849658f SHA256 9e2595220c40abea8dca08746a5f8c664743fda2c606e508c1a3368f4b04b87a
-DIST quagga-0.99.12-patches-20090614.tar.gz 14649 RMD160 8e24bd6eb6c02f3462673e7d8a3284589e06c9a7 SHA1 8154148f5fc7ee0b4de5ddb48a63f85bbc1267a4 SHA256 b0e5435a28cedda4776233b0e0ed71ea4e2161235d43f7fff851733748720cbc
-DIST quagga-0.99.12.tar.gz 2162403 RMD160 f443954db18123ab4b979834ecbff58778338afe SHA1 e6814eca860274fb4f39f036d8117ceb641b2c1a SHA256 2d4897a56774fe78da58e3951e8e365175fcde366036f0071f75c391720997e1
 DIST quagga-0.99.13-patches-20090623.tar.gz 13284 RMD160 55f2401d15d59323e4109b8bd5a1b03e66d6a452 SHA1 b0ddd6edbd7104b47a1e77042102bb1ba4387e76 SHA256 771916e70b2382badcc157317aaf132e0d8a0e0e3bc6e1801344ec5c20ced3a1
 DIST quagga-0.99.13.tar.gz 2172551 RMD160 8f647b0babb9c547cd8d7ce5cdc23c171d11d18c SHA1 41f51de2f068d39f504440ce72321096c5eb79a6 SHA256 da986f2c9ee550c1a9fd76a06bae708cb5988ea468a7fb8c73c3f5f055bd8d9f
+DIST quagga-0.99.14-patches-20090816.tar.gz 13326 RMD160 f0bfb2167aee71620e7359168ae5cf096eca2c8b SHA1 8b25d650c918382c7590bce92e98bd6abec01d60 SHA256 cd062845e14f3d0232e5193250f53b5b80d3db5965eb1bcd2a52cb7738c20e39
+DIST quagga-0.99.14.tar.gz 2185686 RMD160 48ab35063c91c1e8e180f791ec2db65a9b10c53c SHA1 5c182a70987957b968b92251ab81b886647292a4 SHA256 3f637fa1b49d335c00e78602754977d22455ba6e4a82ce4183c4da50667067e5
 EBUILD quagga-0.98.6-r4.ebuild 5384 RMD160 b13750f47c0e0452958a57de6e8547b493ef8a7f SHA1 76504c11179ec546161a2da58ddd884a48b27628 SHA256 f156a7931080ee9d9f0ad8dd4322144e9e2db780b072ae6e2820f51eff393d2c
-EBUILD quagga-0.99.12-r1.ebuild 3623 RMD160 579d48624bd392c4f9458802d8219d3a9e1a61f7 SHA1 9462c9646d3e762b12cbed1642cabe2fdc4947f4 SHA256 c0907fc7306c769aaf3b5065d651679c02977b3d8d8e4ad25849a26d722dca55
-EBUILD quagga-0.99.12.ebuild 3564 RMD160 a94104ce83fd6a539abbf4cea75d9d5baa5c9813 SHA1 2597c2485a3b14f5d7293cc161ddf5880fa55b46 SHA256 1535f4ee9e002f83d04dd5082677c94bb5bf99cfa954433985d5ff8fdd665567
 EBUILD quagga-0.99.13.ebuild 3638 RMD160 dc7390e17c00df4e83f189758979ddcd819a4e1c SHA1 edb4fd772fb46e6685c2243dfb86029471880fbe SHA256 a81d86992b96f35b43ab69b34d98e699c811860496e638bf375cafdf025258dc
-MISC ChangeLog 18694 RMD160 471dd386d429ddd1f32b6ccabf4ce7d583af7e13 SHA1 e1a906f75e82f111ebbd632210def00494e033ec SHA256 6f9a506bdbc4f7beaba85521e8a755665a970e8e7cd8323d56690226c010f60f
+EBUILD quagga-0.99.14.ebuild 3662 RMD160 67d5dd3adc5cd50a083ad16f89a934050f90e3b4 SHA1 51caae20cf9136c638deeffe92d35095a52e8afa SHA256 2b6ce0cead257800ba53619c91bc9d3eaf291159f194f3fb0bee64238524879b
+MISC ChangeLog 18949 RMD160 1041f01bf43023461ca77ab5cb63bb9319cf1517 SHA1 12a348bbdc9d0be1ff53b81752ab842c0f0d0d23 SHA256 8ad7cee575106c73c73c74620d2a14f3eee5c89d84078407b18efee259b5aa11
 MISC metadata.xml 2073 RMD160 99bbbceb932054aa49aaf09566c1ba0ab7acc216 SHA1 bea36155bab6b90d49ed782be2670733c245e4fc SHA256 0c4297ffd73ddc23d96ff5f0a34f1ac45daf4d22367572ef2466312387c62406
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkpBRTMACgkQts85UDFmaOXrEQCeK4VnyPVJ2vurk2Y0KFWGW6Ed
-mxwAn3dWlewPRXueVDPCyasJM4iUxwVP
-=Ico7
+iEYEARECAAYFAkqH9y0ACgkQ9A5kJBGSrsv3qACbBJwdN+7Y3e1Ve2yVfY2oFLNz
+qkIAniMzmpDLyQIfDibL/CDvaYrkH2MT
+=nPtg
 -----END PGP SIGNATURE-----
diff --git a/net-misc/quagga/files/zebra.conf b/net-misc/quagga/files/zebra.conf
index a5256acd04d4..027273b6da0a 100644
--- a/net-misc/quagga/files/zebra.conf
+++ b/net-misc/quagga/files/zebra.conf
@@ -1,7 +1,2 @@
-# Additional command-line parameters to run zebra with:
-#	-k, --keep_kernel     Don't delete old routes which installed by zebra.
-#	-l, --log_mode number Set verbose log mode flag
-#	-A, --vty_addr addr   Set vty's bind address
-#	-P, --vty_port port   Set vty's port number
-#	-r, --retain          When program terminates, retain added route by zebra.
-ZEBRA_OPTS="-l 255"
+# Additional command-line parameters to run zebra with; see man zebra
+ZEBRA_OPTS=""
diff --git a/net-misc/quagga/quagga-0.99.12.ebuild b/net-misc/quagga/quagga-0.99.12.ebuild
deleted file mode 100644
index ada3c7890e41..000000000000
--- a/net-misc/quagga/quagga-0.99.12.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.99.12.ebuild,v 1.1 2009/05/13 21:27:46 mrness Exp $
-
-EAPI="2"
-WANT_AUTOMAKE="latest"
-WANT_AUTOCONF="latest"
-
-inherit eutils multilib autotools
-
-DESCRIPTION="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP."
-HOMEPAGE="http://quagga.net/"
-SRC_URI="http://www.quagga.net/download/${P}.tar.gz
-	mirror://gentoo/${P}-patches-20090513.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~s390 ~sparc ~x86"
-IUSE="caps ipv6 snmp pam bgpclassless ospfapi realms multipath tcp-zebra"
-RESTRICT="userpriv"
-
-COMMON_DEPEND="sys-libs/readline
-	caps? ( sys-libs/libcap )
-	snmp? ( net-analyzer/net-snmp )
-	pam? ( sys-libs/pam )"
-DEPEND="${COMMON_DEPEND}
-	>=sys-devel/libtool-2.2.4"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/iproute2"
-
-src_prepare() {
-	epatch "${WORKDIR}/patch/${P}-link-libcap.patch"
-	epatch "${WORKDIR}/patch/${P}-ipv6.patch"
-
-	# Classless prefixes for BGP - http://hasso.linux.ee/doku.php/english:network:quagga
-	use bgpclassless && epatch "${WORKDIR}/patch/ht-20040304-classless-bgp_adapted.patch"
-
-	# Realms support (Calin Velea) - http://vcalinus.gemenii.ro/quaggarealms.html
-	use realms && epatch "${WORKDIR}/patch/${P}-realms.diff"
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf="--disable-static \
-		$(use_enable caps capabilities) \
-		$(use_enable snmp) \
-		$(use_with pam libpam) \
-		$(use_enable tcp-zebra)"
-	use ipv6 \
-			&& myconf="${myconf} --enable-ipv6 --enable-ripngd --enable-ospf6d --enable-rtadv" \
-			|| myconf="${myconf} --disable-ipv6 --disable-ripngd --disable-ospf6d"
-	use ospfapi \
-			&& myconf="${myconf} --enable-opaque-lsa --enable-ospf-te --enable-ospfclient"
-	use realms && myconf="${myconf} --enable-realms"
-	use multipath && myconf="${myconf} --enable-multipath=0"
-
-	econf \
-		--enable-user=quagga \
-		--enable-group=quagga \
-		--enable-vty-group=quagga \
-		--with-cflags="${CFLAGS}" \
-		--enable-vtysh \
-		--sysconfdir=/etc/quagga \
-		--enable-exampledir=/etc/quagga/samples \
-		--localstatedir=/var/run/quagga \
-		--libdir=/usr/$(get_libdir)/quagga \
-		${myconf} \
-		|| die "configure failed"
-}
-
-src_install() {
-	einstall \
-		localstatedir="${D}/var/run/quagga" \
-		sysconfdir="${D}/etc/quagga" \
-		exampledir="${D}/etc/quagga/samples" \
-		libdir="${D}/usr/$(get_libdir)/quagga" || die "make install failed"
-
-	dodir /var/run/quagga || die "failed to install /var/run/quagga"
-
-	local i MY_SERVICES_LIST="zebra ripd ospfd bgpd"
-	use ipv6 && MY_SERVICES_LIST="${MY_SERVICES_LIST} ripngd ospf6d"
-	for i in ${MY_SERVICES_LIST} ; do
-		newinitd "${FILESDIR}/${i}.init" ${i} || die "failed to install ${i} init.d script"
-	done
-	newconfd "${FILESDIR}/zebra.conf" zebra || die "failed to install zebra conf.d script"
-
-	if use pam; then
-		insinto /etc/pam.d
-		newins "${FILESDIR}/quagga.pam" quagga || die "failed to install pam.d file"
-	fi
-
-	newenvd "${FILESDIR}/quagga.env" 99quagga || die "failed to install env file"
-}
-
-pkg_preinst() {
-	enewgroup quagga
-	enewuser quagga -1 -1 /var/empty quagga
-}
-
-pkg_postinst() {
-	# empty dir for pid files for the new priv separation auth
-	#set proper owner/group/perms even if dir already existed
-	install -d -m0770 -o root -g quagga "${ROOT}/etc/quagga"
-	install -d -m0755 -o quagga -g quagga "${ROOT}/var/run/quagga"
-
-	einfo "Sample configuration files can be found in /etc/quagga/samples."
-	einfo "You have to create config files in /etc/quagga before"
-	einfo "starting one of the daemons."
-}
diff --git a/net-misc/quagga/quagga-0.99.12-r1.ebuild b/net-misc/quagga/quagga-0.99.14.ebuild
index fea5c06d5481..73a941727c2d 100644
--- a/net-misc/quagga/quagga-0.99.12-r1.ebuild
+++ b/net-misc/quagga/quagga-0.99.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.99.12-r1.ebuild,v 1.1 2009/06/14 07:41:26 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.99.14.ebuild,v 1.1 2009/08/16 12:10:11 mrness Exp $
 
 EAPI="2"
 
@@ -9,28 +9,28 @@ inherit eutils multilib autotools
 DESCRIPTION="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP."
 HOMEPAGE="http://quagga.net/"
 SRC_URI="http://www.quagga.net/download/${P}.tar.gz
-	mirror://gentoo/${P}-patches-20090614.tar.gz"
+	mirror://gentoo/${P}-patches-20090816.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~s390 ~sparc ~x86"
-IUSE="caps ipv6 snmp pam bgpclassless ospfapi realms multipath tcp-zebra"
+IUSE="caps doc ipv6 snmp pam pcre bgpclassless ospfapi realms multipath tcp-zebra"
 RESTRICT="userpriv"
 
 COMMON_DEPEND="sys-libs/readline
 	caps? ( sys-libs/libcap )
 	snmp? ( net-analyzer/net-snmp )
-	pam? ( sys-libs/pam )"
+	pam? ( sys-libs/pam )
+	pcre? ( dev-libs/libpcre )"
 DEPEND="${COMMON_DEPEND}
 	>=sys-devel/libtool-2.2.4"
 RDEPEND="${COMMON_DEPEND}
 	sys-apps/iproute2"
 
 src_prepare() {
-	epatch "${WORKDIR}/patch/${P}-bgp-refcount.patch"
 	epatch "${WORKDIR}/patch/${P}-ipaddr-bug486.diff"
 	epatch "${WORKDIR}/patch/${P}-link-libcap.patch"
-	epatch "${WORKDIR}/patch/${P}-ipv6.patch"
+	epatch "${WORKDIR}/patch/${P}-libpcre.patch"
 
 	# Classless prefixes for BGP - http://hasso.linux.ee/doku.php/english:network:quagga
 	use bgpclassless && epatch "${WORKDIR}/patch/ht-20040304-classless-bgp_adapted.patch"
@@ -46,7 +46,9 @@ src_configure() {
 		$(use_enable caps capabilities) \
 		$(use_enable snmp) \
 		$(use_with pam libpam) \
-		$(use_enable tcp-zebra)"
+		$(use_enable pcre pcreposix) \
+		$(use_enable tcp-zebra)
+		$(use_enable doc)"
 	use ipv6 \
 			&& myconf="${myconf} --enable-ipv6 --enable-ripngd --enable-ospf6d --enable-rtadv" \
 			|| myconf="${myconf} --disable-ipv6 --disable-ripngd --disable-ospf6d"