[pkg-wpa-devel] r1174 - in /wpasupplicant/trunk/debian: changelog patches/14_fix_compile_without_eap.patch

[kelmo-guest at users.alioth.debian.org]

Author: kelmo-guest
Date: Sun Jun  1 10:43:25 2008
New Revision: 1174

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1174
Log:
Refresh debian/patches/14_fix_compile_without_eap.patch with what was
applied upstream.

Modified:
    wpasupplicant/trunk/debian/changelog
    wpasupplicant/trunk/debian/patches/14_fix_compile_without_eap.patch

Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=1174&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Sun Jun  1 10:43:25 2008
@@ -31,8 +31,10 @@
     wpa-driver choice, and falls back to the usage of a default backend.
   * Modify debian/README.modes to not contain blurb about which driver_backend
     to use, wext should almost _always_ be used.
-
- -- Kel Modderman <kel at otaku42.de>  Wed, 28 May 2008 22:21:46 +1000
+  * Refresh debian/patches/14_fix_compile_without_eap.patch with what was
+    applied upstream.
+
+ -- Kel Modderman <kel at otaku42.de>  Sun, 01 Jun 2008 20:35:25 +1000
 
 wpasupplicant (0.6.3-1) unstable; urgency=low
 

Modified: wpasupplicant/trunk/debian/patches/14_fix_compile_without_eap.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/14_fix_compile_without_eap.patch?rev=1174&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/14_fix_compile_without_eap.patch (original)
+++ wpasupplicant/trunk/debian/patches/14_fix_compile_without_eap.patch Sun Jun  1 10:43:25 2008
@@ -1,22 +1,38 @@
-From: Kel Modderman <kel at otaku42.de>
-Date: Sat, 17 May 2008 23:25:19 +1000
-Subject: Fix compilation without IEEE8021X_EAPOL defined II
-Status: Reported upstream.
-        http://lists.shmoo.com/pipermail/hostap/2008-May/017851.html
+From: Jouni Malinen <j at w1.fi>
+Date: Fri, 30 May 2008 15:43:06 +0000 (+0300)
+Subject: Fixed build without CONFIG_IEEE8021X_EAPOL, but with CONFIG_CTRL_IFACE
+X-Git-Url: http://w1.fi/gitweb/gitweb.cgi?p=hostap.git;a=commitdiff_plain;h=ec717917e528533f0e26a3b704419b0fda10a307
 
+Fixed build without CONFIG_IEEE8021X_EAPOL, but with CONFIG_CTRL_IFACE
 ---
 
 --- a/wpa_supplicant/ctrl_iface.c
 +++ b/wpa_supplicant/ctrl_iface.c
-@@ -90,7 +90,11 @@
+@@ -76,6 +76,7 @@
+ }
  
- 	wpa_printf(MSG_DEBUG, "CTRL_IFACE PREAUTH " MACSTR, MAC2STR(bssid));
- 	rsn_preauth_deinit(wpa_s->wpa);
+ 
 +#ifdef IEEE8021X_EAPOL
- 	if (rsn_preauth_init(wpa_s->wpa, bssid, ssid ? &ssid->eap : NULL))
-+#else
-+	if (rsn_preauth_init(wpa_s->wpa, bssid, NULL))
-+#endif
- 		return -1;
+ static int wpa_supplicant_ctrl_iface_preauth(struct wpa_supplicant *wpa_s,
+ 					     char *addr)
+ {
+@@ -95,6 +96,7 @@
  
  	return 0;
+ }
++#endif /* IEEE8021X_EAPOL */
+ 
+ 
+ #ifdef CONFIG_PEERKEY
+@@ -1396,9 +1398,11 @@
+ 			wpa_s->reassociate = 1;
+ 			wpa_supplicant_req_scan(wpa_s, 0, 0);
+ 		}
++#ifdef IEEE8021X_EAPOL
+ 	} else if (os_strncmp(buf, "PREAUTH ", 8) == 0) {
+ 		if (wpa_supplicant_ctrl_iface_preauth(wpa_s, buf + 8))
+ 			reply_len = -1;
++#endif /* IEEE8021X_EAPOL */
+ #ifdef CONFIG_PEERKEY
+ 	} else if (os_strncmp(buf, "STKSTART ", 9) == 0) {
+ 		if (wpa_supplicant_ctrl_iface_stkstart(wpa_s, buf + 9))