Version bump, as requested by Moyaze Shivji of the LINX engineering department.
authorTony Vroon <chainsaw@gentoo.org>
Mon, 7 Nov 2011 10:57:30 +0000 (10:57 +0000)
committerTony Vroon <chainsaw@gentoo.org>
Mon, 7 Nov 2011 10:57:30 +0000 (10:57 +0000)
Package-Manager: portage-2.1.10.32/cvs/Linux x86_64

net-misc/bird/ChangeLog
net-misc/bird/Manifest
net-misc/bird/bird-1.3.2.ebuild [new file with mode: 0644]
net-misc/bird/files/1.3.2-v4-v6-build.patch [new file with mode: 0644]
net-misc/bird/files/initd-v4-bird-1.3.2 [new file with mode: 0644]
net-misc/bird/files/initd-v6-bird-1.3.2 [new file with mode: 0644]

index 694e84ad9911575aac741b62c8ff581fde494e54..121dce53bf0109149483b2f68b16bd4e719d4e68 100644 (file)
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/bird
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/ChangeLog,v 1.17 2011/05/02 12:05:37 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/ChangeLog,v 1.18 2011/11/07 10:57:30 chainsaw Exp $
+
+*bird-1.3.2 (07 Nov 2011)
+
+  07 Nov 2011; Tony Vroon <chainsaw@gentoo.org> +files/1.3.2-v4-v6-build.patch,
+  +files/initd-v4-bird-1.3.2, +files/initd-v6-bird-1.3.2, +bird-1.3.2.ebuild:
+  Version bump, as requested by Moyaze Shivji of the LINX engineering
+  department.
 
 *bird-1.3.1 (02 May 2011)
 
index c6824b01ae0c65a4e1232423d7c73706f69c9f36..9ec9f56b395266249334426bd4f0942cbf42e0a1 100644 (file)
@@ -1,32 +1,35 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX 1.2.3-v4-v6-build.patch 4179 RMD160 1b72c3c6173c936f7daeea3322841720802d0d2a SHA1 6b0085eedc041c8a6025c6af15224439070a458d SHA256 e252639c95cdf6f3f9f2dce6f184f042b32a3c293dc0c920081cbac9d2a0f9ca
 AUX 1.2.4-v4-v6-build.patch 4179 RMD160 4e04160c811edde5841d30e6b6ab8bb0e4d11880 SHA1 d70e5ca6053ca48e538988e3755b553cfea02ee2 SHA256 1651431304a25774cc11699a8e6a08ea1eb65dd51d80d38d6601cc842f031b27
 AUX 1.3.0-v4-v6-build.patch 4179 RMD160 68514a3564c5277da2f28658bc78320fef02b8e1 SHA1 7e6720e172fca438fe15da400e176f26d431e6e8 SHA256 b1385e27f5940e3e55b3dc63c9f0b8510cbd57995655ffae2837a6d0634e45d8
 AUX 1.3.1-v4-v6-build.patch 4179 RMD160 7069213cabaa86139675f0e563980ac001fc5cb0 SHA1 73f411ec29ceaf44c89311009f339303bc880815 SHA256 df8f59670616eba7f724406cb4ab1e331f0883d0eb399c23ded57a0adc4bb6a5
+AUX 1.3.2-v4-v6-build.patch 4175 RMD160 c1a6c4bfd8e664cb8a6b464c282d20f838f78f09 SHA1 56456fe05fe87620554f5851ed7253091e1eab21 SHA256 eb167203fc832649c79d11d541ba6b382856eba3c68fb167e03d9cf37119250c
 AUX initd-v4-bird-1.2.3 773 RMD160 1ecbc77863cf2d5d50223a8e1a5ce718618c7f10 SHA1 164726c9630f485ae56f0c66c792ecd7884b4516 SHA256 53dc92e4323f80b623bd7984a6d64dc35f56a765d25fcb82de0e77ae83197439
 AUX initd-v4-bird-1.2.4 773 RMD160 8856801d6020368b2d603e5fb1c294a637a0381c SHA1 260153b87fe80584ed86263df2e4b51cf281804e SHA256 c269007c4b3b93e9a77f490d3ff7b8140bb4cdb430d31ae76153ecd5e2c1b933
 AUX initd-v4-bird-1.3.0 938 RMD160 5c9dd983f57406e3a6babb0e44c80d3f0ab38a77 SHA1 824b49f2772d690e0a6ac5d0f6f387375145dfda SHA256 1135efe8e4b9c0462903cc1711ea638a539d34b0a076d385138d8d4906fafa5d
 AUX initd-v4-bird-1.3.1 938 RMD160 134552c37bf067dbfaf4d9b6d1e53333554f8a75 SHA1 c03d562c65aeee257da1aef8096ab3c30ced46a8 SHA256 0cd257fe572de97e6c149e3cc70fbb3e7de2af7770676bed48a5a62d120f4d44
+AUX initd-v4-bird-1.3.2 938 RMD160 ff608e850fe27a7bd4eb03b1c9b787f683aa0673 SHA1 a54dbfcd7404838b42526129fd6d8f2d6b4f155e SHA256 8e2be870242570e6d96fab6f739800ad6a12857a1a60102f9ea1551bd64d8fc0
 AUX initd-v6-bird-1.2.3 775 RMD160 b90915c2645bf96b772920a0e64d9294109c56f3 SHA1 e41275d7b76294eec7b76aaf945533b051ae0b13 SHA256 6ef4ef42826980b9bb2918a8ef81908c9c04399859d9be246f2e685f124f38d4
 AUX initd-v6-bird-1.2.4 775 RMD160 1e263dcc0e3f6f08e4853e4b9afd1e11708d83b8 SHA1 2e773096c2084163ea7a3b9d904705b74cf62922 SHA256 ec830f49c4238a3b8d78a465a210cd5437d70490c2dfbf9445f007e1ff8ac395
 AUX initd-v6-bird-1.3.0 939 RMD160 85b2901716349bfb16508ac908a168941d88dcb7 SHA1 fd1c101be4a8e10a294f0a6b517efb7de1b1b7e8 SHA256 44ddb6fe2324a4d964b51e8c814a1d7e770ec77e37350282cf66017cb43d7c1a
 AUX initd-v6-bird-1.3.1 939 RMD160 b939f40b640073cb2952899b28fb5c8ab3a4de99 SHA1 290d37bf18415465bf10aef4e7f71c02f4d279bf SHA256 edb7b019473dcdca8aaf0191f0f91bf9b353af296b95b05068503681ff9191b2
+AUX initd-v6-bird-1.3.2 939 RMD160 e67c4f3997864f8d382e1fe461c641455a4c4ab9 SHA1 be3033e7b4f996345d7da7fd0dc902d508fc90b6 SHA256 890ac5b4f0ff9f691c712f6b8f7850c0909aa0ee897d38c9ae223e7f0bc7a884
 DIST bird-1.2.4.tar.gz 702747 RMD160 c08a5688a8bb18570cdafe6ab92df7b7efa3e8c0 SHA1 5883fb4f018b3d25d4716d959d171b2df5ebecb0 SHA256 8985d64c24de8818dedfe37c545f002e0978f2a2b397a91c8529694dbeb8fa9a
 DIST bird-1.3.0.tar.gz 735100 RMD160 b3d78d477b73fecc770fb0bb30f6a40b255ad245 SHA1 00f13917004cbc66e05b2dfc6ca094f59ca5f7bc SHA256 ff90e3ee115a83e2b03a57095132923f66e1fca874dcca7a908075b6c2dc84b3
 DIST bird-1.3.1.tar.gz 826422 RMD160 03e3f1e3e825c4db21bebd77948d7ffd0e0e9cf1 SHA1 60d0388b2515d07d5c7d00635671b145ca34c15b SHA256 848be209aba6a1a85ae0ed6192710f8bcc2f1257068191fe2959398cdec01afb
+DIST bird-1.3.2.tar.gz 744121 RMD160 9dd35896111c5a991449579ca12fbcb452af4da9 SHA1 fb9f4badd4bab84fe1c7affd064f1b1680a30739 SHA256 dbf8794ef3560382f10b8926e2d158da9d34670703090bfe378c08892743f54b
 EBUILD bird-1.2.4.ebuild 1469 RMD160 32d055941797fda636979feec7f7f2b4fd19ad61 SHA1 123b769321f8dc42fd32ecd7cb089facee45ebdf SHA256 add962c51eb739b4771f0104678abf9517dc9b49233395dfd61ad4b33fbf5b27
 EBUILD bird-1.3.0.ebuild 1522 RMD160 eca31d55b5e565e3dac8df12392a2a088fa40608 SHA1 15a6295e6c5c62b7421cd6847b8daa5f668567be SHA256 171d62be346bd87c254474986e8c4b71166ed943a34a82d9a9862cf101496888
 EBUILD bird-1.3.1.ebuild 1522 RMD160 ffeacfbfbcaf93238c600a4c83037a3e6e618cb4 SHA1 51278f1da95f65efca32e586d41da54bd772153c SHA256 f916168130b2d7b089c66b262599e59dfe91e2ac545e8bd8e476594b7da7d983
-MISC ChangeLog 5863 RMD160 3a14705c483065b3ef650abb77f69863f8d2009d SHA1 2a2fc0b2c80e5456bd7d038046ce98d2ab7ca877 SHA256 38cd4376a5f25a17b35dd39ef3710a293614654459904096a584a83ae3e9e68e
+EBUILD bird-1.3.2.ebuild 1522 RMD160 087c98d89a7254607e7d415bfce55432d14327c3 SHA1 e95bfd4b6fee89cfcb3db1a4d742aa4368073a8b SHA256 fd7897827dd853d252fa9d8cac6b779cc7f2c67fad56ccfae8aec02d18a491db
+MISC ChangeLog 6133 RMD160 464d0ab8e0b4c380660df30c1f6bc3d999326ca3 SHA1 0e18a706b0efd7107cf49d28f6783c3678386ec7 SHA256 42487e9a708a3358bfe64588de74780f3e7441c415d282cda60fd2f4ebfd3923
 MISC metadata.xml 230 RMD160 5238bf4ccdd53fab4822db7022a94704c222ff72 SHA1 c92efa46fa150b13d7e6ba11a87540393c331bc8 SHA256 44667b3033aa4aa69744b8eb24206d2edfcc84e8e491c54d891ba252e6540c44
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59rRkACgkQfXuS5UK5QB3uhAP+J/5WS6sSFhh+P9GAZ3sUtC5O
-iOGYcEDxUu832Paaze2IFGeg1Vwa9AbkBC5gsx/sT+mcrptJHA6F18gCQ9+SM43D
-pMGeup2yEubBob4BOhcKfLHx0tSsXyKZ20sC9x/cHdGHWvfN6ryNS1Q75ZEGmcaN
-xMoLWfdFAzGRP2ivDyg=
-=bOcV
+iEYEARECAAYFAk63ua0ACgkQp5vW4rUFj5o9xQCfSYTpjrqN8p8jAYzBT3Vssjp9
+6KAAnRS5Zj0CJL5+8XUlgXm7ejKPRcfG
+=Q4PZ
 -----END PGP SIGNATURE-----
diff --git a/net-misc/bird/bird-1.3.2.ebuild b/net-misc/bird/bird-1.3.2.ebuild
new file mode 100644 (file)
index 0000000..adb0a62
--- /dev/null
@@ -0,0 +1,66 @@
+# 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.3.2.ebuild,v 1.1 2011/11/07 10:57:30 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 ~x86"
+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 \
+               --localstatedir=/var \
+               $(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 \
+                       --localstatedir=/var \
+                       $(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}" bird6 || 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.3.2-v4-v6-build.patch b/net-misc/bird/files/1.3.2-v4-v6-build.patch
new file mode 100644 (file)
index 0000000..134c31f
--- /dev/null
@@ -0,0 +1,109 @@
+diff -uNr bird-1.3.2.ORIG/tools/Makefile.in bird-1.3.2/tools/Makefile.in
+--- bird-1.3.2.ORIG/tools/Makefile.in  2011-11-07 10:53:52.881139861 +0000
++++ bird-1.3.2/tools/Makefile.in       2011-11-07 10:54:08.606140225 +0000
+@@ -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
+@@ -55,25 +55,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.3.2.ORIG/tools/Makefile-top.in bird-1.3.2/tools/Makefile-top.in
+--- bird-1.3.2.ORIG/tools/Makefile-top.in      2011-11-07 10:53:52.881139861 +0000
++++ bird-1.3.2/tools/Makefile-top.in   2011-11-07 10:54:08.603140225 +0000
+@@ -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.3.2 b/net-misc/bird/files/initd-v4-bird-1.3.2
new file mode 100644 (file)
index 0000000..d5c95a2
--- /dev/null
@@ -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.2,v 1.1 2011/11/07 10:57:30 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.2 b/net-misc/bird/files/initd-v6-bird-1.3.2
new file mode 100644 (file)
index 0000000..8aff088
--- /dev/null
@@ -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.2,v 1.1 2011/11/07 10:57:30 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"
+}