Remove old test version. Update TCP MD5 patch (#119256).

(Portage version: 2.0.54)

5 files changed, 20 insertions, 23 deletions

diff --git a/net-misc/quagga/ChangeLog b/net-misc/quagga/ChangeLog
index a910cf500d15..db09bf5fca40 100644
--- a/net-misc/quagga/ChangeLog
+++ b/net-misc/quagga/ChangeLog
@@ -2,7 +2,13 @@
 # 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.28 2006/01/09 13:32:26 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/ChangeLog,v 1.29 2006/02/04 09:11:57 mrness Exp $
+
+*quagga-0.98.5-r3 (04 Feb 2006)
+
+  04 Feb 2006; Alin Nastac <mrness@gentoo.org> -quagga-0.98.5-r1.ebuild,
+  +quagga-0.98.5-r3.ebuild:
+  Remove old test version. Update TCP MD5 patch (#119256).
 
   09 Jan 2006; Alin Nastac <mrness@gentoo.org>
   -files/patches-0.98.2/amir-connected-route.patch,
diff --git a/net-misc/quagga/Manifest b/net-misc/quagga/Manifest
index 0c22925f6cf3..a7fcb8449206 100644
--- a/net-misc/quagga/Manifest
+++ b/net-misc/quagga/Manifest
@@ -1,11 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 139fd0489b45828efb3d9374f528e974 ChangeLog 10622
 MD5 cc109a746273bc0d6aee9d758e7524ab files/bgpd.init 900
 MD5 8550c2f78b4c3ba7ba66c6bcb0bf4913 files/digest-quagga-0.98.4 147
-MD5 d043f8666ea0af9633684d58dcef68e6 files/digest-quagga-0.98.5-r1 147
 MD5 d043f8666ea0af9633684d58dcef68e6 files/digest-quagga-0.98.5-r2 147
+MD5 0b154eae203de93e62ad66e0a926b170 files/digest-quagga-0.98.5-r3 147
 MD5 44547b687343ebfed7524cebc5626067 files/ospf6d.init 919
 MD5 89b0cf4e70172bfcd195b2869cae28da files/ospfd.init 910
 MD5 18c1046db57ea850aabd385058522cc4 files/quagga.env 25
@@ -16,12 +13,5 @@ MD5 c38e884372406e9e59616e436cd26388 files/zebra.conf 371
 MD5 2c1c5b782f96a74b48ccc496ad7a3865 files/zebra.init 1168
 MD5 f0c8f9afaf3bbefcea71ff3b6fa139c4 metadata.xml 1389
 MD5 e3212aca12f84a5cd7164e7727020318 quagga-0.98.4.ebuild 4438
-MD5 9927651424dd0548ba520a169d1afa88 quagga-0.98.5-r1.ebuild 4901
 MD5 2d3296289e42656d7a1f9c313bf1da36 quagga-0.98.5-r2.ebuild 5012
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDwmX+jG8pv1lIUX4RAj4mAJ4w8OrrVxNvdpMS1KKUmCUT08XnZwCcDlwa
-5EdBZFR4C8/+ONGAGYRkigE=
-=UaM5
------END PGP SIGNATURE-----
+MD5 98e8d0ef8ac7096c3bca14231ed593ef quagga-0.98.5-r3.ebuild 4982
diff --git a/net-misc/quagga/files/digest-quagga-0.98.5-r1 b/net-misc/quagga/files/digest-quagga-0.98.5-r1
deleted file mode 100644
index fd9b256cf883..000000000000
--- a/net-misc/quagga/files/digest-quagga-0.98.5-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 ec09c1ec624aea98e18aa19282666784 quagga-0.98.5.tar.gz 2018058
-MD5 fbf4a396755161c7023540bcccdc52cc quagga-0.98.5-patches-20051105.tar.gz 19206
diff --git a/net-misc/quagga/files/digest-quagga-0.98.5-r3 b/net-misc/quagga/files/digest-quagga-0.98.5-r3
new file mode 100644
index 000000000000..ae6e9b5a00b9
--- /dev/null
+++ b/net-misc/quagga/files/digest-quagga-0.98.5-r3
@@ -0,0 +1,2 @@
+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/quagga-0.98.5-r1.ebuild b/net-misc/quagga/quagga-0.98.5-r3.ebuild
index c21dcfb73824..b1ebf32250eb 100644
--- a/net-misc/quagga/quagga-0.98.5-r1.ebuild
+++ b/net-misc/quagga/quagga-0.98.5-r3.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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-r1.ebuild,v 1.1 2005/11/15 13:14:03 amir Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.98.5-r3.ebuild,v 1.1 2006/02/04 09:11:57 mrness Exp $
 
 inherit eutils multilib
 
 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-20051105.tar.gz"
+	mirror://gentoo/${P}-patches-20060204.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ppc ~sparc ~x86"
-IUSE="ipv6 snmp pam tcpmd5 bgpclassless ospfapi realms fix-connected-rt"
+IUSE="ipv6 snmp pam tcpmd5 bgpclassless ospfapi realms fix-connected-rt multipath tcp-zebra"
 
 RDEPEND="sys-apps/iproute2
 	>=sys-libs/libcap-1.10-r5
@@ -29,10 +29,10 @@ src_unpack() {
 
 	cd ${S} || die "source dir not found"
 
-	# TCP MD5 for BGP patch for Linux (RFC 2385) - http://hasso.linux.ee/quagga/ht-20050110-0.98.0-bgp-md5.patch
-	use tcpmd5 && epatch "${WORKDIR}/patch/ht-20050110-0.98.0-bgp-md5.patch"
+	# 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/quagga/pending-patches/ht-20040304-classless-bgp.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
@@ -65,9 +65,10 @@ src_compile() {
 	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-tcp-zebra \
 		--enable-nssa \
 		--enable-user=quagga \
 		--enable-group=quagga \