diff options
| -rw-r--r-- | net-misc/bird/ChangeLog | 11 | ||||
| -rw-r--r-- | net-misc/bird/bird-1.1.0.ebuild | 40 | ||||
| -rw-r--r-- | net-misc/bird/bird-1.1.2.ebuild | 59 | ||||
| -rw-r--r-- | net-misc/bird/files/1.1.2-nostrip.patch (renamed from net-misc/bird/files/1.1.0-nostrip.patch) | 8 | ||||
| -rw-r--r-- | net-misc/bird/files/initd-v4-bird-1.1.2 (renamed from net-misc/bird/files/initd-bird-1.1.0) | 14 | ||||
| -rw-r--r-- | net-misc/bird/files/initd-v6-bird-1.1.2 | 39 |
6 files changed, 120 insertions, 51 deletions
diff --git a/net-misc/bird/ChangeLog b/net-misc/bird/ChangeLog index cd9fff9a7304..7c958b58d41a 100644 --- a/net-misc/bird/ChangeLog +++ b/net-misc/bird/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for net-misc/bird # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/ChangeLog,v 1.4 2009/08/20 16:12:18 chainsaw Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/ChangeLog,v 1.5 2009/08/24 12:22:41 chainsaw Exp $ + +*bird-1.1.2 (24 Aug 2009) + + 24 Aug 2009; <chainsaw@gentoo.org> -files/1.1.0-nostrip.patch, + -files/initd-bird-1.1.0, -bird-1.1.0.ebuild, +files/1.1.2-nostrip.patch, + +files/initd-v4-bird-1.1.2, +files/initd-v6-bird-1.1.2, + +bird-1.1.2.ebuild: + New version that allows more kernel routing tables in IPv6 and contains a + core bugfix. Removed old ebuild. *bird-1.1.1 (20 Aug 2009) diff --git a/net-misc/bird/bird-1.1.0.ebuild b/net-misc/bird/bird-1.1.0.ebuild deleted file mode 100644 index f49100004310..000000000000 --- a/net-misc/bird/bird-1.1.0.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/bird-1.1.0.ebuild,v 1.1 2009/07/22 12:20:53 chainsaw Exp $ - -inherit eutils - -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="ipv6" - -RDEPEND="sys-libs/ncurses - sys-libs/readline - ${DEPEND}" -DEPEND="sys-devel/flex - sys-devel/bison - sys-devel/m4" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}/${PV}-nostrip.patch" -} - -src_compile() { - econf \ - --enable-client \ - $(use_enable ipv6) \ - || die "Configuration stage failed" - emake -j1 || die "Compilation stage failed" -} - -src_install() { - emake DESTDIR="${D}" install || die - newinitd "${FILESDIR}/initd-${P}" bird -} diff --git a/net-misc/bird/bird-1.1.2.ebuild b/net-misc/bird/bird-1.1.2.ebuild new file mode 100644 index 000000000000..2cb5900ed2f6 --- /dev/null +++ b/net-misc/bird/bird-1.1.2.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/bird-1.1.2.ebuild,v 1.1 2009/08/24 12:22:41 chainsaw Exp $ + +inherit eutils + +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" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}/${PV}-nostrip.patch" +} + +src_compile() { + econf \ + --enable-client \ + $(use_enable debug) \ + $(use_enable ipv6) \ + || die "Configuration stage failed" + emake || die "Compilation stage failed" +} + +src_install() { + emake DESTDIR="${D}" install || die + if use ipv6; then + # The only thing worse then not supplying + # a sample configuration file to a user is + # wasting his/her time with a totally + # broken one. + rm "${D}/etc/bird6.conf" + newinitd "${FILESDIR}/initd-v6-${P}" bird6 + else + newinitd "${FILESDIR}/initd-v4-${P}" bird + fi +} + +pkg_postinst() { + if use ipv6; then + elog "Please note that only the IPv6 versions of the BIRD client & daemon have been installed." + else + elog "Please note that only the IPv4 versions of the BIRD client & daemon have been installed." + fi + elog "BIRDs build system is not currently suited to providing both." +} diff --git a/net-misc/bird/files/1.1.0-nostrip.patch b/net-misc/bird/files/1.1.2-nostrip.patch index 9555c89b56bc..e37a84d78868 100644 --- a/net-misc/bird/files/1.1.0-nostrip.patch +++ b/net-misc/bird/files/1.1.2-nostrip.patch @@ -1,7 +1,7 @@ -diff -uNr bird-1.1.0.ORIG/tools/Makefile.in bird-1.1.0/tools/Makefile.in ---- bird-1.1.0.ORIG/tools/Makefile.in 2009-07-22 12:23:19.000000000 +0100 -+++ bird-1.1.0/tools/Makefile.in 2009-07-22 12:25:50.000000000 +0100 -@@ -44,9 +44,9 @@ +diff -uNr bird-1.1.2.ORIG/tools/Makefile.in bird-1.1.2/tools/Makefile.in +--- bird-1.1.2.ORIG/tools/Makefile.in 2009-08-24 13:13:24.000000000 +0100 ++++ bird-1.1.2/tools/Makefile.in 2009-08-24 13:13:39.000000000 +0100 +@@ -56,9 +56,9 @@ install: all $(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/$(localstatedir) diff --git a/net-misc/bird/files/initd-bird-1.1.0 b/net-misc/bird/files/initd-v4-bird-1.1.2 index 0beaa89d8bd3..f2c566d0b512 100644 --- a/net-misc/bird/files/initd-bird-1.1.0 +++ b/net-misc/bird/files/initd-v4-bird-1.1.2 @@ -1,9 +1,11 @@ #!/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-bird-1.1.0,v 1.1 2009/07/22 12:20:53 chainsaw Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/files/initd-v4-bird-1.1.2,v 1.1 2009/08/24 12:22:41 chainsaw Exp $ -SOCK=/var/lib/run/bird.ctl +EXE=bird +CLI=birdc +SOCK="/var/lib/run/${EXE}.ctl" depend() { need net @@ -11,8 +13,8 @@ depend() { } checkconfig() { - if [ ! -f /etc/bird.conf ]; then - eerror "Please create /etc/bird.conf" + if [ ! -f "/etc/${EXE}.conf" ]; then + eerror "Please create /etc/${EXE}.conf" return 1 fi return 0 @@ -22,14 +24,14 @@ start() { checkconfig || return $? ebegin "Starting BIRD" - /usr/sbin/bird -c /etc/bird.conf -s "${SOCK}" + "/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/birdc &>/dev/null + echo "down" | "/usr/sbin/${CLI}" -s "${SOCK}" &>/dev/null eend $? "Failed to stop BIRD" else eend 0 diff --git a/net-misc/bird/files/initd-v6-bird-1.1.2 b/net-misc/bird/files/initd-v6-bird-1.1.2 new file mode 100644 index 000000000000..1500aee9c37d --- /dev/null +++ b/net-misc/bird/files/initd-v6-bird-1.1.2 @@ -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.1.2,v 1.1 2009/08/24 12:22:41 chainsaw Exp $ + +EXE=bird6 +CLI=birdc6 +SOCK="/var/lib/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 +} |