Remove obsolete version. Version bump to the latest testing version, without keeping fix-connected-rt USE flag (#128670).

(Portage version: 2203-svn)

5 files changed, 34 insertions, 60 deletions

diff --git a/net-misc/quagga/ChangeLog b/net-misc/quagga/ChangeLog
index 7d0c593ff2c7..284db7527952 100644
--- a/net-misc/quagga/ChangeLog
+++ b/net-misc/quagga/ChangeLog
@@ -2,7 +2,14 @@
 # Copyright 1999-2006 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.39 2006/05/17 08:09:53 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/ChangeLog,v 1.40 2006/05/23 21:23:52 mrness Exp $
+
+*quagga-0.99.4 (23 May 2006)
+
+  23 May 2006; Alin Nastac <mrness@gentoo.org> -quagga-0.98.5-r3.ebuild,
+  +quagga-0.99.4.ebuild:
+  Remove obsolete version. Version bump to the latest testing version, without
+  keeping fix-connected-rt USE flag (#128670).
 
   17 May 2006; Alin Nastac <mrness@gentoo.org> -quagga-0.98.4.ebuild,
   quagga-0.98.6-r1.ebuild:
diff --git a/net-misc/quagga/Manifest b/net-misc/quagga/Manifest
index bf30b17a2674..87ac1d7ddf76 100644
--- a/net-misc/quagga/Manifest
+++ b/net-misc/quagga/Manifest
@@ -1,10 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 ed5cf8c7556d45b9dd610a416763320d ChangeLog 12101
 MD5 cc109a746273bc0d6aee9d758e7524ab files/bgpd.init 900
 MD5 0b154eae203de93e62ad66e0a926b170 files/digest-quagga-0.98.5-r3 147
 MD5 fd0be646cb5258a11bb1a1ab1c29435d files/digest-quagga-0.98.6-r1 533
+MD5 77c8c901552ef06c9b489ee13abbea33 files/digest-quagga-0.99.4 147
 MD5 44547b687343ebfed7524cebc5626067 files/ospf6d.init 919
 MD5 89b0cf4e70172bfcd195b2869cae28da files/ospfd.init 910
 MD5 18c1046db57ea850aabd385058522cc4 files/quagga.env 25
@@ -16,10 +14,4 @@ MD5 2c1c5b782f96a74b48ccc496ad7a3865 files/zebra.init 1168
 MD5 f0c8f9afaf3bbefcea71ff3b6fa139c4 metadata.xml 1389
 MD5 ba9898a1ed3cd80945e86a4f5027ad24 quagga-0.98.5-r3.ebuild 5004
 MD5 2d6e00fd6afc86de74f979ab2703399e quagga-0.98.6-r1.ebuild 5196
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEatpijG8pv1lIUX4RAttPAJ45CZtLAEqZXgRLUNZe9ZLsetZ5OwCgywK6
-LK+PwZ6cFrSR2uSCXNHFE/A=
-=YU8j
------END PGP SIGNATURE-----
+MD5 e232cf3e1451beb0ac7f1d372c0e706c quagga-0.99.4.ebuild 4579
diff --git a/net-misc/quagga/files/digest-quagga-0.98.5-r3 b/net-misc/quagga/files/digest-quagga-0.98.5-r3
deleted file mode 100644
index ae6e9b5a00b9..000000000000
--- a/net-misc/quagga/files/digest-quagga-0.98.5-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 bb0b802a19f6e58d7b1d2bda62c12ee9 quagga-0.98.5-patches-20060204.tar.gz 19689
-MD5 ec09c1ec624aea98e18aa19282666784 quagga-0.98.5.tar.gz 2018058
diff --git a/net-misc/quagga/files/digest-quagga-0.99.4 b/net-misc/quagga/files/digest-quagga-0.99.4
new file mode 100644
index 000000000000..9ba4221dbb3a
--- /dev/null
+++ b/net-misc/quagga/files/digest-quagga-0.99.4
@@ -0,0 +1,2 @@
+MD5 d28e0fa45ae762f4b5317eb13cc9a0c2 quagga-0.99.4-patches-20060523.tar.gz 17529
+MD5 a75d3f5ed0b3354274c28d195e3f6479 quagga-0.99.4.tar.gz 2207774
diff --git a/net-misc/quagga/quagga-0.98.5-r3.ebuild b/net-misc/quagga/quagga-0.99.4.ebuild
index 00a5ef05c0da..c3a61aa88838 100644
--- a/net-misc/quagga/quagga-0.98.5-r3.ebuild
+++ b/net-misc/quagga/quagga-0.99.4.ebuild
@@ -1,59 +1,43 @@
 # 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.5-r3.ebuild,v 1.6 2006/04/21 01:10:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.99.4.ebuild,v 1.1 2006/05/23 21:23:52 mrness Exp $
 
-inherit eutils multilib
+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-20060204.tar.gz"
+	mirror://gentoo/${P}-patches-20060523.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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~s390 ~sparc ~x86"
+IUSE="ipv6 snmp pam tcpmd5 bgpclassless ospfapi realms multipath tcp-zebra"
+RESTRICT="userpriv"
 
 RDEPEND="sys-apps/iproute2
 	>=sys-libs/libcap-1.10-r5
 	snmp? ( net-analyzer/net-snmp )
 	pam? ( sys-libs/pam )"
-DEPEND="${RDEPEND}
-	virtual/libc
-	sys-devel/binutils
-	sys-devel/autoconf-wrapper
-	sys-devel/libtool"
 
 src_unpack() {
 	unpack ${A} || die "failed to unpack sources"
 
-	cd ${S} || die "source dir not found"
+	cd "${S}" || die "source dir not found"
 
 	# 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"
+	use tcpmd5 && epatch "${WORKDIR}/patch/ht-20050321-0.98.2-bgp-md5_adapted.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"
+	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_compile() {
-	# regenerate configure and co if we touch .ac or .am files
-	#export WANT_AUTOMAKE=1.7
-	#./update-autotools || die
-	autoreconf
-	libtoolize --copy --force
-
 	local myconf="--disable-static --enable-dynamic"
 
 	use ipv6 \
@@ -86,26 +70,26 @@ src_compile() {
 
 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"
+		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
+	keepdir /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"
+		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"
+	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
+		newins "${FILESDIR}/quagga.pam" quagga
 	fi
 
-	newenvd ${FILESDIR}/quagga.env 99quagga
+	newenvd "${FILESDIR}/quagga.env" 99quagga
 }
 
 pkg_preinst() {
@@ -116,8 +100,8 @@ pkg_preinst() {
 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
+	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"
@@ -128,13 +112,4 @@ pkg_postinst() {
 		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
 }