diff options
-rw-r--r-- | main/wpa_supplicant/APKBUILD | 18 | ||||
-rw-r--r-- | main/wpa_supplicant/wpa_supplicant-1.0-wpagui-getopt.patch | 13 |
2 files changed, 9 insertions, 22 deletions
diff --git a/main/wpa_supplicant/APKBUILD b/main/wpa_supplicant/APKBUILD index efe939afce..a69c22c782 100644 --- a/main/wpa_supplicant/APKBUILD +++ b/main/wpa_supplicant/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=wpa_supplicant -pkgver=1.0 -pkgrel=2 +pkgver=1.1 +pkgrel=0 pkgdesc="A utility providing key negotiation for WPA wireless networks" url="http://hostap.epitest.fi/wpa_supplicant" arch="all" @@ -13,7 +13,6 @@ source="http://hostap.epitest.fi/releases/$pkgname-$pkgver.tar.gz wpa_supplicant.initd wpa_supplicant.confd libnl3-includes.patch - wpa_supplicant-1.0-wpagui-getopt.patch " _builddir="$srcdir"/$pkgname-$pkgver @@ -31,6 +30,11 @@ prepare() { # Basic setup echo "CONFIG_CTRL_IFACE=y" >> .config + # dbus support + echo "CONFIG_CTRL_IFACE_DBUS=y" >> .config + echo "CONFIG_CTRL_IFACE_DBUS_NEW=y" >> .config + echo "CONFIG_CTRL_IFACE_DBUS_INTRO=y" >> .config + echo "CONFIG_BACKEND=file" >> .config # Basic authentication methods @@ -51,9 +55,6 @@ prepare() { echo "CONFIG_EAP_TLS=y" >> .config echo "CONFIG_EAP_TTLS=y" >> .config - # dbus support - echo "CONFIG_CTRL_IFACE_DBUS=y" >> .config - # debug # echo "CONFIG_DEBUG_FILE=y" >> .config @@ -146,8 +147,7 @@ gui() { mv "$pkgdir"/usr/bin/wpa_gui "$subpkgdir"/usr/bin/ } -md5sums="8650f6aa23646ef634402552d0669640 wpa_supplicant-1.0.tar.gz +md5sums="b29b9af02d7e092db8c5c8508de0e45c wpa_supplicant-1.1.tar.gz 55f853354f51ba947e4dd6ee2bb0d64a wpa_supplicant.initd bc117427f2c538439f3f1481a028ee06 wpa_supplicant.confd -473fb6b77909ec5a50b6f4d91370e86b libnl3-includes.patch -d4cbcddcd92a0fcab59363ffef59a9fb wpa_supplicant-1.0-wpagui-getopt.patch" +473fb6b77909ec5a50b6f4d91370e86b libnl3-includes.patch" diff --git a/main/wpa_supplicant/wpa_supplicant-1.0-wpagui-getopt.patch b/main/wpa_supplicant/wpa_supplicant-1.0-wpagui-getopt.patch deleted file mode 100644 index 30dd14f22e..0000000000 --- a/main/wpa_supplicant/wpa_supplicant-1.0-wpagui-getopt.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- ./wpa_supplicant/wpa_gui-qt4/wpagui.cpp.orig 2013-01-23 19:04:49.020020133 +0000 -+++ ./wpa_supplicant/wpa_gui-qt4/wpagui.cpp 2013-01-23 19:05:26.210331644 +0000 -@@ -12,10 +12,8 @@ - * See README and COPYING for more details. - */ - --#ifdef __MINGW32__ - /* Need to get getopt() */ - #include <unistd.h> --#endif - - #ifdef CONFIG_NATIVE_WINDOWS - #include <windows.h> |