packages: wpa_supplicant/dbus-services.patch, wpa_supplicant/wpa_supplicant...
qboosh
qboosh at pld-linux.org
Tue May 22 22:12:59 CEST 2012
Author: qboosh Date: Tue May 22 20:12:59 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 1.0
- updated config file
- updated makefile,generate-libeap-peer,dbus-services patches
- removed obsolete syslog-support,bss-changed-prop-notify,nl patches
---- Files affected:
packages/wpa_supplicant:
dbus-services.patch (1.1 -> 1.2) , wpa_supplicant-0.7.2-generate-libeap-peer.patch (1.3 -> 1.4) , wpa_supplicant-makefile.patch (1.5 -> 1.6) , wpa_supplicant.config (1.10 -> 1.11) , wpa_supplicant.spec (1.88 -> 1.89) , bss-changed-prop-notify.patch (1.1 -> NONE) (REMOVED), wpa_supplicant-nl.patch (1.2 -> NONE) (REMOVED), wpa_supplicant-syslog-support.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/wpa_supplicant/dbus-services.patch
diff -u packages/wpa_supplicant/dbus-services.patch:1.1 packages/wpa_supplicant/dbus-services.patch:1.2
--- packages/wpa_supplicant/dbus-services.patch:1.1 Sat Mar 12 22:14:52 2011
+++ packages/wpa_supplicant/dbus-services.patch Tue May 22 22:12:53 2012
@@ -1,18 +1,18 @@
-diff -urN wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service wpa_supplicant-0.7.3.new//wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service
---- wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service 2010-09-07 17:43:39.000000000 +0200
-+++ wpa_supplicant-0.7.3.new//wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service 2011-03-12 01:17:07.176666667 +0100
-@@ -1,4 +1,4 @@
+--- wpa_supplicant-1.0/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in.orig 2012-05-09 23:56:09.000000000 +0200
++++ wpa_supplicant-1.0/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in 2012-05-22 17:20:59.393121919 +0200
+@@ -1,5 +1,5 @@
[D-BUS Service]
Name=fi.epitest.hostap.WPASupplicant
--Exec=/sbin/wpa_supplicant -u
-+Exec=/usr/sbin/wpa_supplicant -c /etc/wpa_supplicant.conf -u
+-Exec=@BINDIR@/wpa_supplicant -u
++Exec=@BINDIR@/wpa_supplicant -c /etc/wpa_supplicant.conf -u
User=root
-diff -urN wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service wpa_supplicant-0.7.3.new//wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service
---- wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service 2010-09-07 17:43:39.000000000 +0200
-+++ wpa_supplicant-0.7.3.new//wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service 2011-03-12 01:17:15.333333334 +0100
-@@ -1,4 +1,4 @@
+ SystemdService=wpa_supplicant.service
+--- wpa_supplicant-1.0/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in.orig 2012-05-09 23:56:09.000000000 +0200
++++ wpa_supplicant-1.0/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in 2012-05-22 17:21:31.359787249 +0200
+@@ -1,5 +1,5 @@
[D-BUS Service]
Name=fi.w1.wpa_supplicant1
--Exec=/sbin/wpa_supplicant -u
-+Exec=/usr/sbin/wpa_supplicant -c /etc/wpa_supplicant.conf -u
+-Exec=@BINDIR@/wpa_supplicant -u
++Exec=@BINDIR@/wpa_supplicant -c /etc/wpa_supplicant.conf -u
User=root
+ SystemdService=wpa_supplicant.service
================================================================
Index: packages/wpa_supplicant/wpa_supplicant-0.7.2-generate-libeap-peer.patch
diff -u packages/wpa_supplicant/wpa_supplicant-0.7.2-generate-libeap-peer.patch:1.3 packages/wpa_supplicant/wpa_supplicant-0.7.2-generate-libeap-peer.patch:1.4
--- packages/wpa_supplicant/wpa_supplicant-0.7.2-generate-libeap-peer.patch:1.3 Fri Sep 9 17:35:55 2011
+++ packages/wpa_supplicant/wpa_supplicant-0.7.2-generate-libeap-peer.patch Tue May 22 22:12:53 2012
@@ -42,7 +42,7 @@
index 3651056..58c067a 100644
--- a/src/eap_peer/Makefile
+++ b/src/eap_peer/Makefile
-@@ -1,11 +1,187 @@
+@@ -1,11 +1,188 @@
-all:
- @echo Nothing to be made.
+LIBEAP_NAME = libeap
@@ -83,6 +83,7 @@
+OBJS_both += ../utils/wpa_debug.o
+OBJS_both += ../utils/base64.o
+OBJS_both += ../utils/wpabuf.o
++OBJS_both += ../utils/eloop.o
+OBJS_both += ../crypto/md5.o
+OBJS_both += ../crypto/sha1.o
+OBJS_both += ../crypto/sha1-tlsprf.o
@@ -93,7 +94,7 @@
+OBJS_both += ../crypto/aes-omac1.o
+OBJS_both += ../crypto/ms_funcs.o
+OBJS_both += ../crypto/sha256.o
-+
++OBJS_both += ../crypto/random.o
+
+OBJS_both += ../eap_common/eap_peap_common.o
+OBJS_both += ../eap_common/eap_psk_common.o
================================================================
Index: packages/wpa_supplicant/wpa_supplicant-makefile.patch
diff -u packages/wpa_supplicant/wpa_supplicant-makefile.patch:1.5 packages/wpa_supplicant/wpa_supplicant-makefile.patch:1.6
--- packages/wpa_supplicant/wpa_supplicant-makefile.patch:1.5 Sat May 8 23:45:25 2010
+++ packages/wpa_supplicant/wpa_supplicant-makefile.patch Tue May 22 22:12:53 2012
@@ -1,11 +1,11 @@
---- wpa_supplicant-0.3.8.orig/wpa_supplicant/Makefile 2005-02-14 02:55:47.000000000 +0100
-+++ wpa_supplicant-0.3.8/wpa_supplicant/Makefile 2005-04-07 21:55:05.803706440 +0200
-@@ -38,6 +38,8 @@
- echo CONFIG_WIRELESS_EXTENSION=y >> .config
+--- wpa_supplicant-1.0/wpa_supplicant/Makefile.orig 2012-05-09 23:56:09.000000000 +0200
++++ wpa_supplicant-1.0/wpa_supplicant/Makefile 2012-05-22 17:15:38.836468705 +0200
+@@ -53,6 +53,8 @@
+ install -D $(<) $(@)
- install: all
+ install: $(addprefix $(DESTDIR)$(BINDIR)/,$(BINALL))
+ mkdir -p $(DESTDIR)/etc
+ cp wpa_supplicant.conf $(DESTDIR)/etc
- mkdir -p $(DESTDIR)$(BINDIR)
- for i in $(ALL); do cp $$i $(DESTDIR)$(BINDIR)/$$i; done
$(MAKE) -C ../src install
+
+ OBJS = config.o
================================================================
Index: packages/wpa_supplicant/wpa_supplicant.config
diff -u packages/wpa_supplicant/wpa_supplicant.config:1.10 packages/wpa_supplicant/wpa_supplicant.config:1.11
--- packages/wpa_supplicant/wpa_supplicant.config:1.10 Sun Mar 27 23:53:06 2011
+++ packages/wpa_supplicant/wpa_supplicant.config Tue May 22 22:12:53 2012
@@ -8,29 +8,39 @@
#CFLAGS += -I../../include/wireless
# Driver interface for madwifi driver
+# Deprecated; use CONFIG_DRIVER_WEXT=y instead.
#CONFIG_DRIVER_MADWIFI=y
-# Change include directories to match with the local setup
+# Set include directory to the madwifi source tree
CFLAGS += -I/usr/include/madwifi
-# Driver interface for Prism54 driver
-CONFIG_DRIVER_PRISM54=y
-
# Driver interface for ndiswrapper
-# # Deprecated; use CONFIG_DRIVER_WEXT=y instead.
-# #CONFIG_DRIVER_NDISWRAPPER=y
+# Deprecated; use CONFIG_DRIVER_WEXT=y instead.
+#CONFIG_DRIVER_NDISWRAPPER=y
# Driver interface for Atmel driver
CONFIG_DRIVER_ATMEL=y
-# Driver interface for Broadcom driver
+# Driver interface for old Broadcom driver
+# Please note that the newer Broadcom driver ("hybrid Linux driver") supports
+# Linux wireless extensions and does not need (or even work) with the old
+# driver wrapper. Use CONFIG_DRIVER_WEXT=y with that driver.
#CONFIG_DRIVER_BROADCOM=y
# Example path for wlioctl.h; change to match your configuration
#CFLAGS += -I/opt/WRT54GS/release/src/include
# Driver interface for Intel ipw2100/2200 driver
+# Deprecated; use CONFIG_DRIVER_WEXT=y instead.
CONFIG_DRIVER_IPW=y
+# Driver interface for Ralink driver
+#CONFIG_DRIVER_RALINK=y
+
# Driver interface for generic Linux wireless extensions
+# Note: WEXT is deprecated in the current Linux kernel version and no new
+# functionality is added to it. nl80211-based interface is the new
+# replacement for WEXT and its use allows wpa_supplicant to properly control
+# the driver to improve existing functionality like roaming and to support new
+# functionality.
CONFIG_DRIVER_WEXT=y
# Driver interface for Linux drivers using the nl80211 kernel interface
@@ -42,14 +52,20 @@
# Driver interface for wired Ethernet drivers
CONFIG_DRIVER_WIRED=y
+# Driver interface for the Broadcom RoboSwitch family
+#CONFIG_DRIVER_ROBOSWITCH=y
+
+# Driver interface for no driver (e.g., WPS ER only)
+#CONFIG_DRIVER_NONE=y
+
# Enable IEEE 802.1X Supplicant (automatically included if any EAP method is
# included)
CONFIG_IEEE8021X_EAPOL=y
-# EAP-MD5 (automatically included if EAP-TTLS is enabled)
+# EAP-MD5
CONFIG_EAP_MD5=y
-# EAP-MSCHAPv2 (automatically included if EAP-PEAP is enabled)
+# EAP-MSCHAPv2
CONFIG_EAP_MSCHAPV2=y
# EAP-TLS
@@ -80,6 +96,9 @@
# EAP-PSK (experimental; this is _not_ needed for WPA-PSK)
#CONFIG_EAP_PSK=y
+# EAP-pwd (secure authentication using only a password)
+#CONFIG_EAP_PWD=y
+
# EAP-PAX
CONFIG_EAP_PAX=y
@@ -109,7 +128,14 @@
# Wi-Fi Protected Setup (WPS)
#CONFIG_WPS=y
-#
+# Enable WSC 2.0 support
+#CONFIG_WPS2=y
+# Enable WPS external registrar functionality
+#CONFIG_WPS_ER=y
+# Disable credentials for an open network by default when acting as a WPS
+# registrar.
+#CONFIG_WPS_REG_DISABLE_OPEN=y
+
# EAP-IKEv2
#CONFIG_EAP_IKEV2=y
@@ -143,6 +169,10 @@
# the resulting binary.
CONFIG_READLINE=y
+# Include internal line edit mode in wpa_cli. This can be used as a replacement
+# for GNU Readline to provide limited command line editing and history support.
+#CONFIG_WPA_CLI_EDIT=y
+
# Remove debugging code that is printing out debug message to stdout.
# This can be used to reduce the size of the wpa_supplicant considerably
# if debugging code is not needed. The size reduction can be around 35%
@@ -158,10 +188,16 @@
# or 6 kB if building for WPA-Enterprise.
#CONFIG_NO_WPA2=y
-# Remove AES extra functions. This can be used to reduce code size by about
-# 1.5 kB by removing extra AES modes that are not needed for commonly used
-# client configurations (they are needed for some EAP types).
-#CONFIG_NO_AES_EXTRAS=y
+# Remove IEEE 802.11i/WPA-Personal ASCII passphrase support
+# This option can be used to reduce code size by removing support for
+# converting ASCII passphrases into PSK. If this functionality is removed, the
+# PSK can only be configured as the 64-octet hexstring (e.g., from
+# wpa_passphrase). This saves about 0.5 kB in code size.
+#CONFIG_NO_WPA_PASSPHRASE=y
+
+# Disable scan result processing (ap_mode=1) to save code size by about 1 kB.
+# This can be used if ap_scan=1 mode is never enabled.
+#CONFIG_NO_SCAN_PROCESSING=y
# Select configuration backend:
# file = text file (e.g., wpa_supplicant.conf; note: the configuration file
@@ -218,18 +254,17 @@
# Select TLS implementation
# openssl = OpenSSL (default)
-# gnutls = GnuTLS (needed for TLS/IA, see also CONFIG_GNUTLS_EXTRA)
+# gnutls = GnuTLS
# internal = Internal TLSv1 implementation (experimental)
# none = Empty template
#CONFIG_TLS=openssl
-# Whether to enable TLS/IA support, which is required for EAP-TTLSv1.
-# You need CONFIG_TLS=gnutls for this to have any effect. Please note that
-# even though the core GnuTLS library is released under LGPL, this extra
-# library uses GPL and as such, the terms of GPL apply to the combination
-# of wpa_supplicant and GnuTLS if this option is enabled. BSD license may not
-# apply for distribution of the resulting binary.
-#CONFIG_GNUTLS_EXTRA=y
+# TLS-based EAP methods require at least TLS v1.0. Newer version of TLS (v1.1)
+# can be enabled to get a stronger construction of messages when block ciphers
+# are used. It should be noted that some existing TLS v1.0 -based
+# implementation may not be compatible with TLS v1.1 message (ClientHello is
+# sent prior to negotiating which version will be used)
+#CONFIG_TLSV11=y
# If CONFIG_TLS=internal is used, additional library and include paths are
# needed for LibTomMath. Alternatively, an integrated, minimal version of
@@ -242,7 +277,6 @@
#LIBS += -L$(LTM_PATH)
#LIBS_p += -L$(LTM_PATH)
#endif
-
# At the cost of about 4 kB of additional binary size, the internal LibTomMath
# can be configured to include faster routines for exptmod, sqr, and div to
# speed up DH and RSA calculation considerably
@@ -292,6 +326,11 @@
# Add support for writing debug log to a file (/tmp/wpa_supplicant-log-#.txt)
#CONFIG_DEBUG_FILE=y
+# Send debug messages to syslog instead of stdout
+#CONFIG_DEBUG_SYSLOG=y
+# Set syslog facility for debug messages
+#CONFIG_DEBUG_SYSLOG_FACILITY=LOG_DAEMON
+
# Enable privilege separation (see README 'Privilege separation' for details)
#CONFIG_PRIVSEP=y
@@ -303,7 +342,7 @@
# This tracks use of memory allocations and other registrations and reports
# incorrect use with a backtrace of call (or allocation) location.
#CONFIG_WPA_TRACE=y
-# For BSD, comment out these.
+# For BSD, uncomment these.
#LIBS += -lexecinfo
#LIBS_p += -lexecinfo
#LIBS_c += -lexecinfo
@@ -312,10 +351,50 @@
# This enables use of libbfd to get more detailed symbols for the backtraces
# generated by CONFIG_WPA_TRACE=y.
#CONFIG_WPA_TRACE_BFD=y
-# For BSD, comment out these.
+# For BSD, uncomment these.
#LIBS += -lbfd -liberty -lz
#LIBS_p += -lbfd -liberty -lz
#LIBS_c += -lbfd -liberty -lz
-# libnl 2.0 (3.0) support
-CONFIG_LIBNL20=1
+# wpa_supplicant depends on strong random number generation being available
+# from the operating system. os_get_random() function is used to fetch random
+# data when needed, e.g., for key generation. On Linux and BSD systems, this
+# works by reading /dev/urandom. It should be noted that the OS entropy pool
+# needs to be properly initialized before wpa_supplicant is started. This is
+# important especially on embedded devices that do not have a hardware random
+# number generator and may by default start up with minimal entropy available
+# for random number generation.
+#
+# As a safety net, wpa_supplicant is by default trying to internally collect
+# additional entropy for generating random data to mix in with the data fetched
+# from the OS. This by itself is not considered to be very strong, but it may
+# help in cases where the system pool is not initialized properly. However, it
+# is very strongly recommended that the system pool is initialized with enough
+# entropy either by using hardware assisted random number generator or by
+# storing state over device reboots.
+#
+# wpa_supplicant can be configured to maintain its own entropy store over
+# restarts to enhance random number generation. This is not perfect, but it is
+# much more secure than using the same sequence of random numbers after every
+# reboot. This can be enabled with -e<entropy file> command line option. The
+# specified file needs to be readable and writable by wpa_supplicant.
+#
+# If the os_get_random() is known to provide strong random data (e.g., on
+# Linux/BSD, the board in question is known to have reliable source of random
+# data from /dev/urandom), the internal wpa_supplicant random pool can be
+# disabled. This will save some in binary size and CPU use. However, this
+# should only be considered for builds that are known to be used on devices
+# that meet the requirements described above.
+#CONFIG_NO_RANDOM_POOL=y
+
+# IEEE 802.11n (High Throughput) support (mainly for AP mode)
+#CONFIG_IEEE80211N=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
+#
+# libnl 3.2 support
+CONFIG_LIBNL32=1
================================================================
Index: packages/wpa_supplicant/wpa_supplicant.spec
diff -u packages/wpa_supplicant/wpa_supplicant.spec:1.88 packages/wpa_supplicant/wpa_supplicant.spec:1.89
--- packages/wpa_supplicant/wpa_supplicant.spec:1.88 Tue Jan 31 12:55:53 2012
+++ packages/wpa_supplicant/wpa_supplicant.spec Tue May 22 22:12:53 2012
@@ -2,10 +2,6 @@
# TODO:
# - consider using CONFIG_PRIVSEP
# - icon for wpa_gui
-# - reverse madwifi bcond when appropriate packages will be available on ftp
-# / as of madwifi-ng > r1499 and kernel > 2.6.14 wext driver could be
-# used instead of madwifi - so madwifi bcond will become obsolete soon /
-# - syslog-support patch should be fixed and/or ripped from debian/ubuntu
#
# Conditional build
%bcond_without dbus # don't build D-BUS control interface
@@ -20,24 +16,21 @@
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: 0.7.3
-Release: 10
+Version: 1.0
+Release: 1
License: GPL v2
Group: Networking
Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz
-# Source0-md5: f516f191384a9a546e3f5145c08addda
+# Source0-md5: 8650f6aa23646ef634402552d0669640
Source1: %{name}.config
Source2: %{name}-wpa_gui.desktop
Source3: %{name}.tmpfiles
Patch0: %{name}-makefile.patch
Patch1: %{name}-OPTCFLAGS.patch
Patch2: %{name}-lrelease.patch
-Patch3: %{name}-syslog-support.patch
# http://www.linuxwimax.org/Download
-Patch4: %{name}-0.7.2-generate-libeap-peer.patch
-Patch5: dbus-services.patch
-Patch6: bss-changed-prop-notify.patch
-Patch7: %{name}-nl.patch
+Patch3: %{name}-0.7.2-generate-libeap-peer.patch
+Patch4: dbus-services.patch
URL: http://hostap.epitest.fi/wpa_supplicant/
%{?with_dbus:BuildRequires: dbus-devel}
BuildRequires: libnl-devel >= 1:3.2
@@ -139,11 +132,8 @@
%patch0 -p1
%patch1 -p1
%patch2 -p0
-#patch3 -p0
+%patch3 -p1
%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
%{__sed} -i -e 's, at LIB@,%{_lib},' src/eap_peer/libeap0.pc
@@ -164,7 +154,7 @@
V=1 \
CC="%{__cc}" \
LDFLAGS="%{rpmldflags}" \
- OPTCFLAGS="%{rpmcppflags} %{rpmcflags} `pkg-config --cflags libnl-3.0`"
+ OPTCFLAGS="%{rpmcppflags} %{rpmcflags} $(pkg-config --cflags libnl-3.0)"
# eapol_test:
%{__make} -C wpa_supplicant eapol_test \
@@ -282,6 +272,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.89 2012/05/22 20:12:53 qboosh
+- updated to 1.0
+- updated config file
+- updated makefile,generate-libeap-peer,dbus-services patches
+- removed obsolete syslog-support,bss-changed-prop-notify,nl patches
+
Revision 1.88 2012/01/31 11:55:53 baggins
- release 10
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/wpa_supplicant/dbus-services.patch?r1=1.1&r2=1.2
http://cvs.pld-linux.org/packages/wpa_supplicant/wpa_supplicant-0.7.2-generate-libeap-peer.patch?r1=1.3&r2=1.4
http://cvs.pld-linux.org/packages/wpa_supplicant/wpa_supplicant-makefile.patch?r1=1.5&r2=1.6
http://cvs.pld-linux.org/packages/wpa_supplicant/wpa_supplicant.config?r1=1.10&r2=1.11
http://cvs.pld-linux.org/packages/wpa_supplicant/wpa_supplicant.spec?r1=1.88&r2=1.89
More information about the pld-cvs-commit
mailing list