[pkg-wpa-devel] r1877 - in /wpa/trunk/debian: changelog config/hostapd/kfreebsd config/hostapd/linux config/wpasupplicant/kfreebsd config/wpasupplicant/linux control

slh-guest at users.alioth.debian.org slh-guest at users.alioth.debian.org
Mon Jun 30 00:45:59 UTC 2014 

Author: slh-guest
Date: Mon Jun 30 00:45:59 2014
New Revision: 1877

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1877
Log:
  - adapt build configs for hostapd/ wpa_supplicant 2.2:
    + sync with updated upstream defconfigs.
    + hostapd: keep sqlite3 support disabled for the time being.

Modified:
    wpa/trunk/debian/changelog
    wpa/trunk/debian/config/hostapd/kfreebsd
    wpa/trunk/debian/config/hostapd/linux
    wpa/trunk/debian/config/wpasupplicant/kfreebsd
    wpa/trunk/debian/config/wpasupplicant/linux
    wpa/trunk/debian/control

Modified: wpa/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/changelog?rev=1877&op=diff
==============================================================================
--- wpa/trunk/debian/changelog	(original)
+++ wpa/trunk/debian/changelog	Mon Jun 30 00:45:59 2014
@@ -5,7 +5,6 @@
   * to-do:
   * verifiy debian/copyright
   * run (by-hand) testsuite
-  * check dependencies (sqlite).
 
   * New upstream release:
     - import suggested changes from Gerald Turner <gturner at unzane.com> (see
@@ -20,6 +19,9 @@
       + drop 13_human_readable_signal.patch, applied upstream.
       + drop hostapd_fix-WDS-VLAN-bridge-handling.patch, applied upstream.
       + drop fix-spelling-s-algorith-algorithm.patch, applied upstream.
+    - adapt build configs for hostapd/ wpa_supplicant 2.2:
+      + sync with updated upstream defconfigs.
+      + hostapd: keep sqlite3 support disabled for the time being.
   * drop pre-wheezy /lib/init/rw/sendsigs.omit.d/ migration support, invert the
     according versioned initscripts dependency to a versioned breaks relation.
   * migrate from /var/run/ to /run/.

Modified: wpa/trunk/debian/config/hostapd/kfreebsd
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/config/hostapd/kfreebsd?rev=1877&op=diff
==============================================================================
--- wpa/trunk/debian/config/hostapd/kfreebsd	(original)
+++ wpa/trunk/debian/config/hostapd/kfreebsd	Mon Jun 30 00:45:59 2014
@@ -21,7 +21,19 @@
 
 # Driver interface for drivers using the nl80211 kernel interface
 #CONFIG_DRIVER_NL80211=y
+
+# driver_nl80211.c requires libnl. If you are compiling it yourself
+# you may need to point hostapd to your version of libnl.
+#
+#CFLAGS += -I$<path to libnl include files>
+#LIBS += -L$<path to libnl library files>
+
+# Use libnl v2.0 (or 3.0) libraries.
+#CONFIG_LIBNL20=y
+
+# Use libnl 3.2 libraries (if this is selected, CONFIG_LIBNL20 is ignored)
 #CONFIG_LIBNL32=y
+
 
 # Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
 CONFIG_DRIVER_BSD=y
@@ -29,7 +41,6 @@
 #LIBS += -L/usr/local/lib
 #LIBS_p += -L/usr/local/lib
 #LIBS_c += -L/usr/local/lib
-#LIBS += -lbsd
 
 # Driver interface for no driver (e.g., RADIUS server only)
 CONFIG_DRIVER_NONE=y
@@ -44,9 +55,6 @@
 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.
-# Driver support is also needed for IEEE 802.11w.
 CONFIG_IEEE80211W=y
 
 # Integrated EAP server
@@ -105,8 +113,6 @@
 
 # Wi-Fi Protected Setup (WPS)
 CONFIG_WPS=y
-# Enable WSC 2.0 support
-CONFIG_WPS2=y
 # Enable UPnP support for external WPS Registrars
 CONFIG_WPS_UPNP=y
 # Enable WPS support with NFC config method
@@ -273,10 +279,10 @@
 CONFIG_INTERWORKING=y
 
 # Hotspot 2.0
-CONFIG_HS20=y
+#CONFIG_HS20=y
 
 # Enable SQLite database support in hlr_auc_gw, EAP-SIM DB, and eap_user_file
-CONFIG_SQLITE=y
+#CONFIG_SQLITE=y
 
 # Testing options
 # This can be used to enable some testing options (see also the example

Modified: wpa/trunk/debian/config/hostapd/linux
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/config/hostapd/linux?rev=1877&op=diff
==============================================================================
--- wpa/trunk/debian/config/hostapd/linux	(original)
+++ wpa/trunk/debian/config/hostapd/linux	Mon Jun 30 00:45:59 2014
@@ -21,7 +21,19 @@
 
 # Driver interface for drivers using the nl80211 kernel interface
 CONFIG_DRIVER_NL80211=y
+
+# driver_nl80211.c requires libnl. If you are compiling it yourself
+# you may need to point hostapd to your version of libnl.
+#
+#CFLAGS += -I$<path to libnl include files>
+#LIBS += -L$<path to libnl library files>
+
+# Use libnl v2.0 (or 3.0) libraries.
+#CONFIG_LIBNL20=y
+
+# Use libnl 3.2 libraries (if this is selected, CONFIG_LIBNL20 is ignored)
 CONFIG_LIBNL32=y
+
 
 # Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
 #CONFIG_DRIVER_BSD=y
@@ -43,9 +55,6 @@
 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.
-# Driver support is also needed for IEEE 802.11w.
 CONFIG_IEEE80211W=y
 
 # Integrated EAP server
@@ -104,8 +113,6 @@
 
 # Wi-Fi Protected Setup (WPS)
 CONFIG_WPS=y
-# Enable WSC 2.0 support
-CONFIG_WPS2=y
 # Enable UPnP support for external WPS Registrars
 CONFIG_WPS_UPNP=y
 # Enable WPS support with NFC config method
@@ -272,10 +279,10 @@
 CONFIG_INTERWORKING=y
 
 # Hotspot 2.0
-CONFIG_HS20=y
+#CONFIG_HS20=y
 
 # Enable SQLite database support in hlr_auc_gw, EAP-SIM DB, and eap_user_file
-CONFIG_SQLITE=y
+#CONFIG_SQLITE=y
 
 # Testing options
 # This can be used to enable some testing options (see also the example

Modified: wpa/trunk/debian/config/wpasupplicant/kfreebsd
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/config/wpasupplicant/kfreebsd?rev=1877&op=diff
==============================================================================
--- wpa/trunk/debian/config/wpasupplicant/kfreebsd	(original)
+++ wpa/trunk/debian/config/wpasupplicant/kfreebsd	Mon Jun 30 00:45:59 2014
@@ -19,63 +19,6 @@
 # the kerberos files are not in the default include path. Following line can be
 # used to fix build issues on such systems (krb5.h not found).
 #CFLAGS += -I/usr/include/kerberos
-
-# Example configuration for various cross-compilation platforms
-
-#### sveasoft (e.g., for Linksys WRT54G) ######################################
-#CC=mipsel-uclibc-gcc
-#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc
-#CFLAGS += -Os
-#CPPFLAGS += -I../src/include -I../../src/router/openssl/include
-#LIBS += -L/opt/brcm/hndtools-mipsel-uclibc-0.9.19/lib -lssl
-###############################################################################
-
-#### openwrt (e.g., for Linksys WRT54G) #######################################
-#CC=mipsel-uclibc-gcc
-#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc
-#CFLAGS += -Os
-#CPPFLAGS=-I../src/include -I../openssl-0.9.7d/include \
-#	-I../WRT54GS/release/src/include
-#LIBS = -lssl
-###############################################################################
-
-
-# Driver interface for Host AP driver
-#CONFIG_DRIVER_HOSTAP=y
-
-# Driver interface for Agere driver
-#CONFIG_DRIVER_HERMES=y
-# Change include directories to match with the local setup
-#CFLAGS += -I../../hcf -I../../include -I../../include/hcf
-#CFLAGS += -I../../include/wireless
-
-# Driver interface for madwifi driver
-# Deprecated; use CONFIG_DRIVER_WEXT=y instead.
-#CONFIG_DRIVER_MADWIFI=y
-# Set include directory to the madwifi source tree
-#CFLAGS += -I../../madwifi
-
-# Driver interface for ndiswrapper
-# Deprecated; use CONFIG_DRIVER_WEXT=y instead.
-#CONFIG_DRIVER_NDISWRAPPER=y
-
-# Driver interface for Atmel driver
-#CONFIG_DRIVER_ATMEL=y
-
-# 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
@@ -87,7 +30,19 @@
 
 # Driver interface for Linux drivers using the nl80211 kernel interface
 #CONFIG_DRIVER_NL80211=y
+
+# driver_nl80211.c requires libnl. If you are compiling it yourself
+# you may need to point hostapd to your version of libnl.
+#
+#CFLAGS += -I$<path to libnl include files>
+#LIBS += -L$<path to libnl library files>
+
+# Use libnl v2.0 (or 3.0) libraries.
+#CONFIG_LIBNL20=y
+
+# Use libnl 3.2 libraries (if this is selected, CONFIG_LIBNL20 is ignored)
 #CONFIG_LIBNL32=y
+
 
 # Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
 CONFIG_DRIVER_BSD=y
@@ -95,7 +50,6 @@
 #LIBS += -L/usr/local/lib
 #LIBS_p += -L/usr/local/lib
 #LIBS_c += -L/usr/local/lib
-#LIBS += -lbsd
 
 # Driver interface for Windows NDIS
 #CONFIG_DRIVER_NDIS=y
@@ -198,8 +152,6 @@
 
 # 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
@@ -238,8 +190,10 @@
 # Select control interface backend for external programs, e.g, wpa_cli:
 # unix = UNIX domain sockets (default for Linux/*BSD)
 # udp = UDP sockets using localhost (127.0.0.1)
+# udp6 = UDP IPv6 sockets using localhost (::1)
 # named_pipe = Windows Named Pipe (default for Windows)
 # udp-remote = UDP sockets with remote access (only for tests systems/purpose)
+# udp6-remote = UDP IPv6 sockets with remote access (only for tests purpose)
 # y = use default (backwards compatibility)
 # If this option is commented out, control interface is not included in the
 # build.
@@ -299,7 +253,7 @@
 # main_none = Very basic example (development use only)
 CONFIG_MAIN=main
 
-# Select wrapper for operatins system and C library specific functions
+# Select wrapper for operating system and C library specific functions
 # unix = UNIX/POSIX like systems (default)
 # win32 = Windows systems
 # none = Empty template
@@ -312,6 +266,9 @@
 
 # Should we use poll instead of select? Select is used by default.
 #CONFIG_ELOOP_POLL=y
+
+# Should we use epoll instead of select? Select is used by default.
+#CONFIG_ELOOP_EPOLL=y
 
 # Select layer 2 packet implementation
 # linux = Linux packet socket (default)
@@ -542,9 +499,6 @@
 # External password backend for testing purposes (developer use)
 #CONFIG_EXT_PASSWORD_TEST=y
 
-# Disable roaming in wpa_supplicant
-#CONFIG_NO_ROAMING=y
-
 # XXX: Debian #650834
 CONFIG_BGSCAN_SIMPLE=y
 

Modified: wpa/trunk/debian/config/wpasupplicant/linux
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/config/wpasupplicant/linux?rev=1877&op=diff
==============================================================================
--- wpa/trunk/debian/config/wpasupplicant/linux	(original)
+++ wpa/trunk/debian/config/wpasupplicant/linux	Mon Jun 30 00:45:59 2014
@@ -19,63 +19,6 @@
 # the kerberos files are not in the default include path. Following line can be
 # used to fix build issues on such systems (krb5.h not found).
 #CFLAGS += -I/usr/include/kerberos
-
-# Example configuration for various cross-compilation platforms
-
-#### sveasoft (e.g., for Linksys WRT54G) ######################################
-#CC=mipsel-uclibc-gcc
-#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc
-#CFLAGS += -Os
-#CPPFLAGS += -I../src/include -I../../src/router/openssl/include
-#LIBS += -L/opt/brcm/hndtools-mipsel-uclibc-0.9.19/lib -lssl
-###############################################################################
-
-#### openwrt (e.g., for Linksys WRT54G) #######################################
-#CC=mipsel-uclibc-gcc
-#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc
-#CFLAGS += -Os
-#CPPFLAGS=-I../src/include -I../openssl-0.9.7d/include \
-#	-I../WRT54GS/release/src/include
-#LIBS = -lssl
-###############################################################################
-
-
-# Driver interface for Host AP driver
-#CONFIG_DRIVER_HOSTAP=y
-
-# Driver interface for Agere driver
-#CONFIG_DRIVER_HERMES=y
-# Change include directories to match with the local setup
-#CFLAGS += -I../../hcf -I../../include -I../../include/hcf
-#CFLAGS += -I../../include/wireless
-
-# Driver interface for madwifi driver
-# Deprecated; use CONFIG_DRIVER_WEXT=y instead.
-#CONFIG_DRIVER_MADWIFI=y
-# Set include directory to the madwifi source tree
-#CFLAGS += -I../../madwifi
-
-# Driver interface for ndiswrapper
-# Deprecated; use CONFIG_DRIVER_WEXT=y instead.
-#CONFIG_DRIVER_NDISWRAPPER=y
-
-# Driver interface for Atmel driver
-#CONFIG_DRIVER_ATMEL=y
-
-# 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
@@ -87,7 +30,19 @@
 
 # Driver interface for Linux drivers using the nl80211 kernel interface
 CONFIG_DRIVER_NL80211=y
+
+# driver_nl80211.c requires libnl. If you are compiling it yourself
+# you may need to point hostapd to your version of libnl.
+#
+#CFLAGS += -I$<path to libnl include files>
+#LIBS += -L$<path to libnl library files>
+
+# Use libnl v2.0 (or 3.0) libraries.
+#CONFIG_LIBNL20=y
+
+# Use libnl 3.2 libraries (if this is selected, CONFIG_LIBNL20 is ignored)
 CONFIG_LIBNL32=y
+
 
 # Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
 #CONFIG_DRIVER_BSD=y
@@ -197,8 +152,6 @@
 
 # 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
@@ -237,8 +190,10 @@
 # Select control interface backend for external programs, e.g, wpa_cli:
 # unix = UNIX domain sockets (default for Linux/*BSD)
 # udp = UDP sockets using localhost (127.0.0.1)
+# udp6 = UDP IPv6 sockets using localhost (::1)
 # named_pipe = Windows Named Pipe (default for Windows)
 # udp-remote = UDP sockets with remote access (only for tests systems/purpose)
+# udp6-remote = UDP IPv6 sockets with remote access (only for tests purpose)
 # y = use default (backwards compatibility)
 # If this option is commented out, control interface is not included in the
 # build.
@@ -298,7 +253,7 @@
 # main_none = Very basic example (development use only)
 CONFIG_MAIN=main
 
-# Select wrapper for operatins system and C library specific functions
+# Select wrapper for operating system and C library specific functions
 # unix = UNIX/POSIX like systems (default)
 # win32 = Windows systems
 # none = Empty template
@@ -311,6 +266,9 @@
 
 # Should we use poll instead of select? Select is used by default.
 #CONFIG_ELOOP_POLL=y
+
+# Should we use epoll instead of select? Select is used by default.
+#CONFIG_ELOOP_EPOLL=y
 
 # Select layer 2 packet implementation
 # linux = Linux packet socket (default)
@@ -541,9 +499,6 @@
 # External password backend for testing purposes (developer use)
 #CONFIG_EXT_PASSWORD_TEST=y
 
-# Disable roaming in wpa_supplicant
-#CONFIG_NO_ROAMING=y
-
 # XXX: Debian #650834
 CONFIG_BGSCAN_SIMPLE=y
 

Modified: wpa/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/control?rev=1877&op=diff
==============================================================================
--- wpa/trunk/debian/control	(original)
+++ wpa/trunk/debian/control	Mon Jun 30 00:45:59 2014
@@ -17,7 +17,6 @@
  libpcap-dev [kfreebsd-any],
  libbsd-dev [kfreebsd-any],
  libreadline-dev,
- libsqlite3-dev,
  pkg-config,
  qt4-qmake,
  docbook-to-man,

More information about the Pkg-wpa-devel mailing list