Browse Source

wpa_supplicant: update to latest upstream, add menu support for libressl

Waldemar Brodkorb 10 years ago
parent
commit
f1fc0a7a49

+ 8 - 5
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

+ 0 - 11
package/wpa_supplicant/patches/patch-src_drivers_drivers_mak

@@ -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

+ 0 - 11
package/wpa_supplicant/patches/patch-src_drivers_drivers_mk

@@ -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

+ 0 - 19
package/wpa_supplicant/patches/patch-src_drivers_linux_wext_h

@@ -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 */