[pkg-wpa-devel] r1876 - in /wpa/trunk/debian: changelog patches/series patches/wpa_supplicant-MACsec-fix-build-failure-for-IEEE8021.patch

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

Author: slh-guest
Date: Sun Jun 29 23:53:25 2014
New Revision: 1876

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1876
Log:
fix FTBS on kfreebsd-any

Added:
    wpa/trunk/debian/patches/wpa_supplicant-MACsec-fix-build-failure-for-IEEE8021.patch
Modified:
    wpa/trunk/debian/changelog
    wpa/trunk/debian/patches/series

Modified: wpa/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/changelog?rev=1876&op=diff
==============================================================================
--- wpa/trunk/debian/changelog	(original)
+++ wpa/trunk/debian/changelog	Sun Jun 29 23:53:25 2014
@@ -6,9 +6,6 @@
   * verifiy debian/copyright
   * run (by-hand) testsuite
   * check dependencies (sqlite).
-  * FTBS on kfreebsd, caused by
-    dd10abccc86d29ee828e7548ec1c3500aa813b9e
-    MACsec: wpa_supplicant integration
 
   * New upstream release:
     - import suggested changes from Gerald Turner <gturner at unzane.com> (see

Modified: wpa/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/series?rev=1876&op=diff
==============================================================================
--- wpa/trunk/debian/patches/series	(original)
+++ wpa/trunk/debian/patches/series	Sun Jun 29 23:53:25 2014
@@ -4,3 +4,4 @@
 07_dbus_service_syslog.patch
 12_wpa_gui_knotify_support.patch
 wpa_gui_desktop_add-keywords-entry.patch
+wpa_supplicant-MACsec-fix-build-failure-for-IEEE8021.patch

Added: wpa/trunk/debian/patches/wpa_supplicant-MACsec-fix-build-failure-for-IEEE8021.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/wpa_supplicant-MACsec-fix-build-failure-for-IEEE8021.patch?rev=1876&op=file
==============================================================================
--- wpa/trunk/debian/patches/wpa_supplicant-MACsec-fix-build-failure-for-IEEE8021.patch	(added)
+++ wpa/trunk/debian/patches/wpa_supplicant-MACsec-fix-build-failure-for-IEEE8021.patch	Sun Jun 29 23:53:25 2014
@@ -0,0 +1,42 @@
+From d79a8b745b58f0ce1aa1b6969414456415e7eb16 Mon Sep 17 00:00:00 2001
+From: Stefan Lippers-Hollmann <s.l-h at gmx.de>
+Date: Mon, 30 Jun 2014 01:46:27 +0200
+Subject: [PATCH] wpa_supplicant/ MACsec: fix build failure for
+ IEEE8021X_EAPOL=n
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Building wpa_supplicant >= 2.2 fails on Debian/ kfreebsd with the following
+error message:
+
+cc -c -o wpa_supplicant.o -MMD -Wall -g -Os -fPIC -Isrc -Isrc/utils -DCONFIG_BACKEND_FILE   -DCONFIG_DRIVER_BSD -DCONFIG_CTRL_IFACE -DCONFIG_CTRL_IFACE_UNIX  wpa_supplicant.c
+wpa_supplicant.c: In function ‘wpa_supplicant_initiate_eapol’:
+wpa_supplicant.c:303:33: error: ‘ssid’ undeclared (first use in this function)
+  ieee802_1x_alloc_kay_sm(wpa_s, ssid);
+                                 ^
+wpa_supplicant.c:303:33: note: each undeclared identifier is reported only once for each function it appears in
+
+Move ieee802_1x_alloc_kay_sm(wpa_s, ssid) into the IEEE8021X_EAPOL ifdef,
+as the "ssid" is only conditionally defined for it.
+
+Signed-off-by: Stefan Lippers-Hollmann <s.l-h at gmx.de>
+---
+Build-tested only.
+
+ wpa_supplicant/wpa_supplicant.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/wpa_supplicant/wpa_supplicant.c
++++ b/wpa_supplicant/wpa_supplicant.c
+@@ -298,9 +298,9 @@ void wpa_supplicant_initiate_eapol(struc
+ 		wpa_s->key_mgmt != WPA_KEY_MGMT_WPS;
+ 	eapol_conf.external_sim = wpa_s->conf->external_sim;
+ 	eapol_sm_notify_config(wpa_s->eapol, &ssid->eap, &eapol_conf);
+-#endif /* IEEE8021X_EAPOL */
+ 
+ 	ieee802_1x_alloc_kay_sm(wpa_s, ssid);
++#endif /* IEEE8021X_EAPOL */
+ }
+ 
+