Fixing #330085

Package-Manager: portage-2.2_rc67/cvs/Linux i686

4 files changed, 41 insertions, 8 deletions

diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index 3f39ae117991..2af812280ee8 100644
--- a/net-wireless/wpa_supplicant/ChangeLog
+++ b/net-wireless/wpa_supplicant/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/wpa_supplicant
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.142 2010/07/25 13:29:03 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.143 2010/08/14 10:16:52 gurligebis Exp $
+
+*wpa_supplicant-0.7.2-r3 (14 Aug 2010)
+
+  14 Aug 2010; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
+  -wpa_supplicant-0.7.2-r2.ebuild, +wpa_supplicant-0.7.2-r3.ebuild,
+  +files/wpa_supplicant-0.7.2-no-crash.patch:
+  Fixing bug #330085
 
 *wpa_supplicant-0.6.10-r1 (25 Jul 2010)
 
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index f302ae1e2a64..7b1d528f4032 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -8,6 +8,7 @@ AUX wpa_cli.sh 1312 RMD160 d894097c699d067068d2cace9bf71dd6c8c29908 SHA1 f2887f7
 AUX wpa_supplicant-0.6.10-generate-libeap-peer.patch 10190 RMD160 f921ae640985974fb6dfd8875f2430d5e798bee5 SHA1 ed46c39d06702369895582a24ea980867f9d01f4 SHA256 f7b9dc867ff2120279b427b0b2e5e2d50875caaed4c6cac971c83b0f7ab55b69
 AUX wpa_supplicant-0.7.1-dbus_path_fix.patch 316 RMD160 bb1b43b0d369a93fa01cef10ca5ad93d9b608853 SHA1 2f9715b648ceb8c67b15a3b1b345a27b5e1dc933 SHA256 3fdc64892399b158b912dac6902ea8c161e998591d4b3bcf56bc1ab06d7a4791
 AUX wpa_supplicant-0.7.2-dbus_path_fix.patch 316 RMD160 bb1b43b0d369a93fa01cef10ca5ad93d9b608853 SHA1 2f9715b648ceb8c67b15a3b1b345a27b5e1dc933 SHA256 3fdc64892399b158b912dac6902ea8c161e998591d4b3bcf56bc1ab06d7a4791
+AUX wpa_supplicant-0.7.2-no-crash.patch 601 RMD160 ade21c632516b4ea179a9bc361d5f8944f5541f4 SHA1 8da52f09f7402dc78b71e39cb5c097169fc7dfa3 SHA256 58922437ffa6be06dd3f6f4e8ae9598c342d6e865f2b43442655666eab3e6611
 AUX wpa_supplicant-9999-dbus_path_fix.patch 836 RMD160 f8928718fff167aed2b799c87111b805b24034f2 SHA1 740a2035ed876ba410c3ba20a3af8a02bd268f8e SHA256 dbcb1a9a84b5439e1a008f5c8ce7fd4e373be63d199abefd0bcc0e86a44b08ad
 AUX wpa_supplicant-conf.d 161 RMD160 8188ddf3448d31c6288d4201cc9d10d0c4ac3ee3 SHA1 c0ca31e2ddb9b2b5cbafc3eba66316e83688b808 SHA256 61ec59007f66ac5bacc0aa095d1f2ccbc977a687038e161a463d1727223d5a90
 AUX wpa_supplicant-init.d 1249 RMD160 b91b304a2913ce47f04c625e01e5cc504922cf0f SHA1 0e158f5954e4046af3bc157a1c85aab4bbcc71cb SHA256 62a3655ea88b3dfff5243666a4e90d3f0eef6370a7889affb849e178ba4a82b0
@@ -20,14 +21,14 @@ EBUILD wpa_supplicant-0.6.10-r1.ebuild 7956 RMD160 09ec163e3d2ee0f95421f3272a271
 EBUILD wpa_supplicant-0.6.10.ebuild 7166 RMD160 18cd6343fa422326ea709deecdd652ca197a0cb1 SHA1 035ff2e9d7279c22692db71805ff6724f9f01b1e SHA256 dce26f37b953eaf16f5448d61fb020330e21fed15187a5e8a898b4669c7171a3
 EBUILD wpa_supplicant-0.6.9.ebuild 7168 RMD160 3e0c9114b3f31aa0ab3ddca2feb85167446a0bfb SHA1 dad8e4a256c5958f39bf1810ec2a70ed34a63e80 SHA256 311b42783788e869b8879b25d869ac2dc3d38f836632b318572acec5e8ed6ad4
 EBUILD wpa_supplicant-0.7.1.ebuild 7246 RMD160 6de3e1630c3f83e1cfb71d304aed3c039d6b778a SHA1 56e08ff2a0f533f509775455b3acac11aa004fa8 SHA256 70879398c73004cce30959c4795bcfe092ef0b08ad6194a91cc4170f09403105
-EBUILD wpa_supplicant-0.7.2-r2.ebuild 7396 RMD160 0ac0d2c4a0835e527e9e5ea098a73cbd02d397a3 SHA1 f5feb3ab1c47767ee5141a3bda139e6b75675ec4 SHA256 ad50765bf48f445879bd8609c140db82eaa22f99cb8ac7bcaa79026ec34fb4b5
+EBUILD wpa_supplicant-0.7.2-r3.ebuild 7456 RMD160 649a6138ca15ce87ae2fe0b2b82b548ed53ff544 SHA1 e9f690b63e5341ac07d0bccf50ad548770034144 SHA256 4ea6e92ab18b7c8a55b3e3b1f262b0394ad2387432095941dd3f9f03ed313506
 EBUILD wpa_supplicant-9999.ebuild 7524 RMD160 2cf7ad48c20af4f12feaf3f880ebf302338822b1 SHA1 51f1f20766c5aa57a33fb4eb3b2e723a85ecff77 SHA256 86418442df6697b96ed7835d97dc82cc10c4c524c321549dd7196f914f07dac8
-MISC ChangeLog 30605 RMD160 dc563176d30cbbf6b80ec574085492b52336ca41 SHA1 72857d04ab4f96672c35e6939e1f307fe2236348 SHA256 7845c61ed26c3b8734bd28de33e63d70c8226fbca1ca3249f4ab48a67fb37689
+MISC ChangeLog 30847 RMD160 57d29ccefb33cbb6563e507ebd600ef847a5a611 SHA1 bfc96fe3157ead6e09878943db16a3106771f059 SHA256 8b1eb8d8d57723200c2482457f05b58eefcd1d2a8247bc2d7e9d8a0be6c48dfb
 MISC metadata.xml 832 RMD160 14771aa4f3533875b5f3f900ee513dcda354873d SHA1 01f054ebe9f2bebdf8814558085c65ce9d8a15f6 SHA256 a8de983e560152d0491219686afa13bde6e5aa9fcade3b79e77f179c61bb164c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkxMPEoACgkQ5BmOA85PVLivMQCcDdQYrlW6pIx4fM/KFQB1k85J
-FZcAn1uU8621iVwZiADCWvFIulZOA+3b
-=kKGp
+iEYEARECAAYFAkxmbRoACgkQsR7PQhRXYEkZXACfZ7qyVLArhwZZdRlkuysNWoiS
+TJoAn3INWbg0yhidwtHdrlT4axpMSNbv
+=K9gJ
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.2-no-crash.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.2-no-crash.patch
new file mode 100644
index 000000000000..2d3ba1a28188
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.2-no-crash.patch
@@ -0,0 +1,22 @@
+--- ../src/rsn_supp/preauth.c	2010-01-16 12:04:38.000000000 -0500
++++ ../src/rsn_supp/preauth.c	2010-02-01 10:08:48.862052876 -0500
+@@ -49,8 +49,10 @@ void pmksa_candidate_free(struct wpa_sm 
+ 		return;
+ 
+ 	dl_list_for_each_safe(entry, n, &sm->pmksa_candidates,
+-			      struct rsn_pmksa_candidate, list)
++			      struct rsn_pmksa_candidate, list) {
++		dl_list_del(&entry->list);
+ 		os_free(entry);
++	}
+ }
+ 
+ 
+@@ -378,6 +380,7 @@ void pmksa_candidate_add(struct wpa_sm *
+ 	}
+ 
+ 	if (cand) {
++		dl_list_del(&cand->list);
+ 		if (prio < PMKID_CANDIDATE_PRIO_SCAN)
+ 			cand->priority = prio;
+ 	} else {
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.2-r2.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.2-r3.ebuild
index df2a1d6521f5..ed5f5cb0b0b9 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.2-r2.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.7.2-r2.ebuild,v 1.2 2010/06/05 11:07:17 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.7.2-r3.ebuild,v 1.1 2010/08/14 10:16:52 gurligebis Exp $
 
 EAPI="2"
 
@@ -72,6 +72,9 @@ src_prepare() {
 
 	# bug (321627)
 	epatch "${FILESDIR}/fix-ssid-combo.patch"
+
+	# bug (330085)
+	epatch "${FILESDIR}/${P}-no-crash.patch"
 }
 
 src_configure() {