Version bump

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64

4 files changed, 140 insertions, 21 deletions

diff --git a/net-misc/quagga/ChangeLog b/net-misc/quagga/ChangeLog
index 3be6c08bf93a..4c59118bd296 100644
--- a/net-misc/quagga/ChangeLog
+++ b/net-misc/quagga/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/quagga
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/ChangeLog,v 1.134 2012/11/11 20:05:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/ChangeLog,v 1.135 2012/12/05 08:04:45 pinkbyte Exp $
+
+*quagga-0.99.21 (05 Dec 2012)
+
+  05 Dec 2012; Sergey Popov <pinkbyte@gentoo.org> +quagga-0.99.21.ebuild,
+  metadata.xml:
+  Version bump. Most important changes are:
+  - Migrate to autotools-utils eclass, get rid of myconf variable
+  - Add support for logrotate
 
   11 Nov 2012; Diego E. Pettenò <flameeyes@gentoo.org> metadata.xml:
   Drop maintainership.
diff --git a/net-misc/quagga/Manifest b/net-misc/quagga/Manifest
index 989f59421080..9c9a1a1312fb 100644
--- a/net-misc/quagga/Manifest
+++ b/net-misc/quagga/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX quagga-services.init.2 1384 SHA256 51f604e45d82831fe2d34ec9a15ab65c6aaa21c7a3bc6856c97372cabbc06108 SHA512 e4d92a694f13ddeea9980b37de9322a19ca21f458fd4be621860c2d5835a78cb853a48bec91a858a48e8fead0dde7f993e2b7a4e119823bf74fa3e170102574e WHIRLPOOL 5ed2f7f801e1b0c859da04b2637c66eb6de94aa1e7ec553fd166e98d242d0081a5327a7a2cc79a715a93393cce71f0cfde15642e252ca8629ffdc23c5c9fc565
 AUX quagga-services.init.3 1198 SHA256 760c70c9df995fb270ffd50e80fc4a4ba42c7fa6326855de53a6fff43cf4f82d SHA512 24756a01338332245ee590fd2583d452ceaa6e68acdff1703fd032cec37db6cd477f1a4c82c62c8941ba8fc1eaedd4ae956015b98b138ec5c2beeac26b197632 WHIRLPOOL 996fd08cdc17e27ac6f476d01f599825deafc26d76222a109f2e57ef656b2a2c11e1cac6f3fa9ddae43e9a39d3141d94245234addacc4c44f616f37db665642f
 AUX quagga.pam 975 SHA256 aa68ac97d7a951324bc3c4124a1c70f6fa88a45da860f636ac01cbcbfa36db70 SHA512 92dc6c68146d46046c6f5ff410629a2a7170e81e9657b7a2aebe1d94c8fa267acdcac9d8d8596fb54dbbacc0566502e82d900ea33f8824c07fba497b7e0f1efe WHIRLPOOL defc345fe4ccbff1cf3b68bee46f589467d68b11f7511d1333f9cdf4dbef8c55c32e4b0d9eb2f2aa57df7bdb47baa75bada593f97059494534192d34c808733b
@@ -9,18 +6,9 @@ DIST ht-20040304-classless-bgp.patch 1581 SHA256 39993890f9e31d662ed0564c732fb22
 DIST quagga-0.99.20-backports-1.tar.bz2 1882 SHA256 2cca223deb57a56f5c58c49d8cdb50d1eef54537d476b0fb38369dbc5a505807 SHA512 ea73a3d4a1707b764351e520d3f7eba7a165f9b7d6691be3960197bb3505969028a7b39d00397581c7b4d89a926b86287c47fdce3dd7de8e675249708dd348cf WHIRLPOOL 2cf8da917e77403ca7f13747e0969fef2aa00220ccc012a5a79a4846362d1cf6054085bbd79c443a0f980a510f314988defafd197f5a2ea32324f98e020351d9
 DIST quagga-0.99.20-backports-2.tar.xz 1968 SHA256 6c2ab6f39bf6a006539603bbeca59c095e1f66ec96199f175bb12cc7d8ef532a SHA512 3609658186744deaccb3fb9c39e7260986da8f76f769a830a6dc392ad6a0b00909500b5b83ca031d9120c9af5ae19d0d733ce08f6131822fd54ebc8d83622efd WHIRLPOOL a961d3b9d96891422d60a746f9a12825100f91763e5c008e09446f826b676366fcca34feb810a2268f90df01c5b9520e44245d637cb79d68a59f6f74222ed456
 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
 EBUILD quagga-0.99.20-r1.ebuild 3412 SHA256 604732d0e9bb1d7df0b913d21b91c4f41dfcd5db08ecc3cfcdfcbf081d060d89 SHA512 a7c0acd617fb951f2426f11413547b20157f39d90836bb9d1cbe2bedbca97177200fa2ae5cfbb74ce75190e2519e9864fd0f14e09b77162e78e519257a450fab WHIRLPOOL 72059d46f6ab83865ed32dece71c9d44997de4e7b5c30e9823eaf5359f593ea9583e2cfa9d81478df8c9186b0cda03c09f3956dc2d121e0ab14b9e7547f0f78b
 EBUILD quagga-0.99.20.ebuild 3434 SHA256 a682d5a3c8fbd632213d761bd41c7687491df42815804cad9de8e7c6d92d96ec SHA512 a5a5c89d9d65c059749b8eb3593b9b27ee4acbce2bbfa35623f369cf1179197ddda324b3d353b0d161ca4cbf070016c76d629b406aea649e92f74cd32b92112d WHIRLPOOL 664aa6af81c8b6271b288069df26d210d277fa5bcde47709ef41508479718fab591440bcc22cccb8abc9b77f858e69f96fc16eb2721bfcade7d3aeb6ca16527b
-MISC ChangeLog 22386 SHA256 5ddb7b9a30e06e1888adb693ee4227fa3f6242ca0386b04781deb0c0649b3244 SHA512 fbd1bb08599b1d2117bb93f04e008911eae592cdaaf7d1dc4882c31d87f7750a5bf3df1233a8f9491c5d9da0d5e5b88d7f5fb1f32b0a177a55d534b6bdf95e7d WHIRLPOOL 3ae096a685333a0c085bcab1138f0e0b7bad7e6861815106658a02d963359e15034e805295148ec01a51e734fc6cf3dc365b71c481c0329a1ab3face51917534
-MISC metadata.xml 2192 SHA256 9e0518856e6da63a69445e90fdb66505833bc69d26bdbd8f614aeb6a6aa5e4c9 SHA512 fa7616e49788417981e2ab7451059fe660a0b01c7a0d7cd51b7fe41ad5589a2083fe98158fb990050e0337a4b46fa0b469db14ebecb94813b1f078735a8bad6a WHIRLPOOL 5caf93b639541e594641290b8f2580b8b1336ba24efcbf374e74a6332a032a8984bc64658d6f8501e63cd01dd36e242f8b1f9479e033af96deac92df6e55ff39
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBCAAGBQJQoAa6AAoJEBzRPIrUMBNC6sgH/jKAYNc/bwhOZ3V+rQ35Z75H
-kqgZs++D6i+Fvq3Si2GhMTg8TzJSjj1S4bejblvVjQUtzBFgejFW/9/heYoRsNnV
-h3fSgmVjJw+TWsf7j3ssvAMEfLkvcfbLx8yex7tMoqKWQGAfEVXp62LSTq8mmAQb
-R47JFXCK5qfntlWdx4YcvH6pY/SyNPbGUuzUa+gJd4YSrpeba3Fg3gcWYBYprWoc
-P5QcrKuOx5ZWFNI2ZgeCNApsF1DvQTC5Juu+judJ1LfuCqz2QmpCMAEKMVHU8TUf
-s6VxieHtqS7UncMaV7HIaVc7x6pGiZ+lbL7ryzvk54I5fGm3k7w7dPebz30nA+o=
-=tl9q
------END PGP SIGNATURE-----
+EBUILD quagga-0.99.21.ebuild 3507 SHA256 dae01f798fb60c3f8ab4cf032a5732b4e076f49fcda6ca1a01d70bf00ed46742 SHA512 3096c63b4844a813be8dff3c5a5d3dd71d75648ec763f3774740a0319c128fd5a1ac7d9cc8b0975af59e5828af6c7013d603e34aea71b8da5f3bdad5f5e22fc7 WHIRLPOOL eb9c2169ce665f3d9a6b8694c00d8f4b390b324573472a7b04c20a587030ca27f7486af91d235a1dbc2a159f9ac78adcd21e7fb19ebe87b72bcff313e4b2085a
+MISC ChangeLog 22647 SHA256 f2925086147b01ba028999cd9c98f46c7567a879e8f51014a0e01ea0a69439d0 SHA512 429e73d805e842f42e5e9f9fa9f2991b9630014230ee9cddf9eff973618b8d9ad1530214e0060619f9a63c2186a3ab542515e84f2c914275050b4868fc5ba286 WHIRLPOOL e1c918bca207190ed5c621d45e9a4bdc2a41135a4c932dfd09ef28afb118740db613a6866e772e418141da71aa3bd375b4f49e87a2b2bedfc2772ee682b5d5c7
+MISC metadata.xml 2287 SHA256 73cb0ec40d1ea376bbf51462c928d5a9f473f9a6c3e4e01389e32130fd0016f2 SHA512 1b8b4c2a4a6563160122701653bcb575f1107ba8c9620e9072f27a46ba2dc06f8b6fc38fdc5c287d3439b01fd1e828e81ea97a97d5507e86fb3525ab7b203bf9 WHIRLPOOL d1f2e25790f16013953bc65d780be89afcf0757088b5796352a4f469c77d521a7c5482226ac07c82b4c72895edb7cde17a2af48d2585a23049333f1e9f66a2b7
diff --git a/net-misc/quagga/metadata.xml b/net-misc/quagga/metadata.xml
index 277e34a6ff8e..2dc9e1008863 100644
--- a/net-misc/quagga/metadata.xml
+++ b/net-misc/quagga/metadata.xml
@@ -14,13 +14,16 @@
     inspection as well as injection of normal and opaque OSPF LSAs. Applications like SRRD - The
     Service Rounting Redundancy Daemon - can make use of OSPFAPI to inject opaque data into the OSPF
     routing domain. SRRD, for example, implements a cluster server by using the OSPFAPI to flood
-    service state information into the routing domain.
+    service state information into the routing domain
   </longdescription>
   <use>
     <flag name="bgpclassless">
       Apply unofficial patch to enable classless prefixes for BGP. Patch and information to be found
       at http://hasso.linux.ee/doku.php/english:network:quagga
     </flag>
+    <flag name="logrotate">
+      Use <pkg>app-admin/logrotate</pkg> for rotating logs
+    </flag>
     <flag name="multipath">
       Enable multipath routes support for any number of routes
     </flag>
@@ -29,15 +32,15 @@
     </flag>
     <flag name="tcp-zebra">
       Enable TCP zserv interface on port 2600 for Zebra/protocol-daemon communication. Unix domain
-      sockets are chosen otherwise.
+      sockets are chosen otherwise
     </flag>
     <flag name="readline">
       Enable support for <pkg>sys-libs/readline</pkg> to provide the Quagga Virtual Terminal
-      Interface Shell (vtysh).
+      Interface Shell (vtysh)
     </flag>
     <flag name="pam">
       Add support for PAM (via <pkg>sys-libs/pam</pkg>) to the Quagga Virtual Terminal Interface
-      Shell (vtysh); if the readline USE flag is disabled, this flag is ignored.
+      Shell (vtysh); if the readline USE flag is disabled, this flag is ignored
     </flag>
   </use>
 </pkgmetadata>
diff --git a/net-misc/quagga/quagga-0.99.21.ebuild b/net-misc/quagga/quagga-0.99.21.ebuild
new file mode 100644
index 000000000000..590dcf61e92d
--- /dev/null
+++ b/net-misc/quagga/quagga-0.99.21.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.99.21.ebuild,v 1.1 2012/12/05 08:04:46 pinkbyte Exp $
+
+EAPI="4"
+
+CLASSLESS_BGP_PATCH=ht-20040304-classless-bgp.patch
+#BACKPORTS=2
+
+AUTOTOOLS_AUTORECONF=1
+inherit eutils autotools-utils multilib flag-o-matic pam 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
+	${BACKPORTS:+
+		http://dev.gentoo.org/~flameeyes/${PN}/${P}-backports-${BACKPORTS}.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 logrotate multipath ospfapi pam +readline snmp tcp-zebra"
+
+COMMON_DEPEND="
+	caps? ( sys-libs/libcap )
+	snmp? ( net-analyzer/net-snmp )
+	logrotate? ( app-admin/logrotate )
+	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"
+
+pkg_setup() {
+	enewgroup quagga
+	enewuser quagga -1 -1 /var/empty quagga
+}
+
+src_prepare() {
+	[[ -n ${BACKPORTS} ]] && \
+		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
+			epatch
+
+	# 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
+	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=/var/run/quagga
+		--disable-static
+		--disable-pie
+		$(use_enable caps capabilities)
+		$(use_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 ripngd)
+		$(use_enable ipv6 ospf6d)
+		$(use_enable ipv6 rtadv)
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	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 ripngd ospf6d); do
+		dosym zebra /etc/init.d/${service}
+	done
+
+	use readline && newpamd "${FILESDIR}/quagga.pam" quagga
+
+	if use logrotate; then
+		insinto /etc/logrotate.d
+		newins redhat/quagga.logrotate quagga
+	fi
+}
+
+pkg_postinst() {
+	elog "Sample configuration files can be found in /usr/share/doc/${PF}/samples"
+	elog "You have to create config files in /etc/quagga before"
+	elog "starting one of the daemons."
+	elog ""
+	elog "You can pass additional options to the daemon by setting the EXTRA_OPTS"
+	elog "variable in their respective file in /etc/conf.d"
+	elog ""
+	elog "Starting from version 0.99.18, quagga no longer supports the realms patch."
+	elog "The patch was abandoned upstream and once again didn't apply; it needs a"
+	elog "dedicated maintainer, if it is still necessary."
+}