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

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

Author: kelmo-guest
Date: Sat May 17 13:26:54 2008
New Revision: 1163

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1163
Log:
Add 14_fix_compile_without_eap.patch to fix another FTBFS when
IEEE8021X_EAPOL is not defined.

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

Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=1163&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Sat May 17 13:26:54 2008
@@ -19,8 +19,10 @@
   * Add debian/patches/13_defined_IEEE8021X_EAPOL.patch to allow compilation
     when CONFIG_IEEE8021X_EAPOL is not defined and allow people attempting to
     progress on wpasuplicant udeb (and netcfg integration) to move on.
-
- -- Kel Modderman <kel at otaku42.de>  Sat, 17 May 2008 22:55:44 +1000
+  * Add 14_fix_compile_without_eap.patch to fix another FTBFS when
+    IEEE8021X_EAPOL is not defined.
+
+ -- Kel Modderman <kel at otaku42.de>  Sat, 17 May 2008 23:26:33 +1000
 
 wpasupplicant (0.6.3-1) unstable; urgency=low
 

Added: 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=1163&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/14_fix_compile_without_eap.patch (added)
+++ wpasupplicant/trunk/debian/patches/14_fix_compile_without_eap.patch Sat May 17 13:26:54 2008
@@ -1,0 +1,20 @@
+From: Kel Modderman <kel at otaku42.de>
+Date: Sat, 17 May 2008 23:25:19 +1000
+Subject: Fix compilation without IEEE8021X_EAPOL defined II
+
+---
+
+--- a/wpa_supplicant/ctrl_iface.c
++++ b/wpa_supplicant/ctrl_iface.c
+@@ -90,7 +90,11 @@
+ 
+ 	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;
+ 
+ 	return 0;

Modified: wpasupplicant/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/series?rev=1163&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/series (original)
+++ wpasupplicant/trunk/debian/patches/series Sat May 17 13:26:54 2008
@@ -7,6 +7,7 @@
 11_avoid_dbus_version_namespace.patch
 12_fix_potential_use_after_free.patch
 13_defined_IEEE8021X_EAPOL.patch
+14_fix_compile_without_eap.patch
 20_wpa_gui_qt4_disable_link_prl.patch
 41_manpage_format_fixes.patch
 42_manpage_explain_available_drivers.patch