[arch-commits] Commit in wpa_supplicant/trunk (PKGBUILD config)

[Thomas Bächler]

    Date: Tuesday, February 25, 2014 @ 23:21:19
  Author: thomas
Revision: 206422

Close some wpa_supplicant bug reports, extend configuration, fix PKGBUILD

Modified:
  wpa_supplicant/trunk/PKGBUILD
  wpa_supplicant/trunk/config

----------+
 PKGBUILD |   13 ++++---------
 config   |   14 +++++++-------
 2 files changed, 11 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-02-25 22:05:10 UTC (rev 206421)
+++ PKGBUILD	2014-02-25 22:21:19 UTC (rev 206422)
@@ -3,7 +3,7 @@
 
 pkgname=wpa_supplicant
 pkgver=2.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A utility providing key negotiation for WPA wireless networks"
 url="http://hostap.epitest.fi/wpa_supplicant"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@
 	config
 	0001-Revert-OpenSSL-Do-not-accept-SSL-Client-certificate-.patch)
 sha256sums=('91632e7e3b49a340ce408e2f978a93546a697383abf2e5a60f146faae9e1b277'
-            '6cb74517f4cc1d319e5124ff049bc3fd224180cc4dabc274f8e4b0a5a2291cef'
+            '522b1e2b330bd3fcb9c3c964b0f05ad197a2f1160741835a47585ea45ba8e0a4'
             '3c85fa2cf2465fea86383eece75fa5479507a174da6f0cd09e691fbaaca03c74')
 
 prepare() {
@@ -24,7 +24,6 @@
 
   cd "${pkgname}/"
   cp "${srcdir}/config" ./.config
-  sed -i 's@/usr/local@$(PREFIX)@g' Makefile
 }
 
 build() {
@@ -32,12 +31,12 @@
 
   # The Makefile does not pick up our CPPFLAGS
   export CFLAGS="$CPPFLAGS $CFLAGS"
-  make PREFIX=/usr
+  make LIBDIR=/usr/lib BINDIR=/usr/bin
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}"
-  make PREFIX=/usr DESTDIR="${pkgdir}" install
+  make LIBDIR=/usr/lib BINDIR=/usr/bin DESTDIR="${pkgdir}" install
 
   install -d -m755 "${pkgdir}/etc/wpa_supplicant"
   install -m644 wpa_supplicant.conf "${pkgdir}/etc/wpa_supplicant/wpa_supplicant.conf"
@@ -55,8 +54,4 @@
 
   install -d -m755 "${pkgdir}/usr/lib/systemd/system"
   install -m644 systemd/*.service "${pkgdir}/usr/lib/systemd/system/"
-
-  # usrmove
-  cd "$pkgdir"/usr
-  mv sbin bin
 }

Modified: config
===================================================================
--- config	2014-02-25 22:05:10 UTC (rev 206421)
+++ config	2014-02-25 22:21:19 UTC (rev 206422)
@@ -106,7 +106,7 @@
 # Note: If OpenSSL is used as the TLS library, OpenSSL 1.0 or newer is needed
 # for EAP-FAST support. Older OpenSSL releases would need to be patched, e.g.,
 # with openssl-0.9.8x-tls-extensions.patch, to add the needed functions.
-#CONFIG_EAP_FAST=y
+CONFIG_EAP_FAST=y
 
 # EAP-GTC
 CONFIG_EAP_GTC=y
@@ -184,7 +184,7 @@
 CONFIG_HT_OVERRIDES=y
 
 # Support VHT overrides (disable VHT, mask MCS rates, etc.)
-#CONFIG_VHT_OVERRIDES=y
+CONFIG_VHT_OVERRIDES=y
 
 # Development testing
 #CONFIG_EAPOL_TEST=y
@@ -281,7 +281,7 @@
 
 # IEEE 802.11w (management frame protection), also known as PMF
 # Driver support is also needed for IEEE 802.11w.
-#CONFIG_IEEE80211W=y
+CONFIG_IEEE80211W=y
 
 # Select TLS implementation
 # openssl = OpenSSL (default)
@@ -436,11 +436,11 @@
 CONFIG_NO_RANDOM_POOL=y
 
 # IEEE 802.11n (High Throughput) support (mainly for AP mode)
-#CONFIG_IEEE80211N=y
+CONFIG_IEEE80211N=y
 
 # IEEE 802.11ac (Very High Throughput) support (mainly for AP mode)
 # (depends on CONFIG_IEEE80211N)
-#CONFIG_IEEE80211AC=y
+CONFIG_IEEE80211AC=y
 
 # Wireless Network Management (IEEE Std 802.11v-2011)
 # Note: This is experimental and not complete implementation.
@@ -471,12 +471,12 @@
 CONFIG_P2P=y
 
 # Enable TDLS support
-#CONFIG_TDLS=y
+CONFIG_TDLS=y
 
 # Wi-Fi Direct
 # This can be used to enable Wi-Fi Direct extensions for P2P using an external
 # program to control the additional information exchanges in the messages.
-#CONFIG_WIFI_DISPLAY=y
+CONFIG_WIFI_DISPLAY=y
 
 # Autoscan
 # This can be used to enable automatic scan support in wpa_supplicant.