Version bump with minor bugfixes. Also adds passive BGP support.

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

7 files changed, 173 insertions, 9 deletions

diff --git a/net-misc/bird/ChangeLog b/net-misc/bird/ChangeLog
index 31f0b941d861..e3565e076a3d 100644
--- a/net-misc/bird/ChangeLog
+++ b/net-misc/bird/ChangeLog
@@ -1,6 +1,13 @@
 # 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.6 2009/09/11 14:01:52 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/ChangeLog,v 1.7 2009/10/02 11:52:08 chainsaw Exp $
+
+*bird-1.1.4 (02 Oct 2009)
+
+  02 Oct 2009; <chainsaw@gentoo.org> +files/1.1.4-nostrip.patch,
+  files/initd-v6-bird-1.1.3, +files/initd-v4-bird-1.1.4,
+  +files/initd-v6-bird-1.1.4, +bird-1.1.4.ebuild:
+  Version bump with minor bugfixes. Also adds passive BGP support.
 
 *bird-1.1.3 (11 Sep 2009)
 
diff --git a/net-misc/bird/Manifest b/net-misc/bird/Manifest
index dfcab1cf4957..2396eb92a6fc 100644
--- a/net-misc/bird/Manifest
+++ b/net-misc/bird/Manifest
@@ -4,24 +4,29 @@ Hash: SHA1
 AUX 1.1.1-nostrip.patch 872 RMD160 63f69360a9a7544b13e228791e937496c7dd5dfb SHA1 727243560911496c30db535a8c74f6b2687f016f SHA256 af20fd3f1395c2ec56901b5df6dd3856045996e164c2de25b7739ba35d8e1547
 AUX 1.1.2-nostrip.patch 872 RMD160 644a72a9c5a9da6c5db30a280ccd1770544295bd SHA1 f3a6721bdf22bf601f24fea4715a7060ad75266f SHA256 2a1f76463b0a30a441c4de0f96088ffb327b3f72e0013772449c8a102fed42b3
 AUX 1.1.3-nostrip.patch 872 RMD160 32949344e4069cf55430d581a812ab059b4b2a6a SHA1 2f28f265ace589afaf3b213bc606ea6bbb3f0562 SHA256 16b2cda59218ef5e390094b3ced74dafd26cb905dbf51917da72300561193520
+AUX 1.1.4-nostrip.patch 872 RMD160 11dbb8ee94b3f3ab8f79f7c4d4d147553b7cdfef SHA1 7bd63c821f37a0bbb5f9c1b2e5591497fc5807a2 SHA256 88479f22683b364aa6422d5d62d6bffd185080c62348fcc33a9116bac37e030c
 AUX initd-v4-bird-1.1.1 777 RMD160 82f1af909fcd608c496b44dce0694932c3942169 SHA1 0c67fb07d81457178df229068618050ae1900205 SHA256 5b187e2d190a8a9f6956decb9be5236fd6d66d4793b739d39c008e9883ab9c88
 AUX initd-v4-bird-1.1.2 777 RMD160 27892eadaad91e8e20d4dc5f4f9af34486f67304 SHA1 8227407010ca725403b7892a295cf4b3a8e9b6e7 SHA256 25fc7b8e1cac7099608aa2e814ceda504712ed56ccd0e9caa83883b47702ced6
 AUX initd-v4-bird-1.1.3 773 RMD160 5e942a65a0fb87c869e77004305e15d09b8a7a70 SHA1 dc10ddaa3825001492c7574551f9523cc740f5c4 SHA256 fec6379029956151825cb98e958ee2e48de77f1b79164400293af1a4ad72d577
+AUX initd-v4-bird-1.1.4 773 RMD160 537c6f68de3a590056dfa44b5d5dc624b96a6316 SHA1 7126342e48994dfb70cdeeda80e84304e6d762d5 SHA256 ebc360828f874f42ef070879942cfc4a712b6b8cb1fa17378013014bac7036a5
 AUX initd-v6-bird-1.1.1 779 RMD160 fdb77eaadfe62451995bd2b0a97b04dced8dc99a SHA1 9c53c2d223806c560788a06cbc2f5b89fa852942 SHA256 e45a86fe4a844ca57f9ddea437e859e6f9f1720a7e9cf88a7d8387ff4985f12a
 AUX initd-v6-bird-1.1.2 779 RMD160 13ce49089fddd1adf81784a0bfe84c822fdc2305 SHA1 8a5ef27a9ed15712277cd824f2997eddd21ef00d SHA256 7e5fd807b82449aae8ffff241adcca1d51417aba9aa21a0da060037ec38a1378
-AUX initd-v6-bird-1.1.3 775 RMD160 f5848ae70123ffc72138572e35f3ea01efba6e41 SHA1 8d8f711ff6d7a66e4370af733067d55b4f77fa17 SHA256 c9f887d92058c22f966ad3c6a75e97e7e00561917e943676af00e33964d3104d
+AUX initd-v6-bird-1.1.3 773 RMD160 ce4cd18245a801bbe65168e930c31fc4f66a9456 SHA1 d1149e9de2d2a8cd25bfb0335d7e61f0384ef649 SHA256 b0fcc9b48412792acd7749b27c418e5af1884bf4e56ca5439ee0a9fda5aaea51
+AUX initd-v6-bird-1.1.4 773 RMD160 f546306b1606a5a3642808d70c074b4705504ffe SHA1 1afe46a9269a5995fca28be013c410e4f11eaaff SHA256 f9ac30327f3368a818700d0678fefec68b4336bfd49c8e885cb692c9dead8ead
 DIST bird-1.1.1.tar.gz 646377 RMD160 0d50c7e8a298de619243db7188b5414ca86e012c SHA1 bc7d447df281e9bf1a2d5706ca9f1124772ffc41 SHA256 68f781812517a00fc804871d27db3ddd3596a82a9e90cf3516ff9d276ac59a99
 DIST bird-1.1.2.tar.gz 646690 RMD160 63c73f241fb67a34a584391a99cc3b22fed2ce60 SHA1 72f81081855863d9fd00aaef1ee4528a8866245d SHA256 a5460b87aa0dbd77b10ac52d8a8bfa56d36e254491763bab5e2ff87cc2dd08d0
 DIST bird-1.1.3.tar.gz 648279 RMD160 2d19222c0c99c9485c757ecf9b1ea5fa7b7f22d9 SHA1 61f798a0af22aca6fe3774e5ebf988ce0339aba4 SHA256 46fd9bce45864f53f3d84202f464444b3be40e5df836538754020603d58480d8
+DIST bird-1.1.4.tar.gz 649415 RMD160 1ea03607e09c2067c6a7e27d77f12870083e01f7 SHA1 6960a89e2a396d638277b27684cf617b80aef52b SHA256 928806a1e0e0a625250c57685ccd8f5f9d0d36118cf726425627a2ab321d56c4
 EBUILD bird-1.1.1.ebuild 1494 RMD160 a0473a3b5b7bb64a679e3ece4854bea84909eab6 SHA1 b2ce5df6181c9a00c5acd46729d51caabd36a3b0 SHA256 77a06267b56462d7c1b0a79053fad4e46dc240988eb7b74de034dbd631cb4ed4
 EBUILD bird-1.1.2.ebuild 1493 RMD160 200375f8c33f9d11304d5dacc98394caffeaf45d SHA1 80e741db68a577ad8b3e42bba61308166e3ef131 SHA256 383d734baf62f264383eb9f9e5baaefe9957f8a3535e936a5d2fea123923d86f
 EBUILD bird-1.1.3.ebuild 1493 RMD160 a7b8ea607cd1db0a02515beb95cc8e4093b71c42 SHA1 0e2c2a5ca596bf055ebb9d77900a5be7b1675328 SHA256 494d97e79a15821ab56126cd146fc836d285a78ffeb2d9e81db1974da36e2a54
-MISC ChangeLog 1493 RMD160 bf7fe7fc275fb97231af414cc5ce79b2c8c86c71 SHA1 b029f71b5e01163b784350744db316c9bc481adc SHA256 59f95d25bc32cb0996e2e5cf119ab09835895f86ce41c7da5f58dc7f60b4267d
+EBUILD bird-1.1.4.ebuild 1493 RMD160 ba0d13e5f911853bd7acd0490085028f4e97ea2f SHA1 d9b2e8c210bb4b51bf9b01fad8d6ebd7df51cdf5 SHA256 f164e89f066b6214921a557ef6dccba773d1b26166711a07c936a419131ac2b1
+MISC ChangeLog 1760 RMD160 32f6cf9e86c11c6f94c768b2839b53a40ebec708 SHA1 dd0e975ad88b9e1d3ab8fe8b1275877ecf1cee23 SHA256 98fcd506f1105bbe9c2152f7a1a5fb7180d53c9dda23dcf868d6a6e2276c13bd
 MISC metadata.xml 252 RMD160 39688056775b93958486028092a635d7596f2295 SHA1 84206aff0a072a68600245da08a0d83233da8259 SHA256 794815266f2c79c7762e9f4eaf6fd122af3b2b5b2d9d07a4aef8787218133d59
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkqqWBoACgkQp5vW4rUFj5p5DQCeOrfRDo6cknlc7e+fyOSc6XFU
-KqIAoIWe17evChi3dygyIR1Ujx2MrQAZ
-=IdzW
+iEYEARECAAYFAkrF6R8ACgkQp5vW4rUFj5rjWQCgweonosds+K9ElWPeBalenup/
+T44AoJ8i/hiQPLfURDva71sCACBFVwR7
+=coxv
 -----END PGP SIGNATURE-----
diff --git a/net-misc/bird/bird-1.1.4.ebuild b/net-misc/bird/bird-1.1.4.ebuild
new file mode 100644
index 000000000000..f74ad4597685
--- /dev/null
+++ b/net-misc/bird/bird-1.1.4.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.4.ebuild,v 1.1 2009/10/02 11:52:08 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.4-nostrip.patch b/net-misc/bird/files/1.1.4-nostrip.patch
new file mode 100644
index 000000000000..15ca414e63d2
--- /dev/null
+++ b/net-misc/bird/files/1.1.4-nostrip.patch
@@ -0,0 +1,15 @@
+diff -uNr bird-1.1.4.ORIG/tools/Makefile.in bird-1.1.4/tools/Makefile.in
+--- bird-1.1.4.ORIG/tools/Makefile.in	2009-10-02 12:45:06.000000000 +0100
++++ bird-1.1.4/tools/Makefile.in	2009-10-02 12:45:31.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.4 b/net-misc/bird/files/initd-v4-bird-1.1.4
new file mode 100644
index 000000000000..6e9b2d00a802
--- /dev/null
+++ b/net-misc/bird/files/initd-v4-bird-1.1.4
@@ -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.4,v 1.1 2009/10/02 11:52:07 chainsaw Exp $
+
+EXE=bird
+CLI=birdc
+SOCK="/var/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.3 b/net-misc/bird/files/initd-v6-bird-1.1.3
index 0784c6d359ea..1a3d3645c292 100644
--- a/net-misc/bird/files/initd-v6-bird-1.1.3
+++ b/net-misc/bird/files/initd-v6-bird-1.1.3
@@ -1,10 +1,10 @@
 #!/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.3,v 1.1 2009/09/11 14:01:51 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/files/initd-v6-bird-1.1.3,v 1.2 2009/10/02 11:52:07 chainsaw Exp $
 
-EXE=bird6
-CLI=birdc6
+EXE=bird
+CLI=birdc
 SOCK="/var/run/${EXE}.ctl"
 
 depend() {
diff --git a/net-misc/bird/files/initd-v6-bird-1.1.4 b/net-misc/bird/files/initd-v6-bird-1.1.4
new file mode 100644
index 000000000000..f00589f20bfa
--- /dev/null
+++ b/net-misc/bird/files/initd-v6-bird-1.1.4
@@ -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.4,v 1.1 2009/10/02 11:52:07 chainsaw Exp $
+
+EXE=bird
+CLI=birdc
+SOCK="/var/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
+}