icwmp: flag based enable/disable annex-f params as inform parameter

bbfdm/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bbfdm
-PKG_VERSION:=1.18.17
+PKG_VERSION:=1.18.18
 
 USE_LOCAL:=0
 ifneq ($(USE_LOCAL),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bbfdm.git
-PKG_SOURCE_VERSION:=df25ff7ce0e42ea6a489cff2386774887a7dbd37
+PKG_SOURCE_VERSION:=fbf01a9e30e7ecccc2453af7abfbccf939e27d43
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.zst
 PKG_MIRROR_HASH:=skip
 endif

dnsmngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dnsmngr
-PKG_VERSION:=1.0.20
+PKG_VERSION:=1.0.21
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/dnsmngr.git
-PKG_SOURCE_VERSION:=83e485fae8905f9061257264cf43ea41e47743a6
+PKG_SOURCE_VERSION:=ef3714cc7555f763dfab626add8f90d7bc0a33b5
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.zst
 PKG_MIRROR_HASH:=skip
 endif

icwmp/Config.in

@@ -19,4 +19,8 @@ config ICWMP_VENDOR_PREFIX
 config ICWMP_ENABLE_SMM_SUPPORT
 	bool "Enable software module management support"
 	default n
+
+config ICWMP_ENABLE_ANNEX_F_INFORM_PARAM
+	bool "Enable Device.Gateway. and Device.ManagementServer.ManageableDevice. as inform parameter"
+	default y
 endmenu

icwmp/Makefile

@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=9.10.11
+PKG_VERSION:=9.10.12
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/icwmp.git
-PKG_SOURCE_VERSION:=e672f84d95803e3047bba9e242afd38452f045e2
+PKG_SOURCE_VERSION:=fc34f19ec5ab691b3d815a0d1d917903d310db75
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.zst
 PKG_MIRROR_HASH:=skip
 endif
@@ -90,6 +90,9 @@ define Package/icwmp/install
 	$(INSTALL_BIN) ./files/etc/uci-defaults/95-set-random-inform-time $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) ./files/etc/uci-defaults/85-migrate-gw-info $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) ./files/etc/uci-defaults/999-cwmp-conn-config $(1)/etc/uci-defaults/
+ifeq ($(CONFIG_ICWMP_ENABLE_ANNEX_F_INFORM_PARAM),y)
+	$(INSTALL_BIN) ./files/etc/uci-defaults/999-cwmp-annex-f-config $(1)/etc/uci-defaults/
+endif
 	$(INSTALL_BIN) ./files/etc/icwmpd/vendor_log.sh $(1)/etc/icwmpd/vendor_log.sh
 	$(INSTALL_BIN) ./files/etc/icwmpd/firewall.cwmp $(1)/etc/icwmpd/firewall.cwmp
 	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/icwmp $(1)/lib/upgrade/keep.d/icwmp

icwmp/files/etc/uci-defaults/999-cwmp-annex-f-config

@@ -0,0 +1,51 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+validate_inform_parameter() {
+	local section="${1}"
+	local target_param="${2}"
+	local parameter_name
+
+	config_get parameter_name "${section}" parameter_name
+	if [ "${parameter_name}" = "${target_param}" ]; then
+		return 0
+	fi
+
+	return 1
+}
+
+check_param_exists() {
+	local target_param="${1}" 
+	local found=1
+
+	check_section() {
+		local section="${1}"
+		if validate_inform_parameter "${section}" "${target_param}"; then
+			found=0
+		fi
+	}
+
+	config_foreach check_section inform_parameter
+	return "${found}"
+}
+
+configure_annex_f_inform_param() {
+	config_load cwmp
+
+	if ! check_param_exists "Device.GatewayInfo."; then
+		uci -q set cwmp.gw_info_param=inform_parameter
+		uci -q set cwmp.gw_info_param.enable='1'
+		uci -q set cwmp.gw_info_param.events_list='0 BOOTSTRAP,1 BOOT'
+		uci -q set cwmp.gw_info_param.parameter_name='Device.GatewayInfo.'
+	fi
+
+	if ! check_param_exists "Device.ManagementServer.ManageableDevice."; then
+		uci -q set cwmp.mng_dev_param=inform_parameter
+		uci -q set cwmp.mng_dev_param.enable='1'
+		uci -q set cwmp.mng_dev_param.events_list='0 BOOTSTRAP,1 BOOT'
+		uci -q set cwmp.mng_dev_param.parameter_name='Device.ManagementServer.ManageableDevice.'
+	fi
+}
+
+configure_annex_f_inform_param

libwifi/Makefile

@@ -6,12 +6,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libwifi
-PKG_VERSION:=7.22.10
+PKG_VERSION:=7.22.11
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=4759a74db66dd0b4bfa6707683129a317ae42779
+PKG_SOURCE_VERSION:=6572047d613d4dc88ed83a80fb4ae0798ab71078
 PKG_SOURCE_URL:=https://dev.iopsys.eu/hal/libwifi.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip

obuspa/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=10.0.7.11
+PKG_VERSION:=10.0.7.12
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/obuspa.git
-PKG_SOURCE_VERSION:=1594e87bdb9481e6aa4f4cfbe7d975d2094713e6
+PKG_SOURCE_VERSION:=567bc255d8847a113864882dfe8b76fc1b2cfdf7
 PKG_MAINTAINER:=Vivek Dutta <vivek.dutta@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.zst
 PKG_MIRROR_HASH:=skip

obuspa/patches/0004-bulkdata_extn.patch

@@ -574,7 +574,7 @@ Index: obuspa-10.0.4.0/src/core/device_bulkdata.c
 +            param_type = param_type_value[0];           // First character denotes the type of the parameter
 +            param_value = &param_type_value[1];         // Subsequent characters contain the parameter's value
 +
-+            strncpy(buff, param_path, sizeof(buff));
++            USP_STRNCPY(buff, param_path, sizeof(buff));
 +            for (pch = strtok_r(buff, ".", &pchr); pch != NULL; pch = strtok_r(NULL, ".", &pchr)) {
 +                int idx;
 +                JsonNode *obj = element;

quickjs/Makefile

@@ -35,6 +35,10 @@ MAKE_FLAGS = \
 	EXTRA_LIBS="-latomic" \
 	CROSS_PREFIX="$(TARGET_CROSS)"
 
+# Ensure the static library is built with position independent code so it can
+# be linked into shared objects.
+TARGET_CFLAGS += -fPIC
+
 define Build/Compile
 	# The upstream Makefile uses the same CFLAGS for host and target builds,
 	# which breaks cross-compilation. We work around this by first building

wifidmd/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wifidmd
-PKG_VERSION:=1.4.9
+PKG_VERSION:=1.4.10
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/wifidmd.git
-PKG_SOURCE_VERSION:=28eac5bf52c16b71213974e15cd9c559b61e1c5d
+PKG_SOURCE_VERSION:=3b4e21beaca3b1a09f8553e5f21b8b275dcafc78
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.zst
 PKG_MIRROR_HASH:=skip
 endif

xmppc/Makefile

@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xmppc
-PKG_VERSION:=2.2.14
+PKG_VERSION:=2.2.15
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/xmppc.git
-PKG_SOURCE_VERSION:=8d2999134683153c0971791230373afabe204afe
+PKG_SOURCE_VERSION:=100bb7d12c31cbb231a2650c15d10e9e9d9d384d
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.zst
 PKG_MIRROR_HASH:=skip
 endif