Add patch from cvs for bug 186865

(Portage version: 2.1.2.9)

4 files changed, 117 insertions, 1 deletions

diff --git a/net-misc/olsrd/ChangeLog b/net-misc/olsrd/ChangeLog
index 2176f0745564..dccd2719eef1 100644
--- a/net-misc/olsrd/ChangeLog
+++ b/net-misc/olsrd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/olsrd
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/olsrd/ChangeLog,v 1.9 2007/07/17 21:06:48 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/olsrd/ChangeLog,v 1.10 2007/07/31 20:31:52 cedk Exp $
+
+*olsrd-0.5.2-r1 (31 Jul 2007)
+
+  31 Jul 2007; Cédric Krier <cedk@gentoo.org> +files/olsrd-0.5.2-bmf.patch,
+  +olsrd-0.5.2-r1.ebuild:
+  Add patch from cvs for bug 186865
 
 *olsrd-0.5.2 (17 Jul 2007)
 
diff --git a/net-misc/olsrd/files/digest-olsrd-0.5.2-r1 b/net-misc/olsrd/files/digest-olsrd-0.5.2-r1
new file mode 100644
index 000000000000..ed8a16019732
--- /dev/null
+++ b/net-misc/olsrd/files/digest-olsrd-0.5.2-r1
@@ -0,0 +1,3 @@
+MD5 a61029e11c001be2997c1e088576d0f5 olsrd-0.5.2.tar.bz2 489416
+RMD160 9a646b9c8bf4e57d42319de6ee058f6378555254 olsrd-0.5.2.tar.bz2 489416
+SHA256 32da9c58be5b6a4b5f736dfcebcbecbd47b0194b9c9a5258ade1c0c2b38400ed olsrd-0.5.2.tar.bz2 489416
diff --git a/net-misc/olsrd/files/olsrd-0.5.2-bmf.patch b/net-misc/olsrd/files/olsrd-0.5.2-bmf.patch
new file mode 100644
index 000000000000..9bea4b80142d
--- /dev/null
+++ b/net-misc/olsrd/files/olsrd-0.5.2-bmf.patch
@@ -0,0 +1,51 @@
+diff -ru olsrd-0.5.2~/lib/bmf/src/Bmf.c olsrd-0.5.2/lib/bmf/src/Bmf.c
+--- olsrd-0.5.2~/lib/bmf/src/Bmf.c	2007-07-29 13:41:15.000000000 +0200
++++ olsrd-0.5.2/lib/bmf/src/Bmf.c	2007-07-31 20:45:52.000000000 +0200
+@@ -1451,19 +1451,22 @@
+     RestoreSpoofFilter();
+   }
+ 
+-  /* Signal BmfThread to exit */
+-  /* Strangely enough, all running threads receive the SIGALRM signal. But only the
+-   * BMF thread is affected by this signal, having specified a handler for this
+-   * signal in its thread entry function BmfRun(...). */
+-  if (pthread_kill(BmfThread, SIGALRM) != 0)
++  if (BmfThreadRunning)
+   {
+-    BmfPError("pthread_kill() error");
+-  }
+-
+-  /* Wait for BmfThread to acknowledge */
+-  if (pthread_join(BmfThread, NULL) != 0)
+-  {
+-    BmfPError("pthread_join() error");
++    /* Signal BmfThread to exit */
++    /* Strangely enough, all running threads receive the SIGALRM signal. But only the
++     * BMF thread is affected by this signal, having specified a handler for this
++     * signal in its thread entry function BmfRun(...). */
++    if (pthread_kill(BmfThread, SIGALRM) != 0)
++    {
++      BmfPError("pthread_kill() error");
++    }
++
++    /* Wait for BmfThread to acknowledge */
++    if (pthread_join(BmfThread, NULL) != 0)
++    {
++      BmfPError("pthread_join() error");
++    }
+   }
+ 
+   /* Clean up after the BmfThread has been killed */
+diff -ru olsrd-0.5.2~/Makefile.inc olsrd-0.5.2/Makefile.inc
+--- olsrd-0.5.2~/Makefile.inc	2007-07-29 13:41:15.000000000 +0200
++++ olsrd-0.5.2/Makefile.inc	2007-07-31 22:23:04.000000000 +0200
+@@ -64,6 +64,9 @@
+ # options to save space on small systems
+ DEFINES +=      -DSUPPORT_OLD_PLUGIN_VERSIONS=1
+ 
++# we have plugins with the old interface
++CPPFLAGS +=     -DSUPPORT_OLD_PLUGIN_VERSIONS=1
++
+ # search sources and headers in current dir and in src/
+ SRCS =		$(wildcard src/*.c)
+ SRCS +=		$(wildcard *.c)
diff --git a/net-misc/olsrd/olsrd-0.5.2-r1.ebuild b/net-misc/olsrd/olsrd-0.5.2-r1.ebuild
new file mode 100644
index 000000000000..9c0ceeb35058
--- /dev/null
+++ b/net-misc/olsrd/olsrd-0.5.2-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/olsrd/olsrd-0.5.2-r1.ebuild,v 1.1 2007/07/31 20:31:52 cedk Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="An implementation of the Optimized Link State Routing protocol"
+HOMEPAGE="http://www.olsr.org/"
+SRC_URI="http://www.olsr.org/releases/${PV%.*}/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~x86"
+IUSE="gtk"
+
+DEPEND="gtk? ( =x11-libs/gtk+-2* )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-bmf.patch"
+}
+
+src_compile() {
+	cd "${S}"
+	emake OS=linux CC=$(tc-getCC) build_all || die "emake failed"
+
+	if use gtk ; then
+		cd "${S}/gui/linux-gtk"
+		einfo "Building GUI ..."
+		emake CC=$(tc-getCC) || die "emake failed"
+	fi
+}
+
+src_install() {
+	emake OS=linux DESTDIR="${D}" STRIP=true install_all || die "emake install_all failed"
+
+	if use gtk; then
+		cd "${S}/gui/linux-gtk"
+		emake DESTDIR="${D}" install || die "emake install failed"
+	fi
+
+	doinitd "${FILESDIR}/olsrd"
+
+	cd "${S}"
+	dodoc CHANGELOG features.txt README README-Olsr-Switch.html \
+		README-FreeBSD-libnet README-Link-Quality-Fish-Eye.txt \
+		README-Link-Quality.html files/olsrd.conf.default.rfc \
+		files/olsrd.conf.default.lq lib/bmf/README_BMF.txt \
+		lib/dyn_gw/README_DYN_GW lib/dyn_gw_plain/README_DYN_GW_PLAIN \
+		lib/dot_draw/README_DOT_DRAW lib/httpinfo/README_HTTPINFO \
+		lib/mini/README_MINI lib/nameservice/README_NAMESERVICE \
+		lib/pgraph/README_PGRAPH lib/quagga/README_QUAGGA \
+		lib/secure/README_SECURE lib/txtinfo/README_TXTINFO
+}