Version bump (#240091).

(Portage version: 2.1.4.4)

2 files changed, 12 insertions, 42 deletions

diff --git a/net-misc/quagga/ChangeLog b/net-misc/quagga/ChangeLog
index 1c38b74f2907..9a19fd4127fd 100644
--- a/net-misc/quagga/ChangeLog
+++ b/net-misc/quagga/ChangeLog
@@ -2,7 +2,13 @@
 # Copyright 1999-2008 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.76 2008/07/08 20:02:26 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/ChangeLog,v 1.77 2008/10/09 22:01:00 mrness Exp $
+
+*quagga-0.99.11 (09 Oct 2008)
+
+  09 Oct 2008; Alin Năstac <mrness@gentoo.org> -quagga-0.99.9-r1.ebuild,
+  +quagga-0.99.11.ebuild:
+  Version bump (#240091).
 
   08 Jul 2008; Alin Năstac <mrness@gentoo.org> quagga-0.98.6-r4.ebuild:
   Add as-needed patch (#152654).
diff --git a/net-misc/quagga/quagga-0.99.9-r1.ebuild b/net-misc/quagga/quagga-0.99.11.ebuild
index 2ebb780a826c..ca84d4cee2e2 100644
--- a/net-misc/quagga/quagga-0.99.9-r1.ebuild
+++ b/net-misc/quagga/quagga-0.99.11.ebuild
@@ -1,58 +1,36 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.99.9-r1.ebuild,v 1.3 2008/05/13 22:38:28 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.99.11.ebuild,v 1.1 2008/10/09 22:01:00 mrness Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
 
-inherit eutils multilib autotools linux-info
+inherit eutils multilib autotools
 
 DESCRIPTION="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP."
 HOMEPAGE="http://quagga.net/"
 SRC_URI="http://www.quagga.net/download/${P}.tar.gz
-	mirror://gentoo/${P}-patches-20070913.tar.gz"
+	mirror://gentoo/${P}-patches-20081009.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~s390 ~sparc ~x86"
-IUSE="caps ipv6 snmp pam tcpmd5 bgpas4 bgpclassless ospfapi realms multipath tcp-zebra"
+IUSE="caps ipv6 snmp pam bgpclassless ospfapi realms multipath tcp-zebra"
 RESTRICT="userpriv"
 
 DEPEND="sys-libs/readline
-	caps? ( >=sys-libs/libcap-1.10-r9 )
+	caps? ( sys-libs/libcap )
 	snmp? ( net-analyzer/net-snmp )
 	pam? ( sys-libs/pam )"
 RDEPEND="${DEPEND}
 	sys-apps/iproute2"
 
-pkg_setup() {
-	if use tcpmd5 ; then
-		get_version || get_running_version
-	fi
-	return 0
-}
-
 src_unpack() {
 	unpack ${A}
 
 	cd "${S}" || die "source dir not found"
 	epatch "${WORKDIR}/patch/${P}-link-libcap.patch"
 
-	# AS4 support (original found at http://quagga.ncc.eurodata.de)
-	use bgpas4 && epatch "${WORKDIR}/patch/quagga-cvs20070909-as4-v09.patch"
-
-	if use tcpmd5 ; then
-		if kernel_is lt 2 6 20 ; then
-			# TCP MD5 for BGP patch for Linux (RFC 2385)
-			# original found at http://hasso.linux.ee/doku.php/english:network:rfc2385
-			epatch "${WORKDIR}/patch/ht-20050321-${PV}-bgp-md5_adapted.patch"
-		else
-			# TCP MD5 in-kernel support for kernels >=2.6.20 (by Leigh Brown)
-			# original found at http://www.solinno.co.uk/md5sig/quagga_linux-2.6.20_md5sig.diff
-			epatch "${WORKDIR}/patch/quagga_linux-2.6.20_md5sig_adapted.diff"
-		fi
-	fi
-
 	# Classless prefixes for BGP - http://hasso.linux.ee/doku.php/english:network:quagga
 	use bgpclassless && epatch "${WORKDIR}/patch/ht-20040304-classless-bgp_adapted.patch"
 
@@ -67,7 +45,6 @@ src_compile() {
 		$(use_enable caps capabilities) \
 		$(use_enable snmp) \
 		$(use_with pam libpam) \
-		$(use_enable tcpmd5 tcp-md5) \
 		$(use_enable tcp-zebra)"
 	use ipv6 \
 			&& myconf="${myconf} --enable-ipv6 --enable-ripng --enable-ospf6d --enable-rtadv" \
@@ -131,17 +108,4 @@ pkg_postinst() {
 	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
-		if kernel_is lt 2 6 20; then
-			ewarn "TCP MD5 for BGP needs a patched kernel!"
-			ewarn "See http://hasso.linux.ee/doku.php/english:network:rfc2385 for more info."
-		else
-			CONFIG_CHECK="~TCP_MD5SIG"
-			local ERROR_TCP_MD5SIG="CONFIG_TCP_MD5SIG:\t missing TCP MD5 signature support (RFC2385)"
-
-			check_extra_config
-		fi
-	fi
 }