Version bump. The ebuild now properly supports building both IPv4 & IPv6 versions, with thanks to Ondrej Filip from upstream. This is a bugfix release, particularly OSPF has received a lot of attention.

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

6 files changed, 271 insertions, 6 deletions

diff --git a/net-misc/bird/ChangeLog b/net-misc/bird/ChangeLog
index d64bc8e077f2..e385e61085d2 100644
--- a/net-misc/bird/ChangeLog
+++ b/net-misc/bird/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/bird
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/ChangeLog,v 1.11 2010/04/12 11:58:59 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/ChangeLog,v 1.12 2010/06/07 13:41:01 chainsaw Exp $
+
+*bird-1.2.3 (07 Jun 2010)
+
+  07 Jun 2010; <chainsaw@gentoo.org> +files/1.2.3-v4-v6-build.patch,
+  +files/initd-v4-bird-1.2.3, +files/initd-v6-bird-1.2.3,
+  +bird-1.2.3.ebuild:
+  Version bump. The ebuild now properly supports building both IPv4 & IPv6
+  versions, with thanks to Ondrej Filip from upstream. This is a bugfix
+  release, particularly OSPF has received a lot of attention.
 
 *bird-1.2.2 (12 Apr 2010)
 
diff --git a/net-misc/bird/Manifest b/net-misc/bird/Manifest
index f23be7c337ba..f8342f26b224 100644
--- a/net-misc/bird/Manifest
+++ b/net-misc/bird/Manifest
@@ -3,20 +3,25 @@ Hash: SHA1
 
 AUX 1.1.7-nostrip.patch 872 RMD160 7e1bb711dcac4f6624317011d88af7f8a4e3cba7 SHA1 69d9e1fc0447e8123ebe0a96e617776f1ea0f22d SHA256 4169dd1e111973b39adb9de483bc3cd2494d514e604ffa40be90e00c230b89fb
 AUX 1.2.2-v4-v6-build.patch 4179 RMD160 80d356ac2ca74b8379130eaf06a8ccbc66807520 SHA1 5dbc574d01a311fb62f0e17880d2595ce6627b6e SHA256 cb7df44af52c9cb7379c391e575f44767ea322d67fffefb56c57e237da167ece
+AUX 1.2.3-v4-v6-build.patch 4179 RMD160 1b72c3c6173c936f7daeea3322841720802d0d2a SHA1 6b0085eedc041c8a6025c6af15224439070a458d SHA256 e252639c95cdf6f3f9f2dce6f184f042b32a3c293dc0c920081cbac9d2a0f9ca
 AUX initd-v4-bird-1.1.7 773 RMD160 168e0b111400df14c6d3dcd0838e08958ad9031e SHA1 f63011a957ab7338c34076814afa4a9c86e76f62 SHA256 96fa8430209d3e412e5de7af849a7becabb939d1cbee14fdcf4b93d37619ccac
 AUX initd-v4-bird-1.2.2 773 RMD160 4952f210bf8d7126d9939084706bac25d4e8c6a1 SHA1 36e1f28ff1885bae8b67d6d77c2a5a873a0ff8f3 SHA256 b18b5b91d50e47e30f5a5a59f5e25532d547581e7a107261f320cb19426c0a21
+AUX initd-v4-bird-1.2.3 773 RMD160 1ecbc77863cf2d5d50223a8e1a5ce718618c7f10 SHA1 164726c9630f485ae56f0c66c792ecd7884b4516 SHA256 53dc92e4323f80b623bd7984a6d64dc35f56a765d25fcb82de0e77ae83197439
 AUX initd-v6-bird-1.1.7 773 RMD160 c0ac6f2e2e4a9faf9e6231404c1fac224b3e409c SHA1 cc75de552ae20ca8a7be4f296f85c9db2d02358e SHA256 9bb5ac9fd4e7e81d92dcba11fb83360e9492c3fa43afd029b41e1d6a33fd5ab2
 AUX initd-v6-bird-1.2.2 773 RMD160 88083b2a203cec10de0cbfbb9e71d3ccad0c3440 SHA1 8d92fa0a2b66d064a05453cd25211a5c948ade8f SHA256 a53f63f10bf16a2528c54b09e8537b516eb5df2e7b975423a5b5f4dd0a67a4e1
+AUX initd-v6-bird-1.2.3 773 RMD160 60b1869c4f3bf655c76bb91f192e731ca9e164f9 SHA1 e8c79035e823971fca037ec43bfaf312fce76203 SHA256 8e7430192654c70fb93c007a7c2b4a663fcedfe9db4b0e9b684dc2c1da90f581
 DIST bird-1.1.7.tar.gz 740466 RMD160 f14c25b645963f5bda5edafb34673199b1ac0689 SHA1 4846616caa4ccde5311b2344758c7491f7e59703 SHA256 be6596caf8e45619a7e345a5dd591fee1bf81fb8c0b476c2e331d218046abbfe
 DIST bird-1.2.2.tar.gz 774484 RMD160 648904d0ab37018098a3d53e133fe633891a62c6 SHA1 7dcf48237e30aca06cb573c6065ed5a2a241a1f7 SHA256 912d0a3d8e775fdeb7fc373a0b25045b935789ea16c577771f00f6b3567e4324
+DIST bird-1.2.3.tar.gz 865144 RMD160 fa03ad8fd95eb03d06f4625eeb5d80e7812c41fa SHA1 167f400910011764659da849b89f9eb4e2249d48 SHA256 503f25ef676c320be3db90b69b8a78da8fda4dc2d640d3aa9dbfae0cb4e66273
 EBUILD bird-1.1.7.ebuild 1493 RMD160 54d6567ad13613032a6a23e716e8b650463d768c SHA1 70ba8b36b17978407a5765287563a5951ad35db7 SHA256 62359f168cdd4e900d1a16e6dc7198021bd86b21580a39811bebeb57030783f8
 EBUILD bird-1.2.2.ebuild 1034 RMD160 3a985dc8ef2fbd6d87d3bf6c6ae9c8fba82d89db SHA1 9d73c24e855e16ed872275d1d5930901cbfccf41 SHA256 1789ecb4bca7db7e4fb5f3c105287c7a4a345a64136564cdfc127c07d2571e08
-MISC ChangeLog 3738 RMD160 b2fafd062e0733ecd618d755bd4ca5a9dbbef0c1 SHA1 b85cb6bf3bad07f239c9594aba41b2a5d392d360 SHA256 1949c262ffe48e39af0a50eb2aa4f4b6e8030594c1c0b818d83f27c9e3723250
+EBUILD bird-1.2.3.ebuild 1465 RMD160 554a8c79c04d2dc37ad5cfa02478e237b6c00fe5 SHA1 063191e16672f301112f8a2dfa8dbe253db0e02b SHA256 21ba2d4d024a105ed2d924b8202451fbaa40dc1755f0048678cee97b770b11c2
+MISC ChangeLog 4124 RMD160 80247bb32d267933f493c56694c2e724e7b13d54 SHA1 5230f555bcf39d331f3e7dc4a02e7c0b87b68cdb SHA256 f6bd0c5471eda9b6a7898b383019f77e35fc06159e37cdfb10c0e498996326df
 MISC metadata.xml 252 RMD160 39688056775b93958486028092a635d7596f2295 SHA1 84206aff0a072a68600245da08a0d83233da8259 SHA256 794815266f2c79c7762e9f4eaf6fd122af3b2b5b2d9d07a4aef8787218133d59
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkvDCwkACgkQp5vW4rUFj5pYEQCguZ+3mcCoCeaikMzIg6bd09x3
-1ocAoJOgrvCt5Yn5H8yubuJkVwRLaoVS
-=0u6H
+iEYEARECAAYFAkwM9vcACgkQp5vW4rUFj5q7CgCeJrh+sNIxRa4ni8P9LoaFksno
+xY8An1zq0+P/X+v2vYtWIg5H0GvIF0FX
+=emnN
 -----END PGP SIGNATURE-----
diff --git a/net-misc/bird/bird-1.2.3.ebuild b/net-misc/bird/bird-1.2.3.ebuild
new file mode 100644
index 000000000000..9e9168aa124a
--- /dev/null
+++ b/net-misc/bird/bird-1.2.3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/bird-1.2.3.ebuild,v 1.1 2010/06/07 13:41:01 chainsaw Exp $
+
+EAPI=1
+
+inherit base autotools
+
+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"
+
+PATCHES=(
+	"${FILESDIR}/${PV}-v4-v6-build.patch"
+)
+
+src_prepare() {
+	base_src_prepare
+	eautoreconf
+}
+
+src_compile() {
+	econf \
+		--enable-client \
+		--enable-ipv4 \
+		--disable-ipv6 \
+		$(use_enable debug) \
+		|| die "V4 configuration stage failed"
+	emake || die "V4 compilation stage failed"
+	if use ipv6; then
+		emake almost-clean
+		econf \
+			--enable-client \
+			--enable-ipv6 \
+			--disable-ipv4 \
+			$(use_enable debug) \
+			|| die "V6 configuration stage failed"
+		emake || die "V6 compilation stage failed"
+	fi
+}
+
+src_install() {
+	if use ipv6; then
+		dobin birdc6
+		dosbin bird6
+		newinitd "${FILESDIR}/initd-v6-${P}" bird || die "V6 init script installation failed"
+	fi
+	dobin birdc
+	dosbin bird
+	newinitd "${FILESDIR}/initd-v4-${P}" bird || die "V4 init script installation failed"
+	dodoc doc/bird.conf.example || die "configuration example installation failed"
+}
diff --git a/net-misc/bird/files/1.2.3-v4-v6-build.patch b/net-misc/bird/files/1.2.3-v4-v6-build.patch
new file mode 100644
index 000000000000..12f9e216efec
--- /dev/null
+++ b/net-misc/bird/files/1.2.3-v4-v6-build.patch
@@ -0,0 +1,109 @@
+diff -uNr bird-1.2.3.ORIG//tools/Makefile.in bird-1.2.3/tools/Makefile.in
+--- bird-1.2.3.ORIG//tools/Makefile.in	2010-06-07 14:15:41.000000000 +0100
++++ bird-1.2.3/tools/Makefile.in	2010-06-07 14:15:58.000000000 +0100
+@@ -3,13 +3,13 @@
+ 
+ include Rules
+ 
+-.PHONY: all daemon client subdir depend clean distclean tags docs userdocs progdocs
++.PHONY: all daemon client subdir depend clean distclean tags docs userdocs progdocs almost-clean
+ 
+ all: sysdep/paths.h .dep-stamp subdir daemon @CLIENT@
+ 
+-daemon: $(exedir)/bird
++daemon: $(exedir)/bird@SUFFIX6@
+ 
+-client: $(exedir)/birdc
++client: $(exedir)/birdc@SUFFIX6@
+ 
+ bird-dep := $(addsuffix /all.o, $(static-dirs)) conf/all.o lib/birdlib.a
+ 
+@@ -27,10 +27,10 @@
+ 	set -e ; for a in $(dynamic-dirs) ; do $(MAKE) -C $$a $@ ; done
+ 	set -e ; for a in $(static-dirs) $(client-dirs) ; do $(MAKE) -C $$a -f $(srcdir_abs)/$$a/Makefile $@ ; done
+ 
+-$(exedir)/bird: $(bird-dep)
++$(exedir)/bird@SUFFIX6@: $(bird-dep)
+ 	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+ 
+-$(exedir)/birdc: $(birdc-dep)
++$(exedir)/birdc@SUFFIX6@: $(birdc-dep)
+ 	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(CLIENT_LIBS)
+ 
+ .dir-stamp: sysdep/paths.h
+@@ -54,25 +54,42 @@
+ tags:
+ 	cd $(srcdir) ; etags -lc `find $(static-dirs) $(addprefix $(objdir)/,$(dynamic-dirs)) $(client-dirs) -name *.[chY]`
+ 
+-install: all
++install-gen:
+ 	$(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/$(localstatedir)/run
+-	$(INSTALL_PROGRAM) -s $(exedir)/bird $(DESTDIR)/$(sbindir)/bird@SUFFIX6@
++
++install-bin: install-gen
++	$(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/
++	if test -n "@CLIENT@" ; then                                                            \
++		$(INSTALL_PROGRAM) $(exedir)/birdc $(DESTDIR)/$(sbindir)/ ;                          \
++	fi
++	if ! test -f $(DESTDIR)/$(sysconfdir)/bird.conf ; then                                          \
++		$(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird.conf ;    \
++	else                                                                                    \
++		echo "Not overwriting old bird.conf" ;                                          \
++	fi
++
++install-bin6: install-gen
++	$(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/
+ 	if test -n "@CLIENT@" ; then								\
+-		$(INSTALL_PROGRAM) -s $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc@SUFFIX6@ ;				\
++		$(INSTALL_PROGRAM) $(exedir)/birdc6 $(DESTDIR)/$(sbindir)/birdc ;				\
+ 	fi
+-	if ! test -f $(DESTDIR)/$(sysconfdir)/bird@SUFFIX6@.conf ; then						\
+-		$(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird@SUFFIX6@.conf ;	\
++	if ! test -f $(DESTDIR)/$(sysconfdir)/bird6.conf ; then						\
++		$(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird6.conf ;	\
+ 	else											\
+-		echo "Not overwriting old bird@SUFFIX@.conf" ;						\
++		echo "Not overwriting old bird6.conf" ;						\
+ 	fi
+ 
++install: all install-bin@SUFFIX6@
++
+ install-docs:
+ 	$(INSTALL) -d $(DESTDIR)/$(docdir)
+ 	$(INSTALL_DATA) $(srcdir)/doc/{bird,prog}{,-*}.html $(DESTDIR)/$(docdir)/
+ 
+-clean:
++almost-clean:
+ 	find . -name "*.[oa]" -o -name core -o -name depend -o -name "*.html" | xargs rm -f
+ 	rm -f conf/cf-lex.c conf/cf-parse.* conf/commands.h conf/keywords.h
++
++clean: almost-clean
+ 	rm -f $(exedir)/bird $(exedir)/birdc $(exedir)/bird.ctl $(exedir)/bird6.ctl .dep-stamp
+ 
+ distclean: clean
+diff -uNr bird-1.2.3.ORIG//tools/Makefile-top.in bird-1.2.3/tools/Makefile-top.in
+--- bird-1.2.3.ORIG//tools/Makefile-top.in	2010-06-07 14:15:41.000000000 +0100
++++ bird-1.2.3/tools/Makefile-top.in	2010-06-07 14:15:58.000000000 +0100
+@@ -3,16 +3,19 @@
+ 
+ objdir=@objdir@
+ 
+-all depend tags install install-docs:
++all depend tags install install-docs install-bin install-bin6:
+ 	$(MAKE) -C $(objdir) $@
+ 
+ docs userdocs progdocs:
+ 	$(MAKE) -C doc $@
+ 
+-clean:
+-	$(MAKE) -C $(objdir) clean
++almost-clean:
++	$(MAKE) -C $(objdir) almost-clean
+ 	find . -name "*~" -or -name "*.[oa]" -or -name "\#*\#" -or -name TAGS -or -name core -or -name depend -or -name ".#*" | xargs rm -f
+ 
++clean: almost-clean
++	$(MAKE) -C $(objdir) clean
++
+ distclean: clean
+ 	$(MAKE) -C doc distclean
+ 	rm -rf $(objdir) autom4te.cache
diff --git a/net-misc/bird/files/initd-v4-bird-1.2.3 b/net-misc/bird/files/initd-v4-bird-1.2.3
new file mode 100644
index 000000000000..c1c49125fd8c
--- /dev/null
+++ b/net-misc/bird/files/initd-v4-bird-1.2.3
@@ -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.2.3,v 1.1 2010/06/07 13:41:01 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.2.3 b/net-misc/bird/files/initd-v6-bird-1.2.3
new file mode 100644
index 000000000000..e8fc4b65e944
--- /dev/null
+++ b/net-misc/bird/files/initd-v6-bird-1.2.3
@@ -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.2.3,v 1.1 2010/06/07 13:41:01 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
+}