With thanks to Ondrej Filip, the build system can now handle parallel make. This new release also improves portability and adds more-style paging to the client. The init-scripts have been reworked.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

6 files changed, 171 insertions, 5 deletions

diff --git a/net-misc/bird/ChangeLog b/net-misc/bird/ChangeLog
index bff206e1eca7..cd9fff9a7304 100644
--- a/net-misc/bird/ChangeLog
+++ b/net-misc/bird/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/bird
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/ChangeLog,v 1.3 2009/07/22 12:20:53 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/ChangeLog,v 1.4 2009/08/20 16:12:18 chainsaw Exp $
+
+*bird-1.1.1 (20 Aug 2009)
+
+  20 Aug 2009; <chainsaw@gentoo.org> +files/1.1.1-nostrip.patch,
+  +files/initd-v4-bird-1.1.1, +files/initd-v6-bird-1.1.1,
+  +bird-1.1.1.ebuild:
+  With thanks to Ondrej Filip, the build system can now handle parallel
+  make. This new release also improves portability and adds more-style
+  paging to the client. The init-scripts have been reworked.
 
 *bird-1.1.0 (22 Jul 2009)
 
diff --git a/net-misc/bird/Manifest b/net-misc/bird/Manifest
index 00fec1d5f0a9..473ca0023981 100644
--- a/net-misc/bird/Manifest
+++ b/net-misc/bird/Manifest
@@ -2,15 +2,20 @@
 Hash: SHA1
 
 AUX 1.1.0-nostrip.patch 872 RMD160 497f01be007fe5e7de26a9bb616a3731ceb564ce SHA1 00d87689269ace0cfda54c9f8a5c4a8668f5f3be SHA256 e45d409c0732f8538fce133e64bbf3a5543a9e074078b32e29a20a45ec9c66f3
+AUX 1.1.1-nostrip.patch 872 RMD160 63f69360a9a7544b13e228791e937496c7dd5dfb SHA1 727243560911496c30db535a8c74f6b2687f016f SHA256 af20fd3f1395c2ec56901b5df6dd3856045996e164c2de25b7739ba35d8e1547
 AUX initd-bird-1.1.0 721 RMD160 decfca41753a499de74e7ce8166ff8cae4dd2e70 SHA1 0bb6a0fdedcddaa0e3598d01c0bd458c7ca35cfc SHA256 50fbdc4593fa2ab14bf2f30b1af027db0b7acf6cd056053a801ec42127c224e8
+AUX initd-v4-bird-1.1.1 777 RMD160 82f1af909fcd608c496b44dce0694932c3942169 SHA1 0c67fb07d81457178df229068618050ae1900205 SHA256 5b187e2d190a8a9f6956decb9be5236fd6d66d4793b739d39c008e9883ab9c88
+AUX initd-v6-bird-1.1.1 779 RMD160 fdb77eaadfe62451995bd2b0a97b04dced8dc99a SHA1 9c53c2d223806c560788a06cbc2f5b89fa852942 SHA256 e45a86fe4a844ca57f9ddea437e859e6f9f1720a7e9cf88a7d8387ff4985f12a
 DIST bird-1.1.0.tar.gz 642729 RMD160 6bf3f7939b72b672d56a3598d0db1ada4209e2e7 SHA1 9acf34b47a89368262e23f52ec2fe56b6b184892 SHA256 10aa8860c10f7a48f978dde39d26935b195ed9662e486c58c2833b913cdbaf6e
+DIST bird-1.1.1.tar.gz 646377 RMD160 0d50c7e8a298de619243db7188b5414ca86e012c SHA1 bc7d447df281e9bf1a2d5706ca9f1124772ffc41 SHA256 68f781812517a00fc804871d27db3ddd3596a82a9e90cf3516ff9d276ac59a99
 EBUILD bird-1.1.0.ebuild 902 RMD160 fcf1b2fc3cdaefde7c0f4d04a2f941e81fe0178e SHA1 246e243428e1b5aa4022f79c42cd49a01229eede SHA256 3d4b20807b0dc3b769d5f29d209785dc8af05cfcd3cc3fbc09af0f2ad87bdea5
-MISC ChangeLog 510 RMD160 f6ccc0de4963ee75115b5869e6ab02c4c34bf7b1 SHA1 b236d7c716f827adf3e7183fd0321cd3cfc22090 SHA256 73db77a446fad5eb2d8d46dee566b58790325d431f28a12799d14a8e7507ebd7
+EBUILD bird-1.1.1.ebuild 1495 RMD160 64579c9bf0d13504c81555b678b2afcaec2255e0 SHA1 ea0697aa40eeebc9af3a06b6da4a055da9e07997 SHA256 97ee90a8f664f4421a18fbf9f97f02f83963e24242b276baed49880ef2fd4ca3
+MISC ChangeLog 887 RMD160 1c4a6aafa54592951e9c097336b24fb3a971a3f6 SHA1 2c6c6cd273fa624f50885f254dde01143ad2d936 SHA256 faa6c0b4eeea77859d40c10700a931067df1b3edec05aa9f956c367270fb95a9
 MISC metadata.xml 252 RMD160 39688056775b93958486028092a635d7596f2295 SHA1 84206aff0a072a68600245da08a0d83233da8259 SHA256 794815266f2c79c7762e9f4eaf6fd122af3b2b5b2d9d07a4aef8787218133d59
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkpnBBsACgkQp5vW4rUFj5pVUgCfVasyxtb/kh37I8CkwNbMyNaR
-Fp4AnAhrweOf0fppWVT2MkwQXd+WqIW0
-=DPS6
+iEYEARECAAYFAkqNdbUACgkQp5vW4rUFj5otXACdHUvEAvwaxOhM2exl1AIKDUUI
+HtMAoMBF7tPvJ/6p5A5DjZFDw/DojspT
+=nDCK
 -----END PGP SIGNATURE-----
diff --git a/net-misc/bird/bird-1.1.1.ebuild b/net-misc/bird/bird-1.1.1.ebuild
new file mode 100644
index 000000000000..bb7b1b9cb749
--- /dev/null
+++ b/net-misc/bird/bird-1.1.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/bird-1.1.1.ebuild,v 1.1 2009/08/20 16:12:18 chainsaw Exp $
+
+inherit eutils
+
+DESCRIPTION="A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 or IPv6"
+HOMEPAGE="http://bird.network.cz"
+SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug ipv6"
+
+RDEPEND="sys-libs/ncurses
+	sys-libs/readline
+	${DEPEND}"
+DEPEND="sys-devel/flex
+	sys-devel/bison
+	sys-devel/m4"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PV}-nostrip.patch"
+}
+
+src_compile() {
+	econf \
+		--enable-client \
+		$(use_enable debug) \
+		$(use_enable ipv6) \
+		|| die "Configuration stage failed"
+	emake || die "Compilation stage failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	if use ipv6; then
+		# The only thing worse then not supplying 
+		# a sample configuration file to a user is 
+		# wasting his/her time with a totally
+		# broken one.
+		rm "${D}/etc/bird6.conf"
+		newinitd "${FILESDIR}/initd-v6-${P}" bird6
+	else
+		newinitd "${FILESDIR}/initd-v4-${P}" bird
+	fi
+}
+
+pkg_postinst() {
+	if use ipv6; then
+		elog "Please note that only the IPv6 versions of the BIRD client & daemon have been installed."
+	else
+		elog "Please note that only the IPv4 versions of the BIRD client & daemon have been installed."
+	fi
+	elog "BIRDs build system is not currently suited to providing both."
+}
diff --git a/net-misc/bird/files/1.1.1-nostrip.patch b/net-misc/bird/files/1.1.1-nostrip.patch
new file mode 100644
index 000000000000..d3513ce90237
--- /dev/null
+++ b/net-misc/bird/files/1.1.1-nostrip.patch
@@ -0,0 +1,15 @@
+diff -uNr bird-1.1.1.ORIG/tools/Makefile.in bird-1.1.1/tools/Makefile.in
+--- bird-1.1.1.ORIG/tools/Makefile.in	2009-08-20 15:47:18.000000000 +0100
++++ bird-1.1.1/tools/Makefile.in	2009-08-20 15:47:40.000000000 +0100
+@@ -56,9 +56,9 @@
+ 
+ install: all
+ 	$(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/$(localstatedir)
+-	$(INSTALL_PROGRAM) -s $(exedir)/bird $(DESTDIR)/$(sbindir)/bird@SUFFIX6@
++	$(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/bird@SUFFIX6@
+ 	if test -n "@CLIENT@" ; then								\
+-		$(INSTALL_PROGRAM) -s $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc@SUFFIX6@ ;				\
++		$(INSTALL_PROGRAM) $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc@SUFFIX6@ ;				\
+ 	fi
+ 	if ! test -f $(DESTDIR)/$(sysconfdir)/bird@SUFFIX6@.conf ; then						\
+ 		$(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird@SUFFIX6@.conf ;	\
diff --git a/net-misc/bird/files/initd-v4-bird-1.1.1 b/net-misc/bird/files/initd-v4-bird-1.1.1
new file mode 100644
index 000000000000..bb0f08f405b0
--- /dev/null
+++ b/net-misc/bird/files/initd-v4-bird-1.1.1
@@ -0,0 +1,39 @@
+#!/sbin/runscript
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/files/initd-v4-bird-1.1.1,v 1.1 2009/08/20 16:12:18 chainsaw Exp $
+
+EXE=bird
+CLI=birdc
+SOCK="/var/lib/run/${EXE}.ctl"
+
+depend() {
+	need net
+	use logger
+}
+
+checkconfig() {
+	if [ ! -f "/etc/${EXE}.conf" ]; then
+		eerror "Please create /etc/${EXE}.conf"
+		return 1
+	fi
+	return 0
+}
+
+start() {
+	checkconfig || return $?
+
+	ebegin "Starting BIRD"
+	"/usr/sbin/${EXE}" -c "/etc/${EXE}.conf" -s "${SOCK}"
+	eend $? "Failed to start BIRD"
+}
+
+stop() {
+	ebegin "Stopping BIRD"
+	if [ -f "${SOCK}" ]; then
+		echo "down" | "/usr/sbin/${CLI}" -s "${SOCK}" &>/dev/null
+		eend $? "Failed to stop BIRD"
+	else
+		eend 0
+	fi
+}
diff --git a/net-misc/bird/files/initd-v6-bird-1.1.1 b/net-misc/bird/files/initd-v6-bird-1.1.1
new file mode 100644
index 000000000000..a74513b856f3
--- /dev/null
+++ b/net-misc/bird/files/initd-v6-bird-1.1.1
@@ -0,0 +1,39 @@
+#!/sbin/runscript
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/files/initd-v6-bird-1.1.1,v 1.1 2009/08/20 16:12:18 chainsaw Exp $
+
+EXE=bird6
+CLI=birdc6
+SOCK="/var/lib/run/${EXE}.ctl"
+
+depend() {
+	need net
+	use logger
+}
+
+checkconfig() {
+	if [ ! -f "/etc/${EXE}.conf" ]; then
+		eerror "Please create /etc/${EXE}.conf"
+		return 1
+	fi
+	return 0
+}
+
+start() {
+	checkconfig || return $?
+
+	ebegin "Starting BIRD"
+	"/usr/sbin/${EXE}" -c "/etc/${EXE}.conf" -s "${SOCK}"
+	eend $? "Failed to start BIRD"
+}
+
+stop() {
+	ebegin "Stopping BIRD"
+	if [ -f "${SOCK}" ]; then
+		echo "down" | "/usr/sbin/${CLI}" -s "${SOCK}" &>/dev/null
+		eend $? "Failed to stop BIRD"
+	else
+		eend 0
+	fi
+}