wifimngr: 17.4.0

libvoice-d2-1.1.14: Don't report DTMF events detected by DSP for DECT

bbfdm/Config_bbfdmd.in

@@ -1,7 +1,7 @@
-if PACKAGE_libbbfdm
-config BBF_VENDOR_LIST
-	string "Vendor List"
-	default "iopsys"
+if PACKAGE_bbfdmd
+config BBF_VENDOR_EXTENSION
+	bool "Enable Vendor Extension"
+	default y
 
 config BBF_VENDOR_PREFIX
 	string "Vendor Prefix"

bbfdm/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bbfdm
-PKG_VERSION:=1.11.0
+PKG_VERSION:=1.12.6
 
 USE_LOCAL:=0
 ifneq ($(USE_LOCAL),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bbfdm.git
-PKG_SOURCE_VERSION:=1537993fc84f9abf367d39c2b83676c5c6d5c58c
+PKG_SOURCE_VERSION:=0a33d96b693ac5cc34ba57f6fd53417d6eaeac61
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -40,21 +40,20 @@ define Package/libbbfdm-ubus
   DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm-api
 endef
 
-define Package/libbbfdm
-  SECTION:=utils
-  CATEGORY:=Utilities
-  SUBMENU:=TRx69
-  TITLE:=Library for broadband forum data model support
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm-api +libopenssl
-  MENU:=1
-endef
-
 define Package/bbfdmd
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
-  TITLE:=Datamodel ubus backend
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libbbfdm-api +libbbfdm-ubus +libbbfdm +jq +bbf_configmngr
+  TITLE:=Datamodel ubus backend to expose core tree
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm-api +libopenssl +libbbfdm-ubus +bbf_configmngr
+endef
+
+define Package/dm-service
+  SECTION:=utils
+  CATEGORY:=Utilities
+  SUBMENU:=TRx69
+  TITLE:=Datamodel ubus backend to expose micro-service tree
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm-api +libbbfdm-ubus +bbf_configmngr
 endef
 
 define Package/bbf_configmngr
@@ -63,11 +62,10 @@ define Package/bbf_configmngr
   SUBMENU:=TRx69
   TITLE:= BBF Config Manager
   DEPENDS:=+libuci +libubox +libubus +libblobmsg-json
-  MENU:=1
 endef
 
-define Package/libbbfdm/config
-	source "$(SOURCE)/Config_bbfdm.in"
+define Package/bbfdmd/config
+	source "$(SOURCE)/Config_bbfdmd.in"
 endef
 
 define Package/bbf_configmngr/config
@@ -82,8 +80,12 @@ define Package/libbbfdm-ubus/description
  Library contains the APIs to expose data model over ubus
 endef
 
-define Package/libbbfdm/description
- Library contains the data model tree, It includes basic TR181 nodes.
+define Package/bbfdmd/description
+ Daemon to expose Datamodel core tree
+endef
+
+define Package/dm-service/description
+ Daemon to expose Datamodel micro-service tree
 endef
 
 define Package/bbf_configmngr/description
@@ -97,17 +99,9 @@ endef
 endif
 
 CMAKE_OPTIONS += \
-	-DBBF_TR181=ON
-
-CMAKE_OPTIONS += \
-	-DBBF_VENDOR_LIST:String="$(CONFIG_BBF_VENDOR_LIST)" \
 	-DBBF_VENDOR_PREFIX:String="$(CONFIG_BBF_VENDOR_PREFIX)" \
-	-DBBF_MAX_OBJECT_INSTANCES:Integer=$(CONFIG_BBF_MAX_OBJECT_INSTANCES)
-
-ifeq ($(CONFIG_PACKAGE_bbfdmd),y)
-CMAKE_OPTIONS += \
+	-DBBF_MAX_OBJECT_INSTANCES:Integer=$(CONFIG_BBF_MAX_OBJECT_INSTANCES) \
 	-DBBFDMD_MAX_MSG_LEN:Integer=10485760
-endif
 
 define Package/libbbfdm-api/install
 	$(INSTALL_DIR) $(1)/lib
@@ -129,45 +123,44 @@ define Package/libbbfdm-ubus/install
 	$(CP) $(PKG_BUILD_DIR)/libbbfdm-ubus/libbbfdm-ubus.so $(1)/lib/
 endef
 
-define Package/libbbfdm/install
+define Package/bbfdmd/install
 	$(INSTALL_DIR) $(1)/etc/bbfdm/dmmap
+	$(INSTALL_DIR) $(1)/usr/share/bbfdm
 
-	$(INSTALL_DIR) $(1)/usr/share/bbfdm/
-	$(CP) $(PKG_BUILD_DIR)/libbbfdm/libbbfdm.so $(1)/usr/share/bbfdm/libbbfdm.so
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) ./files/etc/config/bbfdm $(1)/etc/config/bbfdm
+	$(INSTALL_CONF) ./files/etc/config/schedules $(1)/etc/config/schedules
 
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbfdmd/ubus/bbfdmd $(1)/usr/sbin/
+
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/etc/init.d/bbfdmd $(1)/etc/init.d/bbfdmd
+
+	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
+	$(INSTALL_BIN) ./files/etc/hotplug.d/iface/85-bbfdm-sysctl $(1)/etc/hotplug.d/iface/85-bbfdm-sysctl
+	
 	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
 	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/bbf $(1)/lib/upgrade/keep.d/bbf
-
+	
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_BIN) ./files/etc/uci-defaults/91-fix-bbfdmd-enabled-option $(1)/etc/uci-defaults/
 
-ifeq ($(findstring iopsys,$(CONFIG_BBF_VENDOR_LIST)),iopsys)
-	$(BBFDM_INSTALL_CORE_PLUGIN) $(PKG_BUILD_DIR)/libbbfdm/dmtree/vendor/iopsys/libbbfdm_iopsys_ext.so $(1)
+ifeq ($(CONFIG_BBF_VENDOR_EXTENSION),y)
+	$(BBFDM_INSTALL_CORE_PLUGIN) $(PKG_BUILD_DIR)/libbbfdm/vendor/vendor.json $(1)
 endif
 
-	$(INSTALL_DIR) $(1)/usr/share/bbfdm/scripts/
+	$(INSTALL_DIR) $(1)/usr/share/bbfdm/scripts
 	$(CP) $(PKG_BUILD_DIR)/utilities/files/usr/share/bbfdm/scripts/bbf_activate_handler.sh $(1)/usr/share/bbfdm/scripts/
 	$(CP) $(PKG_BUILD_DIR)/utilities/files/usr/share/bbfdm/scripts/bbf_check_idle.sh $(1)/usr/share/bbfdm/scripts/
 endef
 
-define Package/libbbfdm/prerm
-	#!/bin/sh
-	rm -rf /etc/bbfdm/dmmap/*
-	exit 0
-endef
-
-define Package/bbfdmd/install
+define Package/dm-service/install
 	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DIR) $(1)/etc/bbfdm
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbfdmd/ubus/bbfdmd $(1)/usr/sbin/
-	$(INSTALL_DATA) ./files/etc/bbfdm/input.json $(1)/etc/bbfdm/
-	$(INSTALL_BIN) ./files/etc/init.d/bbfdmd $(1)/etc/init.d/bbfdmd
 	$(INSTALL_BIN) ./files/etc/init.d/bbfdm.services $(1)/etc/init.d/
-	$(INSTALL_CONF) ./files/etc/config/bbfdm $(1)/etc/config/bbfdm
-	$(INSTALL_BIN) ./files/etc/hotplug.d/iface/85-bbfdm-sysctl $(1)/etc/hotplug.d/iface/85-bbfdm-sysctl
+
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dm-service/dm-service $(1)/usr/sbin/
 endef
 
 define Package/bbf_configmngr/install
@@ -183,6 +176,12 @@ ifeq ($(CONFIG_BBF_CONFIGMNGR_SCRIPT_BACKEND),y)
 endif
 endef
 
+define Package/bbfdmd/prerm
+	#!/bin/sh
+	rm -rf /etc/bbfdm/dmmap/*
+	exit 0
+endef
+
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/include
@@ -198,5 +197,5 @@ endef
 $(eval $(call BuildPackage,bbf_configmngr))
 $(eval $(call BuildPackage,libbbfdm-api))
 $(eval $(call BuildPackage,libbbfdm-ubus))
-$(eval $(call BuildPackage,libbbfdm))
 $(eval $(call BuildPackage,bbfdmd))
+$(eval $(call BuildPackage,dm-service))

bbfdm/files/etc/bbfdm/input.json

@@ -1,28 +0,0 @@
-{
-        "daemon": {
-                "config": {
-                },
-                "input": {
-                        "type": "DotSo",
-                        "name": "/usr/share/bbfdm/libbbfdm.so",
-                        "plugin_dir": "/usr/share/bbfdm/plugins"
-                },
-                "output": {
-                        "type": "UBUS",
-                        "name": "bbfdm"
-                }
-        },
-        "cli": {
-                "config": {
-                        "proto": "both",
-                        "instance_mode": 0
-                },
-                "input": {
-                        "type": "UBUS",
-                        "name": "bbfdm"
-                },
-                "output": {
-                        "type": "CLI"
-                }
-        }
-}

bbfdm/files/etc/config/bbfdm

@@ -1,9 +1,8 @@
 config bbfdmd 'bbfdmd'
 	option enable '1'
+	option debug '0'
 	option loglevel '3'
-	option subprocess_level '2'
 
 config micro_services 'micro_services'
 	option enable '1'
 	option enable_core '0'
-	option enable_respawn '1'

bbfdm/files/etc/config/schedules

@@ -0,0 +1,2 @@
+config global 'global'
+	option enable '1'

bbfdm/files/etc/init.d/bbf_configd

@@ -1,6 +1,6 @@
 #!/bin/sh /etc/rc.common
 
-START=64
+START=80
 STOP=10
 
 USE_PROCD=1

bbfdm/files/etc/init.d/bbfdm.services

@@ -1,10 +1,10 @@
 #!/bin/sh /etc/rc.common
 
-START=40
+START=85
 STOP=8
 
 USE_PROCD=1
-PROG=/usr/sbin/bbfdmd
+PROG=/usr/sbin/dm-service
 
 BBFDM_MICROSERVICE_DIR="/etc/bbfdm/micro_services"
 
@@ -18,33 +18,38 @@ validate_bbfdm_micro_service_section()
 {
 	uci_validate_section bbfdm micro_services "micro_services" \
 		'enable:bool:true' \
-		'enable_core:bool:false' \
-		'enable_respawn:bool:true'
+		'enable_core:bool:false'
 }
 
 _add_microservice()
 {
-	local name path
-	local enable enable_core enable_respawn
+	local name path loglevel
+	local enable enable_core
 
 	# Check enable from micro-service
 	path="${1}"
-	enable_respawn="${2}"
-	enable_core="${3}"
+	enable_core="${2}"
 
 	name="$(basename ${path})"
 	name="${name//.json}"
 
-	enable="$(jq -r '.daemon.enable//1' ${path})"
+	json_load_file "${path}"
+	json_select daemon
+
+	json_get_var enable enable 1
 	if [ "${enable}" -eq "0" ]; then
 		log "datamodel micro-service ${name} not enabled"
 		return 0
 	fi
+	
+	json_select config
+	json_get_var loglevel loglevel 3
 
 	procd_open_instance "${name}"
 
 	procd_set_param command ${PROG}
 	procd_append_param command -m "${name}"
+	procd_append_param command -l "${loglevel}"
 
 	if [ "${enable_core}" -eq "1" ]; then
 		procd_set_param limits core="unlimited"
@@ -52,15 +57,13 @@ _add_microservice()
 		procd_set_param stderr 1
 	fi
 
-	if [ "${enable_respawn}" -eq "1" ]; then
-		procd_set_param respawn "3600" "5" "5"
-	fi
+	procd_set_param respawn
 	procd_close_instance "${name}"
 }
 
 configure_bbfdm_micro_services()
 {
-	local enable enable_core enable_respawn
+	local enable enable_core
 
 	config_load bbfdm
 	validate_bbfdm_micro_service_section || {
@@ -77,7 +80,7 @@ configure_bbfdm_micro_services()
 		do
 			[ -e "$file" ] || continue
 
-			_add_microservice $file "${enable_respawn}" "${enable_core}"
+			_add_microservice $file "${enable_core}"
 		done
 	fi
 }
@@ -92,7 +95,7 @@ _start_single_service()
 		file="$(ls -1 ${BBFDM_MICROSERVICE_DIR}/${service}.json)"
 		[ -e "$file" ] || return
 
-		_add_microservice $file "0" "0"
+		_add_microservice $file "0"
 	fi
 }
 

bbfdm/files/etc/init.d/bbfdmd

@@ -1,14 +1,11 @@
 #!/bin/sh /etc/rc.common
 
-START=65
+START=90
 STOP=10
 
 USE_PROCD=1
 PROG=/usr/sbin/bbfdmd
 
-BBFDM_JSON_INPUT="/etc/bbfdm/input.json"
-BBFDM_TEMP_DIR="/tmp/bbfdm"
-
 . /usr/share/libubox/jshn.sh
 
 log() {
@@ -19,15 +16,13 @@ validate_bbfdm_bbfdmd_section()
 {
 	uci_validate_section bbfdm bbfdmd "bbfdmd" \
 		'enable:bool:true' \
-		'sock:string' \
 		'debug:bool:false' \
-		'loglevel:uinteger:1' \
-		'subprocess_level:uinteger'
+		'loglevel:uinteger:3'
 }
 
 configure_bbfdmd()
 {
-	local enable debug sock
+	local enable debug
 	local jlog jrefresh jtimeout jlevel
 
 	config_load bbfdm
@@ -38,25 +33,17 @@ configure_bbfdmd()
 
 	[ "${enable}" -eq 0 ] && return 0
 
-	if [ -f "${BBFDM_JSON_INPUT}" ]; then
-		echo "$(jq --arg log ${loglevel} --arg level ${subprocess_level} '.daemon.config += {"loglevel": $log, "subprocess_level": $level}' ${BBFDM_JSON_INPUT})" > "${BBFDM_TEMP_DIR}/input.json"
-	fi
-
 	procd_set_param command ${PROG}
+	procd_append_param command -l "${loglevel}"
+
 	if [ "${debug}" -eq 1 ]; then
 		procd_set_param stdout 1
 		procd_set_param stderr 1
 	fi
-
-	if [ -f "${sock}" ]; then
-		procd_append_param command -s "${sock}"
-	fi
 }
 
 start_service()
 {
-	mkdir -p ${BBFDM_TEMP_DIR}
-
 	procd_open_instance "bbfdm"
 	configure_bbfdmd
 	procd_set_param respawn

bbfdm/tools/bbfdm.sh

@@ -2,7 +2,7 @@
 
 BBFDM_BASE_DM_PATH="usr/share/bbfdm"
 BBFDM_INPUT_PATH="etc/bbfdm/micro_services"
-INPUT_TEMPLATE='{"daemon":{"enable":"1","service_name":"template","config":{"loglevel":"1"}}}'
+INPUT_TEMPLATE='{"daemon":{"enable":"1","service_name":"template","config":{"loglevel":"3"}}}'
 OUT_NAME=""
 
 MICRO_SERVICE=0

bulkdata/Makefile

@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bulkdata
-PKG_VERSION:=2.1.11
+PKG_VERSION:=2.1.12
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bulkdata.git
-PKG_SOURCE_VERSION:=5dd9cd3cfc95e9dce5f64fe9cadd274bb31b8fa6
+PKG_SOURCE_VERSION:=1c780a8a8f7b5b49aba394da5cfe5ccb10c28652
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

ddnsmngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ddnsmngr
-PKG_VERSION:=1.0.7
+PKG_VERSION:=1.0.8
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/ddnsmngr.git
-PKG_SOURCE_VERSION:=4b0c679c4dc3e3725de5c0c55ed60f24b87c6edd
+PKG_SOURCE_VERSION:=68c54ad5b537a7dfff7c939707bfe8f1a3023c46
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

decollector/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=decollector
-PKG_VERSION:=6.0.1.0
+PKG_VERSION:=6.1.0.0
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=a94894a827259471a1ed528c20eae85596a56743
+PKG_SOURCE_VERSION:=2efa50c2bb5b8d5ed3e72c27395a7f2516bcbd44
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/decollector.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

dectmngr/Makefile

@@ -8,7 +8,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:=82d5bae7ef1d54b41029c9f87e8c821cde38a28e
+PKG_SOURCE_VERSION:=c5254120c2c8b43936e2f9f4f9a3827784d60a43
 PKG_MIRROR_HASH:=skip
 endif
 

dslmngr/Makefile

@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dslmngr
-PKG_VERSION:=1.2.6
+PKG_VERSION:=1.2.8
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/hal/dslmngr.git
-PKG_SOURCE_VERSION:=2b1ecbd2079dbd88ed6d58b277b91dcf5038d869
+PKG_SOURCE_VERSION:=5340cb31f759301f5aca3fd848fc3a63b0b4663f
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MAINTAINER:=Rahul Thakur <rahul.thakur@iopsys.eu>
 PKG_MIRROR_HASH:=skip

fluent-bit/Makefile

@@ -6,14 +6,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fluent-bit
 PKG_VERSION:=3.1.0
-PKG_RELEASE:=1
+PKG_RELEASE:=$(AUTORELEASE)
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/fluent/fluent-bit.git
-PKG_SOURCE_VERSION=v$(PKG_VERSION)
-PKG_MIRROR_HASH:=9a0730ee9b181b0514d50b32700fa29d711d1f44c6e3a78d67e4e5d830962d0f
+PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://github.com/fluent/fluent-bit/archive/v$(PKG_VERSION)
+PKG_HASH:=7a49e110cf3050b6c29c911063494b8081f3c743274d1d95e52562d0476ba1eb
 endif
 
 PKG_LICENSE:=Apache-2.0

icwmp/Makefile

@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=9.8.9
+PKG_VERSION:=9.8.13
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/icwmp.git
-PKG_SOURCE_VERSION:=f16a9bcb529b199c5cebe2afe18828b5fa53e497
+PKG_SOURCE_VERSION:=14f3375ab8f1a586da7c9fd94c46bd16e3ae0ac6
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

ieee1905/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=8.5.6
+PKG_VERSION:=8.5.7
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=25925684c21de7494d4973b1799f5bd121014518
+PKG_SOURCE_VERSION:=171fa1b3886547765b2c223edfe195c26fcda28d
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/ieee1905.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip

iop/scripts/annexconfig.sh

@@ -1,72 +0,0 @@
-#!/bin/bash
-
-function disable_add_config () {
-	local COPTION="$1"
-
-	HAVE_OPTION=`grep $COPTION .config | wc -l`
-	HAVE_OPTION_DISABLED=`grep "# $COPTION" .config | wc -l`
-	if [ "$HAVE_OPTION" = "1" ]
-	then
-		if [ "$HAVE_OPTION_DISABLED" = "0" ]
-		then
-			sed -i -e "s,$COPTION=y,# $COPTION is not set,g" .config
-		fi
-	else
-		echo "# $COPTION is not set" >> .config
-	fi
-}
-
-function enable_option () {
-	local COPTION="$1"
-#	cat .config| grep DSL
-	sed -i -e "s,# $COPTION is not set,$COPTION=y,g" .config
-#	cat .config| grep DSL
-}
-
-function annexconfig {
-
-	v() {
-		[ "$VERBOSE" -ge 1 ] && echo "$@"
-	}
-
-	local ANNEX="$1"
-
-	disable_add_config CONFIG_TARGET_NO_DSL
-	disable_add_config CONFIG_TARGET_DSL_ANNEX_A
-	disable_add_config CONFIG_TARGET_DSL_ANNEX_B
-	disable_add_config CONFIG_TARGET_DSL_ANNEX_C
-	disable_add_config CONFIG_TARGET_DSL_SADSL
-	disable_add_config CONFIG_TARGET_DSL_GFAST
-
-
-	if [ "$ANNEX" = "no" ]
-	then
-		echo "No DSL"
-		enable_option CONFIG_TARGET_NO_DSL
-	elif [ "$ANNEX" = "a" ]
-	then
-		echo "Annex A"
-		enable_option CONFIG_TARGET_DSL_ANNEX_A
-	elif [ "$ANNEX" = "b" ]
-	then
-		echo "Annex B"
-		enable_option CONFIG_TARGET_DSL_ANNEX_B
-	elif [ "$ANNEX" = "c" ]
-	then
-		echo "Annex C"
-		enable_option CONFIG_TARGET_DSL_ANNEX_C
-	elif [ "$ANNEX" = "sadsl" ]
-	then
-		echo "sadsl"
-		enable_option CONFIG_TARGET_DSL_SADSL
-	elif [ "$ANNEX" = "gfast" ]
-	then
-		echo "G.fast"
-		enable_option CONFIG_TARGET_DSL_GFAST
-	else
-		echo "Only option no,a,b,c,sadsl,gfast supported"
-	fi
-
-}
-
-register_command "annexconfig" "Select configuration annex"

iop/scripts/cfe_upgrade.sh

@@ -1,42 +0,0 @@
-# this is a developer helper script to install firmware on a remote host running in CFE mode
-
-function usage {
-	echo "usage: $0 cfe_upgrade <host> <file>"
-}
-
-function cfe_upgrade {
-	if [ -z "$1" ] ; then
-		usage
-		echo "Error: host required"
-		exit 1
-	fi
-	if [ -z "$2" ] ; then
-		usage
-		echo "Error: firmware filename required"
-		exit 1
-	fi
-	if [ ! -e $2 ] ; then
-		usage
-		echo "Error: firmware file does not exist"
-		exit 1
-	fi
-	IMAGE=`basename $2`
-	echo "CFE upgrade host: $1 with file $IMAGE"
-	[ "$2" ] && [ -e "$2" ] &&  curl -i -F filedata=@$2  http://$1/upload.cgi && echo "upgrade done!"
-}
-
-register_command "cfe_upgrade" "<host> <file>  Install firmware on remote host in CFE mode"
-
-function cfe_upgrade_latest {
-	if [ -z "$1" ] ; then
-		echo "usage: $0 cfe_upgrade_latest <host>"
-		echo "Error: host required"
-		exit 1
-	fi
-	{ cd `dirname $0`
-		IMAGE=`ls -Art bin/*/*.w | tail -n1`
-		[ "$IMAGE" ] && [ -e "$IMAGE" ] && ./iop cfe_upgrade $1 $IMAGE
-	}
-}
-
-register_command "cfe_upgrade_latest" "<host>  Install latest firmware on remote host in CFE mode"

iop/scripts/genconfig_wrap.sh

@@ -1,29 +0,0 @@
-#!/bin/bash
-
-# Function to convert parameters to lowercase
-function to_lowercase {
-    local params=()
-    for param in "$@"; do
-        params+=("$(tr '[:upper:]' '[:lower:]' <<< "$param")")
-    done
-    echo "${params[@]}"
-}
-
-function genconfig {
-    target_script="./scripts/gen_config.py"
-
-    # First convert all to lowercase
-    args=$(to_lowercase "$@")
-
-    # Check if an option is provided
-    if [[ ${args[0]} == -* ]]; then
-      # Convert options for target script
-      if [[ ${args[0]}  == "-b" || ${args[0]}  == "--boards" ]]; then
-        args=("--list")
-      fi
-    fi
-
-    ${target_script} ${args[@]}
-}
-
-register_command "genconfig" "Generate configuration for board and customer"

iop/scripts/iopupgrade.sh

@@ -1,283 +0,0 @@
-# this is a developer helper script to install firmware on a remote host with SSH
-
-function upd_usage {
-	echo "usage: $0 ssh_upgrade [-t <host>] [-f <file>] [opts] "
-	echo ""
-	echo "   Default host is 192.168.1.1"
-	echo "   Default firmware file is the latest one (last.{itb,pkgtb})"
-	echo "   Default is to not keep configuration"
-	echo "opts:"
-	echo ""
-	echo "	-i	Interactive use, allows to select firmware file"
-	echo "	-n	Do not do the final reboot of the target board"
-	echo "	-c	Keep configuration"
-	echo "	-x	Force install even if firmware is not for this board"
-	echo "	-b	Force install of bootloader regardless of version installed"
-}
-
-function set_config_string {
-	eval $(grep $1 .config)
-}
-
-function upd_ask_ok {
-	echo "Will continue with the following settings:"
-	echo "-----------------------------------------"
-	printf "%20s: %s\n" "Firmware file" "$upd_fw_base"
-	printf "%20s: %s\n" "Host IP" "$upd_host"
-	printf "%20s: " "Reboot"
-	if [ "$upd_noreboot" == "0" ]; then printf "Yes\n"; else printf "No\n"; fi
-	printf "%20s: " "Keep config"
-	if [ "$upd_keepconf" == "1" ]; then printf "Yes\n"; else printf "No\n"; fi
-	printf "%20s: " "Force bootloader"
-	if [ "$upd_forceboot" == "1" ]; then printf "Yes\n"; else printf "No\n"; fi
-	printf "%20s: " "Force image upgrade"
-	if [ "$upd_forceimage" == "1" ]; then printf "Yes\n"; else printf "No\n"; fi
-	echo "-----------------------------------------"
-
-	echo -n "Continue? [Y/n/q]:"
-	read answer
-
-	case $answer in
-	n | N)
-		return 1
-		;;
-	q | Q)
-		exit 1
-		;;
-	y | Y | *)
-		return 0
-		;;
-	esac
-}
-
-function upd_select_file {
-	dialog --keep-tite --title "To select a file, use TAB/ARROW to highlight then press SPACEBAR -> RETURN" \
-		--fselect "${upd_fw:-bin/targets/$CONFIG_TARGET_BOARD/$CONFIG_TARGET_SUBTARGET/}" \
-		$((lines - 10)) $((cols - 5)) \
-		2>$tempfile
-
-	new_file=$(cat $tempfile)
-	if [ -n "$new_file" ]; then
-		upd_fw="$new_file"
-		upd_fw_base=$(basename $upd_fw)
-	fi
-}
-
-function upd_select_target {
-	dialog --keep-tite --title "Input the hostname/IP of the target board" \
-		--inputbox "Name/IP" \
-		$((lines - 10)) $((cols - 5)) \
-		"$upd_host" \
-		2>$tempfile
-
-	new_file=$(cat $tempfile)
-	if [ -n "$new_file" ]; then
-		upd_host="$new_file"
-	fi
-}
-
-function upd_select_reboot {
-	dialog --keep-tite --radiolist "Should the board reboot after download finished" \
-		$((lines - 5)) $((cols - 5)) $((lines - 5 - 5)) \
-		"Reboot" "Restart board after done" $(if [ "$upd_noreboot" == "0" ]; then echo "ON"; else echo "OFF"; fi) \
-		"No reboot" "Continue running old system" $(if [ "$upd_noreboot" == "1" ]; then echo "ON"; else echo "OFF"; fi) \
-		2>$tempfile
-
-	res=$(cat $tempfile)
-	case $res in
-	"No reboot")
-		upd_noreboot=1
-		;;
-	"Reboot")
-		upd_noreboot=0
-		;;
-	esac
-}
-
-function upd_select_config {
-	dialog --keep-tite --radiolist "Should the configuration be kept" \
-		$((lines - 5)) $((cols - 5)) $((lines - 5 - 5)) \
-		"Keep" "Keep the config from old system" $(if [ "$upd_keepconf" == "1" ]; then echo "ON"; else echo "OFF"; fi) \
-		"Default" "Use default config for new system" $(if [ "$upd_keepconf" == "0" ]; then echo "ON"; else echo "OFF"; fi) \
-		2>$tempfile
-
-	res=$(cat $tempfile)
-	case $res in
-	"Keep")
-		upd_keepconf=1
-		;;
-	"Default")
-		upd_keepconf=0
-		;;
-	esac
-}
-
-function upd_select_forceboot {
-	dialog --keep-tite --radiolist "Should the boot loader be updated regardless of the version installed" \
-		$((lines - 5)) $((cols - 5)) $((lines - 5 - 5)) \
-		"Force" "Always update boot loader" $(if [ "$upd_forceboot" == "1" ]; then echo "ON"; else echo "OFF"; fi) \
-		"Version check" "Only upgrade if version is newer" $(if [ "$upd_forceboot" == "0" ]; then echo "ON"; else echo "OFF"; fi) \
-		2>$tempfile
-
-	res=$(cat $tempfile)
-	case $res in
-	"Force")
-		upd_forceboot=1
-		;;
-	"Version check")
-		upd_forceboot=0
-		;;
-	esac
-}
-
-function upd_select_forceimage {
-	dialog --keep-tite --radiolist "Should the image be stored in flash even if sanity checks would reject it" \
-		$((lines - 5)) $((cols - 5)) $((lines - 5 - 5)) \
-		"Force" "Disable sanity check and force use of image (dangerous)" $(if [ "$upd_forceimage" == "1" ]; then echo "ON"; else echo "OFF"; fi) \
-		"Only compatible" "Normal checks apply" $(if [ "$upd_forceimage" == "0" ]; then echo "ON"; else echo "OFF"; fi) \
-		2>$tempfile
-
-	res=$(cat $tempfile)
-	case $res in
-	"Force")
-		upd_forceimage=1
-		;;
-	"Only compatible")
-		upd_forceimage=0
-		;;
-	esac
-}
-
-function upd_select {
-	dialog --keep-tite --ok-label "Select" --cancel-label "Done" --menu "Select item to change" \
-		$((lines - 5)) $((cols - 5)) $((lines - 5 - 5)) \
-		"Firmware file" "$upd_fw_base" \
-		"Host IP" "$upd_host" \
-		"Reboot" $(if [ "$upd_noreboot" == "0" ]; then printf "Yes\n"; else printf "No\n"; fi) \
-		"Keep config" $(if [ "$upd_keepconf" == "1" ]; then printf "Yes\n"; else printf "No\n"; fi) \
-		"Force bootloader" $(if [ "$upd_forceboot" == "1" ]; then printf "Yes\n"; else printf "No\n"; fi) \
-		"Force image upgrade" $(if [ "$upd_forceimage" == "1" ]; then printf "Yes\n"; else printf "No\n"; fi) \
-		2>$tempfile
-
-	case $(cat $tempfile) in
-	"Firmware file")
-		upd_select_file
-		;;
-	"Host IP")
-		upd_select_target
-		;;
-	"Reboot")
-		upd_select_reboot
-		;;
-	"Keep config")
-		upd_select_config
-		;;
-	"Force bootloader")
-		upd_select_forceboot
-		;;
-	"Force image upgrade")
-		upd_select_forceimage
-		;;
-	*)
-		return
-		;;
-	esac
-	upd_select
-}
-function upd_select_start {
-	lines=$(tput lines)
-	cols=$(tput cols)
-	tempfile="$(mktemp)"
-	trap "rm -f $tempfile" 0 1 2 5 15
-	upd_select
-
-}
-
-function ssh_upgrade {
-	upd_noreboot=0
-	upd_forceboot=0
-	upd_keepconf=0
-	upd_forceimage=0
-	upd_fw_base=""
-	upd_fw=""
-	upd_host="192.168.1.1"
-	do_dialog=0
-
-	while getopts "f:hnxt:icb" opt; do
-		case $opt in
-		n)
-			upd_noreboot=1
-			;;
-		x)
-			upd_forceimage=1
-			;;
-		b)
-			upd_forceboot=1
-			;;
-		c)
-			upd_keepconf=1
-			;;
-		v)
-			verbose=$OPTARG
-			;;
-		f)
-			upd_fw=$OPTARG
-			;;
-		t)
-			upd_host=$OPTARG
-			;;
-		i)
-			do_dialog=1
-			;;
-		h)
-			upd_usage
-			exit 1
-			;;
-		\?)
-			echo "Invalid option: -$OPTARG" >&2
-			exit 1
-			;;
-		esac
-	done
-
-	if [ -z "$upd_fw" ]; then
-		set_config_string CONFIG_TARGET_BOARD
-		set_config_string CONFIG_TARGET_SUBTARGET
-		upd_fw="$(realpath -q --canonicalize-existing --relative-to=. "bin/targets/$CONFIG_TARGET_BOARD/$CONFIG_TARGET_SUBTARGET/"last.{pkgtb,itb})"
-		if [ -z "$upd_fw" ] && [ $do_dialog -eq 0 ]; then
-			echo "Could not find image. Check that last.{itb,pkgtb} exists or specify an image using -f <image> or -i (interactive)." >&2
-			return 1
-		fi
-	fi
-	upd_fw_base="$(basename "$upd_fw")"
-
-	[ $do_dialog -eq 1 ] && upd_select_start
-
-	if ! upd_ask_ok; then
-		upd_select_start
-		if ! upd_ask_ok; then
-			exit 1
-		fi
-	fi
-
-	if [ ! -f $upd_fw ]; then
-		echo "Firmware file $firmware does not exist."
-		exit 1
-	fi
-
-	extra_args=""
-	[ $upd_noreboot -eq 1 ] && extra_args="$extra_args --no-reboot"
-	[ $upd_forceimage -eq 1 ] && extra_args="$extra_args --force"
-	[ $upd_keepconf -eq 0 ] && extra_args="$extra_args -n"
-	[ $upd_forceboot -eq 1 ] && extra_args="$extra_args --force-loader-upgrade"
-
-	pv "$upd_fw" |
-		ssh \
-			-o ConnectTimeout=60 \
-			-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \
-			root@"$upd_host" \
-			sh -c "cat > '/tmp/$upd_fw_base' && (set -x && sysupgrade -v $extra_args /tmp/$upd_fw_base)" ||
-		echo "Sysupgrade failed" >&2 && return 1
-}
-
-register_command "ssh_upgrade" "-t <host> -f <file> [opts]  Install firmware on remote host with SSH"

iop/scripts/taas.sh

@@ -1,89 +0,0 @@
-
-# Shorthand command for doing a HIL runtime smoketest on the
-# latest built image. Does the image boot up correctly?
-# More info here:
-# https://dev.iopsys.eu/iopsys/iopsys-taas
-
-
-#--------------------------------------------------------------
-function taas-init() {
-	local f
-
-	# Path to TaaS binarys. Try some likely ones.
-	if ! which taas-smoketest >/dev/null; then
-		PATH="${PATH}:${PWD}/../iopsys-taas/bin"
-		PATH="${PATH}:${PWD}/../taas/bin"
-		PATH="${PATH}:${HOME}/iopsys-taas/bin"
-		PATH="${PATH}:${HOME}/taas/bin"
-		PATH="${PATH}:${HOME}/bin"
-		PATH="${PATH}:/opt/iopsys-taas/bin"
-		PATH="${PATH}:/opt/taas/bin"
-	fi
-
-	if ! which taas-smoketest >/dev/null; then
-		echo "Error; TaaS is missing! Install it with:"
-		echo "git clone git@dev.iopsys.eu:iopsys/iopsys-taas.git ../iopsys-taas"
-		exit 1
-	fi
-
-	# Create a list of all images which might be of use.
-	for f in ${PWD}/bin/targets/iopsys-*/generic/last.*; do
-		[[ -s "$f" ]] && images+=("$f")
-	done
-
-	# Convert Iopsys target name to the TaaS product name format
-	# according to what is available in the remote lab for HIL.
-	# Also find a suitable image.
-	product=$(grep CONFIG_TARGET_PROFILE .config | \
-		tr -s "=\"" " " | cut -d " " -f 2) || exit
-	case "$product" in
-		smarthub3)
-			export product="SmartHub3a"
-			;;
-		dg400prime|eg400|ex600)
-			export product=$(echo -n "$product" | tr [[:lower:]] [[:upper:]])
-			;;
-		*)
-			echo "Unsupported target; skipping!"
-			exit 0
-			;;
-	esac
-
-	if [[ ${#images[@]} -eq 0 ]]; then
-		echo "No image found"
-		exit 1
-	fi
-}
-
-
-
-#--------------------------------------------------------------
-function taas-smoketest {
-	declare -a images
-
-	taas-init || return
-	echo "Testing a $product with ${images[@]}..."
-	command taas-smoketest "${images[@]}" "$product" "$@"
-}
-
-
-
-#--------------------------------------------------------------
-function taas-bootstrap {
-	declare -a images
-
-	if [[ -n "$1" ]]; then
-		taas-init || return
-		echo "Flashing $1..."
-		command taas-bootstrap "${images[@]}" "$@"
-	else
-		echo "Usage: ./iop taas-bootstrap dutX"
-		exit 1
-	fi
-}
-
-
-
-register_command "taas-bootstrap" "Write image to a remote lab device."
-register_command "taas-smoketest" "Write image to a remote lab device and test it."
-

libdsl/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libdsl
-PKG_VERSION:=7.2.99
+PKG_VERSION:=7.2.100
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=f9f3fcd0f4140540db5bd41059bcca7ded083024
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libdsl.git
+PKG_SOURCE_VERSION:=20875ec79fcc7c546c2f1253c867d6afbc8bff75
+PKG_SOURCE_URL:=https://dev.iopsys.eu/hal/libdsl.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
 endif
@@ -27,6 +27,8 @@ ifeq ($(CONFIG_TARGET_brcmbca),y)
   CONFIG_ID=$(SUBTARGET:bcm%=BCM%)
   CHIP_ID=$(CONFIG_ID:BCM9%=%)
   TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCHIP_$(CHIP_ID) -DCONFIG_$(CONFIG_ID) \
+	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/broadcom/include/bcm963xx \
+	-I$(STAGING_DIR)/usr/include/bcm963xx/shared/opensource/include/bcm963xx \
 	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx \
 	-I$(STAGING_DIR)/usr/include/bcm963xx/userspace/public/include
 else ifeq ($(CONFIG_TARGET_x86),y)
@@ -55,12 +57,19 @@ define Package/libdsl
   SUBMENU:=IOPSYS HAL libs
   MENU:=1
   TITLE:= xDSL library (libdsl)
+  DEPENDS+=TARGET_brcmbca:bcm963xx-bsp
 endef
 
 define Package/libdsl/description
   Library provides xDSL/GFAST HAL APIs
 endef
 
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+        $(CP) -rf ./libdsl/* $(PKG_BUILD_DIR)/
+endef
+endif
+
 define Package/libdsl/config
   if PACKAGE_libdsl
 	  config LIBDSL_DEBUG

libvoice-broadcom/Makefile

@@ -38,7 +38,7 @@ define Package/$(PKG_NAME)
 	CATEGORY:=Utilities
 	TITLE:=IOPSYS libvoice for Broadcom
 	URL:=
-	DEPENDS:=
+	DEPENDS:=+bcm963xx-voice
 endef
 
 define Package/$(PKG_NAME)/description
@@ -56,4 +56,3 @@ define Package/$(PKG_NAME)/install
 endef
 
 $(eval $(call BuildPackage,$(PKG_NAME)))
-

libvoice-d2/Makefile

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libvoice-d2
 PKG_RELEASE:=1
-PKG_VERSION:=1.1.13
+PKG_VERSION:=1.1.14
 PKG_LICENSE:=PROPRIETARY
 PKG_LICENSE_FILES:=LICENSE
 
@@ -17,7 +17,7 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/$(PKG_NAME).git
-PKG_SOURCE_VERSION:=0b00d6e2772bf31e696fc974df071e6fcf972fa3
+PKG_SOURCE_VERSION:=0b2bef862fb5aea0b285e339459f46779224e2d0
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

libwifi/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libwifi
-PKG_VERSION:=7.5.3
+PKG_VERSION:=7.6.3
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=9a17fc7c9857f5976707322469a0e8581ead88a6
+PKG_SOURCE_VERSION:=34d9fca18002b08f135805c7bc3cb00024943784
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libwifi.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
@@ -51,10 +51,6 @@ else ifeq ($(CONFIG_TARGET_ipq53xx),y)
   TARGET_PLATFORM=IPQ53XX
   TARGET_WIFI_TYPE=QUALCOMM MAC80211
   TARGET_CFLAGS +=-DIPQ53XX
-else ifeq ($(CONFIG_TARGET_mediatek),y)
-  TARGET_PLATFORM=LINUX
-  TARGET_WIFI_TYPE=MEDIATEK MAC80211
-  TARGET_CFLAGS +=-DIOPSYS_LINUX
 else
   $(info Unexpected CONFIG_TARGET, use default MAC80211)
   TARGET_PLATFORM=MAC80211

map-agent/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=6.1.1.12
+PKG_VERSION:=6.2.1.0
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=2f83ba1aa0655c07a2d3e40df034f4f81139a571
+PKG_SOURCE_VERSION:=f02e84b263659cf1cdd377597f976abe151bc5cd
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
 
 PKG_LICENSE:=BSD-3-Clause

map-controller/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=6.1.1.8
+PKG_VERSION:=6.1.2.1
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=c947d0783032cc2eb6e627bf8d1d32c38196ab8b
+PKG_SOURCE_VERSION:=3251215d020cb27ab86504d847b3b45900582b57
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
 
 LOCAL_DEV=0

mcastmngr/Makefile

@@ -6,14 +6,14 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=mcastmngr
-PKG_VERSION:=1.2.3
+PKG_VERSION:=1.2.5
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/hal/mcastmngr.git
-PKG_SOURCE_VERSION:=117acf7a29e3a343756aab9b0ae330022892c15b
+PKG_SOURCE_VERSION:=7e114a0313a61f967324ac9f89cacafdbffe74aa
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

mcastmngr/files/broadcom/lib/mcast/broadcom.sh

@@ -128,14 +128,14 @@ configure_mcpd_snooping() {
 		config_snooping_common_params $protocol $igmp_s_version $igmp_s_robustness $igmp_s_mode
 		config_mcast_querier_params $protocol $igmp_s_query_interval $igmp_s_q_resp_interval $igmp_s_last_mem_q_int
 		config_snooping_upstream_interface "$igmp_s_iface"
-		config_snooping_on_bridge $protocol $igmp_s_iface $igmp_s_mode
+		config_snooping_on_bridge $protocol "$igmp_s_iface" $igmp_s_mode
 		exceptions=$igmp_s_exceptions
 		fast_leave=$igmp_s_fast_leave
 	elif [ "$protocol" == "mld" ]; then
 		config_snooping_common_params $protocol $mld_s_version $mld_s_robustness $mld_s_mode
 		config_mcast_querier_params $protocol $mld_s_query_interval $mld_s_q_resp_interval $mld_s_last_mem_q_int
 		config_snooping_upstream_interface "$mld_s_iface"
-		config_snooping_on_bridge $protocol $mld_s_iface $mld_s_mode
+		config_snooping_on_bridge $protocol "$mld_s_iface" $mld_s_mode
 		exceptions=$mld_s_exceptions
 		fast_leave=$mld_s_fast_leave
 	fi
@@ -171,14 +171,14 @@ configure_mcpd_proxy() {
 		config_snooping_common_params $protocol $igmp_p_version $igmp_p_robustness $igmp_p_mode
 		config_mcast_querier_params $protocol $igmp_query_interval $igmp_q_resp_interval $igmp_last_mem_q_int
 		config_mcast_proxy_interface $protocol "$igmp_p_up_interfaces"
-		config_snooping_on_bridge $protocol $igmp_p_down_interfaces $igmp_p_mode
+		config_snooping_on_bridge $protocol "$igmp_p_down_interfaces" $igmp_p_mode
 		fast_leave=$igmp_fast_leave
 		exceptions=$igmp_p_exceptions
 	elif [ "$protocol" == "mld" ]; then
 		config_snooping_common_params $protocol $mld_p_version $mld_p_robustness $mld_p_mode
 		config_mcast_querier_params $protocol $mld_query_interval $mld_q_resp_interval $mld_last_mem_q_int
 		config_mcast_proxy_interface $protocol "$mld_p_up_interfaces"
-		config_snooping_on_bridge $protocol $mld_p_down_interfaces $mld_p_mode
+		config_snooping_on_bridge $protocol "$mld_p_down_interfaces" $mld_p_mode
 		fast_leave=$mld_fast_leave
 		exceptions=$mld_p_exceptions
 	fi

mcastmngr/files/broadcom/usr/libexec/rpcd/mcast

@@ -64,23 +64,11 @@ read_mcast_stats() {
 
 	json_init
 	json_add_array "snooping"
-	json_add_object ""
 	IFS=" "
 	for intf in $ifaces; do
-		while read line; do
-		# reading each line
-			case $line in
-			br-*)
-				snoop_iface="$(echo $line | awk -F ' ' '{ print $1 }')"
-				if [ "$snoop_iface" != "$intf" ]; then
-					continue
-				fi
-				json_add_string "interface" "$intf"
-				json_add_array "groups"
-				break
-				;;
-			esac
-		done < /tmp/igmp_stats
+		json_add_object ""
+		json_add_string "interface" "$intf"
+		json_add_array "groups"
 		IFS=" "
 		for gip_addr in $mcast_addrs; do
 			grp_obj_added=0
@@ -116,12 +104,14 @@ read_mcast_stats() {
 					;;
 				esac
 			done < /tmp/igmp_stats
-			json_close_array #close the associated devices array
-			json_close_object # close the groups object
+			if [ $grp_obj_added -eq 1 ]; then
+				json_close_array #close the associated devices array
+				json_close_object # close the groups object
+			fi
 		done # close the loop for group addresses
 		json_close_array #close the groups array
+		json_close_object # close the snooping object
 	done # close the loop for interfaces
-	json_close_object # close the snooping object
 	json_close_array # close the snooping array
 	json_dump
 
@@ -135,7 +125,12 @@ case "$1" in
 	call)
 		case "$2" in
 			stats)
-				read_mcast_stats
+				out="$(read_mcast_stats)"
+				if [ -z "${out}" ]; then
+					echo '{}'
+				else
+					echo ${out}
+				fi
 				;;
 		esac
 		;;

mcastmngr/files/linux/lib/mcast/linux.sh

@@ -85,9 +85,8 @@ config_mcproxy_interfaces() {
 
 	echo -e "pinstance main:$str_up ==>$str_down;\n" >> $CONFFILE
 
+	local filter=""
 	for excp in $exceptions; do
-		local filter=""
-
 		case $excp in
 		*/*)
 			ip_start="$(ipcalc.sh $excp | grep IP | awk '{print substr($0,4)}')"
@@ -98,16 +97,16 @@ config_mcproxy_interfaces() {
 			filter="$filter ($excp | *)"
 			;;
 		esac
+	done
 
-		for upstream in $str_up; do
-			echo "pinstance main upstream $upstream in blacklist table{$filter };" >> $CONFFILE
-			echo "pinstance main upstream $upstream out blacklist table{$filter };" >> $CONFFILE
-		done
+	for upstream in $str_up; do
+		echo "pinstance main upstream $upstream in blacklist table{$filter };" >> $CONFFILE
+		echo "pinstance main upstream $upstream out blacklist table{$filter };" >> $CONFFILE
+	done
 
-		for downstream in $str_down; do
-			echo "pinstance main downstream $downstream in blacklist table{$filter };" >> $CONFFILE
-			echo "pinstance main downstream $downstream out blacklist table{$filter };" >> $CONFFILE
-		done
+	for downstream in $str_down; do
+		echo "pinstance main downstream $downstream in blacklist table{$filter };" >> $CONFFILE
+		echo "pinstance main downstream $downstream out blacklist table{$filter };" >> $CONFFILE
 	done
 }
 

mcastmngr/files/linux/usr/libexec/rpcd/mcast

@@ -85,23 +85,11 @@ read_mcast_stats() {
 
 	json_init
 	json_add_array "snooping"
-	json_add_object ""
 	IFS=" "
 	for intf in $ifaces; do
-		while read line; do
-		# reading each line
-			case $line in
-			br-*)
-				snoop_iface="$(echo $line | awk -F ' ' '{ print $1 }')"
-				if [ "$snoop_iface" != "$intf" ]; then
-					continue
-				fi
-				json_add_string "interface" "$intf"
-				json_add_array "groups"
-				break
-				;;
-			esac
-		done < "$temp_igmp_file"
+		json_add_object ""
+		json_add_string "interface" "$intf"
+		json_add_array "groups"
 		IFS=" "
 		for gip_addr in $mcast_addrs; do
 			grp_obj_added=0
@@ -137,12 +125,14 @@ read_mcast_stats() {
 					;;
 				esac
 			done < "$temp_igmp_file"
-			json_close_array #close the associated devices array
-			json_close_object # close the groups object
+			if [ $grp_obj_added -eq 1 ]; then
+				json_close_array #close the associated devices array
+				json_close_object # close the groups object
+			fi
 		done # close the loop for group addresses
 		json_close_array #close the groups array
+		json_close_object # close the snooping object
 	done # close the loop for interfaces
-	json_close_object # close the snooping object
 	json_close_array # close the snooping array
 	json_dump
 
@@ -156,7 +146,12 @@ case "$1" in
 	call)
 		case "$2" in
 			stats)
-				read_mcast_stats
+				out="$(read_mcast_stats)"
+				if [ -z "${out}" ]; then
+					echo '{}'
+				else
+					echo "${out}"
+				fi
 				;;
 		esac
 		;;

netmngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=netmngr
-PKG_VERSION:=1.0.0
+PKG_VERSION:=1.0.4
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/netmngr.git
-PKG_SOURCE_VERSION:=775bd689558266380691207e1809b650ed90cee2
+PKG_SOURCE_VERSION:=ad4825bc6349d1cd68680aaaa6c5b217227c90fe
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -34,6 +34,8 @@ endef
 
 MAKE_PATH:=src
 
+TARGET_CFLAGS += -DBBF_VENDOR_PREFIX=$(CONFIG_BBF_VENDOR_PREFIX)
+
 define Package/netmngr/install
 	$(BBFDM_INSTALL_MS_DM) -u Network $(PKG_BUILD_DIR)/src/libnetmngr.so $(1) $(PKG_NAME)
 	$(BBFDM_INSTALL_CORE_PLUGIN) $(PKG_BUILD_DIR)/src/libinterface_stack.so $(1)

obuspa/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=8.0.8.4
+PKG_VERSION:=9.0.0.2
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/obuspa.git
-PKG_SOURCE_VERSION:=d315304de3a704a37673807d5b02b04243487764
+PKG_SOURCE_VERSION:=b56fa3b8ce8d33239cbda3156d936a8d6f73cd0b
 PKG_MAINTAINER:=Vivek Dutta <vivek.dutta@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

obuspa/files/etc/config/obuspa

@@ -2,9 +2,12 @@ config obuspa 'global'
 	option enabled '1'
 	option debug '1'
 	option dhcp_discovery '1'
-	option log_level '2'
+	option log_level '3'
 	option prototrace '0'
 	option db_file '/etc/obuspa/usp.db'
+	option max_group_sep '2'
+	option ipc_timeout '30'
+	option max_cache_time '600'
 	option dm_caching_exclude '/etc/obuspa/dmcaching_exclude.json'
 	#option trust_cert '/etc/obuspa/ca.pem'
 	#option client_cert '/etc/obuspa/client.pem'

obuspa/files/etc/obuspa/dmcaching_exclude.json

@@ -2,6 +2,7 @@
   "dmcaching_exclude": [
     "Device.Hosts.Host.",
     "Device.IEEE1905.",
-    "Device.WiFi.DataElements."
+    "Device.WiFi.DataElements.",
+    "Device.NAT.InterfaceSetting."
   ]
 }

obuspa/files/obuspa.hotplug

@@ -1,5 +1,9 @@
 #!/bin/sh
 
+log() {
+	echo "$*"|logger -t obuspa.hotplug -p debug
+}
+
 get_access_role() {
 	local mode lan_proto
 
@@ -34,6 +38,7 @@ fi
 
 [ "$ACTION" = "ifup" -a "${intf}" = "${INTERFACE}" ] && {
 	sleep 1
+	log "Sending WakeUp event, due to [${ACTION}] on ${intf}"
 	obuspa -c event Device.LocalAgent.WakeUp!
 }
 

obuspc/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspc
-PKG_VERSION:=1.0.1.7
+PKG_VERSION:=1.0.1.8
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/obuspa-test-controller.git
-PKG_SOURCE_VERSION:=61f14c5a1fba8c251cf1cfb18c163eab62d5674d
+PKG_SOURCE_VERSION:=1cf32fa4cb5c07906b1e061a394cf0413a6ad750
 PKG_MAINTAINER:=Vivek Dutta <vivek.dutta@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

packet-capture-diagnostics/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=packet-capture-diagnostics
-PKG_VERSION:=1.0.1
+PKG_VERSION:=1.0.2
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/packet-capture-diagnostics.git
-PKG_SOURCE_VERSION:=6c64e11d78b3be9990714bf5fcd97752cc15c4a8
+PKG_SOURCE_VERSION:=d1115ed0c129614192b9c4e68e7b81b52e08ea4f
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

periodicstats/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=periodicstats
-PKG_VERSION:=1.5.12
+PKG_VERSION:=1.5.13
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/periodicstats.git
-PKG_SOURCE_VERSION:=e59f980306e9ef4c1e3e56839906b8c5cba18338
+PKG_SOURCE_VERSION:=72974d0e22a64b2cec51857c3f17dc239fec079f
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

self-diagnostics/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=self-diagnostics
-PKG_VERSION:=1.0.8
+PKG_VERSION:=1.0.9
 PKG_RELEASE:=1
 
 PKG_LICENSE:=GPL-2.0-only

self-diagnostics/files/usr/libexec/rpcd/self-diagnostics

@@ -11,17 +11,28 @@ case "$1" in
 		case "$2" in
 			generate)
 				read -t 1 -r input
+				local out
 
 				json_load "${input}"
 				json_get_var modules modules
 				if [ -z "${modules}" ]; then
-					${BIN} -j
+					out="$(${BIN} -j)"
 				else
-					${BIN} -j -m "${modules}"
+					out="$(${BIN} -j -m "${modules}")"
+				fi
+				if [ -z "${out}" ]; then
+					echo '{}'
+				else
+					echo "${out}"
 				fi
 			;;
 			list)
-				${BIN} -j -l
+				out="$(${BIN} -j -l)"
+				if [ -z "${out}" ]; then
+					echo '{}'
+				else
+					echo "${out}"
+				fi
 			;;
 		esac
 	;;

sshmngr/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sshmngr
-PKG_VERSION:=1.0.3
+PKG_VERSION:=1.0.4
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)

sshmngr/files/common/usr/libexec/rpcd/sshmngr

@@ -69,7 +69,7 @@ case "$1" in
 					server_pid="$(get_pid "$server")"
 
 					if [ "$server_pid" -eq 0 ]; then
-						return
+						break
 					fi
 
 					# get all current sessions
@@ -119,7 +119,10 @@ case "$1" in
 				if [ "$session_pid" -gt 0 ]; then
 					kill -15 "$session_pid"
 				else
-					[ -n "$server_name" ] || return
+					if [ -z "$server_name" ]; then
+						echo '{}'
+						exit 0
+					fi
 
 					# if server_name is present
 					# get all current sessions
@@ -127,7 +130,8 @@ case "$1" in
 					server_pid="$(get_pid "$server_name")"
 
 					if [ "$server_pid" -eq 0 ]; then
-						return
+						echo '{}'
+						exit 0
 					fi
 
 					# get all current sessions
@@ -146,6 +150,7 @@ case "$1" in
 						fi
 					done
 				fi
+				echo '{}'
 			;;
 
 			list_keys)
@@ -191,6 +196,7 @@ case "$1" in
 						echo "${new_key}" >> ${KEY_FILE}
 					fi
 				fi
+				echo '{}'
 			;;
 
 			remove_pubkey)
@@ -216,6 +222,7 @@ case "$1" in
 
 					mv TEMP_KEY_FILE "$KEY_FILE"
 				fi
+				echo '{}'
 			;;
 		esac
 	;;

stunc/Makefile

@@ -7,14 +7,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=stunc
-PKG_VERSION:=1.4.3
+PKG_VERSION:=1.4.4
 PKG_RELEASE:=1
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/stunc.git
-PKG_SOURCE_VERSION:=92fd3d9d59b3c660266b0411b653fee9dcfda1ed
+PKG_SOURCE_VERSION:=7dfe9ae494cb74d24d0264b6870fc4b84eca7860
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -36,7 +36,6 @@ define Package/stunc
 endef
 
 TARGET_CFLAGS += \
-	-D_GNU_SOURCE \
 	-Wall -Werror
 
 ifeq ($(LOCAL_DEV),1)

swmodd/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=swmodd
-PKG_VERSION:=2.5.16
+PKG_VERSION:=2.5.17
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/lcm/swmodd.git
-PKG_SOURCE_VERSION:=c36ff3594ed20d9bbc90d52adbdf7d6c186c4ce1
+PKG_SOURCE_VERSION:=f14859ab9a5e829ebbe9b3736c2677ee7e7c36cf
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

timemngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=timemngr
-PKG_VERSION:=1.1.0
+PKG_VERSION:=1.1.2
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/timemngr.git
-PKG_SOURCE_VERSION:=524495fc46987eab80eacdd5f2349b2fbd5efb23
+PKG_SOURCE_VERSION:=a6c3926d7d1bb4031d3bc9865d4648abe173ad93
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

timemngr/files/etc/config/time

@@ -1,5 +1,6 @@
 config global 'global'
         option enable '1'
+        option dst '1'
 
 config client 'client'
         option enable '1'

timemngr/files/etc/init.d/timemngr

@@ -19,6 +19,21 @@ validate_global_section() {
 	    'mdns:bool:1'
 }
 
+boot() {
+	config_load time
+	config_get_bool dst_enable global dst 1
+
+	if [ "${dst_enable}" -eq 1 ]; then
+		if ! grep -qF "#timemngr-dst" /etc/crontabs/root; then
+			echo "0 0 * * *   service system restart #timemngr-dst" >> /etc/crontabs/root
+		fi
+	else
+		sed -i '/#timemngr-dst/d' /etc/crontabs/root
+	fi
+
+	start
+}
+
 start_service() {
 	local enable loglevel server_enable mdns
 
@@ -45,8 +60,10 @@ start_service() {
 	fi
 
 	# Generate Config & Start timemngr instance
-	generate_config
-	create_service
+	if [ "${enable}" -eq 1 ]; then
+		generate_config
+		create_service
+	fi
 }
 
 reload_service() {

tr143/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tr143
-PKG_VERSION:=1.0.5
+PKG_VERSION:=1.0.7
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/tr143d.git
-PKG_SOURCE_VERSION:=54302dec291726b0e765e56b4d72ac53655e0f29
+PKG_SOURCE_VERSION:=71d6f4d3b3ba1a3d771b99cc39cdb41e1c197d02
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

tr471/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tr471
-PKG_VERSION:=1.0.5
+PKG_VERSION:=1.0.6
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/tr471d.git
-PKG_SOURCE_VERSION:=69b4d324f2b2c78d858b0446dcb90dba9d5f60c3
+PKG_SOURCE_VERSION:=589c71e07a5e8044bdd03d3d5b161d9ef1270a6d
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

twamp/Makefile

@@ -6,13 +6,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=twamp
-PKG_VERSION:=1.4.6
+PKG_VERSION:=1.4.7
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/twamp-light.git
-PKG_SOURCE_VERSION:=678a980b9433e34c3ea24af003e6ee987f2bce75
+PKG_SOURCE_VERSION:=26950dd25b8091f0da40c177ebb89976be69f9cf
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

udpecho/Makefile

@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=udpecho
-PKG_VERSION:=2.2.3
+PKG_VERSION:=2.2.4
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/udpecho.git
-PKG_SOURCE_VERSION:=abffd08f3c2d333137ce6757619e08f986d89906
+PKG_SOURCE_VERSION:=5d28eabd1772813f89ab23a5f15818d223c228d7
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

userinterface/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=userinterface
-PKG_VERSION:=1.1.4
+PKG_VERSION:=1.1.6
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/userinterface.git
-PKG_SOURCE_VERSION:=98f016c93c162f0f4c4854398ff5936f040e5a77
+PKG_SOURCE_VERSION:=02bedd40e083cc456b2abed8f711b45c93061815
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

userinterface/files/backend/nginx/userinterface_rpc

@@ -70,7 +70,12 @@ case "$1" in
 	call)
 		case "$2" in
 			http_session)
-				get_nginx_session_list
+				out="$(get_nginx_session_list)"
+				if [ -z "${out}" ]; then
+					echo '{}'
+				else
+					echo "$out"
+				fi
 			;;
 			http_status)
 				read -r input
@@ -79,7 +84,12 @@ case "$1" in
 				json_get_var port "port"
 				json_cleanup
 
-				get_nginx_status "${port}"
+				out="$(get_nginx_status "${port})"
+				if [ -z "${out}" ]; then
+					echo '{}'
+				else
+					echo "$out"
+				fi
 			;;
 		esac
 	;;

usermngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=usermngr
-PKG_VERSION:=1.2.18
+PKG_VERSION:=1.2.19
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/usermngr.git
-PKG_SOURCE_VERSION:=3756e698d6debe4b5038a942e7332dc733f6f816
+PKG_SOURCE_VERSION:=99bf586d4facbf10239acf013f5c235b41fdcb5b
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -28,7 +28,7 @@ define Package/usermngr
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
-  DEPENDS:= +shadow-utils +libbbfdm-api
+  DEPENDS:= +shadow-utils +libbbfdm-api +libopenssl
   TITLE:=Package to add Device.Users. datamodel support
 endef
 

voicemngr/Makefile

@@ -41,7 +41,7 @@ define Package/$(PKG_NAME)
 	TITLE:=IOPSYS Voice Manager
 	URL:=
 
-	DEPENDS:= +libubox +libblobmsg-json +ubus +!TARGET_brcmbca:libpicoevent +TARGET_brcmbca:libpicoevent-bcm \
+	DEPENDS:= +libubox +libblobmsg-json +ubus +libopenssl +!TARGET_brcmbca:libpicoevent +TARGET_brcmbca:libpicoevent-bcm \
 		+!TARGET_brcmbca:uci +TARGET_brcmbca:uci-bcm \
 		+TARGET_brcmbca:bcm963xx-bsp +TARGET_brcmbca:libvoice-broadcom \
 		+TARGET_ipq95xx:libvoice-d2 +TARGET_ipq95xx:kmod-d2-voice \

wifidmd/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wifidmd
-PKG_VERSION:=1.0.8
+PKG_VERSION:=1.0.9
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/wifidmd.git
-PKG_SOURCE_VERSION:=6523c92cc2880ec5eebfc60d09bb5084ec504b6e
+PKG_SOURCE_VERSION:=766793f6e66af1522224351810d6593b4cf23359
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

wifimngr/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wifimngr
-PKG_VERSION:=17.3.6
+PKG_VERSION:=17.4.0
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=488957bdd5da67329b84e71c6852e9e5df9fbbdf
+PKG_SOURCE_VERSION:=fd4140665844894313805c9e2fb23ddace618b76
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wifimngr.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz

xmppc/Makefile

@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xmppc
-PKG_VERSION:=2.2.10
+PKG_VERSION:=2.2.12
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/xmppc.git
-PKG_SOURCE_VERSION:=a2945d99b916ddbe3b5270446e9b8d310a104052
+PKG_SOURCE_VERSION:=8a494c51bff8190bf78636220115c003b0b34a51
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif