[arch-commits] Commit in wpa_supplicant (3 files)
Thomas Bächler
thomas at archlinux.org
Mon Sep 13 18:07:53 UTC 2010
Date: Monday, September 13, 2010 @ 14:07:52
Author: thomas
Revision: 90602
wpa_supplicant{,_gui}: Upgrade to the (now stable) 0.7 branch, clean and modernize the PKGBUILDs
Modified:
wpa_supplicant/trunk/PKGBUILD
wpa_supplicant/trunk/config
wpa_supplicant_gui/trunk/PKGBUILD
---------------------+
_gui/trunk/PKGBUILD | 30 +++++++++++----------------
trunk/PKGBUILD | 33 +++++++++++++++---------------
trunk/config | 55 +++++++++++++++++++++++++++++++++-----------------
3 files changed, 67 insertions(+), 51 deletions(-)
Modified: trunk/PKGBUILD
===================================================================
--- trunk/PKGBUILD 2010-09-13 17:04:57 UTC (rev 90601)
+++ trunk/PKGBUILD 2010-09-13 18:07:52 UTC (rev 90602)
@@ -1,41 +1,42 @@
# $Id$
-# Maintainer: Thomas Baechler <thomas at archlinux.org>
+# Maintainer: Thomas Bächler <thomas at archlinux.org>
pkgname=wpa_supplicant
-pkgver=0.6.10
-pkgrel=2
+pkgver=0.7.3
+pkgrel=1
pkgdesc="A utility providing key negotiation for WPA wireless networks"
+url="http://hostap.epitest.fi/wpa_supplicant"
arch=('i686' 'x86_64')
depends=('openssl' 'dbus-core>=1.2.4' 'readline>=6.0' 'libnl')
optdepends=('wpa_supplicant_gui: wpa_gui program')
license=('GPL')
groups=('base')
backup=('etc/wpa_supplicant.conf')
-url="http://hostap.epitest.fi/wpa_supplicant"
source=(http://hostap.epitest.fi/releases/wpa_supplicant-$pkgver.tar.gz
config)
-md5sums=('8985b1030d753e5f74f8acfc34e591bb'
- '6577abc7060ed2d45dba14bf8934e850')
+sha256sums=('d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443'
+ '6a0837f18e5ff179ccd6954f7952dfc2e6aa69f353194ee4cb29c1ed2ef68c5d')
build() {
cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}"
- cp ${srcdir}/config ./.config
+ cp "${srcdir}/config" ./.config
sed -i 's@/usr/local@$(PREFIX)@g' Makefile
- make || return 1
+ make
}
package() {
cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}"
- make PREFIX=/usr DESTDIR="${pkgdir}" install || return 1
+ make PREFIX=/usr DESTDIR="${pkgdir}" install
install -m755 -d "${pkgdir}/etc"
- install -m644 wpa_supplicant.conf "${pkgdir}/etc/wpa_supplicant.conf" || return 1
- install -d -m755 ${pkgdir}/usr/share/man/man{5,8} || return 1
- install -m644 doc/docbook/wpa_supplicant.conf.5 "${pkgdir}/usr/share/man/man5/" || return 1
- install -m644 doc/docbook/{wpa_background,wpa_cli,wpa_passphrase,wpa_supplicant}.8 "${pkgdir}/usr/share/man/man8/" || return 1
+ install -m644 wpa_supplicant.conf "${pkgdir}/etc/wpa_supplicant.conf"
+ install -d -m755 "${pkgdir}/usr/share/man/man"{5,8}
+ install -m644 doc/docbook/*.5 "${pkgdir}/usr/share/man/man5/"
+ install -m644 doc/docbook/*.8 "${pkgdir}/usr/share/man/man8/"
+ rm -f "${pkgdir}/usr/share/man/man8/wpa_"{priv,gui}.8
install -m755 -d "${pkgdir}/usr/share/dbus-1/system-services"
- install -m644 dbus-wpa_supplicant.service "${pkgdir}/usr/share/dbus-1/system-services/fi.epitest.hostap.WPASupplicant.service" || return 1
- sed -e 's/sbin/usr\/sbin/' -i "${pkgdir}/usr/share/dbus-1/system-services/fi.epitest.hostap.WPASupplicant.service" || return 1
+ install -m644 dbus/{fi.epitest.hostap.WPASupplicant.service,fi.w1.wpa_supplicant1.service} "${pkgdir}/usr/share/dbus-1/system-services/"
+ sed -e 's/sbin/usr\/sbin/' -i "${pkgdir}/usr/share/dbus-1/system-services/"*.service
install -m755 -d "${pkgdir}/etc/dbus-1/system.d"
- install -m644 dbus-wpa_supplicant.conf "${pkgdir}/etc/dbus-1/system.d/fi.epitest.hostap.WPASupplicant.conf" || return 1
+ install -m644 dbus/dbus-wpa_supplicant.conf "${pkgdir}/etc/dbus-1/system.d/wpa_supplicant.conf"
}
Modified: trunk/config
===================================================================
--- trunk/config 2010-09-13 17:04:57 UTC (rev 90601)
+++ trunk/config 2010-09-13 18:07:52 UTC (rev 90602)
@@ -55,11 +55,6 @@
# Set include directory to the madwifi source tree
#CFLAGS += -I../../madwifi
-# Driver interface for Prism54 driver
-# (Note: Prism54 is not yet supported, i.e., this will not work as-is and is
-# for developers only)
-#CONFIG_DRIVER_PRISM54=y
-
# Driver interface for ndiswrapper
# Deprecated; use CONFIG_DRIVER_WEXT=y instead.
#CONFIG_DRIVER_NDISWRAPPER=y
@@ -92,6 +87,8 @@
#CONFIG_DRIVER_BSD=y
#CFLAGS += -I/usr/local/include
#LIBS += -L/usr/local/lib
+#LIBS_p += -L/usr/local/lib
+#LIBS_c += -L/usr/local/lib
# Driver interface for Windows NDIS
#CONFIG_DRIVER_NDIS=y
@@ -112,12 +109,20 @@
# Driver interface for development testing
#CONFIG_DRIVER_TEST=y
+# Include client MLME (management frame processing) for test driver
+# This can be used to test MLME operations in hostapd with the test interface.
+# space.
+#CONFIG_CLIENT_MLME=y
+
# 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
@@ -241,11 +246,6 @@
# wpa_passphrase). This saves about 0.5 kB in code size.
#CONFIG_NO_WPA_PASSPHRASE=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
-
# 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
@@ -340,9 +340,17 @@
#CONFIG_NDIS_EVENTS_INTEGRATED=y
#PLATFORMSDKLIB="/opt/Program Files/Microsoft Platform SDK/Lib"
-# Add support for DBus control interface
+# Add support for old DBus control interface
+# (fi.epitest.hostap.WPASupplicant)
CONFIG_CTRL_IFACE_DBUS=y
+# Add support for new DBus control interface
+# (fi.w1.hostap.wpa_supplicant1)
+CONFIG_CTRL_IFACE_DBUS_NEW=y
+
+# Add introspection support for new DBus control interface
+CONFIG_CTRL_IFACE_DBUS_INTRO=y
+
# Add support for loading EAP methods dynamically as shared libraries.
# When this option is enabled, each EAP method can be either included
# statically (CONFIG_EAP_<method>=y) or dynamically (CONFIG_EAP_<method>=dyn).
@@ -364,13 +372,6 @@
# amount of memory/flash.
#CONFIG_DYNAMIC_EAP_METHODS=y
-# Include client MLME (management frame processing).
-# This can be used to move MLME processing of Linux mac80211 stack into user
-# space. Please note that this is currently only available with
-# driver_nl80211.c and only with a modified version of Linux kernel and
-# wpa_supplicant.
-#CONFIG_CLIENT_MLME=y
-
# IEEE Std 802.11r-2008 (Fast BSS Transition)
#CONFIG_IEEE80211R=y
@@ -383,3 +384,21 @@
# Enable mitigation against certain attacks against TKIP by delaying Michael
# MIC error reports by a random amount of time between 0 and 60 seconds
#CONFIG_DELAYED_MIC_ERROR_REPORT=y
+
+# Enable tracing code for developer debugging
+# 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.
+#LIBS += -lexecinfo
+#LIBS_p += -lexecinfo
+#LIBS_c += -lexecinfo
+
+# Use libbfd to get more details for developer debugging
+# 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.
+#LIBS += -lbfd -liberty -lz
+#LIBS_p += -lbfd -liberty -lz
+#LIBS_c += -lbfd -liberty -lz
Modified: _gui/trunk/PKGBUILD
===================================================================
--- _gui/trunk/PKGBUILD 2010-09-13 17:04:57 UTC (rev 90601)
+++ _gui/trunk/PKGBUILD 2010-09-13 18:07:52 UTC (rev 90602)
@@ -1,32 +1,28 @@
# $Id$
-# Maintainer:
-# Contributor: Thomas Bächler <thomas at archlinux.org>
+# Maintainer: Thomas Bächler <thomas at archlinux.org>
pkgname=wpa_supplicant_gui
-pkgver=0.6.10
-pkgrel=2
+pkgver=0.7.3
+pkgrel=1
pkgdesc="A Qt frontend to wpa_supplicant"
url="http://hostap.epitest.fi/wpa_supplicant"
arch=('i686' 'x86_64')
depends=('qt' "wpa_supplicant=$pkgver")
license=('GPL')
source=("http://hostap.epitest.fi/releases/wpa_supplicant-$pkgver.tar.gz")
-md5sums=('8985b1030d753e5f74f8acfc34e591bb')
+sha256sums=('d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443')
build() {
- cd ${srcdir}/wpa_supplicant-${pkgver}/wpa_supplicant/wpa_gui-qt4
- qmake || return 1
- make || return 1
+ cd "${srcdir}/wpa_supplicant-${pkgver}/wpa_supplicant/wpa_gui-qt4"
+ qmake
+ make
}
package() {
- cd ${srcdir}/wpa_supplicant-${pkgver}/wpa_supplicant/wpa_gui-qt4
- install -Dm755 wpa_gui \
- ${pkgdir}/usr/sbin/wpa_gui || return 1
- install -Dm644 icons/wpa_gui.svg \
- ${pkgdir}/usr/share/pixmaps/wpa_gui.svg || return 1
- install -Dm644 wpa_gui.desktop \
- ${pkgdir}/usr/share/applications/wpa_gui.desktop || return 1
- install -Dm644 ${srcdir}/wpa_supplicant-${pkgver}/wpa_supplicant/doc/docbook/wpa_gui.8 \
- ${pkgdir}/usr/share/man/man8/wpa_gui.8 || return 1
+ cd "${srcdir}/wpa_supplicant-${pkgver}/wpa_supplicant/wpa_gui-qt4"
+ install -Dm755 wpa_gui "${pkgdir}/usr/sbin/wpa_gui"
+ install -Dm644 icons/wpa_gui.svg "${pkgdir}/usr/share/pixmaps/wpa_gui.svg"
+ install -Dm644 wpa_gui.desktop "${pkgdir}/usr/share/applications/wpa_gui.desktop"
+ install -Dm644 "${srcdir}/wpa_supplicant-${pkgver}/wpa_supplicant/doc/docbook/wpa_gui.8" \
+ "${pkgdir}/usr/share/man/man8/wpa_gui.8"
}
More information about the arch-commits
mailing list