[OpenWrt-Devel,RFC,18.06,3/3] hostapd: bump wolfssl variants, adjust options
diff mbox series

Message ID 20190805171921.3995-3-cotequeiroz@gmail.com
State Not Applicable
Headers show
Series
  • wolfssl: bump to 4.1.0-stable
Related show

Commit Message

Eneas U de Queiroz Aug. 5, 2019, 5:19 p.m. UTC
wolfssl changed ABI version, so this forces an update to hostapd.
Some build options selected by hostapd are always built now, so they
were removed.

Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>

Patch
diff mbox series

diff --git a/package/network/services/hostapd/Config.in b/package/network/services/hostapd/Config.in
index 222cfb7f13..6611958cf1 100644
--- a/package/network/services/hostapd/Config.in
+++ b/package/network/services/hostapd/Config.in
@@ -67,15 +67,10 @@  config WPA_WOLFSSL
 	        PACKAGE_wpad-wolfssl ||\
 	        PACKAGE_wpad-mesh-wolfssl ||\
 	        PACKAGE_eapol-test-wolfssl
-	select PACKAGE_libwolfssl
 	select WOLFSSL_HAS_AES_CCM
-	select WOLFSSL_HAS_AES_GCM
 	select WOLFSSL_HAS_ARC4
-	select WOLFSSL_HAS_DES3
 	select WOLFSSL_HAS_DH
-	select WOLFSSL_HAS_ECC
 	select WOLFSSL_HAS_OCSP
-	select WOLFSSL_HAS_PSK
 	select WOLFSSL_HAS_SESSION_TICKET
 	select WOLFSSL_HAS_WPAS
 
diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile
index b548ecdf1b..3412125d2c 100644
--- a/package/network/services/hostapd/Makefile
+++ b/package/network/services/hostapd/Makefile
@@ -6,6 +6,15 @@ 
 
 include $(TOPDIR)/rules.mk
 
+### NOTICE FOR THE NEXT VERSION/RELEASE BUMP.
+###
+# The wolfssl variants currently have a different RELEASE than the others.
+# This is temporary, and was done to avoid to needlessly upgrade the rest of the
+# variants.  So when the next update happen, things should get back to normal.
+# If this package gets a PKG_RELEASE bump, please use PKG_RELEASE:=8, and remove the
+# RELEASE:=7 lines under the wolfssl variants, as well as this notice.
+# If the VERSION/SOURCE_DATE gets updated, remove the notice and the RELEASE:=7 lines.
+
 PKG_NAME:=hostapd
 PKG_RELEASE:=6
 
@@ -170,6 +179,9 @@  Package/hostapd-openssl/description = $(Package/hostapd/description)
 define Package/hostapd-wolfssl
 $(call Package/hostapd/Default,$(1))
   TITLE+= (full)
+####
+  RELEASE:=7
+####
   VARIANT:=full-wolfssl
   DEPENDS+=+libwolfssl
 endef
@@ -222,6 +234,9 @@  Package/wpad-openssl/description = $(Package/wpad/description)
 define Package/wpad-wolfssl
 $(call Package/wpad/Default,$(1))
   TITLE+= (full)
+####
+  RELEASE:=7
+####
   VARIANT:=wpad-full-wolfssl
   DEPENDS+=+libwolfssl
 endef
@@ -260,6 +275,9 @@  Package/wpad-mesh-openssl/description = $(Package/wpad-mesh/description)
 define Package/wpad-mesh-wolfssl
 $(call Package/wpad-mesh,$(1))
   DEPENDS+=+libwolfssl
+####
+  RELEASE:=7
+####
   VARIANT:=wpad-mesh-wolfssl
 endef
 
@@ -290,6 +308,9 @@  endef
 
 define Package/wpa-supplicant-wolfssl
 $(call Package/wpa-supplicant/Default,$(1))
+####
+  RELEASE:=7
+####
   VARIANT:=supplicant-full-wolfssl
   DEPENDS+=+libwolfssl
 endef
@@ -320,6 +341,9 @@  endef
 
 define Package/wpa-supplicant-mesh-wolfssl
 $(call Package/wpa-supplicant-mesh/Default,$(1))
+####
+  RELEASE:=7
+####
   VARIANT:=supplicant-mesh-wolfssl
   DEPENDS+=+libwolfssl
 endef
@@ -379,6 +403,9 @@  define Package/eapol-test-wolfssl
   TITLE:=802.1x authentication test utility
   SECTION:=net
   CATEGORY:=Network
+####
+  RELEASE:=7
+####
   VARIANT:=supplicant-full-wolfssl
   CONFLICTS:=$(filter-out eapol-test-openssl ,$(filter-out eapol-test-wolfssl ,$(EAPOL_TEST_PROVIDERS)))
   DEPENDS:=$(DRV_DEPENDS) +libwolfssl