Fix RIP authentication problem - now the default RIP authentication mode is simple text (#132353).

Package-Manager: portage-2203-svn

5 files changed, 32 insertions, 22 deletions

diff --git a/net-misc/quagga/ChangeLog b/net-misc/quagga/ChangeLog
index 69ec329dfbc4..613631047e55 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.33 2006/05/10 07:19:26 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/ChangeLog,v 1.34 2006/05/11 16:42:32 mrness Exp $
+
+*quagga-0.98.6-r1 (11 May 2006)
+
+  11 May 2006; Alin Nastac <mrness@gentoo.org> -quagga-0.98.6.ebuild,
+  +quagga-0.98.6-r1.ebuild:
+  Fix RIP authentication problem - now the default RIP authentication mode is
+  simple text (#132353).
 
 *quagga-0.98.6 (10 May 2006)
 
diff --git a/net-misc/quagga/Manifest b/net-misc/quagga/Manifest
index 5b680bd64a46..013329ea28bd 100644
--- a/net-misc/quagga/Manifest
+++ b/net-misc/quagga/Manifest
@@ -1,11 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 1accad0aa65ff3ad4889d846802d8dfe ChangeLog 11291
+MD5 f3e00b8eb4a5c5ccd12dc8a527a1be18 ChangeLog 11526
 MD5 cc109a746273bc0d6aee9d758e7524ab files/bgpd.init 900
 MD5 8550c2f78b4c3ba7ba66c6bcb0bf4913 files/digest-quagga-0.98.4 147
 MD5 0b154eae203de93e62ad66e0a926b170 files/digest-quagga-0.98.5-r3 147
-MD5 2f9ebf2cdb3f31e503176f9d6682d188 files/digest-quagga-0.98.6 147
+MD5 d99aa510a508923e7f1bf7fc1557a60a files/digest-quagga-0.98.6-r1 147
 MD5 44547b687343ebfed7524cebc5626067 files/ospf6d.init 919
 MD5 89b0cf4e70172bfcd195b2869cae28da files/ospfd.init 910
 MD5 18c1046db57ea850aabd385058522cc4 files/quagga.env 25
@@ -17,11 +17,11 @@ MD5 2c1c5b782f96a74b48ccc496ad7a3865 files/zebra.init 1168
 MD5 f0c8f9afaf3bbefcea71ff3b6fa139c4 metadata.xml 1389
 MD5 e3212aca12f84a5cd7164e7727020318 quagga-0.98.4.ebuild 4438
 MD5 ba9898a1ed3cd80945e86a4f5027ad24 quagga-0.98.5-r3.ebuild 5004
-MD5 062e6ce25b538bac1cd280b81f074031 quagga-0.98.6.ebuild 5004
+MD5 ea41ebb67d33f16a72cd9465ea78a929 quagga-0.98.6-r1.ebuild 5180
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEYZQPjG8pv1lIUX4RAgMBAJ4xEtSESm7D6qGx19AOzmTl0oW8JgCgnYJp
-YSDoyr4yB3MvUm4vJPq7T10=
-=rR4w
+iD8DBQFEY2mJjG8pv1lIUX4RAoFjAKDjxVuCxXcJhNFI4Fu76aF5WRh5kgCbBGmk
+qwrKtLsvUSPz3feMx25NXOI=
+=hfls
 -----END PGP SIGNATURE-----
diff --git a/net-misc/quagga/files/digest-quagga-0.98.6 b/net-misc/quagga/files/digest-quagga-0.98.6
deleted file mode 100644
index 4042fd569f0b..000000000000
--- a/net-misc/quagga/files/digest-quagga-0.98.6
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 0c6192144d0385eb9e3006ac6d842c2b quagga-0.98.6-patches-20060510.tar.gz 18871
-MD5 b0d4132039953a0214256873b7d23d68 quagga-0.98.6.tar.gz 2019992
diff --git a/net-misc/quagga/files/digest-quagga-0.98.6-r1 b/net-misc/quagga/files/digest-quagga-0.98.6-r1
new file mode 100644
index 000000000000..f3026c41c6b6
--- /dev/null
+++ b/net-misc/quagga/files/digest-quagga-0.98.6-r1
@@ -0,0 +1,2 @@
+MD5 569f21f1fe2ca037b78977cf0c589593 quagga-0.98.6-patches-20060511.tar.gz 19251
+MD5 b0d4132039953a0214256873b7d23d68 quagga-0.98.6.tar.gz 2019992
diff --git a/net-misc/quagga/quagga-0.98.6.ebuild b/net-misc/quagga/quagga-0.98.6-r1.ebuild
index b7368684029b..eb9f074340e8 100644
--- a/net-misc/quagga/quagga-0.98.6.ebuild
+++ b/net-misc/quagga/quagga-0.98.6-r1.ebuild
@@ -1,13 +1,13 @@
 # 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.ebuild,v 1.1 2006/05/10 07:19:26 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.98.6-r1.ebuild,v 1.1 2006/05/11 16:42:32 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-20060510.tar.gz"
+	mirror://gentoo/${P}-patches-20060511.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -27,7 +27,10 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A} || die "failed to unpack sources"
 
-	cd ${S} || die "source dir not found"
+	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"
@@ -86,26 +89,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
 
 	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 +119,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"