New upstream release. Note that the V6 version is not functional, I have contacted upstream and will provide an updated ebuild when possible.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

7 files changed, 111 insertions, 110 deletions

diff --git a/net-misc/bird/files/1.1.5-nostrip.patch b/net-misc/bird/files/1.1.5-nostrip.patch
deleted file mode 100644
index d7acd2304b44..000000000000
--- a/net-misc/bird/files/1.1.5-nostrip.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -uNr bird-1.1.5.ORIG/tools/Makefile.in bird-1.1.5/tools/Makefile.in
---- bird-1.1.5.ORIG/tools/Makefile.in	2009-11-02 15:22:13.000000000 +0000
-+++ bird-1.1.5/tools/Makefile.in	2009-11-02 15:22:31.000000000 +0000
-@@ -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/1.1.6-nostrip.patch b/net-misc/bird/files/1.1.6-nostrip.patch
deleted file mode 100644
index 282bfc2e8c36..000000000000
--- a/net-misc/bird/files/1.1.6-nostrip.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -uNr bird-1.1.6.ORIG/tools/Makefile.in bird-1.1.6/tools/Makefile.in
---- bird-1.1.6.ORIG/tools/Makefile.in	2009-11-23 14:18:19.000000000 +0000
-+++ bird-1.1.6/tools/Makefile.in	2009-11-23 14:18:36.000000000 +0000
-@@ -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/1.2.2-v4-v6-build.patch b/net-misc/bird/files/1.2.2-v4-v6-build.patch
new file mode 100644
index 000000000000..bf00f02382cf
--- /dev/null
+++ b/net-misc/bird/files/1.2.2-v4-v6-build.patch
@@ -0,0 +1,109 @@
+diff -uNr bird-1.2.2.ORIG//tools/Makefile.in bird-1.2.2/tools/Makefile.in
+--- bird-1.2.2.ORIG//tools/Makefile.in	2010-04-12 12:25:43.000000000 +0100
++++ bird-1.2.2/tools/Makefile.in	2010-04-12 12:26:11.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.2.ORIG//tools/Makefile-top.in bird-1.2.2/tools/Makefile-top.in
+--- bird-1.2.2.ORIG//tools/Makefile-top.in	2010-04-12 12:25:43.000000000 +0100
++++ bird-1.2.2/tools/Makefile-top.in	2010-04-12 12:26:00.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.1.6 b/net-misc/bird/files/initd-v4-bird-1.1.6
deleted file mode 100644
index 257af405daa1..000000000000
--- a/net-misc/bird/files/initd-v4-bird-1.1.6
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/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.6,v 1.1 2009/11/23 14:35:03 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-v4-bird-1.1.5 b/net-misc/bird/files/initd-v4-bird-1.2.2
index 94087ccc8489..d7219e510c02 100644
--- a/net-misc/bird/files/initd-v4-bird-1.1.5
+++ b/net-misc/bird/files/initd-v4-bird-1.2.2
@@ -1,7 +1,7 @@
 #!/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.5,v 1.1 2009/11/02 15:58:44 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/files/initd-v4-bird-1.2.2,v 1.1 2010/04/12 11:58:59 chainsaw Exp $
 
 EXE=bird
 CLI=birdc
diff --git a/net-misc/bird/files/initd-v6-bird-1.1.6 b/net-misc/bird/files/initd-v6-bird-1.1.6
deleted file mode 100644
index c7d2b34d82d9..000000000000
--- a/net-misc/bird/files/initd-v6-bird-1.1.6
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/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.6,v 1.1 2009/11/23 14:35:03 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.5 b/net-misc/bird/files/initd-v6-bird-1.2.2
index f135078a3f8a..6a0205daf3d2 100644
--- a/net-misc/bird/files/initd-v6-bird-1.1.5
+++ b/net-misc/bird/files/initd-v6-bird-1.2.2
@@ -1,7 +1,7 @@
 #!/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.5,v 1.1 2009/11/02 15:58:44 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/files/initd-v6-bird-1.2.2,v 1.1 2010/04/12 11:58:59 chainsaw Exp $
 
 EXE=bird
 CLI=birdc