New upstream release, adds iBGP, multipath support, layer 2 link state detection, IPv6 RAs and many bugfixes. OSPF now supports point-to-multipoint interfaces. Azamat H. Hackimov has provided completely new initscripts and important socket path fixes, closes bugs #338118 and #338188.

(Portage version: 2.1.9.45/cvs/Linux x86_64)

5 files changed, 210 insertions, 5 deletions

diff --git a/net-misc/bird/ChangeLog b/net-misc/bird/ChangeLog
index b43020d23568..54f66bc068bb 100644
--- a/net-misc/bird/ChangeLog
+++ b/net-misc/bird/ChangeLog
@@ -1,6 +1,16 @@
 # 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.15 2010/09/26 09:16:30 maekke Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/ChangeLog,v 1.16 2011/03/31 09:48:53 chainsaw Exp $
+
+*bird-1.3.0 (31 Mar 2011)
+
+  31 Mar 2011; Tony Vroon <chainsaw@gentoo.org> +files/1.3.0-v4-v6-build.patch,
+  -bird-1.2.3-r1.ebuild, +files/initd-v4-bird-1.3.0,
+  +files/initd-v6-bird-1.3.0, +bird-1.3.0.ebuild:
+  New upstream release, adds iBGP, multipath support, layer 2 link state
+  detection, IPv6 RAs and many bugfixes. OSPF now supports point-to-multipoint
+  interfaces. Azamat H. Hackimov has provided completely new initscripts and
+  important socket path fixes, closes bugs #338118 and #338188.
 
   26 Sep 2010; Markus Meier <maekke@gentoo.org> bird-1.2.4.ebuild:
   add ~x86, bug #338119
diff --git a/net-misc/bird/bird-1.2.3-r1.ebuild b/net-misc/bird/bird-1.3.0.ebuild
index 3f4c74a54f8e..98a15308e2ba 100644
--- a/net-misc/bird/bird-1.2.3-r1.ebuild
+++ b/net-misc/bird/bird-1.3.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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-r1.ebuild,v 1.1 2010/08/23 11:29:16 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/bird-1.3.0.ebuild,v 1.1 2011/03/31 09:48:53 chainsaw Exp $
 
 EAPI=1
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug ipv6"
 
 RDEPEND="sys-libs/ncurses
@@ -36,6 +36,7 @@ src_compile() {
 		--enable-client \
 		--enable-ipv4 \
 		--disable-ipv6 \
+		--localstatedir=/var \
 		$(use_enable debug) \
 		|| die "V4 configuration stage failed"
 	emake || die "V4 compilation stage failed"
@@ -45,6 +46,7 @@ src_compile() {
 			--enable-client \
 			--enable-ipv6 \
 			--disable-ipv4 \
+			--localstatedir=/var \
 			$(use_enable debug) \
 			|| die "V6 configuration stage failed"
 		emake || die "V6 compilation stage failed"
diff --git a/net-misc/bird/files/1.3.0-v4-v6-build.patch b/net-misc/bird/files/1.3.0-v4-v6-build.patch
new file mode 100644
index 000000000000..9e321836b850
--- /dev/null
+++ b/net-misc/bird/files/1.3.0-v4-v6-build.patch
@@ -0,0 +1,109 @@
+diff -uNr bird-1.3.0.ORIG//tools/Makefile-top.in bird-1.3.0/tools/Makefile-top.in
+--- bird-1.3.0.ORIG//tools/Makefile-top.in	2011-03-31 10:42:08.264002882 +0100
++++ bird-1.3.0/tools/Makefile-top.in	2011-03-31 10:42:32.083002944 +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 -uNr bird-1.3.0.ORIG//tools/Makefile.in bird-1.3.0/tools/Makefile.in
+--- bird-1.3.0.ORIG//tools/Makefile.in	2011-03-31 10:42:08.265002882 +0100
++++ bird-1.3.0/tools/Makefile.in	2011-03-31 10:42:32.083002944 +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 --git a/net-misc/bird/files/initd-v4-bird-1.3.0 b/net-misc/bird/files/initd-v4-bird-1.3.0
new file mode 100644
index 000000000000..94e1e3771c58
--- /dev/null
+++ b/net-misc/bird/files/initd-v4-bird-1.3.0
@@ -0,0 +1,42 @@
+#!/sbin/runscript
+# Copyright 1999-2011 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.3.0,v 1.1 2011/03/31 09:48:53 chainsaw Exp $
+
+opts="reload"
+
+EXE=bird
+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"
+	start-stop-daemon --start --exec /usr/sbin/${EXE} -- -c "/etc/${EXE}.conf" -s "${SOCK}"
+	eend $? "Failed to start BIRD"
+}
+
+stop() {
+	ebegin "Stopping BIRD"
+	start-stop-daemon --stop --exec /usr/sbin/${EXE}
+	eend $? "Failed to stop BIRD"
+}
+
+reload() {
+	service_started "${SVCNAME}" || return
+	ebegin "Reloading BIRD"
+	start-stop-daemon --stop --signal HUP --oknodo --exec /usr/sbin/${EXE}
+	eend $? "Failed to reload BIRD"
+}
diff --git a/net-misc/bird/files/initd-v6-bird-1.3.0 b/net-misc/bird/files/initd-v6-bird-1.3.0
new file mode 100644
index 000000000000..177731338833
--- /dev/null
+++ b/net-misc/bird/files/initd-v6-bird-1.3.0
@@ -0,0 +1,42 @@
+#!/sbin/runscript
+# Copyright 1999-2011 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.3.0,v 1.1 2011/03/31 09:48:53 chainsaw Exp $
+
+opts="reload"
+
+EXE=bird6
+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"
+	start-stop-daemon --start --exec /usr/sbin/${EXE} -- -c "/etc/${EXE}.conf" -s "${SOCK}"
+	eend $? "Failed to start BIRD"
+}
+
+stop() {
+	ebegin "Stopping BIRD"
+	start-stop-daemon --stop --exec /usr/sbin/${EXE}
+	eend $? "Failed to stop BIRD"
+}
+
+reload() {
+	service_started "${SVCNAME}" || return
+	ebegin "Reloading BIRD"
+	start-stop-daemon --stop --signal HUP --oknodo --exec /usr/sbin/${EXE}
+	eend $? "Failed to reload BIRD"
+}