Fix crash with gnutls and pthreaded plugins.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0xA5DE03AE

4 files changed, 55 insertions, 11 deletions

diff --git a/net-irc/weechat/ChangeLog b/net-irc/weechat/ChangeLog
index 701416b4ab83..ed01ce2ca02b 100644
--- a/net-irc/weechat/ChangeLog
+++ b/net-irc/weechat/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-irc/weechat
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/ChangeLog,v 1.136 2014/02/12 03:12:35 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/ChangeLog,v 1.137 2014/02/13 13:44:55 zx2c4 Exp $
+
+*weechat-0.4.3-r1 (13 Feb 2014)
+
+  13 Feb 2014; Jason A. Donenfeld <zx2c4@gentoo.org>
+  +files/weechat-0.4.3-always-link-against-pthreads.patch,
+  +weechat-0.4.3-r1.ebuild, -weechat-0.4.3.ebuild:
+  Fix crash with gnutls and pthreaded plugins.
 
 *weechat-0.4.3 (12 Feb 2014)
 
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index 3eec38b44909..7086ce306f9b 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -1,23 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX weechat-0.4.3-always-link-against-pthreads.patch 913 SHA256 673a3bf7a596753697011b262e48e05d79a9d7fa4846fd2ae65589649ee1f0d7 SHA512 2f9c08d2db088644e16ef2584de670030d1576db2cc385bcfeca6be5d559d0597f166721c953fbb4647fd07209b2274691e8351216cb666bc2672ca5d5a87c05 WHIRLPOOL a5b3593dfaa825001c6b3bb9ce81de399845c0375c3e207773e1c840d59a2e7f91268ef1c5332186b2b4e25c6745551ce2f5a8702d573e92267d7c387fe86a88
 DIST weechat-0.4.1.tar.bz2 1772500 SHA256 d27bed07ee2d0638c1683ad18666d478ed9a042aeeedcd0dd9ce22f1392e0ebb SHA512 7b8abef303837d0aee61a113163cecb0834c0dd99b736d9c165e18de8bcd37f9a8307984a4c66038a51262ac15286d44bbd2e53b62ed437d410e4df35292a0ed WHIRLPOOL c6d6ad1f0b5df7936b49332944eb009305e97da573d25bf8f088dd4c5a5d710422ab106c02c9c0fbb64b980e3b9312857b8963bd0691bb8e01f0f62f8c62121c
 DIST weechat-0.4.2.tar.bz2 1892996 SHA256 95c4337b10f0e54192dcdaf7ce60f9bd22dfc82abd0832219b20dedd06d509dc SHA512 be2b13c314512cd5a2b53abb43aa949083fda8c4f255c2ea320e5a7a7388853c78324f73f3fc1c00131b965000c1c74d6b10adbe9fd27376567b4375f861780d WHIRLPOOL 457308dbce99d2321d0d861873742debfc6d2612a5d0b40cc7d7bcf90402ed35780d9033d7aaff87726e7bd298601a53492a966d69f6d2220c03537653b94af7
 DIST weechat-0.4.3.tar.bz2 2089701 SHA256 a8ec847d331a1201de975530a22f1813c260db420c68675b2ecaa7bf3c7c3ff8 SHA512 0d049626e6a5fb44bc368d732c395d7135ad8869d9368cb95487662c4c738c9a44052db6e40a7fa08db9798916de0c466c24531f94993e91b7b19519b1d7cfc2 WHIRLPOOL 1e8f045be496d70c39ffdc63aaa1a4862c68e52549ca378c14e3295de20a9d882c144c1acee49c3dca94db31c0495c39c70087e388f316a9f07beed7e246a58c
 EBUILD weechat-0.4.1.ebuild 3392 SHA256 d8a40e7b1c637a317f81d9dcb1f7ad6feb30d0a8d08b52b1b6dc986dfe90465a SHA512 deec617bfd77e28341b0d5684fcd593e1e2b9be697b299a80a3b43658dd5b32e4a47f437e690f93728554ab241f58c89350afc77f8b9d311ed9f4c2e13c1ed38 WHIRLPOOL cf22ae478e21caea199e27a8185ae5b028d3f5ab05378fbb00ff3cc941d4af80e9a672682aca30c4b7d9a94552d10099caec65b9ca5549600c755ce97271a9a2
 EBUILD weechat-0.4.2.ebuild 3396 SHA256 9cddf837276948ac114b332f5803b496a0ee23d90a13911642a0967cf9b5b0a1 SHA512 72977005f431cabf3e7380f11168830ac2bfa264baf91e294fba01f26ecc9f5bf1fce25ee2b361d12a2685c395f62bfea146f822638a6e29a407f8fd4452f1e0 WHIRLPOOL a7317ca9d5c2c962f22663dc00d8bb34b2227dfbd1ec32fffedf03edc754b0cdf0d40992f7044f083519cd02b2289afa44b76aece78e14a81043e1f7d241e030
-EBUILD weechat-0.4.3.ebuild 3386 SHA256 b4639c05693e37bd357dd0c0d4aae53d40755a3754afadaef340484292cca7e4 SHA512 8db000a7aa03137ae2f00476500d584751be242a18c6f7378642f5ca6368a9ba8328a9e5969c90a7a048d123c5f80f45bfcbf6024bd5cbdfb1249e7430cca0d9 WHIRLPOOL ee3655cf01975a9f7bf40b7092228e3a0c40197ea6c074ef6c4f8bbc14e247fd76af13abc5eecc114bf4beef2a2a49bb00745725611eb548faf7676e684adf10
+EBUILD weechat-0.4.3-r1.ebuild 3457 SHA256 9cb6bd5311f47f13f32029ad5f556997dbf36234d94c401036a3d9e53bb8f62d SHA512 ffc99ac829d86d268d00736d8bf1f4e7204a75d1549074105c61b14c4983ab0caa4a20c2971db12204667142ae3c8eb9b1c07c8f37b2e7e81dc38865cb4ac4d8 WHIRLPOOL bb7ffa58d3d1482ac46dca4a1a43e83d445e52f21d17e5fa4759142bbe1c33f644f34661e2d18734f95c59a4dc83b78419dc38f008b7129cab2c2338c29cb1c1
 EBUILD weechat-9999.ebuild 3386 SHA256 c8d6e2877769da6231052cfd572dc98ab9adf67c88e502a7a8d836009a5c7aa9 SHA512 10426bd79a65fe63cbbfffc6935b95a8801a1edd61227e14a4e013b34da76bc45398de7d44c8f5f473220043de26d82a06755987bf59269835a3a5c65afb9e46 WHIRLPOOL 086eadeb6c2004503b01a1e3654506f9dc35a875c2f1bfafecaa9285a9f34bb3177007dbc09967b11b461944fb96881a3697c628b59b222f4a24e87a01c4fa7d
-MISC ChangeLog 18937 SHA256 e08755f7066053a159bdacd820017aac55816c06a68874aa4350eaf4bda18454 SHA512 44df20dea1f6b600cd0627cb1d2e64d6976c92c9ee566613b23779bfb4d53392b10873a2e19039c6221a1a7bf0006c328f8f9ec9eb9405abd10f4d18f995f6b1 WHIRLPOOL 23977deeaa3473d5d8e7544905417b67ea6d821a98a5dae9b7f36b5aea5f3ea4d4ca090cdc99f940eb2160c68caef24332d488569e0ddeb771d06eb0c78ea948
+MISC ChangeLog 19177 SHA256 182cf15161e4c6cdc1938c2c57bc34f77cafcc510674d7518631c884ac913fab SHA512 c71cccd70c70fe60742545fa329e3f71954acfc9fa070b8f4462318f3335dbca719011b4bdf385ec80fd6e74763259b15d6119ceac62907358907bf105e6f937 WHIRLPOOL 2f33b807d0ac167d492b4a72385651ee1412d5ffdd7d6d788d4c2fe8e44f8ecfd0fef17bd2c6a9b98eb42f4be53aef3c50bcc352427acf5f1fcfc8e3776ddf8c
 MISC metadata.xml 775 SHA256 baddf6a8f9e77502d45119a96455031b564e19a864c8540e5c44500aeb1ddc54 SHA512 2aad4ad5d7b4634bf06078f62e8bb6a53e19df95257b150b43e82b2fe8487ed37c5311dc15d364cb1f5d5fc3eb04ae933e54cc9e44fcf06a471348021feb4d4e WHIRLPOOL 0a21b77e3c62b2e3e2ce4ee935a7212aee8517ef83445710855823e5a5c146255dc15e369f049ca20503205afac611957394494a857ea2f40371ebc50c87d25a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJS+uanAAoJEEqz6FtPBkyj6qkH/1xJ6adkyfFqXR6XcN9CQOcv
-hpUR3lg7R/ndDnitrvTB036Z4Zn2jHduSPyEK+8pGDhPRAd8snTXg7tfqOV3EFKI
-LmpCFhHcKLlNjAuGTmgkZfSc/scMYwrHAPxOda61shUgW/PDBj0ySJuSdnIVe5BC
-35r2DwaRG2UGHGYW92cixDR8870OAPN/CX5poJFZglNwhHLbcl3kQDUDq2njZehr
-g0aZUhs2B4yHXrjACp/8suU9W85TMf6nyF2wcxLCQaNo61zEdoE2WXa+EEdK0ZW9
-Kb0C21FRID9Xgo1ds9W58vEuYVhK8RY5cMD0BfMOuP2T6nsasUnHjNwHtmu2q0E=
-=yaUL
+iQIcBAEBCAAGBQJS/MxgAAoJEEn8cBKl3gOuiz0P/22LqLrLxeVlgXy+FMO8JGxb
+yrxhAsdqWxX36xwKt792Cz/7tbOIPRT0DgMurxqTCoTy5n75Si2uZKF+j2a9nv3W
+S+cTu9QT0qfr5l04hK1bI1nSWrXNCHzm1RUjpSIDg2uLXniqid2X1ZxQpbJOgcQq
+02ISyGb6X2P6PO3i6jOBO03emi+gcbmHNYDjjUhoitpUf6+30ky05khP8WdTKrf0
+6bJc/BPiueWGvwbr6vIDjGChhC4mmKxPPWMlBp/8a3wPBv/zUy0GZHshHcCeC6RJ
+kK8VhbHAqhAIeF69aGHwHPAal+SEwSF+Oz+4OTbny3GbSrZ6p05s/3Uob6weZPyg
+JDSdGF+2koAZ0NcpkpeTkvHZmShon0sMHLWyq1cJYXy0wA46ULWy3p9S2BUKgEs0
+aUgabDkrK1EXNIVfeCCQ+6yUdooe27iRN9WbJfPwqNpktMfv1jKHr+HbRoGrmLpE
+IASt8TKVBIQdEME4DP15bj4UQUHFFb2vzILMdN7fc/oiwsFkgggsg96GGSUTxgL7
+EXR3wl5OIH5YFckvwZWXYKyJQAoTVowFmYcoZol2AE9IugfPFWSbJxHgpa03TW84
+a4CHY4Y59WUqU921ofTFl79C3KYS3gKqk3W3YDF5rDFQttR6jSFhdBilmTnU9OPn
+MVhj67vQZMfiAEnSprq2
+=H8F8
 -----END PGP SIGNATURE-----
diff --git a/net-irc/weechat/files/weechat-0.4.3-always-link-against-pthreads.patch b/net-irc/weechat/files/weechat-0.4.3-always-link-against-pthreads.patch
new file mode 100644
index 000000000000..2a3bc8807a49
--- /dev/null
+++ b/net-irc/weechat/files/weechat-0.4.3-always-link-against-pthreads.patch
@@ -0,0 +1,28 @@
+From 30073b511397646b9ef06ed657fda157dd8c6209 Mon Sep 17 00:00:00 2001
+From: "Jason A. Donenfeld" <Jason@zx2c4.com>
+Date: Thu, 13 Feb 2014 14:36:23 +0100
+Subject: [PATCH] Link against pthread on all platforms.
+
+Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
+---
+ src/gui/curses/CMakeLists.txt | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/src/gui/curses/CMakeLists.txt b/src/gui/curses/CMakeLists.txt
+index 325c611..a8927bc 100644
+--- a/src/gui/curses/CMakeLists.txt
++++ b/src/gui/curses/CMakeLists.txt
+@@ -53,9 +53,7 @@ IF(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
+   ENDIF(HAVE_BACKTRACE)
+ ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
+ 
+-IF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
+-  LIST(APPEND EXTRA_LIBS "pthread")
+-ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
++LIST(APPEND EXTRA_LIBS "pthread")
+ 
+ IF(ICONV_LIBRARY)
+   LIST(APPEND EXTRA_LIBS ${ICONV_LIBRARY})
+-- 
+1.8.5.4
+
diff --git a/net-irc/weechat/weechat-0.4.3.ebuild b/net-irc/weechat/weechat-0.4.3-r1.ebuild
index f402af12a3b3..f7b530b132fc 100644
--- a/net-irc/weechat/weechat-0.4.3.ebuild
+++ b/net-irc/weechat/weechat-0.4.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-0.4.3.ebuild,v 1.1 2014/02/12 03:12:35 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-0.4.3-r1.ebuild,v 1.1 2014/02/13 13:44:55 zx2c4 Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_2,3_3} )
@@ -69,6 +69,8 @@ pkg_setup() {
 src_prepare() {
 	local i
 
+	epatch "${FILESDIR}"/"${PN}"-0.4.3-always-link-against-pthreads.patch
+
 	# fix libdir placement
 	sed -i \
 		-e "s:lib/:$(get_libdir)/:g" \