[pkg-wpa-devel] r1162 - in /wpasupplicant/trunk/debian: changelog patches/13_defined_IEEE8021X_EAPOL.patch patches/series

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

Author: kelmo-guest
Date: Sat May 17 13:02:12 2008
New Revision: 1162

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1162
Log:
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.

Added:
    wpasupplicant/trunk/debian/patches/13_defined_IEEE8021X_EAPOL.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=1162&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Sat May 17 13:02:12 2008
@@ -16,8 +16,11 @@
   * Simplify debian/rules, cleaning up the sanitization of
     README.wpa_supplicant.conf, clean , build and install targets.
   * Span the Build-Depends field of debian/control over multiple lines.
-
- -- Kel Modderman <kel at otaku42.de>  Sun, 11 May 2008 23:38:39 +1000
+  * 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
 
 wpasupplicant (0.6.3-1) unstable; urgency=low
 

Added: wpasupplicant/trunk/debian/patches/13_defined_IEEE8021X_EAPOL.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/13_defined_IEEE8021X_EAPOL.patch?rev=1162&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/13_defined_IEEE8021X_EAPOL.patch (added)
+++ wpasupplicant/trunk/debian/patches/13_defined_IEEE8021X_EAPOL.patch Sat May 17 13:02:12 2008
@@ -1,0 +1,21 @@
+From: Henrik Brix Andersen <henrik at brixandersen.dk>
+Date: Mon, 28 Apr 2008 14:06:43 +0000 (+0300)
+Subject: Fix compilation without IEEE8021X_EAPOL defined
+X-Git-Url: http://w1.fi/gitweb/gitweb.cgi?p=hostap.git;a=commitdiff_plain;h=a6a89fea368001578c75987bbc13b2a3d22c47f7;hp=b717ee2ab25c2ace29098bc720f4117c008ca1b6
+
+Fix compilation without IEEE8021X_EAPOL defined
+---
+
+--- a/wpa_supplicant/wpas_glue.c
++++ b/wpa_supplicant/wpas_glue.c
+@@ -619,8 +619,10 @@
+ 		os_memset(&conf, 0, sizeof(conf));
+ 		conf.peerkey_enabled = ssid->peerkey;
+ 		conf.allowed_pairwise_cipher = ssid->pairwise_cipher;
++#ifdef IEEE8021X_EAPOL
+ 		conf.eap_workaround = ssid->eap_workaround;
+ 		conf.eap_conf_ctx = &ssid->eap;
++#endif /* IEEE8021X_EAPOL */
+ 		conf.ssid = ssid->ssid;
+ 		conf.ssid_len = ssid->ssid_len;
+ 	}

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