Use current kernel version on boxes without kernel sources (#175470). Remove old revision.

Package-Manager: portage-2.1.2.2

5 files changed, 33 insertions, 164 deletions

diff --git a/net-misc/quagga/ChangeLog b/net-misc/quagga/ChangeLog
index 303c37c931e2..8160d833acc6 100644
--- a/net-misc/quagga/ChangeLog
+++ b/net-misc/quagga/ChangeLog
@@ -2,7 +2,12 @@
 # Copyright 1999-2007 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.56 2007/04/30 08:54:53 yoswink Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/ChangeLog,v 1.57 2007/05/01 20:39:57 mrness Exp $
+
+  01 May 2007; Alin Năstac <mrness@gentoo.org> -quagga-0.98.6-r1.ebuild,
+  quagga-0.99.6-r2.ebuild:
+  Use current kernel version on boxes without kernel sources (#175470). Remove
+  old revision.
 
   30 Apr 2007; Jose Luis Rivero <yoswink@gentoo.org>
   quagga-0.98.6-r2.ebuild:
diff --git a/net-misc/quagga/Manifest b/net-misc/quagga/Manifest
index efe3bbd93842..f358fc9a8038 100644
--- a/net-misc/quagga/Manifest
+++ b/net-misc/quagga/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX bgpd.init 900 RMD160 1047341d9f582a946f5460d2a60450fe0fef4463 SHA1 4e7323c366c2bfe5287e132bf8e1e7f7e79b8e43 SHA256 0625c171ec51e58175dbb59892964b5958179374947755678b2c344d98222bac
 MD5 cc109a746273bc0d6aee9d758e7524ab files/bgpd.init 900
 RMD160 1047341d9f582a946f5460d2a60450fe0fef4463 files/bgpd.init 900
@@ -34,16 +37,11 @@ AUX zebra.init 1013 RMD160 1cb01c0b95fd8a49d442b2a0c1d900e1cee7d477 SHA1 462d7e2
 MD5 6d51e9fca8d206a6d9d1d9fde793b48f files/zebra.init 1013
 RMD160 1cb01c0b95fd8a49d442b2a0c1d900e1cee7d477 files/zebra.init 1013
 SHA256 7eac27ca9661fb453a93b131bfbf69e409a06f65c2cedb83cdd55869d6871236 files/zebra.init 1013
-DIST quagga-0.98.6-patches-20060511.tar.gz 19251 RMD160 0c46dc9aac99a74871bf12523e4ed5de17baba01 SHA1 a44a3c7323102e483401db95723f529097256672 SHA256 bb94ec2897fac3c15454c6f25e6346be087db04ba4718cb629b7b41b63da1173
 DIST quagga-0.98.6-patches-20070412.tar.gz 21339 RMD160 25263a2f4393f6610076f4292003e7bf83ef1b3a SHA1 26ecd5ac98a2f6db7e0edc199c186a79ebf9c166 SHA256 d5f713f1720b59910731236b2b5babe8d2a7bc1074114c16e00e41d504a4c01e
 DIST quagga-0.98.6.tar.gz 2019992 RMD160 e15cd93b5d321660d7e29fc27174352967342879 SHA1 2234d1235f504e9dc5865cc8d5fd4e250bf43ed5 SHA256 a84e1aac4e666929abd1942fa8958d9ef0d0bbf605f47d5c2a09f6be716987a1
 DIST quagga-0.99.6-patches-20070412.tar.gz 18681 RMD160 98522ee7c8ac9233458c855781c9a29c81706f44 SHA1 5e668a5cecacb2fc046cf9996ff91f114490a2df SHA256 3f6886a00cb2591f909c4f180a9e258ada78721b5267ef9dc61484c58b62cde7
 DIST quagga-0.99.6-patches-20070426.tar.gz 19851 RMD160 3e6f6b53f1f9a7e00b730d53db56b905a6c37547 SHA1 b4b793f845900adb5756169da009e408df5f024c SHA256 cdda824cd42f6dfd3a1949968537bead818c065608c9e85e66868e54a7697d27
 DIST quagga-0.99.6.tar.gz 2324051 RMD160 0dbeedc6d64ea7266677e88f951adc2f63d02935 SHA1 eb35c4bf2a8da4fdf66f2a7eb7724852b0f7e017 SHA256 a22c927f9ceb7152b0c45c939ccb81217c8d614f3c411c86781b24520f2ec15a
-EBUILD quagga-0.98.6-r1.ebuild 5089 RMD160 5651737641dbb5646a6c020e6a99acac1edd70af SHA1 e9507728c1b9c36aa76f0cc154c092b678b748fc SHA256 2982a9d62c04d4b229557198bd3e5aae6e3b070dcd5cc42e941626595a065300
-MD5 6255b83707ebb2d6d0a4bd77dbec5d71 quagga-0.98.6-r1.ebuild 5089
-RMD160 5651737641dbb5646a6c020e6a99acac1edd70af quagga-0.98.6-r1.ebuild 5089
-SHA256 2982a9d62c04d4b229557198bd3e5aae6e3b070dcd5cc42e941626595a065300 quagga-0.98.6-r1.ebuild 5089
 EBUILD quagga-0.98.6-r2.ebuild 5166 RMD160 90f717124c2e90dcd53765941921690ba4823ccf SHA1 7d76ccbf2b1b8647b1675c2c70c19f21902f9706 SHA256 15e8e32751d9f29e9eba3f9a4861044d67e128cca2c4eae105644eb5b631ada0
 MD5 57f1e61d0c90203d6b05b296652d53df quagga-0.98.6-r2.ebuild 5166
 RMD160 90f717124c2e90dcd53765941921690ba4823ccf quagga-0.98.6-r2.ebuild 5166
@@ -52,21 +50,18 @@ EBUILD quagga-0.99.6-r1.ebuild 4022 RMD160 71ca08b3ad6d7a5169e6cc6963c41ef8b270a
 MD5 3e2e923706b94a4d130053b884bbcec9 quagga-0.99.6-r1.ebuild 4022
 RMD160 71ca08b3ad6d7a5169e6cc6963c41ef8b270a0ee quagga-0.99.6-r1.ebuild 4022
 SHA256 ab6c9d481e18765a5a0a06edf311f9e26b566bee9216ce35edd7075cf3ab2ddd quagga-0.99.6-r1.ebuild 4022
-EBUILD quagga-0.99.6-r2.ebuild 4530 RMD160 474e0d12e1c4a3bb6411ec604b4be4eabb64b68e SHA1 2d516de37e168ec831f095b7a3124794c09f9944 SHA256 b9d5cbd26633e5fe96051cef5ecbc85af48ddaf249035df4dacd3b25e35a9a01
-MD5 56e15aa169b0f58ec0349c362426d969 quagga-0.99.6-r2.ebuild 4530
-RMD160 474e0d12e1c4a3bb6411ec604b4be4eabb64b68e quagga-0.99.6-r2.ebuild 4530
-SHA256 b9d5cbd26633e5fe96051cef5ecbc85af48ddaf249035df4dacd3b25e35a9a01 quagga-0.99.6-r2.ebuild 4530
-MISC ChangeLog 14621 RMD160 ec4e733bc8c9e89a0b56f179aeabad8efca13a00 SHA1 7d19067438b9713724be4b3072df190100887512 SHA256 0678fe5646f31141cbf8f219752de47549c48ac543cfc15664b2b1071c800c61
-MD5 cc3956b059e7a047278a0375b4b5c607 ChangeLog 14621
-RMD160 ec4e733bc8c9e89a0b56f179aeabad8efca13a00 ChangeLog 14621
-SHA256 0678fe5646f31141cbf8f219752de47549c48ac543cfc15664b2b1071c800c61 ChangeLog 14621
+EBUILD quagga-0.99.6-r2.ebuild 4625 RMD160 4e3527288c33d768bfd2a2c341c1754c56ceda63 SHA1 749ec53e93eae777d9063776c72339d1b6742f09 SHA256 3af2042f50804990290b17c7a3491430cf7a94d5fab5e8fdc3c11399fdc17a14
+MD5 444aac03243b50d5bb4428eb13f9c49a quagga-0.99.6-r2.ebuild 4625
+RMD160 4e3527288c33d768bfd2a2c341c1754c56ceda63 quagga-0.99.6-r2.ebuild 4625
+SHA256 3af2042f50804990290b17c7a3491430cf7a94d5fab5e8fdc3c11399fdc17a14 quagga-0.99.6-r2.ebuild 4625
+MISC ChangeLog 14817 RMD160 8f08632bc711be50dd6c03880a314488b2eaeb74 SHA1 804e3ef26aaab5bc6d59c2152149f9641504fe09 SHA256 7f000bd7f4f845bc930a0d970b7753ac11c8006fe4109c2b184adc10a03d5d60
+MD5 fb35d01751a730a9d1aff2f2c5791831 ChangeLog 14817
+RMD160 8f08632bc711be50dd6c03880a314488b2eaeb74 ChangeLog 14817
+SHA256 7f000bd7f4f845bc930a0d970b7753ac11c8006fe4109c2b184adc10a03d5d60 ChangeLog 14817
 MISC metadata.xml 1301 RMD160 2f07ee712c18a121b153385c20a69ceee57395aa SHA1 0d1a07e1b3821ec910b98531511f51f733915a8d SHA256 b6b92c898b68e0c1a270fbd47b91321e9a0db76068990fcbbd93ad83246b4cbb
 MD5 558920a085e2065a8aef6eca3e1896fb metadata.xml 1301
 RMD160 2f07ee712c18a121b153385c20a69ceee57395aa metadata.xml 1301
 SHA256 b6b92c898b68e0c1a270fbd47b91321e9a0db76068990fcbbd93ad83246b4cbb metadata.xml 1301
-MD5 fd0be646cb5258a11bb1a1ab1c29435d files/digest-quagga-0.98.6-r1 533
-RMD160 5639c4a7c18287a5f808a420bb58f29e210d5910 files/digest-quagga-0.98.6-r1 533
-SHA256 16c8576b8842fd33e5545deed73e9d2c4a0a3530e8e9556b567695551a714716 files/digest-quagga-0.98.6-r1 533
 MD5 c6da0bf18d4cfb3ae7bbb66f5419a3dd files/digest-quagga-0.98.6-r2 533
 RMD160 3cb563e1955d78866bc24c3e55550cc2c6ee3037 files/digest-quagga-0.98.6-r2 533
 SHA256 7b0ebb8fdc2a981af64fa6572f643290fd954224084fea2e0ed11d7051abfe19 files/digest-quagga-0.98.6-r2 533
@@ -76,3 +71,10 @@ SHA256 84863559e220e18d5c999681c2549385cf9f95aa95ee31c59e77d727fcca9bf4 files/di
 MD5 3f67e24f678e58c60eaac85138a9936a files/digest-quagga-0.99.6-r2 533
 RMD160 018dae9bfad3792e97c4bd70ad71b63fbf25db28 files/digest-quagga-0.99.6-r2 533
 SHA256 815e6c17c24b96c1c7f518e0aeee9f424ed74e88008391f1a7037ced775016e2 files/digest-quagga-0.99.6-r2 533
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGN6WoJnxX6mF440QRAj7MAJ97sonicMgu1t5BekaNLzwXTb6KlQCg1Te6
+rq3aTmr/b4NTwEuQ6f0MjUY=
+=y6Dc
+-----END PGP SIGNATURE-----
diff --git a/net-misc/quagga/files/digest-quagga-0.98.6-r1 b/net-misc/quagga/files/digest-quagga-0.98.6-r1
deleted file mode 100644
index c64f578051da..000000000000
--- a/net-misc/quagga/files/digest-quagga-0.98.6-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 569f21f1fe2ca037b78977cf0c589593 quagga-0.98.6-patches-20060511.tar.gz 19251
-RMD160 0c46dc9aac99a74871bf12523e4ed5de17baba01 quagga-0.98.6-patches-20060511.tar.gz 19251
-SHA256 bb94ec2897fac3c15454c6f25e6346be087db04ba4718cb629b7b41b63da1173 quagga-0.98.6-patches-20060511.tar.gz 19251
-MD5 b0d4132039953a0214256873b7d23d68 quagga-0.98.6.tar.gz 2019992
-RMD160 e15cd93b5d321660d7e29fc27174352967342879 quagga-0.98.6.tar.gz 2019992
-SHA256 a84e1aac4e666929abd1942fa8958d9ef0d0bbf605f47d5c2a09f6be716987a1 quagga-0.98.6.tar.gz 2019992
diff --git a/net-misc/quagga/quagga-0.98.6-r1.ebuild b/net-misc/quagga/quagga-0.98.6-r1.ebuild
deleted file mode 100644
index 75b3ba76b963..000000000000
--- a/net-misc/quagga/quagga-0.98.6-r1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.98.6-r1.ebuild,v 1.9 2006/11/29 20:10:44 mrness Exp $
-
-WANT_AUTOMAKE="latest"
-WANT_AUTOCONF="latest"
-
-inherit eutils multilib autotools
-
-DESCRIPTION="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP. Includes OSPFAPI, NET-SNMP and IPV6 support."
-HOMEPAGE="http://quagga.net/"
-SRC_URI="http://www.quagga.net/download/${P}.tar.gz
-	mirror://gentoo/${P}-patches-20060511.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm hppa ppc ~s390 sparc x86"
-IUSE="ipv6 snmp pam tcpmd5 bgpclassless ospfapi realms fix-connected-rt multipath tcp-zebra"
-RESTRICT="userpriv"
-
-DEPEND=">=sys-libs/libcap-1.10-r5
-	snmp? ( net-analyzer/net-snmp )
-	pam? ( sys-libs/pam )"
-RDEPEND="${DEPEND}
-	sys-apps/iproute2"
-
-src_unpack() {
-	unpack ${A} || die "failed to unpack sources"
-
-	cd "${S}" || die "source dir not found"
-	#Patch to fix RIP authentication problem in 0.98.6 (#132353)
-	#DO NOT USE IT IN ANY OTHER VERSIONS! 
-	epatch "${WORKDIR}/patch/ripd-show-ifaces.diff"
-
-	# TCP MD5 for BGP patch for Linux (RFC 2385) - http://hasso.linux.ee/doku.php/english:network:rfc2385
-	use tcpmd5 && epatch "${WORKDIR}/patch/ht-20050321-0.98.2-bgp-md5.patch"
-
-	# Classless prefixes for BGP - http://hasso.linux.ee/doku.php/english:network:quagga
-	use bgpclassless && epatch "${WORKDIR}/patch/ht-20040304-classless-bgp.patch"
-
-	# Connected route fix (Amir Guindehi) - http://voidptr.sboost.org/quagga/amir-connected-route.patch.bz2
-	# Dependant on the use flag 'fix-connected-rt' because it seems that more peoples have troubles 
-	# with this than having a benefit.
-	# This patch fixes a bad behavior of the Linux kernel routing packets to interfaces which are
-	# down. Folks with PtP interfaces and VLans report troubles with this patch. Enable it again
-	# if you get a problem because your kernel routes packets to a downed interface.
-	use fix-connected-rt && epatch "${WORKDIR}/patch/amir-connected-route.patch"
-
-	# Realms support (Calin Velea) - http://vcalinus.gemenii.ro/quaggarealms.html
-	use realms && epatch "${WORKDIR}/patch/${P}-realms.diff"
-
-	# regenerate configure and co if we touch .ac or .am files
-	eautoreconf
-}
-
-src_compile() {
-	local myconf="--disable-static --enable-dynamic"
-
-	use ipv6 \
-			&& myconf="${myconf} --enable-ipv6 --enable-ripng --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 snmp && myconf="${myconf} --enable-snmp"
-	use pam && myconf="${myconf} --with-libpam"
-	use tcpmd5 && myconf="${myconf} --enable-tcp-md5"
-	use realms && myconf="${myconf} --enable-realms"
-	use multipath && myconf="${myconf} --enable-multipath=0"
-	use tcp-zebra && myconf="${myconf} --enable-tcp-zebra"
-
-	econf \
-		--enable-nssa \
-		--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"
-	emake || die "make 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"
-
-	keepdir /var/run/quagga || die
-
-	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
-	fi
-
-	newenvd "${FILESDIR}/quagga.env" 99quagga
-}
-
-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."
-
-	if use tcpmd5; then
-		echo
-		ewarn "TCP MD5 for BGP needs a patched kernel!"
-		einfo "See http://hasso.linux.ee/doku.php/english:network:rfc2385 for more info."
-	fi
-
-	if use ipv6; then
-		echo
-		ewarn "This version of quagga contains a netlink race condition fix that triggered a kernel bug"
-		ewarn "which affects IPv6 users who have a kernel version < 2.6.13-rc6."
-		einfo "See following links for more info:"
-		einfo "   http://lists.quagga.net/pipermail/quagga-dev/2005-June/003507.html"
-		einfo "   http://bugzilla.quagga.net/show_bug.cgi?id=196"
-	fi
-}
diff --git a/net-misc/quagga/quagga-0.99.6-r2.ebuild b/net-misc/quagga/quagga-0.99.6-r2.ebuild
index 9e0b56e83e84..182f35431979 100644
--- a/net-misc/quagga/quagga-0.99.6-r2.ebuild
+++ b/net-misc/quagga/quagga-0.99.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.99.6-r2.ebuild,v 1.1 2007/04/25 22:24:06 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.99.6-r2.ebuild,v 1.2 2007/05/01 20:39:57 mrness Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
@@ -24,6 +24,14 @@ DEPEND=">=sys-libs/libcap-1.10-r5
 RDEPEND="${DEPEND}
 	sys-apps/iproute2"
 
+pkg_setup() {
+	if use tcpmd5 ; then
+		get_version || \
+			KV_FULL=$(uname -r)
+	fi
+	return 0
+}
+
 src_unpack() {
 	unpack ${A} || die "failed to unpack sources"