net-misc/quagga: added unstable quagga-0.97.2 and fixed quagga-0.97.1 as well as quagga-0.97.2 to use =libcap-1.10-r3 as dependency. libcap-1.10-r4 does not correctly get recognized by Quagga.

6 files changed, 151 insertions, 16 deletions

diff --git a/net-misc/quagga/ChangeLog b/net-misc/quagga/ChangeLog
index 539424e344de..dca4ee3f2dbb 100644
--- a/net-misc/quagga/ChangeLog
+++ b/net-misc/quagga/ChangeLog
@@ -2,7 +2,12 @@
 # Copyright 1999-2004 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.10 2004/10/22 08:16:24 amir Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/ChangeLog,v 1.11 2004/10/25 17:35:17 amir Exp $
+
+*quagga-0.97.2 (25 Oct 2004)
+
+  25 Oct 2004; Amir Guindehi <amir@datacore.ch> +quagga-0.97.2.ebuild:
+  Bumped version number. Removed obsolete patches.
 
 *quagga-0.97.1 (21 Oct 2004)
 
@@ -10,6 +15,11 @@
   Bumped version number. Added two patches to fix compilation of
   the source when used with the 'ospfapi' use flag.
 
+  25 Oct 2004; Amir Guindehi <amir@datacore.ch> quagga-0.97.1.ebuild:
+  Changed dependency to from >= to =libcap-1.10-r3. libcap-1.10-r4 does
+  not get correctly recognized and used by Quagga. This has to be 
+  investigated further.
+	
 *quagga-0.96.5-r1 (21 Oct 2004)
 
   21 Oct 2004; Amir Guindehi <amir@datacore.ch> +quagga-0.96.5-r1.ebuild:
diff --git a/net-misc/quagga/Manifest b/net-misc/quagga/Manifest
index e68100c8e571..4e5b437cb66c 100644
--- a/net-misc/quagga/Manifest
+++ b/net-misc/quagga/Manifest
@@ -1,20 +1,22 @@
+MD5 644d3223f6061a88055f921421eb8488 ChangeLog 5406
+MD5 853a30dc9e47d59ed3c94a3c9bbc4bf5 metadata.xml 1387
 MD5 01fc96021b8cad5060ba761d5bbb2c3d quagga-0.96.4-r6.ebuild 3354
-MD5 1a9722f18f8417b9f447029d796915ff quagga-0.97.1.ebuild 3819
-MD5 091c71b6c66effb341b6348df30d5bfd ChangeLog 5018
-MD5 f0192175ecea09c49d5bae967c76bbd1 metadata.xml 1500
 MD5 d19ba50e76f663979f91586bf96c9a2d quagga-0.96.5-r1.ebuild 3821
 MD5 cfc3a89dc2a63548877c7544ee9f1f13 quagga-0.96.5.ebuild 3415
-MD5 9056b8bd752a672787eacb129ee47535 files/digest-quagga-0.96.5 142
-MD5 9ee8920582beff3b7ffa2408666f5f2b files/digest-quagga-0.97.1 142
+MD5 d1d268d1b71504a38bf157873ec4157e quagga-0.97.1.ebuild 3818
+MD5 d1d268d1b71504a38bf157873ec4157e quagga-0.97.2.ebuild 3818
 MD5 72494598a213a5d6f441496f48aefd7b files/digest-quagga-0.96.4-r6 66
+MD5 9056b8bd752a672787eacb129ee47535 files/digest-quagga-0.96.5 142
 MD5 9056b8bd752a672787eacb129ee47535 files/digest-quagga-0.96.5-r1 142
+MD5 9ee8920582beff3b7ffa2408666f5f2b files/digest-quagga-0.97.1 142
+MD5 898c502fc59023326048bdb4e014754f files/digest-quagga-0.97.2 142
 MD5 3f95e96aeb427fa3de7f387ff3dc6ad6 files/init/bgpd 866
-MD5 e484b94e7ebb358d11fdf3252e0b604f files/init/ripd 865
-MD5 6b7fbbe67b98a52a36684455c3866d65 files/init/ospfd 875
-MD5 bfecfbc3b2f5b2748271a2838cac5a2b files/init/zebra 1143
 MD5 4a118d93cab17b63f1d9c675f5d92fdf files/init/ospf6d 884
+MD5 6b7fbbe67b98a52a36684455c3866d65 files/init/ospfd 875
+MD5 e484b94e7ebb358d11fdf3252e0b604f files/init/ripd 865
 MD5 2c6f6b3a64eedf1362a56fd6b3ca9c1b files/init/ripngd 885
+MD5 bfecfbc3b2f5b2748271a2838cac5a2b files/init/zebra 1143
 MD5 6d870c42af2625dcc07ba4b155618ebf files/patches-0.96.4/opaque-ready.patch 2617
 MD5 13439f842c485b5402125d2a18158c84 files/patches-0.96.4/ospf_refcount.patch 1296
-MD5 a5e54af5a6268307f6d5d86e6a5a680c files/patches-0.97.1/02_all_unbreak-ospfapi.patch.bz2 645
 MD5 a08e46f6d262bc34749ee9cf9716a753 files/patches-0.97.1/01_all_unbreak-ospfapi.patch.bz2 667
+MD5 a5e54af5a6268307f6d5d86e6a5a680c files/patches-0.97.1/02_all_unbreak-ospfapi.patch.bz2 645
diff --git a/net-misc/quagga/files/digest-quagga-0.97.2 b/net-misc/quagga/files/digest-quagga-0.97.2
new file mode 100644
index 000000000000..240f39b46e43
--- /dev/null
+++ b/net-misc/quagga/files/digest-quagga-0.97.2
@@ -0,0 +1,2 @@
+MD5 1609de2a1633935a1c7e8983e42acba8 quagga-0.97.2.tar.gz 1819209
+MD5 5352f366e6c7d07101d9b1684e8c6710 ht-20040525-0.96.5-bgp-md5.patch 15395
diff --git a/net-misc/quagga/metadata.xml b/net-misc/quagga/metadata.xml
index 497b9f5a9529..e96396a5020f 100644
--- a/net-misc/quagga/metadata.xml
+++ b/net-misc/quagga/metadata.xml
@@ -11,10 +11,6 @@
 		<email>ueli@gentoo.org</email>
 		<description>Secondary Maintainer</description>
 	</maintainer>
-	<maintainer>
-		<email>solar@gentoo.org</email>
-		<description>Secondary Maintainer</description>
-	</maintainer>
         <longdescription>Quagga is a modern fork of Zebra. Quagga is a routing software package that provides TCP/IP based routing services with routing protocols support such as RIPv1, RIPv2, RIPng, OSPFv2, OSPFv3, BGP-4, and BGP-4+ (*note Supported RFC::). Quagga also supports special BGP Route Reflector and Route Server behavior.  In addition to traditional IPv4 routing protocols, Quagga also supports IPv6 routing protocols. With SNMP daemon which supports SMUX protocol, Quagga provides routing protocol MIBs (*note SNMP Support::). Furthermore Quagga supports OSPFAPI (*note OSPFAPI Support::), a API interface to the OSPF LSDB. It supports inspection as well as injection of normal and opaque OSPF LSAs. Applications like SRRD - The Service Rounting Redundancy Daemon - can make use of OSPFAPI to inject opaque data into the OSPF routing domain. SRRD, for example, implements a cluster server by using the OSPFAPI to flood service state information into the routing domain.</longdescription>
 
 </pkgmetadata>
diff --git a/net-misc/quagga/quagga-0.97.1.ebuild b/net-misc/quagga/quagga-0.97.1.ebuild
index 1b7f57dc962e..ef2b38ea5a86 100644
--- a/net-misc/quagga/quagga-0.97.1.ebuild
+++ b/net-misc/quagga/quagga-0.97.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2004 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/quagga-0.97.1.ebuild,v 1.1 2004/10/22 08:16:24 amir Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.97.1.ebuild,v 1.2 2004/10/25 17:35:17 amir Exp $
 
 inherit eutils
 
@@ -20,7 +20,7 @@ IUSE="ipv6 snmp pam tcpmd5 ospfapi"
 DEPEND="virtual/libc
 	sys-devel/binutils
 	sys-apps/iproute2
-	>=sys-libs/libcap-1.10-r3
+	=sys-libs/libcap-1.10-r3
 	!sys-apps/zebra
 	!sys-apps/zebra-ag-svn
 	!sys-apps/zebra-pj-cvs
diff --git a/net-misc/quagga/quagga-0.97.2.ebuild b/net-misc/quagga/quagga-0.97.2.ebuild
new file mode 100644
index 000000000000..29d51ec71934
--- /dev/null
+++ b/net-misc/quagga/quagga-0.97.2.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2004 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/quagga-0.97.2.ebuild,v 1.1 2004/10/25 17:35:17 amir Exp $
+
+inherit eutils
+
+MD5_PATCH="ht-20040525-0.96.5-bgp-md5.patch"
+
+DESCRIPTION="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP. Includes OSPFAPI, NET-SNMP and IPV6 support."
+HOMEPAGE="http://quagga.net/"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+SLOT="0"
+LICENSE="GPL-2"
+SRC_URI="http://www.quagga.net/download/${P}.tar.gz
+	tcpmd5? ( http://hasso.linux.ee/quagga/$MD5_PATCH )"
+
+IUSE="ipv6 snmp pam tcpmd5 ospfapi"
+
+DEPEND="virtual/libc
+	sys-devel/binutils
+	sys-apps/iproute2
+	=sys-libs/libcap-1.10-r3
+	!sys-apps/zebra
+	!sys-apps/zebra-ag-svn
+	!sys-apps/zebra-pj-cvs
+	!sys-apps/quagga-ag-svn-HEAD
+	!sys-apps/quagga-svn-HEAD"
+
+[ -z "${QUAGGA_USER_NAME}" ] && QUAGGA_USER_NAME="quagga"
+[ -z "${QUAGGA_USER_UID}" ] && QUAGGA_USER_UID=441
+[ -z "${QUAGGA_GROUP_NAME}" ] && QUAGGA_GROUP_NAME="quagga"
+[ -z "${QUAGGA_GROUP_GID}" ] && QUAGGA_GROUP_GID=441
+[ -z "${QUAGGA_VTYGROUP}" ] && QUAGGA_VTYGROUP="quagga"
+[ -z "${QUAGGA_USER_SH}" ] && QUAGGA_USER_SH="/bin/false"
+[ -z "${QUAGGA_USER_HOMEDIR}" ] && QUAGGA_USER_HOMEDIR=/var/empty
+[ -z "${QUAGGA_USER_GROUPS}" ] && QUAGGA_USER_GROUPS=${QUAGGA_GROUP_NAME}
+[ -z "${QUAGGA_STATEDIR}" ] && QUAGGA_STATEDIR=/var/run/quagga
+
+pkg_preinst() {
+	enewgroup ${QUAGGA_GROUP_NAME} ${QUAGGA_GROUP_GID}
+	enewuser ${QUAGGA_USER_NAME} ${QUAGGA_USER_UID} ${QUAGGA_USER_SH} ${QUAGGA_USER_HOMEDIR} ${QUAGGA_USER_GROUPS}
+}
+
+src_unpack() {
+	unpack ${A} || die
+	cd ${S} || die
+	[ -d ${FILESDIR}/patches-${PV} ] && epatch ${FILESDIR}/patches-${PV}
+}
+
+src_compile() {
+	local ipv
+	local snmp
+	local pam
+	local tcpmd5
+	local ospfapi
+
+	use ipv6 && ipv="--enable-ipv6 --enable-ripng --enable-ospf6d --enable-rtadv" || ipv="--disable-ipv6 --disable-ripngd --disable-ospf6d"
+	use snmp && snmp="--enable-snmp"
+	use pam && pam="--with-libpam"
+
+	use tcpmd5 && tcpmd5="--enable-tcp-md5"
+	use tcpmd5 && epatch ${DISTDIR}/$MD5_PATCH
+
+	use ospfapi && ospfapi="--enable-opaque-lsa --enable-ospf-te --enable-ospfclient"
+
+	# update makefiles
+
+	export WANT_AUTOMAKE=1.7
+
+	./update-autotools || die
+
+	#
+	# ipforward detection is broken (and usersandbox will break it too)
+	# thanks to Merlin from irc://irc.freenode.net/#quagga
+	#
+	export IPFORWARD=ipforward_proc.o
+	export zebra_ipforward_path="proc"
+
+	# configure the stuff
+
+	./configure --host=${HOST} \
+		    --prefix=${D}/usr \
+		    --enable-tcp-zebra \
+	            --enable-nssa \
+		    --enable-user=${QUAGGA_USER} \
+		    --enable-group=${QUAGGA_GROUP} \
+		    --enable-vty-group=${QUAGGA_VTYGROUP} \
+		    --with-cflags="${CFLAGS}" \
+	            --enable-vtysh ${ipv} ${snmp} ${pam} ${tcpmd5} ${ospfapi} \
+		    --sysconfdir=/etc/quagga \
+		    --enable-exampledir=${D}/etc/quagga/samples \
+		    --includedir=${D}/usr/include \
+		    --localstatedir=${QUAGGA_STATEDIR} \
+		    --libdir=${D}/usr/lib/quagga \
+			|| die
+	emake || die
+}
+
+src_install() {
+	einstall || die
+
+	dodir /etc/quagga || die
+	dodir /etc/quagga/samples || die
+
+	keepdir /var/run/quagga || die
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/init/zebra zebra || die
+	newexe ${FILESDIR}/init/ripd ripd || die
+	newexe ${FILESDIR}/init/ospfd ospfd || die
+	newexe ${FILESDIR}/init/bgpd bgpd || die
+
+	use ipv6 && ( newexe ${FILESDIR}/init/ripngd ripngd )
+	use ipv6 && ( newexe ${FILESDIR}/init/ospf6d ospf6d )
+}
+
+pkg_postinst() {
+	# empty dir for pid files for the new priv separation auth
+	install -d -m0755 -o quagga -g quagga ${ROOT}/var/run/quagga
+
+	einfo "Sample configuration files can be found in /etc/quagga/sample."
+	einfo "You have to create config files in /etc/quagga before"
+	einfo "starting one of the daemons."
+}