[gentoo-commits] repo/gentoo:master commit in: net-p2p/gtk-gnutella/files/, net-p2p/gtk-gnutella/

["Hans de Graaff" <graaff@gentoo.org>]

commit:     8dfa44f37e40e4a638c8bb966346ae5b04af9c21
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 29 19:57:05 2016 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Tue Mar 29 19:57:41 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dfa44f3

net-p2p/gtk-gnutella: fix bug 577012

Package-Manager: portage-2.2.26

 .../files/gtk-gnutella-1.1.9-load-symbols.patch    | 31 ++++++++++++++++++++++
 ...a-1.1.9.ebuild => gtk-gnutella-1.1.9-r1.ebuild} |  2 ++
 2 files changed, 33 insertions(+)

diff --git a/net-p2p/gtk-gnutella/files/gtk-gnutella-1.1.9-load-symbols.patch b/net-p2p/gtk-gnutella/files/gtk-gnutella-1.1.9-load-symbols.patch
new file mode 100644
index 0000000..40a6943
--- /dev/null
+++ b/net-p2p/gtk-gnutella/files/gtk-gnutella-1.1.9-load-symbols.patch
@@ -0,0 +1,31 @@
+From 8645df4344f22228862efb3c212e6aa7ec2c6d45 Mon Sep 17 00:00:00 2001
+From: Raphael Manfredi <Raphael_Manfredi@pobox.com>
+Date: Tue, 29 Mar 2016 21:16:48 +0200
+Subject: [PATCH] symbols_load_from(): must release write lock after falling
+ back to pre-computed.
+
+---
+ src/lib/symbols.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/lib/symbols.c b/src/lib/symbols.c
+index 9b2e080..69796f6 100644
+--- a/src/lib/symbols.c
++++ b/src/lib/symbols.c
+@@ -1448,7 +1448,7 @@ symbols_load_from(symbols_t *st, const char *exe, const  char *lpath)
+ 		}
+ 
+ 		if (st->garbage)
+-			return;			/* Already went through the "done" part */
++			goto unlock;		/* Already went through the "done" part */
+ 
+ 		/* FALL THROUGH */
+ 	}
+@@ -1474,6 +1474,7 @@ symbols_load_from(symbols_t *st, const char *exe, const  char *lpath)
+ 	if (!retried && !st->indirect && st->garbage)
+ 		goto use_pre_computed;
+ 
++unlock:
+ 	SYMBOLS_WRITE_UNLOCK(st);
+ }
+ 

diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.9.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.9-r1.ebuild
similarity index 97%
rename from net-p2p/gtk-gnutella/gtk-gnutella-1.1.9.ebuild
rename to net-p2p/gtk-gnutella/gtk-gnutella-1.1.9-r1.ebuild
index 154b509..35ad927 100644
--- a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.9.ebuild
+++ b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.9-r1.ebuild
@@ -27,6 +27,8 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_prepare() {
+	epatch "${FILESDIR}/${P}-load-symbols.patch"
+
 	strip-linguas -i po
 
 	echo "# Gentoo-selected LINGUAS" > po/LINGUAS