summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjarke Istrup Pedersen <gurligebis@gentoo.org>2010-08-14 10:16:52 +0000
committerBjarke Istrup Pedersen <gurligebis@gentoo.org>2010-08-14 10:16:52 +0000
commit393d1ad4a212a353b6d3366d8369f7bc56867584 (patch)
tree9d4a9b4f19b92935434152c86b753594e52d8cd5 /net-wireless/wpa_supplicant
parentUnmask net-dialup/ppp-2.4.5. (diff)
downloadgentoo-2-393d1ad4a212a353b6d3366d8369f7bc56867584.tar.gz
gentoo-2-393d1ad4a212a353b6d3366d8369f7bc56867584.tar.bz2
gentoo-2-393d1ad4a212a353b6d3366d8369f7bc56867584.zip
Fixing #330085
(Portage version: 2.2_rc67/cvs/Linux i686)
Diffstat (limited to 'net-wireless/wpa_supplicant')
-rw-r--r--net-wireless/wpa_supplicant/ChangeLog9
-rw-r--r--net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.2-no-crash.patch22
-rw-r--r--net-wireless/wpa_supplicant/wpa_supplicant-0.7.2-r3.ebuild (renamed from net-wireless/wpa_supplicant/wpa_supplicant-0.7.2-r2.ebuild)5
3 files changed, 34 insertions, 2 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/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() {