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

(Portage version: 2.1.2.2)

4 files changed, 15 insertions, 148 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/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"