update wpa_supplicant to latest upstream, enable internal crypto as choice

6 files changed, 85 insertions, 3 deletions

diff --git a/package/wpa_supplicant/Makefile b/package/wpa_supplicant/Makefile
index ab7e44355..8f6e0efee 100644
--- a/package/wpa_supplicant/Makefile
+++ b/package/wpa_supplicant/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		wpa_supplicant
-PKG_VERSION:=		1.0
+PKG_VERSION:=		2.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		8650f6aa23646ef634402552d0669640
+PKG_MD5SUM:=		3be2ebfdcced52e00eda0afe2889839d
 PKG_DESCR:=		WPA Supplicant with support for WPA and WPA2
 PKG_SECTION:=		wifi
 PKG_DEPENDS:=		libnl
@@ -18,13 +18,14 @@ PKG_DFLT_WPA_SUPPLICANT:=	y if ADK_TARGET_SYSTEM_IBM_X40
 
 WRKSRC=			${WRKDIST}/${PKG_NAME}
 
-PKG_CHOICES_WPA_SUPPLICANT:=	WITH_OPENSSL WITH_GNUTLS
+PKG_CHOICES_WPA_SUPPLICANT:=	WITH_OPENSSL WITH_GNUTLS WITH_INTERNAL
 PKGCD_WITH_OPENSSL:=		use OpenSSL for crypto
 PKGCS_WITH_OPENSSL:=		libopenssl
 PKGCB_WITH_OPENSSL:=		openssl
 PKGCD_WITH_GNUTLS:=		use GnuTLS for crypto
 PKGCS_WITH_GNUTLS:=		libgnutls
 PKGCB_WITH_GNUTLS:=		gnutls
+PKGCD_WITH_INTERNAL:=		use internal crypto library
 
 include ${TOPDIR}/mk/package.mk
 
@@ -44,6 +45,9 @@ do-configure:
 ifneq (${ADK_PACKAGE_WPA_SUPPLICANT_WITH_GNUTLS},)
 	${SED} "s#openssl#gnutls#" ${WRKBUILD}/.config
 endif
+ifneq (${ADK_PACKAGE_WPA_SUPPLICANT_WITH_INTERNAL},)
+	${SED} "s#openssl#internal#" ${WRKBUILD}/.config
+endif
 
 do-install:
 	${INSTALL_DIR} ${IDIR_WPA_SUPPLICANT}/usr/sbin
diff --git a/package/wpa_supplicant/patches/patch-src_drivers_drivers_mak b/package/wpa_supplicant/patches/patch-src_drivers_drivers_mak
new file mode 100644
index 000000000..3d32a84eb
--- /dev/null
+++ b/package/wpa_supplicant/patches/patch-src_drivers_drivers_mak
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000..fc029e499
--- /dev/null
+++ b/package/wpa_supplicant/patches/patch-src_drivers_drivers_mk
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000..babe847dd
--- /dev/null
+++ b/package/wpa_supplicant/patches/patch-src_drivers_linux_wext_h
@@ -0,0 +1,19 @@
+--- 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 */
diff --git a/package/wpa_supplicant/patches/patch-wpa_supplicant_Makefile b/package/wpa_supplicant/patches/patch-wpa_supplicant_Makefile
new file mode 100644
index 000000000..23704a1ad
--- /dev/null
+++ b/package/wpa_supplicant/patches/patch-wpa_supplicant_Makefile
@@ -0,0 +1,12 @@
+--- wpa_supplicant-2.0.orig/wpa_supplicant/Makefile	2013-01-12 16:42:53.000000000 +0100
++++ wpa_supplicant-2.0/wpa_supplicant/Makefile	2013-08-20 17:31:22.311339505 +0200
+@@ -999,9 +999,6 @@ CFLAGS += -DCONFIG_INTERNAL_LIBTOMMATH
+ ifdef CONFIG_INTERNAL_LIBTOMMATH_FAST
+ CFLAGS += -DLTM_FAST
+ endif
+-else
+-LIBS += -ltommath
+-LIBS_p += -ltommath
+ endif
+ CONFIG_INTERNAL_AES=y
+ CONFIG_INTERNAL_DES=y
diff --git a/package/wpa_supplicant/patches/patch-wpa_supplicant_Makefile.orig b/package/wpa_supplicant/patches/patch-wpa_supplicant_Makefile.orig
new file mode 100644
index 000000000..9bea219d6
--- /dev/null
+++ b/package/wpa_supplicant/patches/patch-wpa_supplicant_Makefile.orig
@@ -0,0 +1,25 @@
+--- wpa_supplicant-2.0.orig/wpa_supplicant/Makefile	2013-01-12 16:42:53.000000000 +0100
++++ wpa_supplicant-2.0/wpa_supplicant/Makefile	2013-08-20 17:30:19.132133775 +0200
+@@ -999,9 +999,6 @@ CFLAGS += -DCONFIG_INTERNAL_LIBTOMMATH
+ ifdef CONFIG_INTERNAL_LIBTOMMATH_FAST
+ CFLAGS += -DLTM_FAST
+ endif
+-else
+-LIBS += -ltommath
+-LIBS_p += -ltommath
+ endif
+ CONFIG_INTERNAL_AES=y
+ CONFIG_INTERNAL_DES=y
+@@ -1519,10 +1516,12 @@ preauth_test: $(OBJS_t2)
+ 	@$(E) "  LD " $@
+ 
+ wpa_passphrase: $(OBJS_p)
++	echo crypto: $(CONFIG_CRYPTO)
+ 	$(Q)$(LDO) $(LDFLAGS) -o wpa_passphrase $(OBJS_p) $(LIBS_p)
+ 	@$(E) "  LD " $@
+ 
+ wpa_cli: $(OBJS_c)
++	echo crypto: $(CONFIG_CRYPTO)
+ 	$(Q)$(LDO) $(LDFLAGS) -o wpa_cli $(OBJS_c) $(LIBS_c)
+ 	@$(E) "  LD " $@
+