fix xdcc segfault wrt #505132

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xBDEED020

4 files changed, 222 insertions, 15 deletions

diff --git a/net-irc/hexchat/ChangeLog b/net-irc/hexchat/ChangeLog
index 03150f81e9cf..41f8f1e36a7d 100644
--- a/net-irc/hexchat/ChangeLog
+++ b/net-irc/hexchat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-irc/hexchat
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/ChangeLog,v 1.88 2014/02/24 01:02:10 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/ChangeLog,v 1.89 2014/03/23 19:07:30 hasufell Exp $
+
+*hexchat-2.9.6.1-r2 (23 Mar 2014)
+
+  23 Mar 2014; Julian Ospald <hasufell@gentoo.org> +hexchat-2.9.6.1-r2.ebuild,
+  +files/hexchat-2.9.6.1-xdcc.patch:
+  fix xdcc segfault wrt #505132
 
   24 Feb 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   hexchat-2.9.6.1-r1.ebuild:
diff --git a/net-irc/hexchat/Manifest b/net-irc/hexchat/Manifest
index b61eb79cbd61..54212f14db6b 100644
--- a/net-irc/hexchat/Manifest
+++ b/net-irc/hexchat/Manifest
@@ -8,28 +8,32 @@ AUX hexchat-2.9.5-fix_leftclick_opens_menu.patch 1430 SHA256 37179c473bc3deb1740
 AUX hexchat-2.9.5-gettextize.patch 604 SHA256 b2ec1dafd439c8661aacebee78b4ea52d13955affbf536ee9f149510a299e48c SHA512 ca31a000ff96a1a30758d3d26ef8df88886b53453231e6b187f6eeaf88fc8bdb43eae349169872af8d8b2efcd72472760c1a1d2c4fa8651140c2b30b95d5bd40 WHIRLPOOL 47d838826a005f6d588ac78991be3791873f07aced5aad70820dc0e36122d80e378ae127e8475b8d382e69add922fe31116bc13601bc400c20d22816c405f20c
 AUX hexchat-2.9.5-gobject.patch 906 SHA256 53a810d814893455f81cb0777fce5f0f6f2e47b944677a5ffd5deb4dff676cca SHA512 1b34cb76373fbd9874a0666c37edae60e6b9a39b6cdff4e71b31f62ebaa1afb410b3d0246be38c2984352c4d020c5c7a3b699019cb8363e6e9b685c62372cadd WHIRLPOOL 44d8564c27e3b09bb85535e76ecc1aa9d801bcf05f913cd1db8359d7b0903b4d8862667aac6394c7f54086bd4229bd4b36d762a08317b7a20e195a50367352ca
 AUX hexchat-2.9.6.1-sasl.patch 2246 SHA256 9bd072f00169362cf488af6bb3474666a2c413b39736da2358a089546ff19b1c SHA512 4f0dc0537fa2a9ac2edaa5e569d9089e37af19a3c9173b080410df177d470a2b6770b7c49fc35702d1d6b5703598532b214332e854d917d0ac5e7537fcd3bbab WHIRLPOOL 2f76bd9b3474c93259d399e6c00b9ee73032ce949166d5d7e5373f94d08914a925e573e2d6a6b084ade68ecf05c315a7a17fe5a08edefd69515806b855c43bca
+AUX hexchat-2.9.6.1-xdcc.patch 648 SHA256 2575e0eaac7dd71ec88fcbe2c54688dd1be89fd041b25e9925f6909b2567e5cf SHA512 aa5189fb538fa699cac2d45a1a895f35cc84f5dbb90ccb1e0b4335e752a8d5b53a9da8146af6336516fc70118c53be88b8957a70288c9c856a6bad290a46939d WHIRLPOOL 3b58c662465015025b2c63fcf48fcad52a5f06f4e695d0fdcd8c8f706c2437b1b4cfecfa26952180f3553b509999c9078d30ee5c44a0ae6765cfacd86ee27774
 DIST hexchat-2.9.5.tar.xz 1309112 SHA256 11dfd0fbfb88d8dbb38f631fab8a7dffbb179f7f7dafe316953ed6f513ac623d SHA512 67eee124b6d0b690d3a43b921826af11730f995de5a697bbcac0d9dca13d44df6e33f3f2273ff1f7f86cc7dca34c091e70c4c481de49a83688522648e3252b9e WHIRLPOOL 8c3a402e030466aa79974c38901e2030cd2dc6fba6bff1eb18ecdd614541c43aaf6187e3d99cd931b3d334e671ebbdb9ce36d763a2fb1a23f60f53ac0cc54dab
 DIST hexchat-2.9.6.1.tar.xz 1768392 SHA256 6267ff3c4d0aec8a808365b384115a769d5001d99dbb10403634667c43966470 SHA512 73a7c2818b9d59a62c2471b9010cd04a6a5ac85b22d5158fdc27831d8700f09eb3011aac341866b76d7a4efe483f59de9c7b6d9a983916ccfbf8e61db81ea195 WHIRLPOOL 900995d8add17ce93da6ec284992a5ddf7dbc086d59ca307e362e485a8b00a6f57bdec43ee4a44c7733539ae9146ffd4b7cb51a75e3076e76c4440755d2c01a9
 EBUILD hexchat-2.9.5-r1.ebuild 4054 SHA256 4040f7e7a6f5c41d8a4168d398ec99d9f85887fa532c919fec0d827087fe1d46 SHA512 8cae41d239571b3070d91bb1a08f2a308a05effda8eb8e2369cbb35b3ca144eeca79c352243129376780c77346deaf03077d38cb3066e48a566ed73abc0c01d0 WHIRLPOOL 299edd135a4c419a864b86a16d78c184a91685f01ccd3a46521b52052436ca3b022cd1230179323cc0bea357fdb325b0ff75a8902e6876888fca54612a783b13
 EBUILD hexchat-2.9.6.1-r1.ebuild 4667 SHA256 be4ee3547ff5e9e89057bd66517f8000d6a15d829d1f70c43240fff54035266f SHA512 b2c9df530c08e77db988e237f877cf71325e96b686e59af150c135a445510f96e51375537c9bf4ffc54278972f43fd0dab34aeba9b49290637f59eb15f465697 WHIRLPOOL c1bb6b230d24d77327b4403c7578389ff66c05ff9fa6b5694e376f207ba53b264678409b4b16e2cae85e3b3bc7a039cd56e13419575ed1398f6856d5f05eebc5
+EBUILD hexchat-2.9.6.1-r2.ebuild 4676 SHA256 94b60e27e76b90ca14ed0265e636eba093714e8b074fab465b3da86fe6d7edba SHA512 4d7a49478a84bd33d55e63786ddecccbfcbe58a61363a0fccab72f8bd3808b3a0e91b16d1a42f2b13595fa60738f95adfbf552f41fa77efb2b297d5974e07244 WHIRLPOOL 3511f67ee9dbcef2c79f1e93a7da25e9a66c059b950cf2cad332a73b7ba6e3f45f9caf6773072c25e0e65515540b7a757feaf4976686d254d7900aa7ee212f8a
 EBUILD hexchat-2.9.6.1.ebuild 4628 SHA256 8259557004b4d2a7c3ef8f43c52de998e0921b2d1687f83ba179dc475b2e09a6 SHA512 d9e921f6c4abe9db0b38a606ef7eb6347d3a0fadde60456bf42b08d0aeb299d9ede8b428823bd93f6eb553aabedf99b139ab9eb27720d66b76edbfab87101fad WHIRLPOOL f311c79970c5b3605d3d31253bcbda7c5a50917d0c23c710cea78e991ab28208fe46c32ed80409f290be2c37cf2a74eecfd3e48676fb97c36fd77dd9fa2b40f0
 EBUILD hexchat-9999.ebuild 4501 SHA256 f128e9c30fb116ecc7bac214618375db524b74280f227583157b6d489f75278e SHA512 9f48cb75c3c8ecf091ba9af394b4db2b4d636f162503efe1a40e3522b6fe7e43c7960a3fe4e1834cf02f54f57496fdd7c20efeb04317049854980f8d65e809c2 WHIRLPOOL 3481117aac4c502278cfc1636e2caa76107e573d102e1f1aa4845b867da9b79662a050d0492deec4edc80563a9678087c961fd1f3b05e28f3f19f29495617c3e
-MISC ChangeLog 11783 SHA256 261394cd4e3381444afe84968920c37a3c541762536a7421ee45cce018c65ec8 SHA512 25b32e43dd0a52e0dc0d572ba2be1267ea253b2fe47b0ef40eeacbcbe582d1266973df8a7a81f440543a4832f5ff2b6eb56072491f5c88ffa2dd23a1dd70ea40 WHIRLPOOL 6435110062f513a82a0553b6951af65d082aabdb52041f272dc31483cf0f2c7c2c71663c62686e4a1d7e73df3cd3bbc464e660abc6261db459b9b66659021844
+MISC ChangeLog 11965 SHA256 e91f29c277cfd34bf88471280c3875665cbe10cb82b7dc598b5d3b8882557958 SHA512 688b2edfaef4de11244bd91c58ebef77a92a5d05a91600f0674121ff96d43dbde01e4ac91a73fd25d1eddb3f49837a7ec07649ac7b41cea4e4357e875ad54e8e WHIRLPOOL 470c4dd0736e09a24323ed47f7324299e900d5f770edd9d41e73d0d802bffdbce502953696efbf1e8d8bf80672a0c4d4747daf7d18d3f177d692bc7994550bda
 MISC metadata.xml 1857 SHA256 bd8a041c30ade7b290d349fc58ee71943e3441a1fe9e67931bc184de24c14e22 SHA512 5159b41ff8b1ee416c34bf73ea0270b304ec1e65519a41d794e12492a0ddd4cc07fca6ce83827c49e50746393c552485ef39ce5992081108127f9e6311505c7f WHIRLPOOL 442064cee2f98013d3b2d7b1f3f326592202872326d2ef6b2380b5e3906ac7db89b3f29fe062c1045a39b18db628505405cf84a777d67ba733b88076139dea4e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTCowIAAoJEE8aJVXqcZkdJjEQAMyqd3XWHGbsjaHkm9Vyu0DL
-SCfrQf2TnTIBQ2rpH0TOTkXZzkTHhA4GhkjIzSIyWaM6RFLhogog5cHnWsvOCMPg
-SCiTqiE/ObPfKrkx/Bx1Hc63RgziAVp0k3yPhHkPZfhQLdDXlyoRn3wL0fNn/cMh
-86fUeXhT6du/tfRzq4FCREXAHNf+WHRhJIQvVtJ4MMRdqH7fwgX9w95giW0LUjiy
-DFleie2SuRPhYaNJLwpX5Yo7LBDpA/uTFPvSVwoLHAZ4ZHO4ejB0+WotpvWH+kgq
-NCFgwc38uV0+kypn5udlCE35C8j6mVQMTBViUfiWfYExuQukc/RKOii7zOEPNOuJ
-NLPP1toIlvC2JVxfDsa2nWTVkEYzqIfUX8u1Lt7ZSI/LqUbxGxCJviqiogInnrnc
-jFdXp/LQ4RuB7ga0Js1bA5Yapiq7aYwV27WCs2K0S9ITjFeIS4tVpDpu4evcPmWD
-W0F/Blxcj/cEUH+k2ibkrnQiZS6GlPhCa/h9hOYjYHuqLSCgffpF4qIQ2aRcMWeG
-tZVKFRiAeTmzsVgJ/UaKj93K8AkVEs/1QGurBqXPDwsND8PMCAkm03jnwke6Z+M/
-uAGmZkAlTpP2Hf3V9PC9B0w8pkIlen+BRyV/EXCRUEbNS2yrVcFCGDekVd1W6n4a
-TSguvgSITHcZD3/kC6pd
-=UVKU
+iQJ8BAEBCABmBQJTLzD2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgKrAP/2Xql47aPW957kZDaraaD6CC
+Y/n3RV/e5mxfeV2zhvyl7sI7lkFjxLg87+4N8s6vr7NHgg0TpyTPqcPXSGHNaU5A
+IVI9xCgf9yhhR82j+AzH6pbpuMIz602sKzh0jlyfH22aBdnzY9QjUsFPl4R1kkIF
+yVr2ZybcZDwpGNIuXGhrR9GRQM0n4Fn4mEy/BtFxGbY99FFBhXZNTBcL4RFJR/gz
+UnzMijTdMMup96fFCLJl1yzTQ+H4+tFF2O7Ps9cNzta/1Ogy9scYu3AbP6DTVNQ6
+pVQDaUUrMGd98l965c76IeLwzyO60go+mCXrjKqpD0FPwtCKANwNTlKicTTDp28k
+l2uSoqdH7u7e7mVWCBtTFKoBQHKBFgKtjWWuxG1/jCiAVx0ICVI8zS+brWuhNZsx
+/uK5AF1aLlRM619z6BsRDVSwDehlxoZX80FTessCswqO5FnRMRkR4JgEPTn7KOCm
+bQm5i0llTNT3S2GU8+RXEckeDBuAiqUjea6W1vXrxr8Ss6yTjj7QyPwFMIC+0Smb
+ZwD3c7StJACFbo4X4CVaGtG2Z43r9CE1Sko1XV8CIRcqFWURRik9qqQOkhLGrZJX
+9nFBqKO8NpZcfsMXdg1uZDu4TjUJ5JV2RbHISAoCJG7+GMelxdPc37mHPOMDT+Qw
+zZk3A+pdxUYnhrk51FEG
+=HasS
 -----END PGP SIGNATURE-----
diff --git a/net-irc/hexchat/files/hexchat-2.9.6.1-xdcc.patch b/net-irc/hexchat/files/hexchat-2.9.6.1-xdcc.patch
new file mode 100644
index 000000000000..c7b0093cafa2
--- /dev/null
+++ b/net-irc/hexchat/files/hexchat-2.9.6.1-xdcc.patch
@@ -0,0 +1,27 @@
+From fa955a0f1a7863ab7a35c8a3753eac014288931f Mon Sep 17 00:00:00 2001
+From: Arnavion <arnavion@gmail.com>
+Date: Thu, 3 Oct 2013 17:43:44 -0700
+Subject: [PATCH] Don't try to update the clear button state when there's no
+ DCC window.
+
+---
+ src/fe-gtk/dccgui.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/fe-gtk/dccgui.c b/src/fe-gtk/dccgui.c
+index 76b1e2f..562fe9e 100644
+--- a/src/fe-gtk/dccgui.c
++++ b/src/fe-gtk/dccgui.c
+@@ -1128,7 +1128,8 @@ struct my_dcc_send
+ 		dcc_update_chat (dcc);
+ 	}
+ 
+-	update_clear_button_sensitivity ();
++	if (dccfwin.window)
++		update_clear_button_sensitivity();
+ }
+ 
+ void
+-- 
+1.8.5.5
+
diff --git a/net-irc/hexchat/hexchat-2.9.6.1-r2.ebuild b/net-irc/hexchat/hexchat-2.9.6.1-r2.ebuild
new file mode 100644
index 000000000000..d852af92d7a1
--- /dev/null
+++ b/net-irc/hexchat/hexchat-2.9.6.1-r2.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/hexchat-2.9.6.1-r2.ebuild,v 1.1 2014/03/23 19:07:30 hasufell Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_3 )
+inherit eutils fdo-mime gnome2-utils mono-env multilib python-single-r1
+
+DESCRIPTION="Graphical IRC client based on XChat"
+HOMEPAGE="http://hexchat.github.io/"
+SRC_URI="http://dl.hexchat.org/hexchat/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+IUSE="dbus fastscroll +gtk gtkspell ipv6 libcanberra libnotify libproxy nls ntlm perl +plugins plugin-checksum plugin-doat plugin-fishlim plugin-sysinfo python sexy spell ssl theme-manager"
+REQUIRED_USE="gtkspell? ( spell )
+	plugin-checksum? ( plugins )
+	plugin-doat? ( plugins )
+	plugin-fishlim? ( plugins )
+	plugin-sysinfo? ( plugins )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	sexy? ( spell )
+	?? ( gtkspell sexy )"
+
+RDEPEND="dev-libs/glib:2
+	dbus? ( >=dev-libs/dbus-glib-0.98 )
+	fastscroll? ( x11-libs/libXft )
+	gtk? ( x11-libs/gtk+:2 )
+	libcanberra? ( media-libs/libcanberra )
+	libproxy? ( net-libs/libproxy )
+	libnotify? ( x11-libs/libnotify )
+	nls? ( virtual/libintl )
+	ntlm? ( net-libs/libntlm )
+	perl? ( >=dev-lang/perl-5.8.0 )
+	plugin-sysinfo? ( sys-apps/pciutils )
+	python? ( ${PYTHON_DEPS} )
+	spell? (
+		app-text/enchant
+		gtkspell? ( app-text/gtkspell:2 )
+		sexy? ( x11-libs/libsexy )
+		!gtkspell? ( !sexy? ( dev-libs/libxml2 ) )
+	)
+	ssl? ( dev-libs/openssl:0 )
+	theme-manager? ( dev-lang/mono )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	theme-manager? ( dev-util/monodevelop )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	if use theme-manager ; then
+		mono-env_pkg_setup
+		export XDG_CACHE_HOME="${T}/.cache"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-{sasl,xdcc}.patch
+	epatch_user
+}
+
+src_configure() {
+	local myspellconf
+	if use spell ; then
+		if use gtkspell ; then
+			myspellconf="--enable-spell=gtkspell"
+		elif use sexy ; then
+			myspellconf="--enable-spell=libsexy"
+		else
+			myspellconf="--enable-spell=static"
+		fi
+	else
+		myspellconf="--disable-spell"
+	fi
+
+	econf \
+		$(use_enable nls) \
+		$(use_enable libproxy socks) \
+		$(use_enable ipv6) \
+		$(use_enable fastscroll xft) \
+		$(use_enable ssl openssl) \
+		$(use_enable gtk gtkfe) \
+		$(use_enable !gtk textfe) \
+		$(usex python "--enable-python=${EPYTHON}" "--disable-python") \
+		$(use_enable perl) \
+		$(use_enable plugins plugin) \
+		$(use_enable plugin-checksum checksum) \
+		$(use_enable plugin-doat doat) \
+		$(use_enable plugin-fishlim fishlim) \
+		$(use_enable plugin-sysinfo sysinfo) \
+		$(use_enable dbus) \
+		$(use_enable libnotify) \
+		$(use_enable libcanberra) \
+		--enable-shm \
+		${myspellconf} \
+		$(use_enable ntlm) \
+		$(use_enable libproxy) \
+		--enable-minimal-flags \
+		$(use_with theme-manager)
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		UPDATE_ICON_CACHE=true \
+		UPDATE_MIME_DATABASE=true \
+		UPDATE_DESKTOP_DATABASE=true \
+		install
+	dodoc share/doc/{readme,hacking}.md
+	use plugin-fishlim && dodoc share/doc/fishlim.md
+	prune_libtool_files --all
+}
+
+pkg_preinst() {
+	if use gtk ; then
+		gnome2_icon_savelist
+	fi
+}
+
+pkg_postinst() {
+	if use gtk ; then
+		gnome2_icon_cache_update
+		einfo
+	else
+		einfo
+		elog "You have disabled the gtk USE flag. This means you don't have"
+		elog "the GTK-GUI for HexChat but only a text interface called \"hexchat-text\"."
+		elog
+	fi
+
+	if use theme-manager ; then
+		fdo-mime_desktop_database_update
+		fdo-mime_mime_database_update
+		elog "Themes are available at:"
+		elog "  http://hexchat.org/themes.html"
+		elog
+	fi
+
+	elog "If you're upgrading from hexchat <=2.9.3 remember to rename"
+	elog "the xchat.conf file found in ~/.config/hexchat/ to hexchat.conf"
+	elog
+	elog "If you're upgrading from hexchat <=2.9.5 you will have to fix"
+	elog "your auto-join channel settings, see:"
+	elog "  https://bugs.gentoo.org/show_bug.cgi?id=473514#c1"
+	elog "Also, some internal hotkeys such as \"Ctrl+l\" (clear screen)"
+	elog "have been removed, but you can add them yourself via:"
+	elog "  Settings -> Keyboard Shortcuts"
+	einfo
+	elog "optional dependencies:"
+	elog "  media-sound/sox (sound playback if you don't have libcanberra"
+	elog "    enabled)"
+	elog "  x11-plugins/hexchat-javascript (javascript support)"
+	elog "  x11-themes/sound-theme-freedesktop (default BEEP sound,"
+	elog "    needs libcanberra enabled)"
+	einfo
+}
+
+pkg_postrm() {
+	if use gtk ; then
+		gnome2_icon_cache_update
+	fi
+
+	if use theme-manager ; then
+		fdo-mime_desktop_database_update
+		fdo-mime_mime_database_update
+	fi
+}