diff options
| -rw-r--r-- | net-misc/bird/ChangeLog | 10 | ||||
| -rw-r--r-- | net-misc/bird/Manifest | 13 | ||||
| -rw-r--r-- | net-misc/bird/bird-1.2.4.ebuild | 64 | ||||
| -rw-r--r-- | net-misc/bird/files/1.2.4-v4-v6-build.patch | 109 | ||||
| -rw-r--r-- | net-misc/bird/files/initd-v4-bird-1.2.4 | 39 | ||||
| -rw-r--r-- | net-misc/bird/files/initd-v6-bird-1.2.4 | 39 |
6 files changed, 269 insertions, 5 deletions
diff --git a/net-misc/bird/ChangeLog b/net-misc/bird/ChangeLog index b5674174e292..fa8d6e8d2f3c 100644 --- a/net-misc/bird/ChangeLog +++ b/net-misc/bird/ChangeLog @@ -1,6 +1,14 @@ # 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.13 2010/08/23 11:29:16 chainsaw Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/ChangeLog,v 1.14 2010/09/06 14:45:53 chainsaw Exp $ + +*bird-1.2.4 (06 Sep 2010) + + 06 Sep 2010; <chainsaw@gentoo.org> +files/1.2.4-v4-v6-build.patch, + +files/initd-v4-bird-1.2.4, +files/initd-v6-bird-1.2.4, + +bird-1.2.4.ebuild: + Version bump. Now compiles again in full debug mode; closes bug #335790 by + Luca Postregna. *bird-1.2.3-r1 (23 Aug 2010) diff --git a/net-misc/bird/Manifest b/net-misc/bird/Manifest index f89386053766..f3a7cb863e21 100644 --- a/net-misc/bird/Manifest +++ b/net-misc/bird/Manifest @@ -2,16 +2,21 @@ 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 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-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 DIST bird-1.2.3.tar.gz 865144 RMD160 fa03ad8fd95eb03d06f4625eeb5d80e7812c41fa SHA1 167f400910011764659da849b89f9eb4e2249d48 SHA256 503f25ef676c320be3db90b69b8a78da8fda4dc2d640d3aa9dbfae0cb4e66273 +DIST bird-1.2.4.tar.gz 702747 RMD160 c08a5688a8bb18570cdafe6ab92df7b7efa3e8c0 SHA1 5883fb4f018b3d25d4716d959d171b2df5ebecb0 SHA256 8985d64c24de8818dedfe37c545f002e0978f2a2b397a91c8529694dbeb8fa9a EBUILD bird-1.2.3-r1.ebuild 1469 RMD160 f03cdee1ce40945e52b04e554b1c8c8b5f484ae7 SHA1 73ed1ab026001638045ed49e2d1fff985ee39fec SHA256 2371d039a3d7ffbb73f7396aef2bbcaa6710bec6415843f246d17ac813823bb2 -MISC ChangeLog 4570 RMD160 40484bbd665bca5bebb9d3a8ac212879b9994984 SHA1 9042acb643d30572cae3bda5164e23c01ee0d5a3 SHA256 da6b219e9fa84ac5ae47f3bcbd8dc6225022c907e8124729d6795f59b0938d16 +EBUILD bird-1.2.4.ebuild 1466 RMD160 6e86eee4c908d4a487db18101f65b65244164cfb SHA1 a79a6ad4a4631f780361e76982242c5855271c72 SHA256 86153e4f0d8ed44d87b598828e8c3b9f1a492e81b468fa09687fd0a7c100f80c +MISC ChangeLog 4842 RMD160 515d8def5b283f3a2688607cc5d2bc7e443c5870 SHA1 669f7e1c5d9039ee94edc4958185f99128f9acf6 SHA256 8d7e63c477d266cb2f5fbd1fcd8cbbdca0ab9ce8eb114086402592e348251634 MISC metadata.xml 252 RMD160 39688056775b93958486028092a635d7596f2295 SHA1 84206aff0a072a68600245da08a0d83233da8259 SHA256 794815266f2c79c7762e9f4eaf6fd122af3b2b5b2d9d07a4aef8787218133d59 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) -iEYEARECAAYFAkxyW5UACgkQp5vW4rUFj5oixwCfT078p+13e9o8068NhiNlFt2v -KVwAnjUYIB0E/x0d0xDZ4e1f+metejVb -=K6SH +iEYEARECAAYFAkyE/qkACgkQp5vW4rUFj5pPVwCgmM6P1msU7BmNfdRxZUn62NGl +guwAoJ1oRfEoQ29vaEkSB8TtWQStvAnp +=EJ8h -----END PGP SIGNATURE----- diff --git a/net-misc/bird/bird-1.2.4.ebuild b/net-misc/bird/bird-1.2.4.ebuild new file mode 100644 index 000000000000..3ecdf3d8a709 --- /dev/null +++ b/net-misc/bird/bird-1.2.4.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.4.ebuild,v 1.1 2010/09/06 14:45:53 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}" 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.2.4-v4-v6-build.patch b/net-misc/bird/files/1.2.4-v4-v6-build.patch new file mode 100644 index 000000000000..83a2710f7591 --- /dev/null +++ b/net-misc/bird/files/1.2.4-v4-v6-build.patch @@ -0,0 +1,109 @@ +diff -uNr bird-1.2.4.ORIG//tools/Makefile.in bird-1.2.4/tools/Makefile.in +--- bird-1.2.4.ORIG//tools/Makefile.in 2010-09-06 15:38:39.000000000 +0100 ++++ bird-1.2.4/tools/Makefile.in 2010-09-06 15:38:56.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.4.ORIG//tools/Makefile-top.in bird-1.2.4/tools/Makefile-top.in +--- bird-1.2.4.ORIG//tools/Makefile-top.in 2010-09-06 15:38:39.000000000 +0100 ++++ bird-1.2.4/tools/Makefile-top.in 2010-09-06 15:38:56.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.4 b/net-misc/bird/files/initd-v4-bird-1.2.4 new file mode 100644 index 000000000000..5d17c98174d6 --- /dev/null +++ b/net-misc/bird/files/initd-v4-bird-1.2.4 @@ -0,0 +1,39 @@ +#!/sbin/runscript +# Copyright 1999-2010 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.4,v 1.1 2010/09/06 14:45:53 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.4 b/net-misc/bird/files/initd-v6-bird-1.2.4 new file mode 100644 index 000000000000..c24e375c89c3 --- /dev/null +++ b/net-misc/bird/files/initd-v6-bird-1.2.4 @@ -0,0 +1,39 @@ +#!/sbin/runscript +# Copyright 1999-2010 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.4,v 1.1 2010/09/06 14:45:53 chainsaw Exp $ + +EXE=bird6 +CLI=birdc6 +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 +} |