Version bump, wrt bug #475706

Package-Manager: portage-2.2.6/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

3 files changed, 134 insertions, 17 deletions

diff --git a/net-misc/quagga/ChangeLog b/net-misc/quagga/ChangeLog
index 47e04bab215b..501cff009657 100644
--- a/net-misc/quagga/ChangeLog
+++ b/net-misc/quagga/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/quagga
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/ChangeLog,v 1.155 2013/05/26 07:24:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/ChangeLog,v 1.156 2013/09/24 11:52:52 pinkbyte Exp $
+
+*quagga-0.99.22.4 (24 Sep 2013)
+
+  24 Sep 2013; Sergey Popov <pinkbyte@gentoo.org> +quagga-0.99.22.4.ebuild:
+  Version bump, wrt bug #475706
 
   26 May 2013; Agostino Sarubbo <ago@gentoo.org> quagga-0.99.22.1.ebuild:
   Stable for ppc, wrt bug #464218
diff --git a/net-misc/quagga/Manifest b/net-misc/quagga/Manifest
index ebce571155af..020bbaaca036 100644
--- a/net-misc/quagga/Manifest
+++ b/net-misc/quagga/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX quagga-0.99.21-fix-no-ipv6.patch 3144 SHA256 905478424846456138fa194fee40ffd773d58ee0c68424fc0f5b986abfd0044e SHA512 8d05e60c980b207dd4a0e59f8bc95f687e16c521a41aeda542beb68ae23bc0e4f416c46521d902b188903fbde858479d8dbe6e02585508d9ab3326b29a277be4 WHIRLPOOL c1dd29bd9a7f3cd1c00f31a0d80d2728ae97cdf45040605064470070bf0b6989d7f18331b243b8c9784b78bdba292da2e48a02ccce8e5a3b9988b6d7f4331081
 AUX quagga-link-libcap.patch 1027 SHA256 33bbab3490852b32f38437d50d64fcbb2a98e063503ccc46dd75cd350187853f SHA512 bc87b14432af75bc6e1bb27a7f90f0a05ddd98c6b554ef53535a2fc8e43f49c76762c8a0c240323817fdbb4e1ce29b868da7b768c597acce919febe8f040ec78 WHIRLPOOL 6be7d422ecdd4166c2bf22d8a2dbfdbdbcee9bb4d3af1d189457e3dda8d2746466533789c23f18ce9f726daf2c89b2b731675a8222d8957fb4410b550e24964f
@@ -13,28 +13,24 @@ DIST quagga-0.99.20-backports-2.tar.xz 1968 SHA256 6c2ab6f39bf6a006539603bbeca59
 DIST quagga-0.99.20.tar.gz 2232520 SHA256 b7a98cc6b022bb0cb405557b3d920cf513150f64384dbd0a2248b5bd248df58b SHA512 f515496d9f437afb08c47519c42efd28946acaff2bd353233e00e27e6463dc08b56732c8ce027b76543da86f14906a00266420e41a909200f45dcf2c84259422 WHIRLPOOL e9cae164e48fe1e557f5149c3cfe364689f4f26cd848c71e5bfa9ca8fb1bb752249bcfabaa14c1505671aa4730bb3296928fa0a3587356442ce6b0345eebe480
 DIST quagga-0.99.21.tar.xz 1572264 SHA256 87329c3d9d4e5c0a74812e725026560c477f610eec9771e67baf513da0357246 SHA512 0f35cabfd7aa82e08f3f728660f0fe4c35a38e1146fca8ea37100e176333363cdd3cb22987cffd644f77852bfbf8b98da87310abdc575b2200415901837765cd WHIRLPOOL f745f4840671da06c6e6504c446e86c02f255f7bf5b35651aa205cf6e4021048fd3640b8b4a66a45798191105799f19aa77ea2b05d26cc2111aba22659722197
 DIST quagga-0.99.22.1.tar.xz 1608840 SHA256 fb49dce0d54b83bf4cb82cf998dc3adddd34a7579f3c7cba0572a252c010c6a6 SHA512 0ebe2fe2062a9f9db985fb3ac56df142bc35b45e5afe1b265a211cc3310920b39defab0baae805092cc20ce99e1af57ad1f03d7d65691f2150b4a23cdc70b5d4 WHIRLPOOL 783edc9b80488ce427f33728573f4056e2aa8aa4eec7f7ae509485d2dd8df9f152d549b38ec89c421a1263d9ac53583a9631116fa625a00ebd47fc796cced020
+DIST quagga-0.99.22.4.tar.xz 1609248 SHA256 5e12056692e2dbc272a929f96d0e98d9873f4e7f7ffcca62434b58f6660a6386 SHA512 bcf429e71073e4fc71efc364a21a6c8b70871a17c66bd1328bc57b57962c2c15182436183b2e363c9c1c0e85d84c49d304d4049d40129272f52d6140db330b8a WHIRLPOOL bfd2d5405b6ba44d52e8dcbdb74b31be02ad384d186abb37ec0dfba52facbc9c6c7a5309a11ad844e73129a2da970b91d293271b7194fdf98c93930a2def8cfd
 DIST quagga-0.99.22.tar.xz 1595948 SHA256 50336547ed53a03a3fa9130de5721fb916c40fef6652a1a36c9a71fdf338c75a SHA512 580113cd9b68c1267cc737b98c64f15c8754c7ce2f9a23979b8beb03049ab81ac08feb4df38dbc46cfeeac79992bd6fa5e59a35c8f226945f752b873624718db WHIRLPOOL 8620da3e1457db2ece6df07eaea68f984ee2e7335c3f47a92a4aef605917b2c7078a83dfc20cbfb7721c08f37631be179a97277d8131bdb94e8f142aeba8ad86
 EBUILD quagga-0.99.20-r1.ebuild 3422 SHA256 575e977e42fcb57ca53d4c517f1e2bea934029d3132a90beb29da95d095fb158 SHA512 9e4479d62834e0f3b142806f82b602d6814d24614b1a538d178cda5fd418095162bfa93f4840ff418d262bfad5057df026114a2da6c9e6630199de6583f73bf2 WHIRLPOOL b2bc5616c7453bb5cf21f80353afcad29a094514b89d421e93ab0dadcd0fb67b0c2d65b2d24fe19d3a33b68d83f329a4e3ff26673f6f98566d037f0196305185
 EBUILD quagga-0.99.20.ebuild 3437 SHA256 f51edb691ca50079db8fd514b8616beb26c32722f9b938024aa7b4ac42740cdd SHA512 874d29a54ada41bb3c20bf8a8deebeed9b0f6c555b8cd0d28f161e5867ac983e3a5765381705060b5bddd6ad895111633e5219b61d066d9d18eec89be6e46bff WHIRLPOOL c57dcf0b8341fa000d592a8c4cbe52707545a0e3cb5f0c6d6ba1a4357694a2b582149e1bdb1bf83aa9054824c1fb2b0c026877e65a710464dfa504a3cdd421a0
 EBUILD quagga-0.99.21.ebuild 3616 SHA256 8564605e9b6c1b77a6a48bda831e57915527d88076b62f77d22cf0b433511447 SHA512 33ac2bab33d7b6e1f214af849a217086884a1f30eb02d6fbfaba1e43a7f1f97a6999fda084e7ec2c15db674cf0ec6e5e7b43db9540b68c8c81bf0391335e6110 WHIRLPOOL e7e78bd44fe27e53fe52f521ec8d3942cede9e5ffd662599dd662448e9dc43a33160a84a67f72d7c3ba25dffeacaf271f65f0988e173417a36b038382ad9d794
 EBUILD quagga-0.99.22.1.ebuild 3298 SHA256 f500f97936d4d4ef216e57ddfdc60d21a9db4016f3bd9747dccb0dcf5740a7cb SHA512 4748b148f499d131c9b01caa650a9d9f25fc543192e9aa158f184e4ec65952168c3718cf8766811e630df484a9618cb3fe3d36a1e7fbbc6bbf9f90eee931ae91 WHIRLPOOL 9ed3a9faaa8c6bc9e5d901a0edf74d731a0d082afa67d6f1f28b9f93d9e2fcd558d13e9996ecc9f83ec31bc89c3608259bc701edeb250b03d4f6952906214c9d
+EBUILD quagga-0.99.22.4.ebuild 3399 SHA256 7a6fcda23bc73df0f6226a75307ad165fa7c1cd4638f6ac0edd763adc60bff06 SHA512 b2b74031568b48d96ef02b3e75ad6094eb5d2357219f7e0fec482e258d124ef10deb1ae6cf92878a8796c614a99504ab0423a3942adb1263ddb291bfd141f282 WHIRLPOOL b3a904d1b77160c5ff6ee9884fefbca42c952d74e35d360dd574a7f747c322d9002b0ff1daccc94a761aa0b87f67652bf5d92f52b9d6830986767bca4c4bd5bd
 EBUILD quagga-0.99.22.ebuild 3548 SHA256 319b7af892dbff58155acb9ee2e4c90209754ddf65929d2ff1733f6903773b02 SHA512 af81cf225b297ac9d78bedd6b2065f3c7c1cda4505658b7de5df71382d3fdbf4752767b3cf0bca3b0a427f0d05d2f515102126590709ffeabc6e35ce94bd2abf WHIRLPOOL a0c4e5e6ec9f062e80bc0df237a4af5d60a6951222908d5b94ef345becf5a5e152407e6ea996441e0efbfedfde670bcdfa3ad8a5d69fd2e40565cc5f74bc154f
-MISC ChangeLog 25269 SHA256 7c4b8beccd866027d9675ebe1e689ac80aff7bfb56096f8dccf73e177e29d393 SHA512 8af02f7e705b671a0425085c7a16fd573ae5c03622b7b1a8d85b624e97166cfd4a082bc6fc168f4a5bd78224ceb9c6e1ecdcd1546e1fe7d67b4885aafc36daa5 WHIRLPOOL 0a316a696db4d2786a888f901bf8990ff0048fed01177ccdad1aa5c97917bbf8120106c40b1a652b5cf264b0dd7fc3848d1d273b34ad64a8f23c59ea395df979
+MISC ChangeLog 25416 SHA256 7d20f7f8bf17138045798bc20a3bcf1a09cea5599b492992c61f11d732b1c561 SHA512 d7d062eb1f8055ffbe484d6d47cfa4c563863bfecca3303bbeef15379a60428e193093706f2dfe438b8334e83f4a0104181c1c2bcc7795916d88667ff189137e WHIRLPOOL 87414ba5a15b04185fe481b566fb724e569ce580f1ef91fff7e8f9ea2b5e50279426499e5e9f299cd757b5b0d7c9cad2bd504cd183c0227b8fd038dba827463a
 MISC metadata.xml 2125 SHA256 a8fa9b5faa1486306615e9088458960f5dc6463c88e672234f04ee5ac0874e68 SHA512 ba254525fd2dea2cbfc6f2b5a2d6e82c8c2d5ddecb5687c38faa14ea8ec53ebcd44a934b2f2350cfe0bf28a216d93773813a64388514a4079d92108796ea30a3 WHIRLPOOL 381fb94ef4954da55d87724b0590a7ee95129d6b365d95455a9909b8ff499c0de4f5856c9eb81f619308efd2edda9a3c88840ee5c5789bfd689618afe8280131
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRobgSAAoJELp701BxlEWfPtMP/A8HOVq8f1ZIUBTYRxRBssNc
-uczhtI38Ta88pW6kwuEReJX9iXU1DIUUfEZ4Crj0dE8IbRLDbMxwgigH0oyZjd2Q
-0slSoEXsAiVavz++Atd53CRqatjNDwgG5mhQMMXO/Tc1UOGbpYUQd48i9HKK97p7
-31xK76RRtyzFHLAvNe10Rx81MJKyv4EOr9P/h6A+uPTOCYZ9WVm+v5yRGCLgzncl
-jdmuE7A/ggQyhgqkzioFtL+Hzxi1VOfMbivLKuG+pimfQr5aZiFow2TzNykN2tN+
-02qXXWamRPqL61JqsAnGXRkxRp/lFN1llRB0Dn3/yXDrmfTLwwxki+CBzXR/1qoa
-GJQ33LaEsu30+JkaC3jcfZkdp0tXFOGah+Yxx4wtOw3rlkQbGeEk1OBu4aK5Qydc
-V6wxEDw/qYK24EfVBbmKIflmqBOPzAvtu7ccc1Q3Za9DlBtI7eMT+362J84gNF9G
-qAsjRLed72fD2GUdpk4wDRM0fmRZXdSqcXyKN4X7n/ST9iAGpfS3RYeY2CWEAY1N
-caP0dthKl1LiFCllP3wnc7SGlfuKXLtLJa+tpveTIJtyoo43HZ36+yE6R6o4BKKS
-omHl51iUIVmXg8Z5gAeb1CrxeJfK3RPtDhqREdoR0idgpkXF3nD3S6laEyrc/gwZ
-qNtI4Cuk3sG38EFxktlQ
-=1IMY
+iQEcBAEBCAAGBQJSQXziAAoJECo/aRed92679SwH/RTHGgwpTWQv6V6KVrxRBF9y
+RbMX49lPDEAAtJfFQvGt5RuKV3LP99K7wrYF8qYLFBv6+ceieCMB7PKqD37A0lLl
+I9oeZpkQeEnzrpj1sDH74UHYcxoT6X4C4AZH3HjEnEA+IQWCXbyCK+ibVSJdmjNJ
+8p9nzfd3QI28EUzABaYXf2ugqAPt4BCq0i6Rp8fPMzxibD1xokVeRLDNuN1P5Zqa
+Vr/UfcEHAztIZKa1txbuR5bCW8TmsUWF4KPOoUl3lX1nTMrY8ImIhfPJxjuQzl3l
+b/QsTYpljbxLHHbX6Buzqmc/vG6HBknAtQx7cv49D28sC7mWYW6klitIJhb9okw=
+=IJWn
 -----END PGP SIGNATURE-----
diff --git a/net-misc/quagga/quagga-0.99.22.4.ebuild b/net-misc/quagga/quagga-0.99.22.4.ebuild
new file mode 100644
index 000000000000..d4e3b6f1825d
--- /dev/null
+++ b/net-misc/quagga/quagga-0.99.22.4.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.99.22.4.ebuild,v 1.1 2013/09/24 11:52:52 pinkbyte Exp $
+
+EAPI="5"
+
+CLASSLESS_BGP_PATCH=ht-20040304-classless-bgp.patch
+
+AUTOTOOLS_AUTORECONF=1
+inherit autotools-utils eutils flag-o-matic multilib pam readme.gentoo user
+
+DESCRIPTION="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP"
+HOMEPAGE="http://quagga.net/"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz
+	bgpclassless? ( http://hasso.linux.ee/stuff/patches/quagga/${CLASSLESS_BGP_PATCH} )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~s390 ~sparc ~x86"
+IUSE="bgpclassless caps doc elibc_glibc ipv6 multipath ospfapi pam +readline snmp tcp-zebra"
+
+COMMON_DEPEND="
+	caps? ( sys-libs/libcap )
+	snmp? ( net-analyzer/net-snmp )
+	readline? (
+		sys-libs/readline
+		pam? ( sys-libs/pam )
+	)
+	!elibc_glibc? ( dev-libs/libpcre )"
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=sys-devel/libtool-2.2.4"
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/openrc
+	sys-apps/iproute2"
+
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS="Sample configuration files can be found in /usr/share/doc/${PF}/samples
+You have to create config files in /etc/quagga before
+starting one of the daemons.
+
+You can pass additional options to the daemon by setting the EXTRA_OPTS
+variable in their respective file in /etc/conf.d
+
+Starting from version 0.99.18, quagga no longer supports the realms patch.
+The patch was abandoned upstream and once again didn't apply; it needs a
+dedicated maintainer, if it is still necessary."
+
+pkg_setup() {
+	enewgroup quagga
+	enewuser quagga -1 -1 /var/empty quagga
+}
+
+src_prepare() {
+	# Classless prefixes for BGP
+	# http://hasso.linux.ee/doku.php/english:network:quagga
+	use bgpclassless && epatch "${DISTDIR}/${CLASSLESS_BGP_PATCH}"
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	# do not build PDF docs
+	export ac_cv_prog_PDFLATEX=no
+	export ac_cv_prog_LATEXMK=no
+
+	local myeconfargs=(
+		--enable-user=quagga
+		--enable-group=quagga
+		--enable-vty-group=quagga
+		--with-cflags="${CFLAGS}"
+		--sysconfdir=/etc/quagga
+		--enable-exampledir=/usr/share/doc/${PF}/samples
+		--localstatedir=/run/quagga
+		--disable-static
+		--disable-pie
+		$(use_enable caps capabilities)
+		$(usex snmp '--enable-snmp' '' '' '')
+		$(use_enable !elibc_glibc pcreposix)
+		$(use_enable tcp-zebra)
+		$(use_enable doc)
+		$(usex multipath $(use_enable multipath) '' '=0' '')
+		$(usex ospfapi '--enable-opaque-lsa --enable-ospf-te --enable-ospfclient' '' '' '')
+		$(use_enable readline vtysh)
+		$(use_with pam libpam)
+		$(use_enable ipv6)
+		$(use_enable ipv6 babeld) # babeld does not build properly with USE="-ipv6", bug #446289
+		$(use_enable ipv6 ripngd)
+		$(use_enable ipv6 ospf6d)
+		$(use_enable ipv6 rtadv)
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+	readme.gentoo_create_doc
+
+	keepdir /etc/quagga
+	fowners root:quagga /etc/quagga
+	fperms 0770 /etc/quagga
+
+	# install zebra as a file, symlink the rest
+	newinitd "${FILESDIR}"/quagga-services.init.3 zebra
+
+	for service in ripd ospfd bgpd $(use ipv6 && echo babeld ripngd ospf6d); do
+		dosym zebra /etc/init.d/${service}
+	done
+
+	use readline && newpamd "${FILESDIR}/quagga.pam" quagga
+
+	insinto /etc/logrotate.d
+	newins redhat/quagga.logrotate quagga
+}