icwmp: 8.4.0

bbf/Config_bbfdm.in

@@ -1,3 +1,5 @@
+if PACKAGE_libbbfdm
+
 config BBF_VENDOR_EXTENSION
 	bool "Enable Vendor Extension"
 	default y
@@ -10,6 +12,10 @@ config BBF_VENDOR_PREFIX
 	string "Vendor Prefix"
 	default "X_IOPSYS_EU_"
 
+config BBF_TR181
+	bool "Enable TR-181 Data Model Support"
+	default y
+
 config BBF_TR104
 	bool "Enable TR-104 Data Model Support"
 	default y
@@ -20,8 +26,24 @@ config BBF_TR143
 
 config BBFDM_ENABLE_JSON_PLUGIN
 	bool "Enable json plugin to extend datamodel"
-	default y
+	default n
 
 config BBFDM_ENABLE_DOTSO_PLUGIN
 	bool "Enable shared library plugin to extend datamodel"
-	default y
+	default n
+
+choice
+	prompt "Select SSL utility"
+	default BBF_USE_WOLFSSL
+
+config BBF_USE_WOLFSSL
+	bool "Use WolfSSL for ssl utilities"
+	select CONFIG_PACKAGE_libwolfssl
+
+config BBF_USE_OPENSSL
+	bool "Use OpenSSL for ssl utilities"
+	select CONFIG_PACKAGE_libopenssl
+
+endchoice
+
+endif

bbf/Makefile

@@ -5,20 +5,21 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libbbfdm
-PKG_VERSION:=6.6.24
-
-PKG_SOURCE_PROTO:=git
+PKG_VERSION:=6.6.20
+PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
-PKG_SOURCE_VERSION:=daa67e6bad5526c5904715214ac553366255765c
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=491a8b0c00680ba110fb42d17a51627365b1baed
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_LICENSE:=LGPL-2.1
 PKG_LICENSE_FILES:=LICENSE
 
-PKG_FIXUP:=autoreconf
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libbbf_api
@@ -26,45 +27,16 @@ define Package/libbbf_api
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=Library for libbbfdm API
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c
-endef
-
-define Package/libbbfdm/default
-  SECTION:=utils
-  CATEGORY:=Utilities
-  SUBMENU:=TRx69
-  TITLE:=Library for broadband forum data model support
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libtrace +libcurl
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libopenssl +libwolfssl
 endef
 
 define Package/libbbfdm
-  $(Package/libbbfdm/default)
-  TITLE += (internal)
-  VARIANT:=internal
-endef
-
-define Package/libbbfdm-mbedtls
-  $(Package/libbbfdm/default)
-  TITLE += (mbedtls)
-  DEPENDS += +PACKAGE_libbbfdm-mbedtls:libmbedtls
-  VARIANT:=mbedtls
-  DEFAULT_VARIANT:=1
-endef
-
-define Package/libbbfdm-openssl
-  $(Package/libbbfdm/default)
-  TITLE += (openssl)
-  DEPENDS += +PACKAGE_libbbfdm-openssl:libopenssl
-  CONFLICTS := libbbfdm-mbedtls
-  VARIANT:=openssl
-endef
-
-define Package/libbbfdm-wolfssl
-  $(Package/libbbfdm/default)
-  TITLE += (wolfssl)
-  DEPENDS += +PACKAGE_libbbfdm-wolfssl:libwolfssl
-  CONFLICTS := libbbfdm-mbedtls libbbfdm-openssl
-  VARIANT:=wolfssl
+  SECTION:=utils
+  CATEGORY:=Utilities
+  SUBMENU:=TRx69
+  TITLE:=Library for broadband-forum data model
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libtrace +libbbf_api +libcurl +libopenssl +libwolfssl
+  MENU:=1
 endef
 
 define Package/libbbfdm/config
@@ -90,8 +62,10 @@ TARGET_CFLAGS += \
 	-D_GNU_SOURCE \
 	-Wall -Werror \
 
+ifeq ($(CONFIG_BBF_TR181),y)
 CONFIGURE_ARGS += \
 	--enable-tr181
+endif
 
 ifeq ($(CONFIG_BBF_TR104),y)
 CONFIGURE_ARGS += \
@@ -123,19 +97,16 @@ CONFIGURE_ARGS += \
 	--enable-shared-library
 endif
 
-ifeq ($(BUILD_VARIANT),openssl)
-CONFIGURE_ARGS += --enable-libopenssl
-TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/
-endif
-
-ifeq ($(BUILD_VARIANT),wolfssl)
+ifeq ($(CONFIG_BBF_USE_WOLFSSL), y)
 CONFIGURE_ARGS += --enable-libwolfssl
 TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/wolfssl
+TARGET_LDFLAGS += "-lwolfssl"
 endif
 
-ifeq ($(BUILD_VARIANT),mbedtls)
-CONFIGURE_ARGS += --enable-libmbedtls
+ifeq ($(CONFIG_BBF_USE_OPENSSL), y)
+CONFIGURE_ARGS += --enable-libopenssl
 TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/
+TARGET_LDFLAGS += "-lssl"
 endif
 
 define Package/libbbf_api/install
@@ -143,7 +114,7 @@ define Package/libbbf_api/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/.libs/libbbf_api.so* $(1)/lib/
 endef
 
-define Package/libbbfdm/default/install
+define Package/libbbfdm/install
 	$(INSTALL_DIR) $(1)/lib
 	$(INSTALL_DIR) $(1)/usr/share/bbfdm
 	$(INSTALL_DIR) $(1)/etc/bbfdm
@@ -154,20 +125,12 @@ define Package/libbbfdm/default/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/* $(1)/usr/share/bbfdm
 endef
 
-define Package/libbbfdm/default/prerm
+define Package/libbbfdm/prerm
 	#!/bin/sh
 	rm -rf /etc/bbfdm/dmmap/*
 	exit 0
 endef
 
-Package/libbbfdm-openssl/prerm = $(Package/libbbfdm/default/prerm)
-Package/libbbfdm-wolfssl/prerm = $(Package/libbbfdm/default/prerm)
-Package/libbbfdm-mbedtls/prerm = $(Package/libbbfdm/default/prerm)
-
-Package/libbbfdm-openssl/install = $(Package/libbbfdm/default/install)
-Package/libbbfdm-wolfssl/install = $(Package/libbbfdm/default/install)
-Package/libbbfdm-mbedtls/install = $(Package/libbbfdm/default/install)
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/include
@@ -182,6 +145,3 @@ endef
 
 $(eval $(call BuildPackage,libbbf_api))
 $(eval $(call BuildPackage,libbbfdm))
-$(eval $(call BuildPackage,libbbfdm-openssl))
-$(eval $(call BuildPackage,libbbfdm-wolfssl))
-$(eval $(call BuildPackage,libbbfdm-mbedtls))

bulkdata/Makefile

@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bulkdata
-PKG_VERSION:=1.0.5
+PKG_VERSION:=1.0.4
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
@@ -19,41 +19,23 @@ 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/bulkdata/default
+define Package/$(PKG_NAME)
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=BBF BulkData Collection
-  DEPENDS:=+libubus +libuci +libubox +libjson-c +libcurl +curl +libblobmsg-json +libbbf_api
+  DEPENDS:=+libubus +libuci +libubox +libjson-c +libcurl +curl +libblobmsg-json +libbbfdm +libbbf_api
 endef
 
-define Package/bulkdata-mbedtls
-  $(Package/bulkdata/default)
-  TITLE += (mbedtls)
-  DEPENDS += +libbbfdm-mbedtls
-  VARIANT:=mbedtls
-  DEFAULT_VARIANT:=1
-endef
-
-define Package/bulkdata-openssl
-  $(Package/bulkdata/default)
-  TITLE += (openssl)
-  DEPENDS += +libbbfdm-openssl
-  CONFLICTS := bulkdata-mbedtls
-  VARIANT:=openssl
-endef
-
-define Package/bulkdata-wolfssl
-  $(Package/bulkdata/default)
-  TITLE += (wolfssl)
-  DEPENDS += +libbbfdm-wolfssl
-  CONFLICTS := bulkdata-mbedtls bulkdata-openssl
-  VARIANT:=wolfssl
+define Package/$(PKG_NAME)/description
+	BBF BulkData Collection
 endef
 
 TARGET_CFLAGS += \
@@ -66,7 +48,7 @@ define Build/Prepare
 endef
 endif
 
-define Package/bulkdata/default/install
+define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bulkdatad $(1)/usr/sbin/
 	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
@@ -74,10 +56,4 @@ define Package/bulkdata/default/install
 	$(CP) ./files/* $(1)/
 endef
 
-Package/bulkdata-openssl/install = $(Package/bulkdata/default/install)
-Package/bulkdata-wolfssl/install = $(Package/bulkdata/default/install)
-Package/bulkdata-mbedtls/install = $(Package/bulkdata/default/install)
-
-$(eval $(call BuildPackage,bulkdata-openssl))
-$(eval $(call BuildPackage,bulkdata-wolfssl))
-$(eval $(call BuildPackage,bulkdata-mbedtls))
+$(eval $(call BuildPackage,$(PKG_NAME)))

dectmngr/Makefile

@@ -14,7 +14,7 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=96011a9ac7f8b714846ac0ba629528a078de8d9a
+PKG_SOURCE_VERSION:=cc475d5bfe663b73f4ae28d74c9035e210a8ad24
 PKG_MIRROR_HASH:=skip
 endif
 

evoice/Makefile

@@ -51,15 +51,12 @@ export _XFLAGS = -I$(IDIR) -I$(IDIR)/$(BDIR)/inc -I$(IDIR)/bcm963xx/xchg/bos/pub
 
 define Build/Compile
 	+$(MAKE) -r -R -C $(PKG_BUILD_DIR) -f _bld/src/cdabs.mk SWB=b_gxxqca6 HWA=a_openwrt HWC=c_hosted OSP=p_posix TRG=SVrgBcmFxs LIF=cerder DBG=dbg
-	+$(MAKE) -r -R -C $(PKG_BUILD_DIR) -f _bld/src/cdabs.mk SWB=b_gxxqca6 HWA=a_openwrt HWC=c_hosted OSP=p_posix TRG=libvoiceservice LIF=cerder DBG=dbg
 endef
 
 define Package/evoice/install
 	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/_bin/a_openwrt/evoice $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/_bin/a_openwrt/libvoiceservice.so $(1)/usr/lib/bbfdm/
 endef
 
 $(eval $(call BuildPackage,evoice))

icwmp/Config_cwmp.in

@@ -1,30 +1,36 @@
+if PACKAGE_icwmp
+
 choice
-       prompt "Select ACS sever"
-       default CWMP_ACS_MULTI
-       depends on PACKAGE_icwmp || \
-		   PACKAGE_icwmp-openssl || \
-		   PACKAGE_icwmp-wolfssl || \
-		   PACKAGE_icwmp-mbedtls
+	prompt "Select ACS sever"
+	default CWMP_ACS_MULTI
 
 config CWMP_ACS_MULTI
 	bool "No specific ACS, follow standard"
 
 config CWMP_ACS_HDM
-	bool "Select HDM as ACS server"
+	bool "HDM"
 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
+	bool "Compile with development debug options"
 	default n
+
+choice
+	prompt "Select SSL utility"
+	default CWMP_USE_WOLFSSL
+
+config CWMP_USE_WOLFSSL
+	bool "Use WolfSSL for ssl utilities"
+	select CONFIG_PACKAGE_libwolfssl
+
+config CWMP_USE_OPENSSL
+	bool "Use OpenSSL for ssl utilities"
+	select CONFIG_PACKAGE_libopenssl
+
+endchoice
+endif
+

icwmp/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020-2022 IOPSYS Software Solutions AB
+# Copyright (C) 2020 iopsys Software Solutions AB
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,91 +9,56 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
 PKG_VERSION:=8.4.0
-
-PKG_SOURCE_PROTO:=git
+PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
-PKG_SOURCE_VERSION:=a8463946f3df9227685947a6b5a7ffde17b10a44
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=473e8f449032cb195ae4aff2595e5c2efe623335
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
-
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
+PKG_LICENSE_FILES:=COPYING
 
-PKG_FIXUP:=autoreconf
 PKG_CONFIG_DEPENDS:= \
 	CONFIG_CWMP_ACS_MULTI \
 	CONFIG_CWMP_ACS_HDM \
 	CONFIG_CWMP_DEBUG \
 	CONFIG_CWMP_DEVEL_DEBUG
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
 include $(INCLUDE_DIR)/package.mk
 
-define Package/icwmp/default
+define Package/$(PKG_NAME)
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
-  TITLE:=TR069 CWMP client
-  DEPENDS:=+libuci +libubox +libblobmsg-json +libubus +libjson-c +libcurl +mxml
+  TITLE:=CWMP client
+  DEPENDS:=+libuci +libubox +jshn +libubus +libblobmsg-json +libpthread +ubusd +shflags +getopt +zlib +libjson-c +libwolfssl +curl +libcurl +libopenssl +mxml
+  MENU := 1
 endef
 
-define Package/icwmp/config
+define Package/$(PKG_NAME)/description
+ A free client implementation of CWMP (TR-069) protocol
+endef
+
+define Package/$(PKG_NAME)/config
 	source "$(SOURCE)/Config_cwmp.in"
 endef
 
+USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1)
+ifneq ($(USE_LOCAL),)
+define Build/Prepare
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
+endef
+endif
+
 TARGET_CFLAGS += \
 	-D_GNU_SOURCE \
 	"-DCWMP_REVISION=\\\"$(PKG_SOURCE_VERSION)\\\""
 
-define Package/icwmp
-  $(Package/icwmp/default)
-  TITLE += (internal)
-  VARIANT:=internal
-endef
-
-define Package/icwmp-openssl
-  $(Package/icwmp/default)
-  TITLE += (openssl)
-  DEPENDS += +PACKAGE_icwmp-openssl:libopenssl
-  VARIANT:=openssl
-endef
-
-define Package/icwmp-wolfssl
-  $(Package/icwmp/default)
-  TITLE += (wolfssl)
-  DEPENDS += +PACKAGE_icwmp-wolfssl:libwolfssl
-  CONFLICTS := icwmp-openssl
-  VARIANT:=wolfssl
-endef
-
-define Package/icwmp-mbedtls
-  $(Package/icwmp/default)
-  TITLE += (mbedtls)
-  DEPENDS += +PACKAGE_icwmp-mbedtls:libmbedtls
-  CONFLICTS := icwmp-openssl icwmp-wolfssl
-  VARIANT:=mbedtls
-  DEFAULT_VARIANT:=1
-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)
 CONFIGURE_ARGS += \
 	--enable-acs=multi
@@ -114,14 +79,19 @@ CONFIGURE_ARGS += \
 	--enable-devel
 endif
 
-USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1)
-ifneq ($(USE_LOCAL),)
-define Build/Prepare
-	$(CP) ./src/* $(PKG_BUILD_DIR)/
-endef
+ifeq ($(CONFIG_CWMP_USE_WOLFSSL), y)
+CONFIGURE_ARGS += --enable-libwolfssl
+TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/wolfssl
+TARGET_LDFLAGS += "-lwolfssl"
 endif
 
-define Package/icwmp/default/install
+ifeq ($(CONFIG_CWMP_USE_OPENSSL), y)
+CONFIGURE_ARGS += --enable-libopenssl
+TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/
+TARGET_LDFLAGS += "-lssl"
+endif
+
+define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/etc/icwmpd
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc/config
@@ -139,11 +109,4 @@ define Package/icwmp/default/install
 	$(INSTALL_BIN) ./files/etc/icwmpd/update.sh $(1)/etc/icwmpd/update.sh
 endef
 
-Package/icwmp-openssl/install = $(Package/icwmp/default/install)
-Package/icwmp-wolfssl/install = $(Package/icwmp/default/install)
-Package/icwmp-mbedtls/install = $(Package/icwmp/default/install)
-
-$(eval $(call BuildPackage,icwmp))
-$(eval $(call BuildPackage,icwmp-openssl))
-$(eval $(call BuildPackage,icwmp-wolfssl))
-$(eval $(call BuildPackage,icwmp-mbedtls))
+$(eval $(call BuildPackage,$(PKG_NAME)))

ieee1905/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=4.7.7
+PKG_VERSION:=4.7.4
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=8de4d6cab56f2107e89728187e8e72f95f0e2afa
+PKG_SOURCE_VERSION:=efe39a957f8512243e6ee6044e91d8f5a97c318e
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ieee1905.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip

iop/config

@@ -65,12 +65,12 @@ CONFIG_PACKAGE_questd=y
 CONFIG_PACKAGE_rulengd=y
 
 # TR-x69 #
-CONFIG_PACKAGE_uspd-mbedtls=y
-CONFIG_PACKAGE_icwmp-mbedtls=y
+CONFIG_PACKAGE_uspd=y
+CONFIG_PACKAGE_icwmp=y
 CONFIG_PACKAGE_obuspa=y
-CONFIG_PACKAGE_bulkdata-mbedtls=y
+CONFIG_PACKAGE_bulkdata=y
 CONFIG_PACKAGE_periodicstats=y
-CONFIG_PACKAGE_stunc-mbedtls=m
+CONFIG_PACKAGE_stunc=m
 CONFIG_PACKAGE_swmodd=m
 CONFIG_PACKAGE_twamp=m
 CONFIG_PACKAGE_udpechoserver=m

map-agent/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=7.1.34
+PKG_VERSION:=7.1.33
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=b94b561bc74ec7682cebcc3b4c9cb1bfc08b4c41
+PKG_SOURCE_VERSION:=9d37e0b65571a6e5b9ad05bd79f49dc04d9a1dbb
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 
 PKG_LICENSE:=PROPRIETARY IOPSYS

map-controller/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=6.0.19
+PKG_VERSION:=6.0.18
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=b0e445b1a9ee962c1d151526eeb39d657f6f855c
+PKG_SOURCE_VERSION:=4029fa48a18e3a6c8af3a2478558e74184fd1786
 
 PKG_LICENSE:=PROPRIETARY IOPSYS
 PKG_LICENSE_FILES:=LICENSE

obuspa/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=5.0.0.9
+PKG_VERSION:=5.0.0.7
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
@@ -31,7 +31,7 @@ define Package/obuspa
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=USP agent
-  DEPENDS:=+libopenssl +libuci +libblobmsg-json +libcurl +libsqlite3 +libubox +libubus +libmosquitto-ssl +libwebsockets-openssl
+  DEPENDS:=+libopenssl +libcurl +libsqlite3 +libubox +libubus +uspd +libmosquitto-ssl +libwebsockets-openssl
 endef
 
 define Package/obuspa/description

obuspa/files/etc/init.d/obuspa

@@ -699,16 +699,20 @@ configure_obuspa() {
 
 	if [ -n "${ifname}" ]; then
 		procd_set_param env USP_BOARD_IFNAME="${ifname}"
-	fi
-
-	if [ -z "${ifname}" ] || ! grep -F -q "export USP_BOARD_IFNAME=${ifname}" "${PROFILE}"; then
+		# Set this variable for root user and obuspa -c tool
 		if [ -f "${PROFILE}" ]; then
-			sed -i "/export USP_BOARD_IFNAME/d" "${PROFILE}"
+			if grep -q "export USP_BOARD_IFNAME=${ifname}" ${PROFILE}; then
+				if grep -q "export USP_BOARD_IFNAME" ${PROFILE}; then
+					sed -i "g/export USP_BOARD_IFNAME/d" ${PROFILE}
+				fi
+			fi
 		fi
-
-		if [ -n "${ifname}" ]; then
-			# Set this variable for root user and obuspa -c tool
-			echo "export USP_BOARD_IFNAME=${ifname}" >> "${PROFILE}"
+		echo "export USP_BOARD_IFNAME=${ifname}" >> ${PROFILE}
+	else
+		if [ -f "$PROFILE" ]; then
+			if grep -q "export USP_BOARD_IFNAME" ${PROFILE}; then
+				sed -i "g/export USP_BOARD_IFNAME/d" ${PROFILE}
+			fi
 		fi
 	fi
 

qosmngr/files/lib/qos/broadcom.sh

@@ -5,6 +5,7 @@
 IP_RULE=""
 BR_RULE=""
 
+POLICER_SKIP=0
 POLICER_COUNT=0
 INTF_NAME=""
 Q_COUNT=0
@@ -756,7 +757,12 @@ handle_policer_rules() {
 		return
 	fi
 
-	config_ingress_rate_limit $ifname $ingress_rate $in_burst_size
+	# The policer object is not available on non BCM968* chips
+	if [ $POLICER_SKIP -eq 1 ]; then
+		assign_policer_to_port $ifname $pindex
+	else
+		config_ingress_rate_limit $ifname $ingress_rate $in_burst_size
+	fi
 
 }
 
@@ -874,15 +880,17 @@ configure_queue() {
 configure_policer() {
 	# The policer object is not available on non BCM968* chips, just clean up
 	# the old config if any and return
-	for intf in $(db get hw.board.ethernetPortOrder); do
-		local unitport="$(get_port_number $intf)"
-		local unit=$(echo $unitport | cut -d ' ' -f 1)
-		local port=$(echo $unitport | cut -d ' ' -f 2)
-		# setting rate and burst size to 0 disables rate limiting
-		if [ $port != "" -a $unit != "" ]; then
-			ethswctl -c rxratectrl -n $unit -p $port -x 0 -y 0
-		fi
-	done
+	if [ $POLICER_SKIP -eq 0 ]; then
+		for intf in $(db get hw.board.ethernetPortOrder); do
+			local unitport="$(get_port_number $intf)"
+			local unit=$(echo $unitport | cut -d ' ' -f 1)
+			local port=$(echo $unitport | cut -d ' ' -f 2)
+			# setting rate and burst size to 0 disables rate limiting
+			if [ $port != "" -a $unit != "" ]; then
+				ethswctl -c rxratectrl -n $unit -p $port -x 0 -y 0
+			fi
+		done
+	fi
 
 	# Delete policer
 	local i=0
@@ -923,6 +931,10 @@ reload_qos() {
 	local service_name="$1"
 	local cpu_model="$(cat /proc/socinfo  | grep 'SoC Name' | cut -d':' -f2)"
 
+	case $cpu_model in
+		BCM68*|BCM6755) POLICER_SKIP=1 ;;
+	esac
+
 	if [ -z "$service_name" ]; then
 		configure_qos
 	elif [ "$service_name" == "shaper" ]; then

stunc/Config.in

@@ -0,0 +1,16 @@
+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-2022 IOPSYS Software Solutions AB
+# Copyright (C) 2020 iopsys Software Solutions AB
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,75 +8,49 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=stunc
-PKG_RELEASE:=1
-PKG_VERSION:=1.1.5
+PKG_VERSION:=1.1.3
+
 
 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:=fd87f85f3e73b7de4a35c977c8d7ff6338749f08
 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/stunc/default
+define Package/$(PKG_NAME)
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=BBF STUN Client
-  DEPENDS:=+libubus +libuci +libubox +libjson-c +libblobmsg-json +libbbf_api
+  DEPENDS:=+libubus +libuci +libubox +libjson-c +libwolfssl +libblobmsg-json +libbbf_api +libopenssl
+  MENU := 1
 endef
 
-define Package/stunc-mbedtls
-  $(Package/stunc/default)
-  TITLE += (mbedtls)
-  DEPENDS += +PACKAGE_stunc-mbedtls:libmbedtls
-  VARIANT:=mbedtls
-  DEFAULT_VARIANT:=1
+define Package/$(PKG_NAME)/description
+	BBF STUN Client
 endef
 
-define Package/stunc-openssl
-  $(Package/stunc/default)
-  TITLE += (openssl)
-  DEPENDS += +PACKAGE_stunc-openssl:libopenssl
-  CONFLICTS := stunc-mbedtls
-  VARIANT:=openssl
-endef
-
-define Package/stunc-wolfssl
-  $(Package/stunc/default)
-  TITLE += (wolfssl)
-  DEPENDS += +PACKAGE_stunc-wolfssl:libwolfssl
-  CONFLICTS := stunc-mbedtls stunc-openssl
-  VARIANT:=wolfssl
+define Package/$(PKG_NAME)/config
+	source "$(SOURCE)/Config.in"
 endef
 
 TARGET_CFLAGS += \
 	-D_GNU_SOURCE \
 	-Wall -Werror
 
-ifeq ($(BUILD_VARIANT),wolfssl)
-  TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/wolfssl
-  MAKE_FLAGS += \
-	USE_WOLFSSL="yes"
-endif
-
-ifeq ($(BUILD_VARIANT),mbedtls)
-  TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/mbedtls
-  MAKE_FLAGS += \
-	USE_MBEDTLS="yes"
-endif
-
-ifeq ($(BUILD_VARIANT),openssl)
-  TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/
-  MAKE_FLAGS += \
-	USE_OPENSSL="yes"
+ifeq ($(CONFIG_STUNC_USE_WOLFSSL), y)
+TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/wolfssl
+TARGET_LDFLAGS += -lwolfssl
 endif
 
 ifeq ($(LOCAL_DEV),1)
@@ -85,7 +59,7 @@ define Build/Prepare
 endef
 endif
 
-define Package/stunc/default/install
+define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/etc/init.d
@@ -96,10 +70,4 @@ define Package/stunc/default/install
 	$(INSTALL_DATA) ./files/etc/config/stunc $(1)/etc/config/stunc
 endef
 
-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))
+$(eval $(call BuildPackage,$(PKG_NAME)))

sulu/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sulu
-PKG_VERSION:=1.0.2
+PKG_VERSION:=1.0.0
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu.git
-PKG_SOURCE_VERSION:=bbb96509dfb6f64e653421d3c37228a800548261
+PKG_SOURCE_VERSION:=ab01473ad17974714f7cc91fcb345746fb7ddd6d
 
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz

udpechoserver/Makefile

@@ -10,16 +10,13 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=udpechoserver
 PKG_VERSION:=1.0.3
 
-LOCAL_DEV:=1
-ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_VERSION:=973684979939496d57b93db9f83f09945ad53858
+PKG_SOURCE_VERSION:=4e80bbec15b284080798b5ffbe8655febaa239aa
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/udpechoserver.git
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-endif
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_LICENSE:=GPL-2.0-only
@@ -27,6 +24,8 @@ PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
 
+MAKE_PATH:=src
+
 define Package/$(PKG_NAME)
   SECTION:=utils
   CATEGORY:=Utilities
@@ -43,14 +42,6 @@ TARGET_CFLAGS += \
 	-D_GNU_SOURCE \
 	-Wall -Werror
 
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-	$(CP) -rf ~/git/udpechoserver/* $(PKG_BUILD_DIR)/
-endef
-endif
-
-MAKE_PATH:=src
-
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/usr/lib/bbfdm

udpechoserver/files/etc/init.d/udpechoserverd

@@ -12,40 +12,21 @@ PROG="/usr/sbin/udpechoserverd"
 start_service() {
 	local enable_udpechoserver=`uci -q get udpechoserver.udpechoserver.enable`
 	local port_udpechoserver=`uci -q get udpechoserver.udpechoserver.server_port`
-	local address_udpechoserver=`uci -q get udpechoserver.udpechoserver.address`
 	if [ "$port_udpechoserver" != "0" ]; then
 		if [ "$enable_udpechoserver" = "1" ]; then
-			if [ -z "$address_udpechoserver" ]; then
-				iptables -I zone_wan_input -p udp --dport "$port_udpechoserver" -j ACCEPT -m comment --comment "Open UDPechoserver port"
-				ip6tables -I zone_wan_input -p udp --dport "$port_udpechoserver" -j ACCEPT -m comment --comment "Open UDPechoserver port"
-			elif [[ "$address_udpechoserver" =~ .*:.* ]]; then
-				ip6tables -I zone_wan_input -p udp --dport "$port_udpechoserver" -j ACCEPT -m comment --comment "Open UDPechoserver port"
-			else
-				iptables -I zone_wan_input -p udp --dport "$port_udpechoserver" -j ACCEPT -m comment --comment "Open UDPechoserver port"
-			fi
-
+			iptables -I zone_wan_input -p udp --dport "$port_udpechoserver" -j ACCEPT -m comment --comment "Open UDPechoserver port"
 			procd_open_instance
 			procd_set_param command "$PROG"
 			procd_set_param respawn "3" "7" "0"
 			procd_close_instance
+		else
+			iptables -I zone_wan_input -p udp --dport "$port_udpechoserver" -j REJECT -m comment --comment "Close UDPechoserver port"
 		fi
 	fi
 }
 
-stop_service() {
-	while iptables -L zone_wan_input --line-numbers | grep "Open UDPechoserver port" > /dev/null; do
-		iptables -D zone_wan_input $(iptables -L zone_wan_input --line-numbers | grep "Open UDPechoserver port" | head -1|awk '{print $1}');
-	done
-
-	while ip6tables -L zone_wan_input --line-numbers | grep "Open UDPechoserver port" > /dev/null; do
-		ip6tables -D zone_wan_input $(ip6tables -L zone_wan_input --line-numbers | grep "Open UDPechoserver port" | head -1|awk '{print $1}');
-	done
-
-	local plus_enable=`uci -q -c /var/state get udpechoserver.udpechoserver.plus`
-	if [ -n "$plus_enable" ]; then
-		uci -q set udpechoserver.udpechoserver.plus="$plus_enable"
-		uci commit udpechoserver
-	fi
+boot() {
+	start
 }
 
 reload_service() {
@@ -55,4 +36,4 @@ reload_service() {
 
 service_triggers() {
 	procd_add_reload_trigger udpechoserver
-}
+}

uspd/Config.in

@@ -0,0 +1,14 @@
+if PACKAGE_uspd
+
+menu "Configuration"
+config USPD_MAX_MSG_LEN
+    int "Maximum message length"
+    default 10485760
+    help
+        Set the maximum data length allowed over ubus in Bytes.
+
+	This value should not be larger than UBUS_MAX_MSGLEN from ubusd.
+	The maximum blob message length allowed is:
+	(configured value - 128) bytes
+endmenu
+endif

uspd/Makefile

@@ -5,60 +5,46 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uspd
-PKG_VERSION:=2.2.7
+PKG_VERSION:=2.2.6
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/uspd.git
 PKG_SOURCE_VERSION:=ff39170a3e0595a67763a61ac81b2f99b5bf11d7
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/uspd.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 
+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/uspd/default
+define Package/uspd
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
-  TITLE:=Datamodel ubus backend
-  DEPENDS:=+libubox +ubus +@BBFDM_ENABLE_JSON_PLUGIN +@BBFDM_ENABLE_DOTSO_PLUGIN \
+  TITLE:=USP ubus backend
+  DEPENDS:=+libubox +ubus +libbbfdm +@BBFDM_ENABLE_JSON_PLUGIN +@BBFDM_ENABLE_DOTSO_PLUGIN \
            +@BBF_TR181 +@BBF_TR104 +@BBF_TR143
 endef
 
-define Package/uspd-mbedtls
-  $(Package/uspd/default)
-  TITLE += (mbedtls)
-  DEPENDS += +libbbfdm-mbedtls
-  VARIANT:=mbedtls
-  DEFAULT_VARIANT:=1
+define Package/uspd/description
+ Ubus based backend for TR-369/USP which can be used by other USP agents
+ running on top of it.
 endef
 
-define Package/uspd-openssl
-  $(Package/uspd/default)
-  TITLE += (openssl)
-  DEPENDS += +libbbfdm-openssl
-  CONFLICTS := uspd-mbedtls
-  VARIANT:=openssl
-endef
-
-define Package/uspd-wolfssl
-  $(Package/uspd/default)
-  TITLE += (wolfssl)
-  DEPENDS += +libbbfdm-wolfssl
-  CONFLICTS := uspd-mbedtls uspd-openssl
-  VARIANT:=wolfssl
+define Package/uspd/config
+	source "$(SOURCE)/Config.in"
 endef
 
 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
 	-D_GNU_SOURCE \
 	-Wall -Werror \
-	-DUSPD_MAX_MSG_LEN="10485760"
+	-DUSPD_MAX_MSG_LEN=$(CONFIG_USPD_MAX_MSG_LEN)
 
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
@@ -66,7 +52,7 @@ define Build/Prepare
 endef
 endif
 
-define Package/uspd/default/install
+define Package/uspd/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/etc/bbfdm/json/
@@ -77,10 +63,4 @@ define Package/uspd/default/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/uspd $(1)/usr/sbin/
 endef
 
-Package/uspd-openssl/install = $(Package/uspd/default/install)
-Package/uspd-wolfssl/install = $(Package/uspd/default/install)
-Package/uspd-mbedtls/install = $(Package/uspd/default/install)
-
-$(eval $(call BuildPackage,uspd-openssl))
-$(eval $(call BuildPackage,uspd-wolfssl))
-$(eval $(call BuildPackage,uspd-mbedtls))
+$(eval $(call BuildPackage,uspd))