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.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

5 files changed, 261 insertions, 1 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/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
+}