diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-09-16 00:55:12 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-09-16 00:55:19 +0200 |
| commit | f1fc0a7a49e01b52339a6c2a89efa6144da14461 (patch) | |
| tree | 1dea8fff0dbc9a365fa4c12da9e6c9f69132571b /package/wpa_supplicant | |
| parent | aaeb7de3b09138d05fdbb3141bd5310331cb0735 (diff) | |
wpa_supplicant: update to latest upstream, add menu support for libressl
Diffstat (limited to 'package/wpa_supplicant')
4 files changed, 8 insertions, 46 deletions
diff --git a/package/wpa_supplicant/Makefile b/package/wpa_supplicant/Makefile index c99df3238..7b6be4c1c 100644 --- a/package/wpa_supplicant/Makefile +++ b/package/wpa_supplicant/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= wpa_supplicant -PKG_VERSION:= 2.2 +PKG_VERSION:= 2.4 PKG_RELEASE:= 1 -PKG_HASH:= e0d8b8fd68a659636eaba246bb2caacbf53d22d53b2b6b90eb4b4fef0993c8ed +PKG_HASH:= 058dc832c096139a059e6df814080f50251a8d313c21b13364c54a1e70109122 PKG_DESCR:= wpa supplicant PKG_SECTION:= net/wifi PKG_DEPENDS:= libnl librt @@ -20,11 +20,14 @@ PKG_DFLT_WPA_SUPPLICANT:= y if ADK_TARGET_WITH_WIFI WRKSRC= ${WRKDIST}/${PKG_NAME} -PKG_CHOICES_WPA_SUPPLICANT:= WITH_GNUTLS WITH_OPENSSL WITH_INTERNAL -PKGCD_WITH_OPENSSL:= use OpenSSL for crypto +PKG_CHOICES_WPA_SUPPLICANT:= WITH_GNUTLS WITH_LIBRESSL WITH_OPENSSL WITH_INTERNAL +PKGCD_WITH_LIBRESSL:= use libressl for crypto +PKGCS_WITH_LIBRESSL:= libressl +PKGCB_WITH_LIBRESSL:= libressl +PKGCD_WITH_OPENSSL:= use openssl for crypto PKGCS_WITH_OPENSSL:= libopenssl PKGCB_WITH_OPENSSL:= openssl -PKGCD_WITH_GNUTLS:= use GnuTLS for crypto +PKGCD_WITH_GNUTLS:= use gnutls for crypto PKGCS_WITH_GNUTLS:= libgnutls PKGCB_WITH_GNUTLS:= gnutls PKGCD_WITH_INTERNAL:= use internal crypto library diff --git a/package/wpa_supplicant/patches/patch-src_drivers_drivers_mak b/package/wpa_supplicant/patches/patch-src_drivers_drivers_mak deleted file mode 100644 index 3d32a84eb..000000000 --- a/package/wpa_supplicant/patches/patch-src_drivers_drivers_mak +++ /dev/null @@ -1,11 +0,0 @@ ---- wpa_supplicant-2.0.orig/src/drivers/drivers.mak 2013-01-12 16:42:53.000000000 +0100 -+++ wpa_supplicant-2.0/src/drivers/drivers.mak 2013-08-20 17:17:08.430074246 +0200 -@@ -30,7 +30,7 @@ NEED_RFKILL=y - ifdef CONFIG_LIBNL32 - DRV_LIBS += -lnl-3 - DRV_LIBS += -lnl-genl-3 -- DRV_CFLAGS += -DCONFIG_LIBNL20 -I/usr/include/libnl3 -+ DRV_CFLAGS += -DCONFIG_LIBNL20 - else - ifdef CONFIG_LIBNL_TINY - DRV_LIBS += -lnl-tiny diff --git a/package/wpa_supplicant/patches/patch-src_drivers_drivers_mk b/package/wpa_supplicant/patches/patch-src_drivers_drivers_mk deleted file mode 100644 index fc029e499..000000000 --- a/package/wpa_supplicant/patches/patch-src_drivers_drivers_mk +++ /dev/null @@ -1,11 +0,0 @@ ---- wpa_supplicant-2.0.orig/src/drivers/drivers.mk 2013-01-12 16:42:53.000000000 +0100 -+++ wpa_supplicant-2.0/src/drivers/drivers.mk 2013-08-20 17:16:43.386389087 +0200 -@@ -30,7 +30,7 @@ NEED_RFKILL=y - ifdef CONFIG_LIBNL32 - DRV_LIBS += -lnl-3 - DRV_LIBS += -lnl-genl-3 -- DRV_CFLAGS += -DCONFIG_LIBNL20 -I/usr/include/libnl3 -+ DRV_CFLAGS += -DCONFIG_LIBNL20 - else - ifdef CONFIG_LIBNL_TINY - DRV_LIBS += -lnl-tiny diff --git a/package/wpa_supplicant/patches/patch-src_drivers_linux_wext_h b/package/wpa_supplicant/patches/patch-src_drivers_linux_wext_h deleted file mode 100644 index babe847dd..000000000 --- a/package/wpa_supplicant/patches/patch-src_drivers_linux_wext_h +++ /dev/null @@ -1,19 +0,0 @@ ---- wpa_supplicant-2.0.orig/src/drivers/linux_wext.h 2013-01-12 16:42:53.000000000 +0100 -+++ wpa_supplicant-2.0/src/drivers/linux_wext.h 2013-08-20 17:10:28.179106082 +0200 -@@ -21,11 +21,11 @@ - - #include <sys/types.h> - #include <net/if.h> --typedef __uint32_t __u32; --typedef __int32_t __s32; --typedef __uint16_t __u16; --typedef __int16_t __s16; --typedef __uint8_t __u8; -+typedef u_int32_t __u32; -+typedef int32_t __s32; -+typedef u_int16_t __u16; -+typedef int16_t __s16; -+typedef u_int8_t __u8; - #ifndef __user - #define __user - #endif /* __user */ |