diff --git a/srcpkgs/wpa_supplicant/files/config b/srcpkgs/wpa_supplicant/files/config index d8921dffbc5..e4a7a964c43 100644 --- a/srcpkgs/wpa_supplicant/files/config +++ b/srcpkgs/wpa_supplicant/files/config @@ -41,7 +41,7 @@ # Driver interface for Host AP driver -#CONFIG_DRIVER_HOSTAP=y +CONFIG_DRIVER_HOSTAP=y # Driver interface for Agere driver #CONFIG_DRIVER_HERMES=y @@ -50,16 +50,13 @@ #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 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 # Driver interface for Atmel driver @@ -74,10 +71,11 @@ CONFIG_DRIVER_ATMEL=y #CFLAGS += -I/opt/WRT54GS/release/src/include # Driver interface for Intel ipw2100/2200 driver -#CONFIG_DRIVER_IPW=y +# Deprecated; use CONFIG_DRIVER_WEXT=y instead. +CONFIG_DRIVER_IPW=y # Driver interface for Ralink driver -#CONFIG_DRIVER_RALINK=y +CONFIG_DRIVER_RALINK=y # Driver interface for generic Linux wireless extensions CONFIG_DRIVER_WEXT=y @@ -89,6 +87,8 @@ CONFIG_DRIVER_NL80211=y #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 @@ -109,12 +109,20 @@ CONFIG_DRIVER_NL80211=y # 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 @@ -181,7 +189,7 @@ CONFIG_EAP_LEAP=y #CONFIG_EAP_TNC=y # Wi-Fi Protected Setup (WPS) -CONFIG_WPS=y +#CONFIG_WPS=y # EAP-IKEv2 #CONFIG_EAP_IKEV2=y @@ -238,11 +246,6 @@ CONFIG_READLINE=y # 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 @@ -329,7 +332,7 @@ CONFIG_PEERKEY=y # 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 -#CONFIG_INTERNAL_LIBTOMMATH_FAST=y +CONFIG_INTERNAL_LIBTOMMATH_FAST=y # Include NDIS event processing through WMI into wpa_supplicant/wpasvc. # This is only for Windows builds and requires WMI-related header files and @@ -337,9 +340,17 @@ CONFIG_PEERKEY=y #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_=y) or dynamically (CONFIG_EAP_=dyn). @@ -361,13 +372,6 @@ CONFIG_CTRL_IFACE_DBUS=y # 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 @@ -380,3 +384,21 @@ CONFIG_DEBUG_FILE=y # 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 diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template index b2c00704fb1..358f20a5994 100644 --- a/srcpkgs/wpa_supplicant/template +++ b/srcpkgs/wpa_supplicant/template @@ -1,15 +1,12 @@ # Template file for 'wpa_supplicant' pkgname=wpa_supplicant -version=0.7.0 -revision=3 +version=0.7.3 wrksrc=${pkgname}-${version}/${pkgname} distfiles="http://hostap.epitest.fi/releases/$pkgname-$version.tar.gz" -build_style=gnu_makefile -make_install_target="PREFIX=/usr - DESTDIR=${XBPS_DESTDIR}/${pkgname}-${version} install" +build_style=custom-install short_desc="WPA/WPA2/IEEE 802.1X Supplicant" maintainer="Juan RP " -checksum=9d34f678881b21eb685b730bfed2dc56f4c9eb50bf79245c246f0b8266b75e21 +checksum=d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443 long_desc=" $pkgname is a WPA Supplicant for Linux, BSD, Mac OS X, and Windows with support for WPA and WPA2 (IEEE 802.11i / RSN). It is suitable for both @@ -38,18 +35,18 @@ Add_dependency build dbus-devel Add_dependency build ncurses-devel Add_dependency build readline-devel -pre_build() +do_build() { sed -i 's|/usr/local|$(PREFIX)|g' ${wrksrc}/Makefile cp -f ${FILESDIR}/config ${wrksrc}/.config + make ${makejobs} || return 1 } -post_install() +do_install() { - local dbus_srv=fi.epitest.hostap.WPASupplicant.service - local dbus_conf=fi.epitest.hostap.WPASupplicant.conf - cd ${wrksrc} || return 1 + make PREFIX=/usr DESTDIR=${DESTDIR} install || return 1 + install -d ${DESTDIR}/etc/init.d install -m755 ${FILESDIR}/${pkgname}.rc \ ${DESTDIR}/etc/init.d/${pkgname} @@ -61,10 +58,10 @@ post_install() ${DESTDIR}/usr/share/man/man5 install -m644 doc/docbook/wpa_*.8 ${DESTDIR}/usr/share/man/man8 install -d ${DESTDIR}/usr/share/dbus-1/system-services - sed -i -e "s|/sbin|/usr/sbin|" dbus-wpa_supplicant.service - install -m644 dbus-wpa_supplicant.service \ - ${DESTDIR}/usr/share/dbus-1/system-services/${dbus_srv} + sed -i -e "s|/sbin|/usr/sbin|" dbus/*.service + install -m644 dbus/*.service \ + ${DESTDIR}/usr/share/dbus-1/system-services/ install -d ${DESTDIR}/etc/dbus-1/system.d - install -m644 dbus-wpa_supplicant.conf \ - ${DESTDIR}/etc/dbus-1/system.d/${dbus_conf} + install -m644 dbus/dbus-wpa_supplicant.conf \ + ${DESTDIR}/etc/dbus-1/system.d/wpa_supplicant.conf }