[packages/wpa_supplicant] - updated to 2.0 - adjusted generate-libeap-peer patch and config file

qboosh qboosh at pld-linux.org
Tue Jan 22 19:22:05 CET 2013 

commit de1f0e4eb12c3c169ff180938d1ad40f8c46ae61
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Jan 22 19:22:41 2013 +0100

    - updated to 2.0
    - adjusted generate-libeap-peer patch and config file

 wpa_supplicant-0.7.2-generate-libeap-peer.patch | 24 +++++----
 wpa_supplicant.config                           | 69 ++++++++++++++++++++++---
 wpa_supplicant.spec                             | 23 ++++-----
 3 files changed, 87 insertions(+), 29 deletions(-)
---
diff --git a/wpa_supplicant.spec b/wpa_supplicant.spec
index b9973fe..66cff18 100644
--- a/wpa_supplicant.spec
+++ b/wpa_supplicant.spec
@@ -15,12 +15,12 @@
 Summary:	Linux WPA/WPA2/RSN/IEEE 802.1X supplicant
 Summary(pl.UTF-8):	Suplikant WPA/WPA2/RSN/IEEE 802.1X dla Linuksa
 Name:		wpa_supplicant
-Version:	1.1
-Release:	2
+Version:	2.0
+Release:	1
 License:	GPL v2
 Group:		Networking
 Source0:	http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz
-# Source0-md5:	b29b9af02d7e092db8c5c8508de0e45c
+# Source0-md5:	3be2ebfdcced52e00eda0afe2889839d
 Source1:	%{name}.config
 Source2:	%{name}-wpa_gui.desktop
 Source3:	%{name}.tmpfiles
@@ -157,7 +157,7 @@ echo 'CONFIG_DRIVER_MADWIFI=y' >> wpa_supplicant/.config
 	CC="%{__cc}" \
 	BINDIR="%{_sbindir}" \
 	LDFLAGS="%{rpmldflags}" \
-	OPTCFLAGS="%{rpmcppflags} %{rpmcflags} $(pkg-config --cflags libnl-3.0)"
+	OPTCFLAGS="%{rpmcppflags} %{rpmcflags}"
 
 # eapol_test:
 %{__make} -C wpa_supplicant eapol_test \
@@ -168,23 +168,22 @@ echo 'CONFIG_DRIVER_MADWIFI=y' >> wpa_supplicant/.config
 
 %if %{with gui}
 cd wpa_supplicant/wpa_gui-qt4
-qmake-qt4 -o Makefile wpa_gui.pro
+qmake-qt4 -o Makefile wpa_gui.pro \
+	QMAKE_CXX="%{__cxx}" \
+	QMAKE_CXXFLAGS_RELEASE="%{rpmcxxflags}" \
+	QMAKE_LFLAGS_RELEASE="%{rpmldflags}"
 cd ../..
 %{__make} -C wpa_supplicant wpa_gui-qt4 \
 	V=1 \
 	QTDIR=%{_libdir}/qt4 \
-	UIC=%{_bindir}/uic-qt4 \
-	CC="%{__cc}" \
-	CXX="%{__cxx}" \
-	LDFLAGS="%{rpmldflags}" \
-	OPTCFLAGS="%{rpmcppflags} %{rpmcflags}"
+	UIC=%{_bindir}/uic-qt4
 %endif
 
 %{__make} -C src/eap_peer clean
 %{__make} -C src/eap_peer \
 	CC="%{__cc}" \
-	LDFLAGS="%{rpmldflags} -shared" \
-	OPTCFLAGS="%{rpmcppflags} %{rpmcflags}"
+	CFLAGS="%{rpmcppflags} %{rpmcflags} -MMD -Wall $(pkg-config --cflags libnl-3.0)" \
+	LDFLAGS="%{rpmldflags} -shared"
 
 %install
 rm -rf $RPM_BUILD_ROOT
diff --git a/wpa_supplicant-0.7.2-generate-libeap-peer.patch b/wpa_supplicant-0.7.2-generate-libeap-peer.patch
index 96602df..0ed47f9 100644
--- a/wpa_supplicant-0.7.2-generate-libeap-peer.patch
+++ b/wpa_supplicant-0.7.2-generate-libeap-peer.patch
@@ -42,7 +42,7 @@ diff --git a/src/eap_peer/Makefile b/src/eap_peer/Makefile
 index 3651056..58c067a 100644
 --- a/src/eap_peer/Makefile
 +++ b/src/eap_peer/Makefile
-@@ -1,11 +1,188 @@
+@@ -1,11 +1,190 @@
 -all:
 -	@echo Nothing to be made.
 +LIBEAP_NAME = libeap
@@ -85,7 +85,9 @@ index 3651056..58c067a 100644
 +OBJS_both += ../utils/wpabuf.o
 +OBJS_both += ../utils/eloop.o
 +OBJS_both += ../crypto/md5.o
++ifneq ($(CONFIG_TLS), openssl)
 +OBJS_both += ../crypto/sha1.o
++endif
 +OBJS_both += ../crypto/sha1-tlsprf.o
 +OBJS_both += ../crypto/aes-encblock.o
 +OBJS_both += ../crypto/aes-wrap.o
@@ -210,15 +212,15 @@ index 3651056..58c067a 100644
 +
 +#	copy the headers reqd by apps using eap peer library in its own subfolder under /usr/include
 +	mkdir -p \
-+		$(DESTDIR)/$(INCLUDE_INSTALL_DIR)/eap_common \
-+		$(DESTDIR)/$(INCLUDE_INSTALL_DIR)/common \
-+		$(DESTDIR)/$(INCLUDE_INSTALL_DIR)/util \
-+		$(DESTDIR)/$(INCLUDE_INSTALL_DIR)/crypto
-+	install -m 0644 $(EAP_COMMON_HEADERS) $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/eap_common
-+	install -m 0644 $(COMMON_HEADERS) $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/common
-+	install -m 0644 $(CRYPTO_HEADERS) $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/crypto
-+	install -m 0644 $(UTIL_HEADERS) $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/util
-+	install -m 0644 $(MAIN_HEADERS) $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/
++		$(DESTDIR)$(INCLUDE_INSTALL_DIR)/eap_common \
++		$(DESTDIR)$(INCLUDE_INSTALL_DIR)/common \
++		$(DESTDIR)$(INCLUDE_INSTALL_DIR)/util \
++		$(DESTDIR)$(INCLUDE_INSTALL_DIR)/crypto
++	install -m 0644 $(EAP_COMMON_HEADERS) $(DESTDIR)$(INCLUDE_INSTALL_DIR)/eap_common
++	install -m 0644 $(COMMON_HEADERS) $(DESTDIR)$(INCLUDE_INSTALL_DIR)/common
++	install -m 0644 $(CRYPTO_HEADERS) $(DESTDIR)$(INCLUDE_INSTALL_DIR)/crypto
++	install -m 0644 $(UTIL_HEADERS) $(DESTDIR)$(INCLUDE_INSTALL_DIR)/util
++	install -m 0644 $(MAIN_HEADERS) $(DESTDIR)$(INCLUDE_INSTALL_DIR)/
 +
 +	mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig
 +	cp libeap0.pc $(DESTDIR)$(LIBDIR)/pkgconfig
@@ -226,7 +228,7 @@ index 3651056..58c067a 100644
 +uninstall: 
 +
 +	rm $(DESTDIR)$(LIBDIR)/$(LIBEAP)
-+	rm -fr $(DESTDIR)/$(INCLUDE_INSTALL_DIR)
++	rm -fr $(DESTDIR)$(INCLUDE_INSTALL_DIR)
 +	rm -f $(DESTDIR)$(LIBDIR)/pkgconfig/libeap0.pc
  
  clean:
diff --git a/wpa_supplicant.config b/wpa_supplicant.config
index d9ee6b7..11150d9 100644
--- a/wpa_supplicant.config
+++ b/wpa_supplicant.config
@@ -135,6 +135,8 @@ CONFIG_EAP_GPSK_SHA256=y
 # Disable credentials for an open network by default when acting as a WPS
 # registrar.
 #CONFIG_WPS_REG_DISABLE_OPEN=y
+# Enable WPS support with NFC config method
+CONFIG_WPS_NFC=y
 
 # EAP-IKEv2
 #CONFIG_EAP_IKEV2=y
@@ -151,6 +153,9 @@ CONFIG_SMARTCARD=y
 # Enable this if EAP-SIM or EAP-AKA is included
 #CONFIG_PCSC=y
 
+# Support HT overrides (disable HT/HT40, mask MCS rates, etc.)
+#CONFIG_HT_OVERRIDES=y
+
 # Development testing
 #CONFIG_EAPOL_TEST=y
 
@@ -158,6 +163,7 @@ CONFIG_SMARTCARD=y
 # unix = UNIX domain sockets (default for Linux/*BSD)
 # udp = UDP sockets using localhost (127.0.0.1)
 # named_pipe = Windows Named Pipe (default for Windows)
+# udp-remote = UDP sockets with remote access (only for tests systems/purpose)
 # y = use default (backwards compatibility)
 # If this option is commented out, control interface is not included in the
 # build.
@@ -234,6 +240,9 @@ CONFIG_OS=unix
 # eloop_none = Empty template
 #CONFIG_ELOOP=eloop
 
+# Should we use poll instead of select? Select is used by default.
+#CONFIG_ELOOP_POLL=y
+
 # Select layer 2 packet implementation
 # linux = Linux packet socket (default)
 # pcap = libpcap/libdnet/WinPcap
@@ -244,11 +253,9 @@ CONFIG_OS=unix
 CONFIG_L2_PACKET=linux
 
 # PeerKey handshake for Station to Station Link (IEEE 802.11e DLS)
-#CONFIG_PEERKEY=y
+CONFIG_PEERKEY=y
 
-# IEEE 802.11w (management frame protection)
-# This version is an experimental implementation based on IEEE 802.11w/D1.0
-# draft and is subject to change since the standard has not yet been finalized.
+# IEEE 802.11w (management frame protection), also known as PMF
 # Driver support is also needed for IEEE 802.11w.
 CONFIG_IEEE80211W=y
 
@@ -266,6 +273,13 @@ CONFIG_IEEE80211W=y
 # sent prior to negotiating which version will be used)
 #CONFIG_TLSV11=y
 
+# TLS-based EAP methods require at least TLS v1.0. Newer version of TLS (v1.2)
+# can be enabled to enable use of stronger crypto algorithms. It should be
+# noted that some existing TLS v1.0 -based implementation may not be compatible
+# with TLS v1.2 message (ClientHello is sent prior to negotiating which version
+# will be used)
+CONFIG_TLSV12=y
+
 # If CONFIG_TLS=internal is used, additional library and include paths are
 # needed for LibTomMath. Alternatively, an integrated, minimal version of
 # LibTomMath can be used. See beginning of libtommath.c for details on benefits
@@ -331,6 +345,12 @@ CONFIG_DEBUG_FILE=y
 # Set syslog facility for debug messages
 #CONFIG_DEBUG_SYSLOG_FACILITY=LOG_DAEMON
 
+# Add support for sending all debug messages (regardless of debug verbosity)
+# to the Linux kernel tracing facility. This helps debug the entire stack by
+# making it easy to record everything happening from the driver up into the
+# same file, e.g., using trace-cmd.
+#CONFIG_DEBUG_LINUX_TRACING=y
+
 # Enable privilege separation (see README 'Privilege separation' for details)
 #CONFIG_PRIVSEP=y
 
@@ -390,11 +410,48 @@ CONFIG_DEBUG_FILE=y
 # IEEE 802.11n (High Throughput) support (mainly for AP mode)
 #CONFIG_IEEE80211N=y
 
+# Wireless Network Management (IEEE Std 802.11v-2011)
+# Note: This is experimental and not complete implementation.
+#CONFIG_WNM=y
+
 # Interworking (IEEE 802.11u)
 # This can be used to enable functionality to improve interworking with
 # external networks (GAS/ANQP to learn more about the networks and network
 # selection based on available credentials).
 #CONFIG_INTERWORKING=y
+
+# Hotspot 2.0
+CONFIG_HS20=y
+
+# AP mode operations with wpa_supplicant
+# This can be used for controlling AP mode operations with wpa_supplicant. It
+# should be noted that this is mainly aimed at simple cases like
+# WPA2-Personal while more complex configurations like WPA2-Enterprise with an
+# external RADIUS server can be supported with hostapd.
+CONFIG_AP=y
+
+# P2P (Wi-Fi Direct)
+# This can be used to enable P2P support in wpa_supplicant. See README-P2P for
+# more information on P2P operations.
+CONFIG_P2P=y
+
+# Autoscan
+# This can be used to enable automatic scan support in wpa_supplicant.
+# See wpa_supplicant.conf for more information on autoscan usage.
 #
-# libnl 3.2 support
-CONFIG_LIBNL32=1
+# Enabling directly a module will enable autoscan support.
+# For exponential module:
+CONFIG_AUTOSCAN_EXPONENTIAL=y
+# For periodic module:
+CONFIG_AUTOSCAN_PERIODIC=y
+
+# Password (and passphrase, etc.) backend for external storage
+# These optional mechanisms can be used to add support for storing passwords
+# and other secrets in external (to wpa_supplicant) location. This allows, for
+# example, operating system specific key storage to be used
+#
+# External password backend for testing purposes (developer use)
+#CONFIG_EXT_PASSWORD_TEST=y
+
+# choose libnl 3.2
+CONFIG_LIBNL32=y
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/wpa_supplicant.git/commitdiff/de1f0e4eb12c3c169ff180938d1ad40f8c46ae61

More information about the pld-cvs-commit mailing list