net-misc/quagga: added quagga-0.96.5-r1 which introduces the local use flag "ospfapi" and made it stable. added quagga-0.97.1 as unstable ebuild.

10 files changed, 293 insertions, 13 deletions

diff --git a/net-misc/quagga/ChangeLog b/net-misc/quagga/ChangeLog
index 5b9d1d92ffc1..539424e344de 100644
--- a/net-misc/quagga/ChangeLog
+++ b/net-misc/quagga/ChangeLog
@@ -1,9 +1,29 @@
 # ChangeLog for net-misc/quagga
-# Copyright 2003-2004 DataCore GmbH; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/ChangeLog,v 1.9 2004/10/05 22:11:05 malverian Exp $
+# 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 $
+
+*quagga-0.97.1 (21 Oct 2004)
+
+  21 Oct 2004; Amir Guindehi <amir@datacore.ch> quagga-0.97.1.ebuild:
+  Bumped version number. Added two patches to fix compilation of
+  the source when used with the 'ospfapi' use flag.
+
+*quagga-0.96.5-r1 (21 Oct 2004)
+
+  21 Oct 2004; Amir Guindehi <amir@datacore.ch> +quagga-0.96.5-r1.ebuild:
+  Added dependency to sys-apps/iproute2. Added --localstatedir. The ebuild
+  will apply patches if it finds the corresponding patch directory exists.
+  Fixed location of quagga include files to /usr/include/quagga. Added new
+  USE flag named 'ospfapi' to enable ospfapi and opaque lsa support 
+  sepparately. Made x86 stable.
 
 *quagga-0.96.5 (05 Oct 2004)
 
+  21 Oct 2004; Amir Guindehi <amir@datacore.ch> quagga-0.96.5.ebuild:
+  Made x86 stable.
+	
   05 Oct 2004; Philip Walls <malverian@gentoo.org> +quagga-0.96.5.ebuild:
   Version bump, support for tcp md5 passwords
 
diff --git a/net-misc/quagga/Manifest b/net-misc/quagga/Manifest
index cff9a4505254..e68100c8e571 100644
--- a/net-misc/quagga/Manifest
+++ b/net-misc/quagga/Manifest
@@ -1,14 +1,20 @@
-MD5 072b7a686b2a26a63d9354b1231be8f9 ChangeLog 4202
+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 af13176eb8a5a91e90ff47652b4637c9 quagga-0.96.4-r6.ebuild 3360
-MD5 4575ec2e74ac1c7571eebcc660c32cad quagga-0.96.5.ebuild 3421
-MD5 72494598a213a5d6f441496f48aefd7b files/digest-quagga-0.96.4-r6 66
+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 72494598a213a5d6f441496f48aefd7b files/digest-quagga-0.96.4-r6 66
+MD5 9056b8bd752a672787eacb129ee47535 files/digest-quagga-0.96.5-r1 142
 MD5 3f95e96aeb427fa3de7f387ff3dc6ad6 files/init/bgpd 866
-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 6b7fbbe67b98a52a36684455c3866d65 files/init/ospfd 875
 MD5 bfecfbc3b2f5b2748271a2838cac5a2b files/init/zebra 1143
+MD5 4a118d93cab17b63f1d9c675f5d92fdf files/init/ospf6d 884
+MD5 2c6f6b3a64eedf1362a56fd6b3ca9c1b files/init/ripngd 885
 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
diff --git a/net-misc/quagga/files/digest-quagga-0.96.5-r1 b/net-misc/quagga/files/digest-quagga-0.96.5-r1
new file mode 100644
index 000000000000..1c208a87005f
--- /dev/null
+++ b/net-misc/quagga/files/digest-quagga-0.96.5-r1
@@ -0,0 +1,2 @@
+MD5 cc84ef15cf4c2823a36097fe01775dc3 quagga-0.96.5.tar.gz 1558033
+MD5 5352f366e6c7d07101d9b1684e8c6710 ht-20040525-0.96.5-bgp-md5.patch 15395
diff --git a/net-misc/quagga/files/digest-quagga-0.97.1 b/net-misc/quagga/files/digest-quagga-0.97.1
new file mode 100644
index 000000000000..c54918cb5d72
--- /dev/null
+++ b/net-misc/quagga/files/digest-quagga-0.97.1
@@ -0,0 +1,2 @@
+MD5 ddfa09a520e9245d1aeb9b3de695882b quagga-0.97.1.tar.gz 1813974
+MD5 5352f366e6c7d07101d9b1684e8c6710 ht-20040525-0.96.5-bgp-md5.patch 15395
diff --git a/net-misc/quagga/files/patches-0.97.1/01_all_unbreak-ospfapi.patch.bz2 b/net-misc/quagga/files/patches-0.97.1/01_all_unbreak-ospfapi.patch.bz2
new file mode 100644
index 000000000000..0f42e0e01c35
--- /dev/null
+++ b/net-misc/quagga/files/patches-0.97.1/01_all_unbreak-ospfapi.patch.bz2
diff --git a/net-misc/quagga/files/patches-0.97.1/02_all_unbreak-ospfapi.patch.bz2 b/net-misc/quagga/files/patches-0.97.1/02_all_unbreak-ospfapi.patch.bz2
new file mode 100644
index 000000000000..d55fa88f2a10
--- /dev/null
+++ b/net-misc/quagga/files/patches-0.97.1/02_all_unbreak-ospfapi.patch.bz2
diff --git a/net-misc/quagga/quagga-0.96.4-r6.ebuild b/net-misc/quagga/quagga-0.96.4-r6.ebuild
index 493388de5f2f..31bd4531796e 100644
--- a/net-misc/quagga/quagga-0.96.4-r6.ebuild
+++ b/net-misc/quagga/quagga-0.96.4-r6.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.96.4-r6.ebuild,v 1.7 2004/10/05 22:11:06 malverian Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.96.4-r6.ebuild,v 1.8 2004/10/22 08:16:24 amir Exp $
 
 inherit eutils
 
 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"
+KEYWORDS="x86 ~ppc ~sparc ~alpha"
 SLOT="0"
 LICENSE="GPL-2"
 SRC_URI="http://www.quagga.net/download/${P}.tar.gz"
diff --git a/net-misc/quagga/quagga-0.96.5-r1.ebuild b/net-misc/quagga/quagga-0.96.5-r1.ebuild
new file mode 100644
index 000000000000..80564580f947
--- /dev/null
+++ b/net-misc/quagga/quagga-0.96.5-r1.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.96.5-r1.ebuild,v 1.1 2004/10/22 08:16:24 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."
+}
diff --git a/net-misc/quagga/quagga-0.96.5.ebuild b/net-misc/quagga/quagga-0.96.5.ebuild
index 012910966661..6ed6f606cd37 100644
--- a/net-misc/quagga/quagga-0.96.5.ebuild
+++ b/net-misc/quagga/quagga-0.96.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.96.5.ebuild,v 1.1 2004/10/05 22:11:06 malverian Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.96.5.ebuild,v 1.2 2004/10/22 08:16:24 amir Exp $
 
 inherit eutils
 
@@ -8,7 +8,7 @@ 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"
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~amd64"
 SLOT="0"
 LICENSE="GPL-2"
 SRC_URI="http://www.quagga.net/download/${P}.tar.gz
diff --git a/net-misc/quagga/quagga-0.97.1.ebuild b/net-misc/quagga/quagga-0.97.1.ebuild
new file mode 100644
index 000000000000..1b7f57dc962e
--- /dev/null
+++ b/net-misc/quagga/quagga-0.97.1.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.1.ebuild,v 1.1 2004/10/22 08:16:24 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."
+}