From 2a29a54ba01b2b99a720160114d9bd39791afb59 Mon Sep 17 00:00:00 2001 From: Tony Vroon <chainsaw@gentoo.org> Date: Fri, 2 Oct 2009 11:52:08 +0000 Subject: Version bump with minor bugfixes. Also adds passive BGP support. (Portage version: 2.1.6.13/cvs/Linux x86_64) --- net-misc/bird/ChangeLog | 9 ++++- net-misc/bird/bird-1.1.4.ebuild | 59 +++++++++++++++++++++++++++++++++ net-misc/bird/files/1.1.4-nostrip.patch | 15 +++++++++ net-misc/bird/files/initd-v4-bird-1.1.4 | 39 ++++++++++++++++++++++ net-misc/bird/files/initd-v6-bird-1.1.3 | 6 ++-- net-misc/bird/files/initd-v6-bird-1.1.4 | 39 ++++++++++++++++++++++ 6 files changed, 163 insertions(+), 4 deletions(-) create mode 100644 net-misc/bird/bird-1.1.4.ebuild create mode 100644 net-misc/bird/files/1.1.4-nostrip.patch create mode 100644 net-misc/bird/files/initd-v4-bird-1.1.4 create mode 100644 net-misc/bird/files/initd-v6-bird-1.1.4 (limited to 'net-misc') diff --git a/net-misc/bird/ChangeLog b/net-misc/bird/ChangeLog index 31f0b941d861..e3565e076a3d 100644 --- a/net-misc/bird/ChangeLog +++ b/net-misc/bird/ChangeLog @@ -1,6 +1,13 @@ # 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.6 2009/09/11 14:01:52 chainsaw Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/ChangeLog,v 1.7 2009/10/02 11:52:08 chainsaw Exp $ + +*bird-1.1.4 (02 Oct 2009) + + 02 Oct 2009; <chainsaw@gentoo.org> +files/1.1.4-nostrip.patch, + files/initd-v6-bird-1.1.3, +files/initd-v4-bird-1.1.4, + +files/initd-v6-bird-1.1.4, +bird-1.1.4.ebuild: + Version bump with minor bugfixes. Also adds passive BGP support. *bird-1.1.3 (11 Sep 2009) diff --git a/net-misc/bird/bird-1.1.4.ebuild b/net-misc/bird/bird-1.1.4.ebuild new file mode 100644 index 000000000000..f74ad4597685 --- /dev/null +++ b/net-misc/bird/bird-1.1.4.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.4.ebuild,v 1.1 2009/10/02 11:52:08 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.4-nostrip.patch b/net-misc/bird/files/1.1.4-nostrip.patch new file mode 100644 index 000000000000..15ca414e63d2 --- /dev/null +++ b/net-misc/bird/files/1.1.4-nostrip.patch @@ -0,0 +1,15 @@ +diff -uNr bird-1.1.4.ORIG/tools/Makefile.in bird-1.1.4/tools/Makefile.in +--- bird-1.1.4.ORIG/tools/Makefile.in 2009-10-02 12:45:06.000000000 +0100 ++++ bird-1.1.4/tools/Makefile.in 2009-10-02 12:45:31.000000000 +0100 +@@ -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/initd-v4-bird-1.1.4 b/net-misc/bird/files/initd-v4-bird-1.1.4 new file mode 100644 index 000000000000..6e9b2d00a802 --- /dev/null +++ b/net-misc/bird/files/initd-v4-bird-1.1.4 @@ -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-v4-bird-1.1.4,v 1.1 2009/10/02 11:52:07 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.3 b/net-misc/bird/files/initd-v6-bird-1.1.3 index 0784c6d359ea..1a3d3645c292 100644 --- a/net-misc/bird/files/initd-v6-bird-1.1.3 +++ b/net-misc/bird/files/initd-v6-bird-1.1.3 @@ -1,10 +1,10 @@ #!/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.3,v 1.1 2009/09/11 14:01:51 chainsaw Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/files/initd-v6-bird-1.1.3,v 1.2 2009/10/02 11:52:07 chainsaw Exp $ -EXE=bird6 -CLI=birdc6 +EXE=bird +CLI=birdc SOCK="/var/run/${EXE}.ctl" depend() { diff --git a/net-misc/bird/files/initd-v6-bird-1.1.4 b/net-misc/bird/files/initd-v6-bird-1.1.4 new file mode 100644 index 000000000000..f00589f20bfa --- /dev/null +++ b/net-misc/bird/files/initd-v6-bird-1.1.4 @@ -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.4,v 1.1 2009/10/02 11:52:07 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 +} -- cgit v1.2.3-65-gdbad