summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Crête <tester@gentoo.org>2008-05-26 17:26:14 +0000
committerOlivier Crête <tester@gentoo.org>2008-05-26 17:26:14 +0000
commit42a5ba8071b98f17fdbc07609dba6d5cba5fbb9b (patch)
tree941922c518397abe075f0ce3749415428deed77f
parentFix the blocker atom to not be typoed, noticed by David Leverton (diff)
downloadhistorical-42a5ba8071b98f17fdbc07609dba6d5cba5fbb9b.tar.gz
historical-42a5ba8071b98f17fdbc07609dba6d5cba5fbb9b.tar.bz2
historical-42a5ba8071b98f17fdbc07609dba6d5cba5fbb9b.zip
Add patch for xmpp crash, from upstream, bug #223361
Package-Manager: portage-2.1.4.4
-rw-r--r--net-im/pidgin/ChangeLog6
-rw-r--r--net-im/pidgin/Manifest13
-rw-r--r--net-im/pidgin/files/pidgin-2.4.2-jabber_crash_fix.patch10
-rw-r--r--net-im/pidgin/pidgin-2.4.2.ebuild9
4 files changed, 30 insertions, 8 deletions
diff --git a/net-im/pidgin/ChangeLog b/net-im/pidgin/ChangeLog
index fd9aa5f10080..7e1ed756bb63 100644
--- a/net-im/pidgin/ChangeLog
+++ b/net-im/pidgin/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-im/pidgin
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.53 2008/05/19 03:09:30 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.54 2008/05/26 17:26:14 tester Exp $
+
+ 26 May 2008; Olivier Crête <tester@gentoo.org>
+ +files/pidgin-2.4.2-jabber_crash_fix.patch, pidgin-2.4.2.ebuild:
+ Add patch for xmpp crash, from upstream, bug #223361
19 May 2008; Olivier Crête <tester@gentoo.org> pidgin-2.4.2.ebuild:
Add build-time dep for x11-proto/scrnsaverproto
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index af8fe5f176ca..3f0d60e5fcec 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -1,18 +1,19 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
+AUX pidgin-2.4.2-jabber_crash_fix.patch 388 RMD160 dda7e9813c7494b3d27397e6a8c88ed30bd7e52c SHA1 06f500febac2a77822b63995936bf1b4152f608a SHA256 2efedf3275861354b2abdafbd7129e06e68a1c787aa97475e69b02464f168430
DIST pidgin-2.3.1.tar.bz2 9358563 RMD160 f7473efa72974610224ea622fcc02d4703552d2c SHA1 d247d085e89360c2a6bd8e4775b7814fd02d10c9 SHA256 2d083687734b232c18b9d4500a314cff5ba1a2584350832c9688ecec668eb79e
DIST pidgin-2.4.1.tar.bz2 9459078 RMD160 cd9de3b9260dcc4f2f2b11a5fb5d7b210f3a83c2 SHA1 3c86d1ec487eade72d5d513dcd5bb491e50640d2 SHA256 a4fa66247266e8e7453e13322a30910b944e7a406fa30c56cb84be9816b253c7
DIST pidgin-2.4.2.tar.bz2 9376721 RMD160 5609117af4cfd23bffdd4c071b5239750ad6bcfc SHA1 66c0aa58122f29c3a0262a555f05af46ca76fa77 SHA256 3f09878883c6980083e7774371ec57d8bdc320a325342965afb120d52780d15f
EBUILD pidgin-2.3.1.ebuild 5733 RMD160 63252e9889fde319843fa7094fd22ed495e2ba96 SHA1 e3212d8e84dab05d2f9e4d2d83b7014b8f6335e3 SHA256 5218a123a863f65d3751030f03e5222b7d53f711b006edfe7d7796533493aa07
EBUILD pidgin-2.4.1.ebuild 5739 RMD160 86d12520ef58e759f9ce9481419721f76e2e124e SHA1 cfebd35182291e3197e67b26c5132a0ab6c058c0 SHA256 c42406abaf140616d4d4fac0e1480b625c62b918de4a1fb93eb279913104c580
-EBUILD pidgin-2.4.2.ebuild 5806 RMD160 8d5088d2be30fc5087321a1b97ecd2609a830204 SHA1 ba191c2cbf8fa07886dab9717f63c1548d32fc19 SHA256 778b6ec2f9044b0ea6c1fe9a0326b4e242d6c7e5f0a7cdae705cb9ee9a622ae3
-MISC ChangeLog 7624 RMD160 c27278baeeb082969fbd4aebbf0f1f6124b1519a SHA1 775c9807b6d477acc7bff66e269611676268a19b SHA256 365d9de81fbc7952f67bde2abc579bb14ca1cca3406b1870ef7e69712c9e09b5
+EBUILD pidgin-2.4.2.ebuild 5907 RMD160 6e1baf6d566d8065c03c2502c9ce04a8b8a44d86 SHA1 41c5921f331f6cc48053bbd47c90ad1ab678b67a SHA256 97236055ff6985b37063e5d2003cf366262c294330db3836d528663cc6fd4e57
+MISC ChangeLog 7797 RMD160 981681ec8447ed74e83cfa99119c0006dd5ada14 SHA1 bfdb1ca2300b3dead3160252202b95b357c35fa9 SHA256 91717c1e147c2f16c48248cb84882a653c3b4b3c7078395a32474417ef8b1a17
MISC metadata.xml 458 RMD160 dca91f12277688e0a35ab2aefc0d46c8c70facbd SHA1 7dc17a356911852b3f5867e3629ef02a46adb675 SHA256 4457ab0d5db90f61e9d916879c32d1e0a7c6d15f2f7c955a17e5e31cb0777ba9
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v1.4.9 (GNU/Linux)
-iEYEARECAAYFAkgw73oACgkQmOfEJZHYOKeOwACg4qLRJSjroUx3eoH56XyO+wqP
-Pc8AoLN8OwXjQIq/NG7jWrT8i2t5wXtI
-=uelX
+iEYEARECAAYFAkg68s8ACgkQmOfEJZHYOKfJzwCdFaU0QR7ODCP/yjlBBB7Q9Grb
+Qh4AoM9SykJj8zw8tDvUt6dq8pvGU2HE
+=iwZV
-----END PGP SIGNATURE-----
diff --git a/net-im/pidgin/files/pidgin-2.4.2-jabber_crash_fix.patch b/net-im/pidgin/files/pidgin-2.4.2-jabber_crash_fix.patch
new file mode 100644
index 000000000000..6af9cbafdce3
--- /dev/null
+++ b/net-im/pidgin/files/pidgin-2.4.2-jabber_crash_fix.patch
@@ -0,0 +1,10 @@
+--- pidgin-2.4.2/libpurple/protocols/jabber/auth.c 2008-05-06 14:04:00.000000000 +0200
++++ pidgin-2.4.3/libpurple/protocols/jabber/auth.c 2008-05-23 17:48:44.000000000 +0200
+@@ -936,6 +945,7 @@
+ _("Invalid challenge from server"));
+ }
+ g_free(js->expected_rspauth);
++ js->expected_rspauth = NULL;
+ } else {
+ /* assemble a response, and send it */
+ /* see RFC 2831 */
diff --git a/net-im/pidgin/pidgin-2.4.2.ebuild b/net-im/pidgin/pidgin-2.4.2.ebuild
index 4ad592e2f510..8f476d61cb3f 100644
--- a/net-im/pidgin/pidgin-2.4.2.ebuild
+++ b/net-im/pidgin/pidgin-2.4.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.4.2.ebuild,v 1.3 2008/05/19 03:09:30 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.4.2.ebuild,v 1.4 2008/05/26 17:26:14 tester Exp $
inherit flag-o-matic eutils toolchain-funcs multilib perl-app gnome2
@@ -122,6 +122,13 @@ pkg_setup() {
}
+src_unpack() {
+ unpack ${A}
+
+ cd "${S}"
+ epatch "${FILESDIR}/pidgin-2.4.2-jabber_crash_fix.patch"
+}
+
src_compile() {
# Stabilize things, for your own good
strip-flags