From b66629350ddd5dce1d8fa8852953ad3dccc98440 Mon Sep 17 00:00:00 2001
From: vdutta <vivek.dutta@iopsys.eu>
Date: Tue, 7 Jun 2022 20:53:57 +0530
Subject: [PATCH] icwmp: 8.4.14

---
 icwmp/Config_cwmp.in | 16 ----------------
 icwmp/Makefile       | 23 +++++------------------
 2 files changed, 5 insertions(+), 34 deletions(-)

diff --git a/icwmp/Config_cwmp.in b/icwmp/Config_cwmp.in
index a90e10ef3..3a989dd6b 100644
--- a/icwmp/Config_cwmp.in
+++ b/icwmp/Config_cwmp.in
@@ -12,19 +12,3 @@ config CWMP_ACS_MULTI
 config CWMP_ACS_HDM
 	bool "Select HDM as ACS server"
 endchoice
-
-config CWMP_DEBUG
-	bool "Compile with debug options"
-	depends on PACKAGE_icwmp || \
-		   PACKAGE_icwmp-openssl || \
-		   PACKAGE_icwmp-wolfssl || \
-		   PACKAGE_icwmp-mbedtls
-	default y
-
-config CWMP_DEVEL_DEBUG
-	bool "Compile with development debug options (deprecated)"
-	depends on PACKAGE_icwmp || \
-		   PACKAGE_icwmp-openssl || \
-		   PACKAGE_icwmp-wolfssl || \
-		   PACKAGE_icwmp-mbedtls
-	default n
diff --git a/icwmp/Makefile b/icwmp/Makefile
index 1ebb287a2..eea4bcbe6 100755
--- a/icwmp/Makefile
+++ b/icwmp/Makefile
@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=8.4.12
+PKG_VERSION:=8.4.14
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
-PKG_SOURCE_VERSION:=617f5371093fdf1d7a80c00c228cc70564c731f3
+PKG_SOURCE_VERSION:=a3be4dd092de5e98022ccd29f10a5724863a360a
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 
@@ -28,6 +28,9 @@ PKG_CONFIG_DEPENDS:= \
 	CONFIG_CWMP_DEBUG \
 	CONFIG_CWMP_DEVEL_DEBUG
 
+# Avoid striping of binary
+STRIP:=:
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/icwmp/default
@@ -78,20 +81,14 @@ endef
 
 ifeq ($(BUILD_VARIANT),openssl)
 CONFIGURE_ARGS += --enable-libopenssl
-TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/
-TARGET_LDFLAGS += "-lssl"
 endif
 
 ifeq ($(BUILD_VARIANT),wolfssl)
 CONFIGURE_ARGS += --enable-libwolfssl
-TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/wolfssl
-TARGET_LDFLAGS += "-lwolfssl"
 endif
 
 ifeq ($(BUILD_VARIANT),mbedtls)
 CONFIGURE_ARGS += --enable-libmbedtls
-TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/
-TARGET_LDFLAGS += "-lmbedtls"
 endif
 
 ifeq ($(CONFIG_CWMP_ACS_MULTI),y)
@@ -104,16 +101,6 @@ CONFIGURE_ARGS += \
 	--enable-acs=hdm
 endif
 
-ifeq ($(CONFIG_CWMP_DEBUG),y)
-CONFIGURE_ARGS += \
-	--enable-debug
-endif
-
-ifeq ($(CONFIG_CWMP_DEVEL_DEBUG),y)
-CONFIGURE_ARGS += \
-	--enable-devel
-endif
-
 USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1)
 ifneq ($(USE_LOCAL),)
 define Build/Prepare