stunc: Added ssl variants

iop/config

@@ -70,7 +70,7 @@ CONFIG_PACKAGE_icwmp=y
 CONFIG_PACKAGE_obuspa=y
 CONFIG_PACKAGE_bulkdata=y
 CONFIG_PACKAGE_periodicstats=y
-CONFIG_PACKAGE_stunc=m
+CONFIG_PACKAGE_stunc-mbedtls=m
 CONFIG_PACKAGE_swmodd=m
 CONFIG_PACKAGE_twamp=m
 CONFIG_PACKAGE_udpechoserver=m

stunc/Config.in

@@ -1,16 +0,0 @@
-if PACKAGE_stunc
-
-choice
-	prompt "Select SSL utility"
-	default STUNC_USE_WOLFSSL
-
-config STUNC_USE_WOLFSSL
-	bool "Use WolfSSL for ssl utilities"
-	select CONFIG_PACKAGE_libwolfssl
-
-config STUNC_USE_OPENSSL
-	bool "Use OpenSSL for ssl utilities"
-	select CONFIG_PACKAGE_libopenssl
-
-endchoice
-endif

stunc/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020 iopsys Software Solutions AB
+# Copyright (C) 2020-2022 IOPSYS Software Solutions AB
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,49 +8,78 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=stunc
-PKG_VERSION:=1.1.3
-
+PKG_RELEASE:=1
+PKG_VERSION:=1.1.4
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=c5de804fb976d17fd9a7ed7967d760d0c7e4c224
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/stunc.git
+PKG_SOURCE_VERSION:=0f87e2b62abe39474ce689b68e1edf433fbad370
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/$(PKG_NAME)
+define Package/stunc/default
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=BBF STUN Client
-  DEPENDS:=+libubus +libuci +libubox +libjson-c +libwolfssl +libblobmsg-json +libbbf_api +libopenssl
-  MENU := 1
+  DEPENDS:=+libubus +libuci +libubox +libjson-c +libblobmsg-json +libbbf_api
 endef
 
-define Package/$(PKG_NAME)/description
-	BBF STUN Client
+define Package/stunc-openssl
+  $(Package/stunc/default)
+  TITLE += (openssl)
+  DEPENDS += +PACKAGE_stunc-openssl:libopenssl
+  VARIANT:=openssl
 endef
 
-define Package/$(PKG_NAME)/config
-	source "$(SOURCE)/Config.in"
+define Package/stunc-wolfssl
+  $(Package/stunc/default)
+  TITLE += (wolfssl)
+  DEPENDS += +PACKAGE_stunc-wolfssl:libwolfssl
+  CONFLICTS := stunc-openssl
+  VARIANT:=wolfssl
+endef
+
+define Package/stunc-mbedtls
+  $(Package/stunc/default)
+  TITLE += (mbedtls)
+  DEPENDS += +PACKAGE_stunc-mbedtls:libmbedtls
+  CONFLICTS := stunc-openssl stunc-wolfssl
+  VARIANT:=mbedtls
+  DEFAULT_VARIANT:=1
 endef
 
 TARGET_CFLAGS += \
 	-D_GNU_SOURCE \
 	-Wall -Werror
 
-ifeq ($(CONFIG_STUNC_USE_WOLFSSL), y)
-TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/wolfssl
-TARGET_LDFLAGS += -lwolfssl
+ifeq ($(BUILD_VARIANT),wolfssl)
+  TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/wolfssl
+  MAKE_FLAGS += \
+	USE_SSL="yes"
+  TARGET_LDFLAGS += -lwolfssl
+endif
+
+ifeq ($(BUILD_VARIANT),mbedtls)
+  TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/mbedtls
+  MAKE_FLAGS += \
+	USE_MBEDTLS="yes"
+  TARGET_LDFLAGS += -lmbedtls
+endif
+
+ifeq ($(BUILD_VARIANT),openssl)
+  TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/
+  MAKE_FLAGS += \
+	USE_SSL="yes"
+  TARGET_LDFLAGS += -lssl
 endif
 
 ifeq ($(LOCAL_DEV),1)
@@ -59,7 +88,7 @@ define Build/Prepare
 endef
 endif
 
-define Package/$(PKG_NAME)/install
+define Package/stunc/default/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/etc/init.d
@@ -70,4 +99,10 @@ define Package/$(PKG_NAME)/install
 	$(INSTALL_DATA) ./files/etc/config/stunc $(1)/etc/config/stunc
 endef
 
-$(eval $(call BuildPackage,$(PKG_NAME)))
+Package/stunc-openssl/install = $(Package/stunc/default/install)
+Package/stunc-wolfssl/install = $(Package/stunc/default/install)
+Package/stunc-mbedtls/install = $(Package/stunc/default/install)
+
+$(eval $(call BuildPackage,stunc-openssl))
+$(eval $(call BuildPackage,stunc-wolfssl))
+$(eval $(call BuildPackage,stunc-mbedtls))