bbfdm: Added SelfTestDiagnostics()

2025-12-26 20:14:11 +08:00 · 2023-10-31 14:08:49 +05:30
100 changed files with 671 additions and 2509 deletions
--- a/bbfdm/Makefile
+++ b/bbfdm/Makefile
@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=bbfdm
-PKG_VERSION:=1.4.23
+PKG_VERSION:=1.4.4

 USE_LOCAL:=0
 ifneq ($(USE_LOCAL),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bbfdm.git
-PKG_SOURCE_VERSION:=c10303fc51a1034cb87040e0eaf23c95d2b1c658
+PKG_SOURCE_VERSION:=3c0f416653781f04e2b73e7da6ccaddf6ab691de
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -132,6 +132,7 @@ CMAKE_OPTIONS += \
 CMAKE_OPTIONS += \
 	-DBBF_VENDOR_LIST:String="$(CONFIG_BBF_VENDOR_LIST)" \
 	-DBBF_VENDOR_PREFIX:String="$(CONFIG_BBF_VENDOR_PREFIX)" \
+	-DDAEMON_JSON_INPUT:String="/etc/bbfdm/input.json" \
 	-DBBF_MAX_OBJECT_INSTANCES:Integer=$(CONFIG_BBF_MAX_OBJECT_INSTANCES)

 endif ##CONFIG_BBF_VENDOR_EXTENSION
@@ -196,7 +197,7 @@ define Package/bbfdmd/install
 	$(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) $(PKG_BUILD_DIR)/json/input.json $(1)/etc/bbfdm/
 	$(INSTALL_BIN) ./files/etc/init.d/bbfdmd $(1)/etc/init.d/bbfdmd
 	$(INSTALL_CONF) ./files/etc/config/bbfdm $(1)/etc/config/bbfdm
 	$(INSTALL_BIN) ./files/etc/bbfdm/bbfdm_services.sh $(1)/etc/bbfdm/
--- a/bbfdm/files/etc/bbfdm/bbfdm_services.sh
+++ b/bbfdm/files/etc/bbfdm/bbfdm_services.sh
@@ -15,33 +15,3 @@ bbfdm_add_service()

 	ubus call service add "{'name':'bbfdm.services','instances':{'$name':{'command':['$BBFDMD','-m','$path']}}}"
 }
-
-bbfdm_stop_service()
-{
-	local name
-
-	name="${1}"
-	if [ -z "${name}" ]; then
-		return 0;
-	fi
-
-	if ubus call service list '{"name":"bbfdm.services"}' |grep -q "bbfdm.$name"; then
-		ubus call service delete "{'name':'bbfdm.services','instance':'bbfdm.$name'}"
-	fi
-}
-
-usages()
-{
-	echo "Usages $0: <OPTIONS>..."
-	echo
-	echo "    -h    show help"
-	echo "    -k    micro-service name to stop"
-	echo
-}
-
-while getopts "s:k:h" opts; do
-	case "$opts" in
-		h) usages; exit 0;;
-		k) bbfdm_stop_service "${OPTARG}";;
-	esac
-done
--- a/bbfdm/files/etc/bbfdm/input.json
+++ b/bbfdm/files/etc/bbfdm/input.json
@@ -1,28 +0,0 @@
-{
-        "daemon": {
-                "config": {
-                },
-                "input": {
-                        "type": "DotSo",
-                        "name": "/lib/libbbfdm.so",
-                        "plugin_dir": "/etc/bbfdm/plugins"
-                },
-                "output": {
-                        "type": "UBUS",
-                        "name": "bbfdm"
-                }
-        },
-        "cli": {
-                "config": {
-                        "proto": "both",
-                        "instance_mode": 0
-                },
-                "input": {
-                        "type": "UBUS",
-                        "name": "bbfdm"
-                },
-                "output": {
-                        "type": "CLI"
-                }
-        }
-}
--- a/bbfdm/files/etc/config/bbfdm
+++ b/bbfdm/files/etc/config/bbfdm
@@ -4,5 +4,4 @@ config bbfdmd 'bbfdmd'
 	option loglevel '1'
 	option refresh_time '10'
 	option transaction_timeout '30'
-	option subprocess_level '2'

--- a/bbfdm/files/etc/init.d/bbfdmd
+++ b/bbfdm/files/etc/init.d/bbfdmd
@@ -7,7 +7,7 @@ USE_PROCD=1
 PROG=/usr/sbin/bbfdmd

 BBFDM_JSON_INPUT="/etc/bbfdm/input.json"
-BBFDM_TEMP_JSON="/tmp/bbfdm/input.json"
+BBFDM_TEMP_JSON="/tmp/bbfdm.json"

 log() {
 	echo "${@}"|logger -t bbfdmd.init -p info
@@ -28,7 +28,7 @@ validate_bbfdm_bbfdmd_section()
 configure_bbfdmd()
 {
 	local enabled debug sock update
-	local jlog jrefresh jtimeout jlevel
+	local jlog jrefresh jtimeout

 	update=0
 	config_load bbfdm
@@ -38,9 +38,26 @@ configure_bbfdmd()
 	}

 	[ "${enabled}" -eq 0 ] && return 0
+	[ ! -f "${BBFDM_JSON_INPUT}" ] && return 0

-	if [ -f "${BBFDM_JSON_INPUT}" ]; then
-		echo "$(jq --arg log ${loglevel} --arg tran ${transaction_timeout} --arg refresh ${refresh_time} --arg level ${subprocess_level} '.daemon.config += {"loglevel": $log, "refresh_time": $refresh, "transaction_timeout": $tran, "subprocess_level": $level}' ${BBFDM_JSON_INPUT})" > ${BBFDM_TEMP_JSON}
+	jlog="$(jq '.daemon.config.loglevel' ${BBFDM_JSON_INPUT})"
+	if [ "\"${loglevel}\"" != "${jlog}" ]; then
+		update=1
+	fi
+
+	jrefresh="$(jq '.daemon.config.refresh_time' ${BBFDM_JSON_INPUT})"
+	if [ "\"${refresh_time}\"" != "${jrefresh}" ]; then
+		update=1
+	fi
+
+	jtimeout="$(jq '.daemon.config.transaction_timeout' ${BBFDM_JSON_INPUT})"
+	if [ "\"${transaction_timeout}\"" != "${jtimeout}" ]; then
+		update=1
+	fi
+
+	if [ "${update}" -eq "1" ]; then
+		echo "$(jq --arg log ${loglevel} --arg tran ${transaction_timeout} --arg refresh ${refresh_time} '.daemon.config += {"loglevel": $log, "refresh_time": $refresh, "transaction_timeout": $tran}' ${BBFDM_JSON_INPUT})" > ${BBFDM_TEMP_JSON}
+		mv ${BBFDM_TEMP_JSON} ${BBFDM_JSON_INPUT}
 	fi

 	procd_set_param command ${PROG}
@@ -56,7 +73,6 @@ configure_bbfdmd()

 start_service()
 {
-	mkdir -p /tmp/bbfdm
 	procd_open_instance "bbfdm"
 	configure_bbfdmd
 	procd_set_param respawn
--- a/bulkdata/Makefile
+++ b/bulkdata/Makefile
@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=bulkdata
-PKG_VERSION:=2.1.3
+PKG_VERSION:=2.1.2

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bulkdata.git
-PKG_SOURCE_VERSION:=f556410b51a2248f11358793f11ae54d3e53e85e
+PKG_SOURCE_VERSION:=d83c42070e7f10178dc1c2d0ce078e3d6d42d889
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
--- a/decollector/Makefile
+++ b/decollector/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=decollector
-PKG_VERSION:=4.2.1.1
+PKG_VERSION:=4.2.0.1

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=ae836adb0779979686d0dad34b941f319ffed1b8
+PKG_SOURCE_VERSION:=3e54fa519defa462d08d4107c115905abb929c1a
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/decollector.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
--- a/dectmngr/Makefile
+++ b/dectmngr/Makefile
@@ -2,13 +2,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=dectmngr
 PKG_RELEASE:=3
-PKG_VERSION:=3.6.4
+PKG_VERSION:=3.5.19

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=d9cc11c81ce1ff625e4e789afa180b301c7fcf74
+PKG_SOURCE_VERSION:=1fd0b11ad34f8f59b40c3a12e0cc07aa212eb87b
 PKG_MIRROR_HASH:=skip
 endif

--- a/ethmngr/Makefile
+++ b/ethmngr/Makefile
@@ -5,10 +5,10 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=ethmngr
-PKG_VERSION:=2.1.1
+PKG_VERSION:=2.1.0

 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=b81d06867d895245ef47004c6949f9d6dedd10ef
+PKG_SOURCE_VERSION:=5a0ff3bc7c49dcb05129f423ef8e0c4929f6aa03
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ethmngr.git

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
--- a/hostmngr/Makefile
+++ b/hostmngr/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=hostmngr
-PKG_VERSION:=1.1.4
+PKG_VERSION:=1.0.7

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=edb5bbe57c5bc83035e217c73071c9b3e878dc22
+PKG_SOURCE_VERSION:=975549e01df338a90e1d1a356d22a2c7f5bf2387
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/hostmngr.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
@@ -63,8 +63,7 @@ define Package/hostmngr/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/hostmngr $(1)/usr/sbin/
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/bbf_plugin/libhostmngr.so $(1)/etc/hostmngr/
 	$(INSTALL_DATA) ./files/etc/hostmngr/input.json $(1)/etc/hostmngr/	
-	$(INSTALL_DIR) $(1)/usr/share/hostmngr
-	$(INSTALL_DATA) ./files/scripts/hosts_acl.sh $(1)/usr/share/hostmngr/
+	$(INSTALL_DATA) ./files/lib/hosts/hosts_acl.sh $(1)/lib/hosts/
 endef

 ifeq ($(LOCAL_DEV),1)
--- a/hostmngr/files/etc/firewall.hosts
+++ b/hostmngr/files/etc/firewall.hosts
@@ -1,3 +1,19 @@
 #!/bin/sh

-sh /usr/share/hostmngr/hosts_acl.sh
+. /lib/functions.sh
+. /lib/hosts/hosts_acl.sh
+
+iptables -w -F hosts_forward
+ip6tables -w -F hosts_forward
+
+iptables -w -t filter -N hosts_forward
+ret=$?                        
+[ $ret -eq 0 ] && iptables -w -t filter -I FORWARD -j hosts_forward
+ip6tables -w -t filter -N hosts_forward
+ret=$?                        
+[ $ret -eq 0 ] && ip6tables -w -t filter -I FORWARD -j hosts_forward
+
+# Load /etc/config/hosts UCI file
+config_load hosts
+config_foreach process_ac_schedule ac_schedule
+
--- a/hostmngr/files/etc/init.d/hostmngr
+++ b/hostmngr/files/etc/init.d/hostmngr
@@ -1,9 +1,10 @@
 #!/bin/sh /etc/rc.common

-START=65
+START=97
 STOP=20

 . /etc/bbfdm/bbfdm_services.sh
+. /lib/hosts/hosts_acl.sh

 USE_PROCD=1

@@ -19,7 +20,7 @@ start_service() {
 	procd_close_instance
 	
 	bbfdm_add_service "bbfdm.hosts" "${HOSTS_JSON_INPUT}"
-	sh /usr/share/hostmngr/hosts_acl.sh
+	hosts_acl
 }

 service_triggers()
--- a/hostmngr/files/lib/hosts/hosts_acl.sh
+++ b/hostmngr/files/lib/hosts/hosts_acl.sh
@@ -144,11 +144,6 @@ process_ac_schedule() {
 	IP_RULE=""
 	IP_RULE1=""

-	config_get is_enabled "$access_control" "enable" 1
-	if [ "$is_enabled" == "0" ]; then
-		return
-	fi
-
 	mac=$(uci -q get hosts.$access_control.macaddr)
 	access_policy=$(uci -q get hosts.$access_control.access_policy)

@@ -215,19 +210,21 @@ process_ac_schedule() {
 	prev_days=""
 }

-iptables -w -F hosts_forward
-ip6tables -w -F hosts_forward
+hosts_acl() {
+	iptables -w -F hosts_forward
+	ip6tables -w -F hosts_forward

-hosts_forward=$(iptables -t filter --list | grep hosts_forward)
-if [ -z "$hosts_forward" ]; then
-	iptables -w -t filter -N hosts_forward
-	ret=$?
-	[ $ret -eq 0 ] && iptables -w -t filter -I FORWARD -j hosts_forward
-	ip6tables -w -t filter -N hosts_forward
-	ret=$?
-	[ $ret -eq 0 ] && ip6tables -w -t filter -I FORWARD -j hosts_forward
-fi
+	hosts_forward=$(iptables -t filter --list | grep hosts_forward)
+	if [ -z "$hosts_forward" ]; then
+		iptables -w -t filter -N hosts_forward
+		ret=$?
+		[ $ret -eq 0 ] && iptables -w -t filter -I FORWARD -j hosts_forward
+		ip6tables -w -t filter -N hosts_forward
+		ret=$?
+		[ $ret -eq 0 ] && ip6tables -w -t filter -I FORWARD -j hosts_forward
+	fi

-# Load /etc/config/hosts UCI file
-config_load hosts
-config_foreach process_ac_schedule ac_schedule
+	# Load /etc/config/hosts UCI file
+	config_load hosts
+	config_foreach process_ac_schedule ac_schedule
+}
--- a/icwmp/Makefile
+++ b/icwmp/Makefile
@@ -8,16 +8,15 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=icwmp
-PKG_VERSION:=9.5.27
+PKG_VERSION:=9.5.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:=ce1f7e01f0f5e7cc3a5dfeb5378d488f3e2938a0
+PKG_SOURCE_VERSION:=ade480d2b090e3fba952605596c9e9276e4cbd02
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
-endif
+
+PKG_RELEASE=$(PKG_SOURCE_VERSION)

 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
@@ -81,9 +80,10 @@ ifeq ($(BUILD_VARIANT),mbedtls)
 CMAKE_OPTIONS += -DWITH_MBEDTLS=ON
 endif

-ifeq ($(LOCAL_DEV),1)
+USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1)
+ifneq ($(USE_LOCAL),)
 define Build/Prepare
-	$(CP) -rf ~/git/icwmp/* $(PKG_BUILD_DIR)/
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
 endef
 endif

@@ -101,7 +101,6 @@ define Package/icwmp/default/install
 	$(INSTALL_BIN) ./files/etc/init.d/icwmpd $(1)/etc/init.d/icwmpd
 	$(INSTALL_BIN) ./files/etc/uci-defaults/85-cwmp-set-userid $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) ./files/etc/uci-defaults/90-cwmpfirewall $(1)/etc/uci-defaults/
-	$(INSTALL_BIN) ./files/etc/uci-defaults/95-set-random-inform-time $(1)/etc/uci-defaults/
 	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/icwmp $(1)/lib/upgrade/keep.d/icwmp
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/etc/udhcpc.user.d/udhcpc_icwmp_opt125.user $(1)/etc/udhcpc.user.d/udhcpc_icwmp_opt125.user
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/etc/udhcpc.user.d/udhcpc_icwmp_opt43.user $(1)/etc/udhcpc.user.d/udhcpc_icwmp_opt43.user
--- a/icwmp/files/etc/config/cwmp
+++ b/icwmp/files/etc/config/cwmp
@@ -11,7 +11,6 @@ config acs 'acs'
 	option retry_min_wait_interval '5'
 	# possible configs interval :[1000:65535]
 	option retry_interval_multiplier '2000'
-	option skip_dhcp_boot_options '0'

 config cpe 'cpe'
 	option enable '1'
@@ -21,7 +20,7 @@ config cpe 'cpe'
 	option log_to_file 'disable'
 	# log_severity: INFO (Default)	
 	# log_severity possible configs: EMERG, ALERT, CRITIC ,ERROR, WARNING, NOTICE, INFO, DEBUG
-	option log_severity 'ERROR'
+	option log_severity 'INFO'
 	option log_file_name '/var/log/icwmpd.log'
 	option log_max_size '102400'
 	option userid '' #$OUI-$SER
@@ -38,8 +37,6 @@ config cpe 'cpe'
 	option periodic_notify_interval '10'
 	option incoming_rule 'Port_Only'
 	option active_notif_throttle '0'
-	option disable_gatewayinfo '0'
-	option fw_upgrade_keep_settings '1'
 	
 config lwn 'lwn'
 	option enable '0'
--- a/icwmp/files/etc/init.d/icwmpd
+++ b/icwmp/files/etc/init.d/icwmpd
@@ -407,7 +407,6 @@ validate_acs_section()
 		'periodic_inform_time:string' \
 		'url:string' \
 		'dhcp_discovery:string' \
-		'skip_dhcp_boot_options:bool:0' \
 		'dhcp_url:string' \
 		'compression:or("GZIP","Deflate","Disabled")' \
 		'retry_min_wait_interval:range(1, 65535)' \
@@ -437,8 +436,7 @@ validate_cpe_section()
 		'exec_download:bool' \
 		'periodic_notify_enable:bool' \
 		'enable:bool' \
-		'periodic_notify_interval:uinteger' \
-		'fw_upgrade_keep_settings:bool'
+		'periodic_notify_interval:uinteger'
 }

 validate_defaults() {
@@ -469,32 +467,25 @@ validate_defaults() {
 }

 boot() {
-	local dhcp_discovery wan_interface skip_dhcp_boot_options disable_gatewayinfo
+	local dhcp_discovery="0"
+	local wan_interface=""

 	config_load cwmp
 	config_get wan_interface cpe default_wan_interface "wan"
-	config_get disable_gatewayinfo cpe disable_gatewayinfo "0"
-
 	config_get dhcp_discovery acs dhcp_discovery "0"
-	config_get dhcp_discovery acs dhcp_discovery "0"
-	config_get skip_dhcp_boot_options acs skip_dhcp_boot_options "0"

 	if [ "${dhcp_discovery}" = "enable" ] || [ "${dhcp_discovery}" = "1" ]; then
-		if [ "${skip_dhcp_boot_options}" -ne 1 ]; then
-			# Set dhcp option 43 if not already configured
-			enable_dhcp_option43 "${wan_interface}"
-			# Set dhcp option 60
-			set_vendor_id "${wan_interface}"
-		fi
+		# Set dhcp option 43 if not already configured
+		enable_dhcp_option43 "${wan_interface}"
+		# Set dhcp option 60
+		set_vendor_id "${wan_interface}"
 	fi

 	config_get lan_interface cpe default_lan_interface ""
 	if [ -n "${lan_interface}" ]; then
-		if [ "${disable_gatewayinfo}" -ne 1 ]; then
-			# Set dhcp_option 125 if not already configured
-			enable_dhcp_option125 "${wan_interface}"
-			enable_dnsmasq_option125 "${lan_interface}"
-		fi
+		# Set dhcp_option 125 if not already configured
+		enable_dhcp_option125 "${wan_interface}"
+		enable_dnsmasq_option125 "${lan_interface}"
 	fi
 	
 	config_get ssl_capath acs ssl_capath
@@ -519,19 +510,16 @@ start_service() {
 	config_get url acs url ""
 	config_get dhcp_url acs dhcp_url ""

-	procd_open_instance icwmp
-
 	if [ "$enable_cwmp" = "0" ]; then
-		procd_close_instance
 		return 0
 	fi

 	validate_defaults || {
 		log "Validation of defaults failed"
-		procd_close_instance
 		return 1;
 	}

+	procd_open_instance icwmp
 	if [ -n "${url}" ] || [ -n "${dhcp_url}" ]; then
 		procd_set_param command "$PROG"
 		procd_append_param command -b
@@ -556,7 +544,6 @@ reload_service() {
 	config_load cwmp
 	config_get_bool enable_cwmp cpe enable 1

-	log "Reload service $ret"
 	ret="0"
 	if [ "$enable_cwmp" = "0" ]; then
 		stop
@@ -566,9 +553,9 @@ reload_service() {

 	ret=$(ubus call service list '{"name":"icwmpd"}' | jsonfilter -qe '@.icwmpd.instances.icwmp.running')
 	if [ "$ret" != "true" ]; then
-		log "Reloading cwmp service ..."
 		stop
 		start
+		return 0
 	fi
 }

--- a/icwmp/files/etc/uci-defaults/95-set-random-inform-time
+++ b/icwmp/files/etc/uci-defaults/95-set-random-inform-time
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-set_inform_time()
-{
-	local sec inform_time value
-
-	config_load cwmp
-	config_get inform_time acs periodic_inform_time '0001-01-01T00:00:00Z'
-
-	if [ "${inform_time}" == "0001-01-01T00:00:00Z" ]; then
-		sec=$(date +%s)
-		value="$(date -d @$(($sec-$RANDOM)) +%Y-%m-%dT%H:%M:%SZ)"
-
-		uci_set cwmp acs periodic_inform_time "$value"
-	fi
-}
-
-set_inform_time
--- a/ieee1905/Config.in
+++ b/ieee1905/Config.in
@@ -20,6 +20,7 @@ config IEEE1905_WIFI_EASYMESH

 config IEEE1905_CMDU_FRAGMENT_TLV_BOUNDARY
 	bool "Fragment large CMDU frame at TLV boundary instead of octet boundary"
+	default y

 endmenu

--- a/ieee1905/Makefile
+++ b/ieee1905/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=ieee1905
-PKG_VERSION:=8.3.4
+PKG_VERSION:=8.2.22

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=526690993c93720ee1707bba6b7a08e8c28f2dd9
+PKG_SOURCE_VERSION:=78ab0f41b76773a446bd64d6d981e2b91302c02b
 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
@@ -123,6 +123,7 @@ define Build/InstallDev/libieee1905
 	$(CP) $(PKG_BUILD_DIR)/src/cmdu_ackq.h $(1)/usr/include/
 	$(CP) $(PKG_BUILD_DIR)/src/1905_tlvs.h $(1)/usr/include/
 	$(CP) $(PKG_BUILD_DIR)/src/i1905_wsc.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/src/bufutil.h $(1)/usr/include/
 	$(CP) $(PKG_BUILD_DIR)/src/timer_impl.h $(1)/usr/include/
 	$(CP) $(PKG_BUILD_DIR)/src/i1905_extension.h $(1)/usr/include/
 	$(CP) $(PKG_BUILD_DIR)/src/libmidgen.so $(1)/usr/lib/
--- a/ieee1905/files/etc/config/ieee1905
+++ b/ieee1905/files/etc/config/ieee1905
@@ -4,7 +4,6 @@ config ieee1905 'ieee1905'
 	list extmodule 'map'
 	list extmodule 'topology'
 	option registrar '2 5 6'
-	list exclude_tagging '/eth.*'
 #	option macaddress '0a:1b:2c:3d:4e:50'

 config al-iface
--- a/ieee1905/files/etc/init.d/ieee1905
+++ b/ieee1905/files/etc/init.d/ieee1905
@@ -1,6 +1,6 @@
 #!/bin/sh /etc/rc.common

-START=60
+START=96
 STOP=21

 USE_PROCD=1
--- a/iop/config
+++ b/iop/config
@@ -11,19 +11,10 @@ CONFIG_DEVEL=y
 CONFIG_USE_STRIP=y
 # CONFIG_SIGNED_PACKAGES is not set

-CONFIG_JSON_CYCLONEDX_SBOM=y
-CONFIG_INCLUDE_CONFIG=y
-
 # Image #
 CONFIG_TARGET_CUSTOMER="IOPSYS"
 CONFIG_TARGET_ROOTFS_TARGZ=y

-# Although UBIFS and EXT4 images work on all non-secure-boot devices,
-# squashfs is the only officially supported rootfs filesystem.
-# A writable rootfs is useful for developping an debugging preinit code.
-# CONFIG_TARGET_ROOTFS_UBIFS is not set
-# CONFIG_TARGET_ROOTFS_EXT4FS is not set
-
 # /etc/banner and /etc/device_info #
 CONFIG_IMAGEOPT=y
 CONFIG_VERSIONOPT=y
@@ -103,7 +94,6 @@ CONFIG_PACKAGE_udpecho-server=y
 CONFIG_PACKAGE_userinterface=y
 CONFIG_PACKAGE_xmppc=y
 CONFIG_PACKAGE_timemngr=y
-CONFIG_PACKAGE_self-diagnostics=y

 # WebGUI #
 CONFIG_PACKAGE_sulu=y
@@ -195,7 +185,6 @@ CONFIG_PACKAGE_at=y
 CONFIG_PACKAGE_ca-certificates=y
 CONFIG_PACKAGE_crun=y
 CONFIG_PACKAGE_getopt=y
-CONFIG_PACKAGE_gpiod-tools=y
 # CONFIG_PACKAGE_iwatchdog is not set
 CONFIG_PACKAGE_jq=y
 CONFIG_PACKAGE_libcap-bin=y
@@ -253,6 +242,7 @@ CONFIG_BUSYBOX_CONFIG_ASH_IDLE_TIMEOUT=y
 CONFIG_BUSYBOX_CONFIG_ASH_RANDOM_SUPPORT=y
 CONFIG_BUSYBOX_CONFIG_CTTYHACK=y
 CONFIG_BUSYBOX_CONFIG_DELUSER=y
+# CONFIG_BUSYBOX_CONFIG_DEVMEM is not set
 CONFIG_BUSYBOX_CONFIG_FEATURE_UDHCP_8021Q=y
 CONFIG_BUSYBOX_CONFIG_FIRST_SYSTEM_ID=100
 # CONFIG_BUSYBOX_CONFIG_HTTPD is not set
@@ -329,4 +319,3 @@ CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_SQUASHFS=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_UBIFS=y
 CONFIG_BUSYBOX_CONFIG_TIMEOUT=y
 CONFIG_BUSYBOX_CONFIG_NOHUP=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="sha512"
--- a/iop/scripts/feeds_update.sh
+++ b/iop/scripts/feeds_update.sh
@@ -4,18 +4,7 @@ function feeds_update {
 	heads=1
 	developer=0
 	override=1
-	force=1
-
-	function update_failure {
-		if [ $force == 1 ]; then
-			echo "WARNING: Failed to update feed(s). Forced update, proceeding anyway." >&2
-		else
-			echo "ERROR: Failed to update feed(s). Omit -F to proceed anyway." >&2
-			exit 1
-		fi
-	}
-
-	while getopts "inFh" opt; do
+	while getopts "inh" opt; do
 		case $opt in
 		i)
 			heads=0
@@ -23,16 +12,12 @@ function feeds_update {
 		n)
 			override=0
 			;;
-		F)
-			force=0
-			;;
 		h|\?)
-			echo "Usage: ./iop feeds_update [-i] [-n] [-F] [-h]"
+			echo "Usage: ./iop feeds_update [-i] [-n] [-h]"
 			echo
 			echo "OPTIONS:"
 			echo "  -i - Only update index. Do not change HEAD in feeds."
 			echo "  -n - Do not replace core packages with iopsys versions."
-			echo "  -F - Do not force update if there are inaccessible feeds."
 			echo "  -h - Display this help message and exit."
 			exit 1
 			;;
@@ -45,9 +30,9 @@ function feeds_update {

 	if [ $heads == 1 ]; then
 		if [ $developer == 1 ]; then
-			./scripts/feeds update -g || update_failure
+			./scripts/feeds update -g
 		else
-			./scripts/feeds update || update_failure
+			./scripts/feeds update
 		fi
 	fi
 	./scripts/feeds update -ai || exit 1
--- a/iop/scripts/genconfig.sh
+++ b/iop/scripts/genconfig.sh
@@ -2,7 +2,6 @@

 function genconfig {
 	export CLEAN=0
-	export DIRTY="--dirty"
 	export IMPORT=1
 	export SRCTREEOVERR=0
 	export FILEDIR="files/"
@@ -199,7 +198,6 @@ function genconfig {
 		echo 1>&2 "Usage: $0 [ OPTIONS ] < Board_Type > [ Customer [customer2 ]...]"
 		echo
 		echo -e "  -c|--clean\t\tRemove all files under ./files and import from config "
-		echo -e "  -D|--no-dirty\t\tIgnore dirty tree"
 		echo -e "  -v|--verbose\t\tVerbose"
 		echo -e "  -n|--no-update\tDo NOT! Update customer config before applying"
 		echo -e "  -t|--target\t\tExplicitly specify the linux target to build the board profile from"
@@ -418,7 +416,7 @@ function genconfig {

 		# Set target version
 		local git_version
-		if ! git_version="$(git describe --always $DIRTY --tags --match '[0-9].*.*' --match '[0-9][0-9].*.*')"; then
+		if ! git_version="$(git describe --always --dirty --tags --match '[0-9].*.*' --match '[0-9][0-9].*.*')"; then
 			echo "ERROR: Failed getting version via git describe, exiting." >&2
 			return 1
 		fi
@@ -485,7 +483,6 @@ function genconfig {
 			case "$1" in

 			-c|--clean) export CLEAN=1;;
-			-D|--no-dirty) export DIRTY="";;
 			-n|--no-update) export IMPORT=0;;
 			-v|--verbose) export VERBOSE="$(($VERBOSE + 1))";;
 			-t|--target) export TARGET="$2"; shift;;
--- a/iop/scripts/genconfig_min.sh
+++ b/iop/scripts/genconfig_min.sh
@@ -2,7 +2,6 @@

 function genconfig_min {
 	export CLEAN=0
-	export DIRTY="--dirty"
 	export SRCTREEOVERR=0
 	export FILEDIR="files/"
 	CURRENT_CONFIG_FILE=".current_config_file"
@@ -198,7 +197,6 @@ function genconfig_min {
 		echo 1>&2 "Usage: $0 [ OPTIONS ] < Board_Type > [ Customer [customer2 ]...]"
 		echo
 		echo -e "  -c|--clean\t\tRemove all files under ./files and import from config "
-		echo -e "  -D|--no-dirty\t\tIgnore dirty tree"
 		echo -e "  -v|--verbose\t\tVerbose"
 		echo -e "  -n|--no-update\tDo NOT! Update customer config before applying"
 		echo -e "  -t|--target\t\tExplicitly specify the linux target to build the board profile from"
@@ -392,7 +390,7 @@ function genconfig_min {

 		# Set target version
 		local git_version
-		if ! git_version="$(git describe --always $DIRTY --tags --match '[0-9].*.*' --match '[0-9][0-9].*.*')"; then
+		if ! git_version="$(git describe --always --dirty --tags --match '[0-9].*.*' --match '[0-9][0-9].*.*')"; then
 			echo "ERROR: Failed getting version via git describe, exiting." >&2
 			return 1
 		fi
@@ -453,7 +451,6 @@ function genconfig_min {
 			case "$1" in

 			-c|--clean) export CLEAN=1;;
-			-D|--no-dirty) export DIRTY="";;
 			-n|--no-update) export IMPORT=0;;
 			-v|--verbose) export VERBOSE="$(($VERBOSE + 1))";;
 			-t|--target) export TARGET="$2"; shift;;
--- a/libdpp/Makefile
+++ b/libdpp/Makefile
@@ -1,57 +0,0 @@
-#
-# Copyright (C) 2020-2023 Iopsys
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libdpp
-PKG_VERSION:=2.0.0
-
-LOCAL_DEV=0
-ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=f22959b107a8bf443d04d6261d00074b5514dfe8
-PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/libdpp.git
-PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
-PKG_MIRROR_HASH:=skip
-endif
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_LICENSE:=LGPL-2.1-only
-PKG_LICENSE_FILES:=LICENSE
-
-include $(INCLUDE_DIR)/package.mk
-
-
-define Package/libdpp/description
-  Library providing APIs for DPP EasyConnect frame generation and handling
-endef
-
-define Package/libdpp
-  TITLE:= DPP EasyConnect library (libdpp)
-  DEPENDS:= +libeasy +libopenssl +libgcrypt +libubox +libwifiutils
-endef
-
-MAKE_PATH:=lib
-
-
-define Build/InstallDev/libdpp
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/lib/dpp_api.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/lib/dpputils.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/lib/libdpp.so* $(1)/usr/lib/
-endef
-
-
-define Build/InstallDev
-	$(call Build/InstallDev/libdpp,$(1),$(2))
-endef
-
-define Package/libdpp/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/lib/libdpp.so* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libdpp))
--- a/libdsl/Makefile
+++ b/libdsl/Makefile
@@ -24,9 +24,8 @@ include $(INCLUDE_DIR)/package.mk

 ifeq ($(CONFIG_TARGET_brcmbca),y)
  TARGET_PLATFORM=BROADCOM
-  CONFIG_ID=$(SUBTARGET:bcm%=BCM%)
-  CHIP_ID=$(CONFIG_ID:BCM9%=%)
-  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCHIP_$(CHIP_ID) -DCONFIG_$(CONFIG_ID) \
+  CHIP_ID=$(patsubst "%",%,$(CONFIG_BCM_CHIP_ID))
+  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCHIP_$(CHIP_ID) -DCONFIG_BCM9$(CHIP_ID) \
 	-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)
--- a/libeasy/Makefile
+++ b/libeasy/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=libeasy
-PKG_VERSION:=7.4.2
+PKG_VERSION:=7.2.100

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=11eb263666556c419220e2a50c3a67422e79f884
+PKG_SOURCE_VERSION:=32db1b79bd88eba85a3e7518dbbbd1e29f4b06d9
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libeasy.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
@@ -50,9 +50,6 @@ define Build/InstallDev/libeasy
 	$(CP) $(PKG_BUILD_DIR)/easy.h $(1)/usr/include/easy/
 	$(CP) $(PKG_BUILD_DIR)/event.h $(1)/usr/include/easy/
 	$(CP) $(PKG_BUILD_DIR)/utils.h $(1)/usr/include/easy/
-	$(CP) $(PKG_BUILD_DIR)/bufutil.h $(1)/usr/include/easy/
-	$(CP) $(PKG_BUILD_DIR)/cryptutil.h $(1)/usr/include/easy/
-	$(CP) $(PKG_BUILD_DIR)/ecc_cryptutil.h $(1)/usr/include/easy/
 	$(CP) $(PKG_BUILD_DIR)/if_utils.h $(1)/usr/include/easy/
 	$(CP) $(PKG_BUILD_DIR)/debug.h $(1)/usr/include/easy/
 	$(CP) $(PKG_BUILD_DIR)/hlist.h $(1)/usr/include/easy/
--- a/libethernet/Makefile
+++ b/libethernet/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=libethernet
-PKG_VERSION:=7.2.107
+PKG_VERSION:=7.2.105

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=9c0e9ecd62b79d4e89b4f013f04124870d237395
+PKG_SOURCE_VERSION:=4a363a699c4a8024054ca095f1b7818f8bd56ded
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libethernet.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
@@ -24,9 +24,8 @@ include $(INCLUDE_DIR)/package.mk

 ifeq ($(CONFIG_TARGET_brcmbca),y)
  TARGET_PLATFORM=BROADCOM
-  CONFIG_ID=$(SUBTARGET:bcm%=BCM%)
-  CHIP_ID=$(CONFIG_ID:BCM9%=%)
-  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCHIP_$(CHIP_ID) -DCONFIG_$(CONFIG_ID) \
+  CHIP_ID=$(patsubst "%",%,$(CONFIG_BCM_CHIP_ID))
+  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCHIP_$(CHIP_ID) -DCONFIG_BCM9$(CHIP_ID) \
 	-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
--- a/libqos/Makefile
+++ b/libqos/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=libqos
-PKG_VERSION:=7.2.106
+PKG_VERSION:=7.2.105

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=02dba6571fddd9b4c5b4b671270604b4c0faf9ae
+PKG_SOURCE_VERSION:=61b15e0fe345186d36d0ca3212a08f384af3609b
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libqos.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
@@ -24,9 +24,8 @@ include $(INCLUDE_DIR)/package.mk

 ifeq ($(CONFIG_TARGET_brcmbca),y)
  TARGET_PLATFORM=BROADCOM
-  CONFIG_ID=$(SUBTARGET:bcm%=BCM%)
-  CHIP_ID=$(CONFIG_ID:BCM9%=%)
-  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCHIP_$(CHIP_ID) -DCONFIG_$(CONFIG_ID) \
+  CHIP_ID=$(patsubst "%",%,$(CONFIG_BCM_CHIP_ID))
+  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCHIP_$(CHIP_ID) -DCONFIG_BCM9$(CHIP_ID) \
 	-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)
--- a/libvoice-airoha/Makefile
+++ b/libvoice-airoha/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=libvoice-airoha
 PKG_RELEASE:=1
-PKG_VERSION:=1.0.10
+PKG_VERSION:=1.0.8
 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:=e6ba6fca814f6c83a3d6ff4a5b7560fbc36d3101
+PKG_SOURCE_VERSION:=a6a70c7259ba440f7587f4f79d29e8caecafa544
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
--- a/libvoice-broadcom/Makefile
+++ b/libvoice-broadcom/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=libvoice-broadcom
 PKG_RELEASE:=1
-PKG_VERSION:=1.0.8
+PKG_VERSION:=1.0.6
 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:=e1de60c2c05935fb2f4adfc1f73feba0bb32ade6
+PKG_SOURCE_VERSION:=14e626db4e8943c100602e6e73e0b1652ff3faca
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -28,7 +28,7 @@ PKG_CONFIG_DEPENDS:=CONFIG_TARGET_BOARD

 LIBVOICE_PKG_BUILD_DIR := $(PKG_BUILD_DIR)

-export BCM_CHIP_ID:=$(SUBTARGET)
+export CONFIG_BCM_CHIP_ID

 include $(INCLUDE_DIR)/package.mk

--- a/libvoice-d2/Makefile
+++ b/libvoice-d2/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=libvoice-d2
 PKG_RELEASE:=1
-PKG_VERSION:=1.1.2
+PKG_VERSION:=1.0.15
 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:=e6d689334000bc57498d9a3f203a8933160e1ef4
+PKG_SOURCE_VERSION:=499abc3c7932bf5187bce6cabeffdc0c0f6eada8
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
--- a/libwifi/Makefile
+++ b/libwifi/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=libwifi
-PKG_VERSION:=7.4.16
+PKG_VERSION:=7.4.6

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=dfafd5f7ea387d6119a9eb692e435f98b16f75a3
+PKG_SOURCE_VERSION:=57348d9a901c33650ebfe8b5d8f35a0b57d12a89
 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
@@ -26,9 +26,8 @@ include $(INCLUDE_DIR)/package.mk
 ifeq ($(CONFIG_TARGET_brcmbca),y)
  TARGET_PLATFORM=BROADCOM
  TARGET_WIFI_TYPE=BROADCOM
-  CONFIG_ID=$(SUBTARGET:bcm%=BCM%)
-  CHIP_ID=$(CONFIG_ID:BCM9%=%)
-  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCHIP_$(CHIP_ID) -DCONFIG_$(CONFIG_ID) \
+  CHIP_ID=$(patsubst "%",%,$(CONFIG_BCM_CHIP_ID))
+  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCHIP_$(CHIP_ID) -DCONFIG_BCM9$(CHIP_ID) \
 	-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)
@@ -53,7 +52,7 @@ else ifeq ($(CONFIG_TARGET_ipq53xx),y)
  TARGET_CFLAGS +=-DIPQ53XX
 else ifeq ($(CONFIG_TARGET_mediatek),y)
  TARGET_PLATFORM=LINUX
-  TARGET_WIFI_TYPE=MAC80211
+  TARGET_WIFI_TYPE=MEDIATEK MAC80211
  TARGET_CFLAGS +=-DIOPSYS_LINUX
 else
  $(info Unexpected CONFIG_TARGET, use default MAC80211)
--- a/map-agent/Config.in
+++ b/map-agent/Config.in
@@ -52,8 +52,5 @@ config AGENT_OPER_CHANNEL_CHANGE_RELAY_MCAST
 	bool "Use config opt to determine if Oper Channel Report CMDU is send as relayed multicast or directly to controller"
 	default y

-config AGENT_USE_LIBDPP
-	bool "Depend on libdpp for DPP EasyConnect"
-
 endmenu
 endif
--- a/map-agent/Makefile
+++ b/map-agent/Makefile
@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=map-agent
-PKG_VERSION:=4.5.0.10
+PKG_VERSION:=4.3.7.2
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=a03ea6bee6856000496d858f3b4c8d161612472d
+PKG_SOURCE_VERSION:=406b484e33f5f9862f2adcc95c8e8231a7bde87c
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>

 PKG_LICENSE:=BSD-3-Clause
@@ -16,7 +16,7 @@ PKG_LICENSE_FILES:=LICENSE
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git@dev.iopsys.eu:multi-ap/map-agent.git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/map-agent
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
 endif
@@ -28,12 +28,9 @@ define Package/map-agent
  CATEGORY:=Utilities
  TITLE:=WiFi multi-AP Agent (EasyMesh R2)
  DEPENDS:=+libwifi +libuci +libubox +ubus +libeasy +libieee1905 +ieee1905 \
-	   +map-plugin +ip-bridge +AGENT_USE_LIBDPP:libdpp
+	  +map-plugin +ip-bridge
 endef

-ifeq ($(CONFIG_AGENT_USE_LIBDPP),y)
-  TARGET_CFLAGS += -DUSE_LIBDPP
-endif

 define Package/dynbhd
  SECTION:=utils
--- a/map-agent/files/etc/config/mapagent
+++ b/map-agent/files/etc/config/mapagent
@@ -1,7 +1,7 @@
 config agent 'agent'
 	option enabled '0'
 	option debug '0'
-	option profile '3'
+	option profile '4'
 	option al_bridge 'br-lan'
 	option netdev 'wlan'
 	option island_prevention '0'
--- a/map-agent/files/lib/multiap/map_genconfig
+++ b/map-agent/files/lib/multiap/map_genconfig
@@ -19,8 +19,8 @@ is_broadcom() {
 }

 is_qualcomm() {
-	[ -d /sys/module/ath12k ] && return 0
-	return 1
+	[ -f /proc/device-tree/compatible ] || return
+	strings /proc/device-tree/compatible | grep -qE '^(qcom,|ipq,)'; return
 }

 generate_multiap_config() {
@@ -80,7 +80,6 @@ generate_multiap_config() {
 			ifprefix="wlan0%-"
 			ifname="wlan${devidx}"
 			ifname_bh="wlan${devidx}-1"
-			ap_follow_sta_dfs="1"
 		else
 			ifprefix="wlan%-"
 			ifname="wlan$devidx"
@@ -90,7 +89,6 @@ generate_multiap_config() {
 		if [ $generate_mapagent_config -eq 1 ]; then
 			uci set mapagent.agent.ifprefix="$ifprefix"
 			uci set mapagent.agent.brcm_setup="$brcm_setup"
-			uci set mapagent.agent.ap_follow_sta_dfs="$ap_follow_sta_dfs"
 			uci add mapagent radio
 			uci set mapagent.@radio[-1].device="$device"
 			uci set mapagent.@radio[-1].band="$mode_band"
@@ -120,7 +118,6 @@ generate_multiap_config() {
 					uci set wireless.$secname.default_disabled="1"
 					uci set wireless.$secname.multi_ap="1"
 					uci commit wireless
-					wifi reload
 				else
 					ubus call uci set "{\"config\":\"wireless\",\"type\":\"wifi-iface\", \
 						\"match\":{\"mode\":\"sta\", \"ifname\":\"$ifname\", \"device\":\"$device\"},\"values\":{\"multi_ap\":\"1\"}}" 2>/dev/null
--- a/map-controller/Config.in
+++ b/map-controller/Config.in
@@ -26,9 +26,5 @@ config CONTROLLER_EASYMESH_VENDOR_EXT_OUI
 	enabled through CONTROLLER_EASYMESH_VENDOR_EXT. Please provide the Vendor's OUI
 	through which such features would be exposed.

-config CONTROLLER_USE_LIBDPP
-	bool "Depend on libdpp for DPP EasyConnect"
-
-
 endmenu
 endif
--- a/map-controller/Makefile
+++ b/map-controller/Makefile
@@ -5,15 +5,15 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=map-controller
-PKG_VERSION:=4.5.0.2
+PKG_VERSION:=4.3.3.1
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=3c915f5f17ff339487a3b8533d384a23888b9c9a
+PKG_SOURCE_VERSION:=1faf0fce0d524f626638e08bd45348d11631f390
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git@dev.iopsys.eu:multi-ap/map-controller.git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/map-controller
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
 endif
@@ -27,15 +27,9 @@ define Package/map-controller
  SECTION:=utils
  CATEGORY:=Utilities
  TITLE:=WiFi Multi-AP Controller (EasyMesh R2)
-  DEPENDS:=+libuci +libubox +ubus +libeasy +libwifiutils +libieee1905 +ieee1905 +map-plugin \
-	   +CONTROLLER_USE_LIBDPP:libdpp
+  DEPENDS:=+libuci +libubox +ubus +libeasy +libwifiutils +libieee1905 +ieee1905 +map-plugin
 endef

-ifeq ($(CONFIG_CONTROLLER_USE_LIBDPP),y)
-  TARGET_CFLAGS += -DUSE_LIBDPP
-endif
-
-
 define Package/map-controller/description
 This package provides WiFi MultiAP Controller as per the EasyMesh-R2 specs.
 endef
--- a/map-controller/files/etc/config/mapcontroller
+++ b/map-controller/files/etc/config/mapcontroller
@@ -1,6 +1,6 @@
 config controller 'controller'
 	option enabled '1'	# may be modified by other package start-up scripts (i.e. map-agent)
-	option profile '3'
+	option profile '4'
 	option registrar '2 5 6'
 	option debug '0'
 	option bcn_metrics_max_num '10'
--- a/map-controller/files/etc/uci-defaults/99-mapcntlr
+++ b/map-controller/files/etc/uci-defaults/99-mapcntlr
@@ -5,7 +5,7 @@
 WIFI_BH_KEY=$(openssl rand -rand /dev/urandom -hex 64 2>/dev/null | openssl dgst -hex -sha256 | cut -d " " -f 2)
 WIFI_BH_KEY=${WIFI_BH_KEY::-1}

-BASEMAC_ADDR="$(fw_printenv -n ethaddr | tr -d ':' | tr 'a-z' 'A-Z')"
+BASEMAC_ADDR="$(fw_printenv -n ethaddr | tr -d ':')"
 [ ${#BASEMAC_ADDR} -eq 12 ] || BASEMAC_ADDR="$(db -q get device.deviceinfo.BaseMACAddress | tr -d ':')"

 WIFI_FH_KEY="$(db get hw.board.wpa_key)"
--- a/mcastmngr/files/common/etc/uci-defaults/61-mcast_config_generate
+++ b/mcastmngr/files/common/etc/uci-defaults/61-mcast_config_generate
@@ -89,24 +89,15 @@ interfaces_ok(){
 	# check if upstream untagged
 	IFS=" "
 	for itf in $up_interf; do
-		# check if there exist a interface section for this upstream interface, if yes the
-		# do nothing, if no then generate config as mcast config is outdated
-		local dev_section=$(uci show network | grep -E "\.device=\'$itf\'" | cut -d'.' -f2)
+		# check if there exist a device section for this upstream interface, if yes the
+		# do nothing, if no then split the it at . and use the native interface as
+		# upstream interface
+		dev_section=$(ubus call uci get '{"config":"network", "type":"device", "match":{"name":"'"$itf"'"}}' | jsonfilter -e @.values | jq keys[])

 		# mcast config is outdated, simply generate as per new logic
 		if [ -z "$dev_section" ]; then
 		       # check if the itf is a native interface	&& return 1
-			return 1
-		else
-			section_type=$(uci get network.$dev_section)
-			if [ "$section_type" == "interface" ]; then
-				# interface section exits, hence, sync has already happened
-				# nothing to do further, just return
-				return 0
-			else
-				# mcast config is outdated
-				return 1
-			fi
+			[ -f "/proc/net/vlan/$itf" ] || return 1
 		fi
 	done
 	return 0
--- a/mcastmngr/files/linux/lib/mcast/linux.sh
+++ b/mcastmngr/files/linux/lib/mcast/linux.sh
@@ -15,7 +15,7 @@ snooping_bridges=

 __device_is_bridge() {
 	local device="$2"
-	local devsec__="$(uci show network | grep name=.*$device | grep -v ifname | cut -d'.' -f2)"
+	local devsec__="$(uci show network | grep name=.*$device | cut -d'.' -f2)"
 	local sectype="$(uci -q get network.$devsec__)"
 	local devtype="$(uci -q get network.$devsec__.type)"
 	[ "$sectype" != "device" -o "$devtype" != "bridge" ] && return 1
@@ -311,16 +311,6 @@ config_mcproxy_instance() {
 	PROG_PARAMS="${PROG_PARAMS} -f ${CONFFILE}${PROG_PARAMS_SEPARATOR}"
 }

-disable_snooping_iface() {
-	local iface="$(uci -q get network.$1.name)"
-	config_sysfs_mcast_snooping "$iface" 0
-}
-
-disable_snooping() {
-	config_load network
-	config_foreach disable_snooping_iface device
-}
-
 config_snooping() {
 	local protocol="$1"

@@ -393,7 +383,6 @@ config_snooping() {
 }

 config_mcproxy() {
-	disable_snooping
 	if [ "$igmp_p_enable" == "1" ]; then
 		config_mcproxy_instance igmp "$igmp_p_version"
 	elif [ "$igmp_s_enable" == "1" ]; then
--- a/mosquitto-auth-shadow/src/mosquitto_auth_shadow.c
+++ b/mosquitto-auth-shadow/src/mosquitto_auth_shadow.c
@@ -11,7 +11,6 @@
 *   Erik Karlsson - initial implementation
 */

-#define _GNU_SOURCE
 #include <string.h>
 #include <shadow.h>
 #include <crypt.h>
--- a/obuspa/Makefile
+++ b/obuspa/Makefile
@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=obuspa
-PKG_VERSION:=7.0.5.5
+PKG_VERSION:=7.0.4.11

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/obuspa.git
-PKG_SOURCE_VERSION:=ad32d70ccbe3942b945bf6caf74988bd5660cf96
+PKG_SOURCE_VERSION:=1211494650d170cc23e7d041dd5bff260530080e
 PKG_MAINTAINER:=Vivek Dutta <vivek.dutta@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
--- a/obuspa/files/etc/obuspa/roles.json
+++ b/obuspa/files/etc/obuspa/roles.json
@@ -61,488 +61,7 @@
        {
          "object": "Device.",
          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object": "Device.Reboot()",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object": "Device.FactoryReset()",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object": "Device.DeviceInfo.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SET",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.Time.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SET",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.UPnP.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SET",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.Bridging.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SET",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.Ethernet.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SET",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.DHCPv4.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SET",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.DHCPv4.Server.Pool.{i}.StaticAddress.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SET",
-            "PERMIT_ADD",
-            "PERMIT_DEL",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.DHCPv6.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SET",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.Hosts.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SET",
-            "PERMIT_ADD",
-            "PERMIT_DEL",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.{BBF_VENDOR_PREFIX}URLFilter.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SET",
-            "PERMIT_ADD",
-            "PERMIT_DEL",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.NAT.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SET",
-            "PERMIT_ADD",
-            "PERMIT_DEL",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.PPP.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SET",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.Routing.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SET",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.IEEE1905.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SET",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.InterfaceStack.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SET",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.DynamicDNS.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SET",
-            "PERMIT_ADD",
-            "PERMIT_DEL",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.LANConfigSecurity.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SET",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.Security.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SET",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.RouterAdvertisement.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SET",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.Services.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SET",
-            "PERMIT_ADD",
-            "PERMIT_DEL",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.UserInterface.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SET",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.PeriodicStatistics.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SET",
-            "PERMIT_ADD",
-            "PERMIT_DEL",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.SoftwareModules.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SET",
-            "PERMIT_ADD",
-            "PERMIT_DEL",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.Users.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SET",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object": "Device.LocalAgent.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object": "Device.LocalAgent.Subscription.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SET",
-            "PERMIT_ADD",
-            "PERMIT_DEL",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object": "Device.WiFi.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SET",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object": "Device.DNS.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SET",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object": "Device.IP.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SET",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
+            "PERMIT_ALL"
          ]
        }
      ]
--- a/obuspa/patches/0009-Implement-non-failing-version-of-asprintf-and-use-it.patch
+++ b/obuspa/patches/0009-Implement-non-failing-version-of-asprintf-and-use-it.patch
@@ -1,121 +0,0 @@
-diff --git a/src/core/device_bulkdata.c b/src/core/device_bulkdata.c
-index 8e44f59..a77bd71 100755
--- a/src/core/device_bulkdata.c
-+++ b/src/core/device_bulkdata.c
-@@ -2995,6 +2995,33 @@ char *bulkdata_generate_json_report(bulkdata_profile_t *bp, char *report_timesta
-     return result;
- }
- 
-+/*********************************************************************//**
-+**
-+**  safe_asprintf
-+**
-+** Wrapper around asprintf that calls terminate in case of error
-+**
-+** \param   strp -- pointer to the output string
-+** \param   fmt -- printing format
-+**
-+** \return  None
-+**
-+**************************************************************************/
-+static void safe_asprintf(char **strp, const char *fmt, ...)
-+{
-+	int ret;
-+	va_list argp;
-+
-+	va_start(argp, fmt);
-+	ret = vasprintf(strp, fmt, argp);
-+	va_end(argp);
-+
-+	if (ret == -1) {
-+		USP_ERR_Terminate("%s (%d): asprintf(%s) failed",
-+				  __FUNCTION__, __LINE__, fmt);
-+	}
-+}
-+
- /*********************************************************************//**
- **
- ** append_string_to_target
-@@ -3024,7 +3051,7 @@ void append_string_to_target(char *str, char **output)
-     }
- 
-     assert(tmp != NULL);
-    asprintf(output, "%s%s", tmp, str);
-+    safe_asprintf(output, "%s%s", tmp, str);
-     free(tmp);
- }
- 
-@@ -3072,9 +3099,9 @@ char *bulkdata_generate_csv_report(bulkdata_profile_t *bp, char *field_separator
- 
-     if (strcasecmp(csv_format, "ParameterPerRow") == 0) {
-         if (strcmp(row_timestamp, "None") == 0)
-            asprintf(&str, "ParameterName%cParameterValue%cParameterType%c", separator, separator, rowseparator);
-+            safe_asprintf(&str, "ParameterName%cParameterValue%cParameterType%c", separator, separator, rowseparator);
-         else
-            asprintf(&str, "ReportTimestamp%cParameterName%cParameterValue%cParameterType%c", separator, separator, separator, rowseparator);
-+            safe_asprintf(&str, "ReportTimestamp%cParameterName%cParameterValue%cParameterType%c", separator, separator, separator, rowseparator);
- 
-         assert(str != NULL);
-         append_string_to_target(str, &output);
-@@ -3091,14 +3118,14 @@ char *bulkdata_generate_csv_report(bulkdata_profile_t *bp, char *field_separator
-         // Add Collection time to each csv report element (only if specified and not 'None')
-         if (strcmp(row_timestamp, "Unix-Epoch")==0)
-         {
-            asprintf(&timestamp, "%lld", (long long int)report->collection_time);
-+            safe_asprintf(&timestamp, "%lld", (long long int)report->collection_time);
-         }
-         else if (strcmp(row_timestamp, "ISO-8601")==0)
-         {
-             char *result = iso8601_from_unix_time(report->collection_time, buf, sizeof(buf));
-             if (result != NULL)
-             {
-                asprintf(&timestamp, "%s", buf);
-+                safe_asprintf(&timestamp, "%s", buf);
-             }
-         }
- 
-@@ -3151,9 +3178,9 @@ char *bulkdata_generate_csv_report(bulkdata_profile_t *bp, char *field_separator
-             if (type) {
-                 if (strcasecmp(csv_format, "ParameterPerRow") == 0) {
-                     if (timestamp == NULL)
-                        asprintf(&str, "%s%c%s%c%s%c", param_path, separator, param_value, separator, type, rowseparator);
-+                        safe_asprintf(&str, "%s%c%s%c%s%c", param_path, separator, param_value, separator, type, rowseparator);
-                     else
-                        asprintf(&str, "%s%c%s%c%s%c%s%c", timestamp, separator, param_path, separator, param_value, separator, type, rowseparator);
-+                        safe_asprintf(&str, "%s%c%s%c%s%c%s%c", timestamp, separator, param_path, separator, param_value, separator, type, rowseparator);
- 
-                     assert(str != NULL);
-                     append_string_to_target(str, &output);
-@@ -3161,9 +3188,9 @@ char *bulkdata_generate_csv_report(bulkdata_profile_t *bp, char *field_separator
-                     str = NULL;
-                 } else {
-                     if (str1 == NULL || strlen(str1) == 0)
-                        asprintf(&str, "%s", param_path);
-+                        safe_asprintf(&str, "%s", param_path);
-                     else
-                        asprintf(&str, "%c%s", separator, param_path);
-+                        safe_asprintf(&str, "%c%s", separator, param_path);
- 
-                     assert(str != NULL);
-                     append_string_to_target(str, &str1);
-@@ -3171,9 +3198,9 @@ char *bulkdata_generate_csv_report(bulkdata_profile_t *bp, char *field_separator
-                     str = NULL;
- 
-                     if (str2 == NULL || strlen(str2) == 0)
-                        asprintf(&str, "%s", param_value);
-+                        safe_asprintf(&str, "%s", param_value);
-                     else
-                        asprintf(&str, "%c%s", separator, param_value);
-+                        safe_asprintf(&str, "%c%s", separator, param_value);
- 
-                     assert(str != NULL);
-                     append_string_to_target(str, &str2);
-@@ -3190,7 +3217,7 @@ char *bulkdata_generate_csv_report(bulkdata_profile_t *bp, char *field_separator
-     }
- 
-     if (strcasecmp(csv_format, "ParameterPerColumn") == 0) {
-        asprintf(&str, "%c", rowseparator);
-+        safe_asprintf(&str, "%c", rowseparator);
-         assert(str != NULL);
-         append_string_to_target(str, &str1);
-         append_string_to_target(str, &str2);
--- a/obuspa/patches/0010-Return-error-when-XSI-compliant-strerror_r-fails-in-.patch
+++ b/obuspa/patches/0010-Return-error-when-XSI-compliant-strerror_r-fails-in-.patch
@@ -1,15 +0,0 @@
-diff --git a/src/core/usp_err.c b/src/core/usp_err.c
-index 1626e58..6db1d42 100755
--- a/src/core/usp_err.c
-+++ b/src/core/usp_err.c
-@@ -189,7 +189,9 @@ char *USP_ERR_ToString(int err, char *buf, int len)
- {
- #if HAVE_STRERROR_R && !STRERROR_R_CHAR_P
-     // XSI version of strerror_r
-    strerror_r(err, buf, len);
-+    if (strerror_r(err, buf, len) != 0) {
-+        snprintf(buf, len, "Unknown error %d", err);
-+    }
-     return buf;
- #else
-     // GNU version of strerror_r
--- a/qosmngr/files/linux/lib/qos/qos.sh
+++ b/qosmngr/files/linux/lib/qos/qos.sh
@@ -23,11 +23,6 @@ get_burst_size_per_queue() {
 	echo "1500"
 }

-get_max_burst_size_per_queue() {
-	# maximum burst size for tc class
-	echo "4289999999"
-}
-
 handle_q_weight() {
 	local qid="$1" #queue section ID
 	config_get ifname "$qid" "ifname"
@@ -104,8 +99,6 @@ handle_queue() {
 	local port_bs="$5"
 	local par_class="$6"
 	local priority=7
-	local bs=0
-
 	config_get is_enable "$qid" "enable"

 	# no need to configure disabled queues
@@ -153,10 +146,6 @@ handle_queue() {
 	fi
 	# burst size in tc class is given in bytes
 	bs=$(( bs * 1000 ))
-	local max_bs=$(get_max_burst_size_per_queue )
-	if [ $bs -gt $max_bs ]; then
-		bs=$max_bs
-	fi

 	local salg=1

@@ -171,14 +160,7 @@ handle_queue() {
 		;;
 	esac

-	[ -f /etc/board.json ] || return 0
-	if [ $salg -ne 2 ]; then
-		priority=$order
-		wan_port=$(jsonfilter -i /etc/board.json -e @.network.wan.device)
-		if [ "$wan_port" == "$port" ]; then
-			priority=`expr 7 - $order`
-		fi
-	fi
+	priority=`expr $priority - $order`

 	local ceil_rate=$port_bw
 	if [ "$rate" -lt "$port_bw" ]; then
@@ -372,20 +354,15 @@ config_ingress_rate_limit() {

 	ingress_rate=$((ingress_rate / 1000))

-	local bs=0
-	local avg_bs=$(( ingress_rate * 25 ))
-	config_get b_size "$sid" "burst_size"
-	if [ "$in_burst_size" > "0" ]; then
-		bs=`expr $in_burst_size / 1000`
-	fi
-	bs=$(( bs * 8 ))
-	if [ $avg_bs -gt $bs ]; then
-		bs="$avg_bs"
+	if [ $in_burst_size -eq 0 ]; then
+		in_burst_size=$ingress_rate
+	else
+		in_burst_size=$((in_burst_size / 1000))
 	fi

 	tc qdisc add dev $ifname ingress

-	tc filter add dev $ifname parent ffff: protocol ip prio $pindex u32 match ip src 0.0.0.0/0 police rate ${ingress_rate}kbit burst $bs drop flowid :$pindex
+	tc filter add dev $ifname parent ffff: protocol ip prio $pindex u32 match ip src 0.0.0.0/0 police rate ${ingress_rate}kbit burst $in_burst_size drop flowid :$pindex

 }

--- a/self-diagnostics/Makefile
+++ b/self-diagnostics/Makefile
@@ -1,35 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=self-diagnostics
-PKG_VERSION:=1.0.4
-PKG_RELEASE:=1
-
-PKG_LICENSE:=GPL-2.0-only
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/self-diagnostics
-  CATEGORY:=Utilities
-  TITLE:=System Report
-  DEPENDS:=+@CONFIG_BUSYBOX_CONFIG_TIMEOUT +@CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_PATH +@CONFIG_BUSYBOX_CONFIG_TEE \
-           +@CONFIG_BUSYBOX_CONFIG_GZIP
-endef
-
-define Package/self-diagnostics/description
-	Generate Self test diagnostics report
-endef
-
-#define Build/Prepare
-#	mkdir -p $(PKG_BUILD_DIR)
-#	$(CP) ./files/* $(PKG_BUILD_DIR)/
-#endef
-
-define Build/Compile
-endef
-
-define Package/self-diagnostics/install
-	$(INSTALL_DIR) $(1)/etc/self-diagnostics/spec/
-	$(CP) ./files/* $(1)/
-endef
-
-$(eval $(call BuildPackage,self-diagnostics))
--- a/self-diagnostics/README.md
+++ b/self-diagnostics/README.md
@@ -1,188 +0,0 @@
-# Self Test Diagnostics and Reports
-
-Self test diagnostics package provides a set of tools and recipes to run diagnostics/commands and collect logs.
-
-It provides a cli utility called `self-diagnostics`, which executes recipes defined in json files and collect logs.
-```bash
-# self-diagnostics -h
-Generate self diagnostics report
-
-Syntax: /usr/sbin/self-diagnostics [-m|h|l|j]
-
-Options:
-  l     List available module(s)
-  m     Generate system report of specific module(s)
-  j     Enable JSON output
-  h     Print this help
-```
-
-It also has an uci file to configure the various parameters:
-
-```bash
-# cat /etc/config/self-diagnostics
-config globals 'globals'
-        option extended_spec_dir '/etc/self-diagnostics/spec'
-        option exec_timeout '5'
-        option report_name 'self-diagnostics-report-$MODEL-$SERIAL'
-        option verbose '0'
-        option compression_level '9'
-```
-
-Here:
-
-| Options            |  Description                    |
-| ------------------ | ------------------------------- |
-| extended_spec_dir  | Directory path to store 3rd-party/user diagnostics recipes |
-| exec_timeout       | Timeout used for each command |
-| report_name        | Name of the generated report file, here $MODEL and $SERIAL replaced with ProductModel and SerialNumber |
-| verbose            | Logs everythings to logread as well |
-| commpression_level | Gzip compression_level 0-9, if not set, then report will not gziped |
-
-
-It also provide, a rpcd script to expose `self-diagnostics` over ubus
-
-```bash
-# ubus -v list self-diagnostics
-'self-diagnostics' @2c0b768d
-        "list":{}
-        "generate":{"modules":"String"}
-```
-
-## Recipe(s)
-
-It has core modules and extended modules.
-
-Core module recipes are present in `/usr/share/self-diagnostics/spec/` path, where as
-extended module recipes are defined in uci option 'self-diagnostics.globals.extended_spec_dir'
-
-Both the spec directories has recipes to run diagnostics and collect logs, these recipes are defined in json files.
-
-```bash
-# ls /usr/share/self-diagnostics/spec/
-config.json   network.json  trx69.json    wifi.json
-multiap.json  system.json   voice.json
-```
-
-Each json file need to follow below structure:
-
-```json
-{
-  "description": "<Description of module>",
-  "dependency": [
-    {
-      "type": "file",
-      "file": "<filepath>"
-    }
-  ],
-  "exec": [
-    {
-      "description": "<Description of command>",
-      "cmd": "<command To Execute>",
-      "dependency": [
-        {
-          "type": "file",
-          "file": "<filepath>"
-        }
-      ]
-    },
-    {
-      "description": "<Next command description>",
-      "cmd": "<command to execute>"
-    }
-  ]
-}
-```
-
-## How to use
-
-This can be run from command line, ubus , USP-Controller and ACS.
-
-### List available core/extension modules
-
-```bash
-# self-diagnostics -l
-
-Core Module(s):
- - config
- - multiap
- - network
- - system
- - trx69
- - voice
- - wifi
-
-Extension Module(s):
-```
-
-### Run and collect logs
-
-```bash
-# self-diagnostics
-/tmp/self-diagnostics-report-EX600-Y.0721140081.tar.gz
-```
-
-### List available core/extension modules over ubus
-
-```bash
-# ubus call self-diagnostics list
-{
-        "CoreModules": [
-                "config",
-                "multiap",
-                "network",
-                "system",
-                "trx69",
-                "voice",
-                "wifi"
-        ],
-        "ExtensionModules": [
-
-        ]
-}
-```
-
-### Run specific module from ubus
-
-```bash
-# ubus call self-diagnostics generate '{"modules":"config"}'
-{
-        "result": "/tmp/self-diagnostics-report-EX600-Y.0721140081.tar.gz"
-}
-```
-
-## TR-181 Integration
-
-
-TR-181 (USP) provides an Operate command `Device.SelfTestDiagnostics()` to execute it from USP-controllers.
-TR-181 (CWMP) provides a diagnostics object `Device.SelfTestDiagnostics.` for the same, so its can be triggered from ACS as well.
-
-```bash
-# ubus call bbfdm operate '{"command":"Device.SelfTestDiagnostics()"}'
-{
-        "results": [
-                {
-                        "path": "Device.SelfTestDiagnostics()",
-                        "data": "",
-                        "output": [
-                                {
-                                        "Results": "Device.DeviceInfo.VendorLogFile.2",
-                                        "Status": "Complete"
-                                }
-                        ]
-                }
-        ]
-}
-```
-
-
-Once the opreate command is done, it generate a new entry in VendorLogFile, like below:
-
-```bash
-# bbfdmd -c get Device.DeviceInfo.VendorLogFile.2.
-Device.DeviceInfo.VendorLogFile.2.Alias => cpe-2
-Device.DeviceInfo.VendorLogFile.2.Name => /tmp/self-diagnostics-report-EX600-Y.0721140081.tar.gz
-Device.DeviceInfo.VendorLogFile.2.MaximumSize => 0
-Device.DeviceInfo.VendorLogFile.2.Persistent => 0
-```
-
-Which is then can be uploaded to a server using `Device.DeviceInfo.VendorLogFile.{i}.Upload()` operate command.
--- a/self-diagnostics/files/etc/config/self-diagnostics
+++ b/self-diagnostics/files/etc/config/self-diagnostics
@@ -1,6 +0,0 @@
-config globals 'globals'
-	option extended_spec_dir '/etc/self-diagnostics/spec'
-	option exec_timeout '5'
-	option report_name 'self-diagnostics-report-$MODEL-$SERIAL'
-	option verbose '0'
-	option compression_level '9'
--- a/self-diagnostics/files/usr/libexec/rpcd/self-diagnostics
+++ b/self-diagnostics/files/usr/libexec/rpcd/self-diagnostics
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-BIN="/usr/sbin/self-diagnostics"
-. /usr/share/libubox/jshn.sh
-
-case "$1" in
-	list)
-		echo '{"list": {}, "generate" : {"modules":"String"}}'
-	;;
-	call)
-		case "$2" in
-			generate)
-				read -t 1 -r input
-
-				json_load "${input}"
-				json_get_var modules modules
-				if [ -z "${modules}" ]; then
-					${BIN} -j
-				else
-					${BIN} -j -m "${modules}"
-				fi
-			;;
-			list)
-				${BIN} -j -l
-			;;
-		esac
-	;;
-esac
--- a/self-diagnostics/files/usr/sbin/self-diagnostics
+++ b/self-diagnostics/files/usr/sbin/self-diagnostics
@@ -1,383 +0,0 @@
-#!/bin/sh
-
-. /usr/share/libubox/jshn.sh
-
-JSON_OUT=0
-SPEC_DIR="/usr/share/self-diagnostics/spec"
-SPEC_EXT_DIR="/etc/self-diagnostics/spec"
-REPORT_DIR="$(mktemp -d)"
-REPORT_NAME="self-test-diagnostics"
-VERBOSE=0
-COMPOPTS=""
-TIMEOUT=5
-
-cleanup()
-{
-	[ -d "${REPORT_DIR}" ] && \
-		rm -rf ${REPORT_DIR}
-}
-
-trap cleanup EXIT
-
-help()
-{
-	echo "Generate self diagnostics report"
-	echo
-	echo "Syntax: $0 [-m|h|l|j]"
-	echo
-	echo "Options:"
-	echo "  l     List available module(s)"
-	echo "  m     Generate system report of specific module(s)"
-	echo "  j     Enable JSON output"
-	echo "  h     Print this help"
-	echo
-}
-
-log()
-{
-	log_file="${REPORT_DIR}/execution.log"
-	if [ "$VERBOSE" -eq 1 ]; then
-		logger -t $0 "$*"
-	fi
-	echo "[$(date +%Y:%m:%d-%H:%M:%S)] $*" >> ${log_file}
-}
-
-# Alias ubus to have a smaller 5-second timeout on all subsequent calls
-ubus()
-{
-	if [ "${1}" == "call" ]; then
-		if command ubus list $2 >/dev/null 2>&1; then
-			command ubus "$@";
-		fi
-	else
-		command ubus "$@";
-	fi
-
-}
-
-config_load()
-{
-	local temp
-	local MODEL SERIAL
-
-	log "# Starting Self diagnostics tests #"
-
-	MODEL="$(db get device.deviceinfo.ModelName)"
-	SERIAL="$(db get device.deviceinfo.SerialNumber)"
-
-	temp="$(uci -q get self-diagnostics.globals.extended_spec_dir)"
-	[ -d "${temp}" ] && \
-		SPEC_EXT_DIR="${temp}"
-
-	temp="$(uci -q get self-diagnostics.globals.exec_timeout)"
-	[ -n "${temp}" ] && \
-		TIMEOUT="${temp}"
-
-	temp="$(uci -q get self-diagnostics.globals.report_name)"
-	[ -n "${temp}" ] && \
-		REPORT_NAME="$(eval echo ${temp})"
-
-	REPORT_NAME="${REPORT_NAME//[ \/]/_}"
-
-	temp="$(uci -q get self-diagnostics.globals.compression_level)"
-	[ -n "${temp}" ] && \
-		COMPOPTS="${temp}"
-
-	temp="$(uci -q get self-diagnostics.globals.verbose)"
-	[ -n "${temp}" ] && \
-		VERBOSE="${temp}"
-}
-
-exec_spec()
-{
-	local json_file exec_skip name timeout exec_timeout rc
-
-	json_file="$1"
-	[ -z "$json_file" ] && {
-		log "No/invalid spec json_file"
-		return 1
-	}
-
-	log "Loading $json_file ..."
-
-	json_init
-	json_load_file "${json_file}" || {
-		log "Failed to load ${json_file} spec file"
-		return 1
-	}
-
-	name="$(basename ${json_file})"
-	export_path="${REPORT_DIR}/${name//.json/.log}"
-
-	exec_skip=0
-	if json_is_a dependency array; then
-		json_select "dependency"
-		json_get_keys ekeys
-
-		for key in $ekeys; do
-			if json_is_a $key object; then
-				json_select $key
-				json_get_var type type
-
-				if [ "$type" == "file" ]; then
-					json_get_var file file
-					if [ ! -e "$file" ]; then
-						log "${json_file} has unmet file dependency $file"
-						exec_skip=1
-						json_select ..
-						continue
-					fi
-				fi
-				json_select ..
-			fi
-		done
-		json_select ..
-	fi
-
-	[ "${exec_skip}" -eq 1 ] && {
-		log "Dependency not satisfied for ${json_file}"
-		return 0
-	}
-
-	json_get_var description description
-	log "Description: $description"
-
-	if json_is_a exec array; then
-		json_select "exec"
-		json_get_keys keys
-
-		for key in $keys; do
-			if json_is_a $key object; then
-				json_select $key
-				cmd_skip=0
-				if json_is_a dependency array; then
-					json_select "dependency"
-					json_get_keys d_keys
-
-					for d_key in $d_keys; do
-						if json_is_a $d_key object; then
-							json_select $d_key
-							json_get_var type type
-							if [ "$type" == "file" ]; then
-								json_get_var file file
-								if [ ! -e $file ]; then
-									json_select ..
-									cmd_skip=1
-									continue
-								fi
-							fi
-							json_select ..
-						fi
-					done
-					json_select ..
-				fi
-
-				[ $cmd_skip -eq 1 ] && {
-					json_select ..
-					log "Dependency not satisfied for ${file}"
-					continue
-				}
-
-				json_get_var description description
-				json_get_var cmd cmd
-				json_get_var timeout timeout
-
-				if [ -n "$timeout" ]; then
-					exec_timeout=$timeout
-				else
-					exec_timeout=$TIMEOUT
-				fi
-				log "Executing $cmd with timeout $exec_timeout"
-				echo "##########################################" >> $export_path
-				echo "# $description #">> $export_path
-				echo "# Exec [$cmd], timeout [$exec_timeout] #" >> $export_path
-				echo "##########################################" >> $export_path
-				if [ "$VERBOSE" -eq 1 ]; then
-					if [[ "$cmd" == *"logread "* ]]; then
-						eval timeout ${exec_timeout} $cmd 2>&1 | tee -a $export_path
-						rc=$?
-					else
-						eval timeout ${exec_timeout} $cmd 2>&1 | tee -a $export_path | logger -t self-diagnostics
-						rc=$?
-					fi
-				else
-					eval timeout ${exec_timeout} $cmd >> $export_path 2>&1
-					rc=$?
-				fi
-				echo "######## Execution return code $rc ######" >> $export_path
-
-				if [ "$rc" -eq 0 ]; then
-					log "Execution [$cmd] completed"
-				else
-					log "Execution [$cmd] Failed/Timeout with $rc exit code"
-				fi
-
-				echo >> $export_path
-				json_select ..
-			fi
-		done
-		json_select ..
-	fi
-
-	log "Handling of $json_file done"
-	log ""
-}
-
-generate_module()
-{
-	local modules="${@}"
-	local file module
-
-	config_load
-
-	log "Modules [$@]"
-	for module in $modules; do
-		module="${module/.json/}"
-		file="$(find $SPEC_DIR -type f -name ${module}.json)"
-		[ -z "$file" ] && {
-			[ -d "${SPEC_EXT_DIR}" ] && \
-				file="$(find $SPEC_EXT_DIR -type f -name ${module}.json)"
-		}
-
-		[ -f "$file" ] && \
-			exec_spec "$file"
-	done
-}
-
-generate_all()
-{
-	local files
-
-	config_load
-
-	files="$(find ${SPEC_DIR} -type f -name *.json)"
-	[ -d "${SPEC_EXT_DIR}" ] && \
-		files="${files} $(find $SPEC_EXT_DIR -type f -name *.json)"
-
-	[ -z "$files" ] && {
-		return 0
-	}
-
-	for file in $files; do
-		exec_spec "$file"
-	done
-
-}
-
-list_modules()
-{
-	local files
-
-	if [ "${JSON_OUT}" -eq 1 ]; then
-		json_init
-		json_add_array "CoreModules"
-	else
-		echo
-		echo "Core Module(s):"
-	fi
-
-	cd ${SPEC_DIR} && {
-		for file in $(ls); do
-			if [ "${JSON_OUT}" -eq 1 ]; then
-				json_add_string "" "${file/.json/}"
-			else
-				echo " - ${file/.json/}"
-			fi
-		done
-	}
-
-	if [ "${JSON_OUT}" -eq 1 ]; then
-		json_close_array
-		json_add_array "ExtensionModules"
-	else
-		echo
-		echo "Extension Module(s):"
-	fi
-
-	cd ${SPEC_EXT_DIR} && {
-		for file in $(ls); do
-			if [ "${JSON_OUT}" -eq 1 ]; then
-				json_add_string "" "${file/.json/}"
-			else
-				echo " - ${file/.json/}"
-			fi
-		done
-	}
-
-	if [ "${JSON_OUT}" -eq 1 ]; then
-		json_close_array
-		json_dump
-	else
-		echo
-	fi
-}
-
-generate_report()
-{
-	local filename report_path
-
-	report_path="$(dirname "${REPORT_DIR}")"
-	filename="${report_path}/${REPORT_NAME}"
-
-	[ -f "${filename}.tar" ] && rm "${filename}.tar"
-	[ -f "${filename}.tar.gz" ] && rm "${filename}.tar.gz"
-
-	log "# Report generation completed #"
-	cd ${REPORT_DIR} && {
-		filename="${filename}.tar"
-		tar -cf "${filename}" *
-	}
-
-	rm -r "$REPORT_DIR"
-
-	if [ -n "$COMPOPTS" ]; then
-		gzip -${COMPOPTS} -f "${filename}"
-		filename="${filename}.gz"
-	fi
-
-	if [ "${JSON_OUT}" -eq 1 ]; then
-		json_init
-		json_add_string result "${filename}"
-		json_dump
-	else
-		echo "${filename}"
-	fi
-}
-
-[ ! -d "${SPEC_DIR}" ] && {
-	log "# ${SPEC_DIR} does not exits"
-	exit 1
-}
-
-list=0
-modules=""
-
-while getopts "m:hlj" opts; do
-	case $opts in
-		h)
-			help
-			exit;;
-		j)
-			JSON_OUT=1
-			;;
-		l)
-			list=1
-			;;
-		m)
-			modules="$modules ${OPTARG}"
-			;;
-	esac
-done
-
-if [ "${list}" -eq 1 ]; then
-	list_modules
-	exit 0
-fi
-
-if [ -z "${modules}" ]; then
-	generate_all
-else
-	generate_module ${modules}
-fi
-
-generate_report
--- a/self-diagnostics/files/usr/share/self-diagnostics/helper/wifi_assoclist.sh
+++ b/self-diagnostics/files/usr/share/self-diagnostics/helper/wifi_assoclist.sh
@@ -1,11 +0,0 @@
-interfaces=$(uci show wireless | grep "ifname=" |  awk -F'[.,=]' '{print$2}')
-for int in $interfaces; do
-	mode=$(uci get "wireless.${int}.mode")
-	if [ "$mode" = "ap" ] ; then
-		ap_int=$(uci get "wireless.${int}.ifname")
-		echo "Get assoc list for ${ap_int}"
-		ubus call "wifi.ap.${ap_int}" assoclist
-		echo "Get station info for ${ap_int}"
-		ubus call "wifi.ap.${ap_int}" stations
-	fi
-done
--- a/self-diagnostics/files/usr/share/self-diagnostics/helper/wifi_radio_scan.sh
+++ b/self-diagnostics/files/usr/share/self-diagnostics/helper/wifi_radio_scan.sh
@@ -1,5 +0,0 @@
-for radio_if in $(ubus list 'wifi.radio.*'); do
-	ubus call "${radio_if}" scan
-	sleep 2
-	ubus call "${radio_if}" scanresults
-done
--- a/self-diagnostics/files/usr/share/self-diagnostics/spec/config.json
+++ b/self-diagnostics/files/usr/share/self-diagnostics/spec/config.json
@@ -1,29 +0,0 @@
-{
-	"description": "Gathering configuration data",
-	"exec" : [
-		{
-			"description": "OS Release",
-			"cmd": "cat /etc/os-release"
-		},
-		{
-			"description": "Installed Packages",
-			"cmd": "opkg list-installed"
-		},
-		{
-			"description": "Database",
-			"cmd": "db export"
-		},
-		{
-			"description": "Configuration",
-			"cmd": "uci export"
-		},
-		{
-			"description": "Runtime Configuration",
-			"cmd": "cat /var/state/*"
-		},
-		{
-			"description": "Firmware Environment",
-			"cmd": "fw_printenv"
-		}
-	]
-}
--- a/self-diagnostics/files/usr/share/self-diagnostics/spec/multiap.json
+++ b/self-diagnostics/files/usr/share/self-diagnostics/spec/multiap.json
@@ -1,71 +0,0 @@
-{
-	"description": "Gathering EasyMesh state",
-	"dependency" : [
-		{
-			"type": "file",
-			"file": "/etc/config/mapagent"
-		},
-		{
-			"type": "file",
-			"file": "/etc/config/ieee1905"
-		}
-	],
-	"exec" : [
-		{
-			"description": "Hosts Show",
-			"cmd": "ubus call hosts show"
-		},
-		{
-			"description": "Hosts Dump",
-			"cmd": "ubus call hosts dump"
-		},
-		{
-			"description": "IEEE1905 Info",
-			"cmd": "ubus call ieee1905 info"
-		},
-		{
-			"description": "IEEE1905 Links",
-			"cmd": "ubus call ieee1905 links"
-		},
-		{
-			"description": "IEEE1905 Neighbors",
-			"cmd": "ubus call ieee1905 neighbors"
-		},
-		{
-			"description": "IEEE1905 Others",
-			"cmd": "ubus call ieee1905 others"
-		},
-		{
-			"description": "IEEE1905 Topology",
-			"cmd": "ubus call ieee1905.topology dump"
-		},
-		{
-			"description": "MAP Agent Info",
-			"cmd": "ubus call map.agent info"
-		},
-		{
-			"description": "MAP Agent Status",
-			"cmd": "ubus call map.agent status"
-		},
-		{
-			"description": "MAP Agent Backhaul Info",
-			"cmd": "ubus call map.agent backhaul_info"
-		},
-		{
-			"description": "MAP Controller Status",
-			"cmd": "ubus call map.controller status"
-		},
-		{
-			"description": "MAP Controller List MACs",
-			"cmd": "ubus call map.controller.dbg list_macs"
-		},
-		{
-			"description": "MAP Controller BH Topology Dump",
-			"cmd": "ubus call map.controller.dbg bh_topology_dump"
-		},
-		{
-			"description": "Data Elements Dump",
-			"cmd": "ubus call wifi.dataelements.collector refresh; sleep 2; ubus call wifi.dataelements.collector dump2"
-		}
-	]
-}
--- a/self-diagnostics/files/usr/share/self-diagnostics/spec/network.json
+++ b/self-diagnostics/files/usr/share/self-diagnostics/spec/network.json
@@ -1,89 +0,0 @@
-{
-	"description": "Gathering network state",
-	"exec" : [
-		{
-			"description": "Network Device Status",
-			"cmd": "ubus call network.device status"
-		},
-		{
-			"description": "Network Interface Dump",
-			"cmd": "ubus call network.interface dump"
-		},
-		{
-			"description": "Linux Network Interface Config",
-			"cmd": "ifconfig -a"
-		},
-		{
-			"description": "IPv4 Routes",
-			"cmd": "ip -d r"
-		},
-		{
-			"description": "IPv6 Routes",
-			"cmd": "ip -d -6 r"
-		},
-		{
-			"description": "Neighbor Table",
-			"cmd": "ip n"
-		},
-		{
-			"description": "ARP Table",
-			"cmd": "cat /proc/net/arp"
-		},
-		{
-			"description": "Conntrack Table",
-			"cmd": "cat /proc/net/nf_conntrack"
-		},
-		{
-			"description": "Network Interface Status",
-			"cmd": "ip -d a"
-		},
-		{
-			"description": "IPv4 Firewall Status",
-			"cmd": "iptables -xvnL"
-		},
-		{
-			"description": "IPv6 Firewall Status",
-			"cmd": "ip6tables -xvnL"
-		},
-		{
-			"description": "Bridge Info",
-			"cmd": "brctl show"
-		},
-		{
-			"description": "Bridge Link",
-			"cmd": "bridge link"
-		},
-		{
-			"description": "Bridge VLAN",
-			"cmd": "bridge vlan"
-		},
-		{
-			"description": "Bridge FDB",
-			"cmd": "bridge fdb"
-		},
-		{
-			"description": "TCP listened ports",
-			"cmd": "netstat -tlnp"
-		},
-		{
-			"description": "UDP listened ports",
-			"cmd": "netstat -ulnp"
-		},
-		{
-			"description": "MAC layer firewall status list",
-			"cmd": "ebtables -L"
-		},
-		{
-			"description": "MAC layer firewall status",
-			"cmd": "ebtables -t broute -L"
-		},
-		{
-			"description": "QoS queue stats",
-			"cmd": "ubus call qos queue_stats"
-		},
-		{
-			"description": "IGMP Snooping Table",
-			"cmd": "ubus call mcast stats"
-		}
-	]
-}
--- a/self-diagnostics/files/usr/share/self-diagnostics/spec/system.json
+++ b/self-diagnostics/files/usr/share/self-diagnostics/spec/system.json
@@ -1,67 +0,0 @@
-{
-	"description": "Gathering system information",
-	"exec" : [
-		{
-			"description": "Firmware banks",
-			"cmd": "ubus call fwbank dump"
-		},
-		{
-			"description": "System Info",
-			"cmd": "ubus call system info"
-		},
-		{
-			"description": "Board Info",
-			"cmd": "ubus call system board"
-		},
-		{
-			"description": "Running Processes",
-			"cmd": "top -b -n 1"
-		},
-		{
-			"description": "Kernel Parameters",
-			"cmd": "sysctl -A  2>/dev/null"
-		},
-		{
-			"description": "System Log",
-			"cmd": "timeout 5 logread -l 1000"
-		},
-		{
-			"description": "Driver Message",
-			"cmd": "timeout 5 dmesg"
-		},
-		{
-			"description": "PCI Devices",
-			"cmd": "lspci -k"
-		},
-		{
-			"description": "Installed Modules",
-			"cmd": "lsmod"
-		},
-		{
-			"description": "CPU Info",
-			"cmd": "cat /proc/cpuinfo"
-		},
-		{
-			"description": "Memory Info",
-			"cmd": "cat /proc/meminfo"
-		},
-		{
-			"description": "Slab Info",
-			"cmd": "cat /proc/slabinfo"
-		},
-		{
-			"description": "eMMC Partition/Volume Info",
-			"cmd": "fdisk -l",
-			"dependency" : {
-				"file": "/sbin/fdisk"
-			}
-		},
-		{
-			"description": "NAND Partition/Volume Info",
-			"cmd": "ubinfo --all",
-			"dependency" : {
-				"file": "/usr/sbin/ubinfo"
-			}
-		}
-	]
-}
--- a/self-diagnostics/files/usr/share/self-diagnostics/spec/trx69.json
+++ b/self-diagnostics/files/usr/share/self-diagnostics/spec/trx69.json
@@ -1,56 +0,0 @@
-{
-	"description": "Gathering TR-x69 state",
-	"dependency" : [
-		{
-			"type": "file",
-			"file": "/etc/config/cwmp"
-		}
-	],
-	"exec" : [
-		{
-			"description": "TR-181 DM MAP",
-			"cmd": "uci -c /etc/bbfdm/dmmap export"
-		},
-		{
-			"description": "TR-181 Parameters via BBFDM",
-			"cmd": "bbfdmd -c schema Device."
-		},
-		{
-			"description": "TR-181 Parameters via CWMP",
-			"cmd": "icwmpd -c get Device."
-		},
-		{
-			"description": "TR-069 status",
-			"cmd": "ubus call tr069 status"
-		},
-		{
-			"description": "TR-069 Logs",
-			"cmd": "cat /var/log/icwmpd.log",
-			"dependency" : [
-				{
-					"type": "file",
-					"file": "/var/log/icwmpd.log"
-				}
-			]
-		},
-		{
-			"description": "TR-181 Parameters via USP",
-			"cmd": "obuspa -c get Device.",
-			"timeout": 10
-		},
-		{
-			"description": "USP Agent Database",
-			"cmd": "obuspa -f $(uci -q get obuspa.global.db_file) -c show database"
-		},
-		{
-			"description": "USP Logs",
-			"cmd": "cat /var/log/obuspa.log",
-			"dependency" : [
-				{
-					"type": "file",
-					"file": "/var/log/obuspa.log"
-				}
-			]
-		}
-	]
-}
--- a/self-diagnostics/files/usr/share/self-diagnostics/spec/voice.json
+++ b/self-diagnostics/files/usr/share/self-diagnostics/spec/voice.json
@@ -1,43 +0,0 @@
-{
-	"description": "Gathering Voice state",
-	"dependency" : [
-		{
-			"type": "file",
-			"file": "/etc/config/asterisk"
-		}
-	],
-	"exec" : [
-		{
-			"description": "Endpoint Status",
-			"cmd": "ubus call endpt status"
-		},
-		{
-			"description": "Endpoint Count",
-			"cmd": "ubus call endpt count"
-		},
-		{
-			"description": "Voice Status",
-			"cmd": "ubus call voice.asterisk status"
-		},
-		{
-			"description": "DECT Status",
-			"cmd": "ubus call dect status",
-			"dependency" : [
-				{
-					"type": "file",
-					"file": "/etc/config/dect"
-				}
-			]
-		},
-		{
-			"description": "DECT Handsets",
-			"cmd": "ubus call dect handsets",
-			"dependency" : [
-				{
-					"type": "file",
-					"file": "/etc/config/dect"
-				}
-			]
-		}
-	]
-}
--- a/self-diagnostics/files/usr/share/self-diagnostics/spec/wifi.json
+++ b/self-diagnostics/files/usr/share/self-diagnostics/spec/wifi.json
@@ -1,31 +0,0 @@
-{
-	"description": "Gathering WiFi state",
-	"dependency" : [
-		{
-			"type": "file",
-			"file": "/sys/class/ieee80211"
-		}
-	],
-	"exec" : [
-		{
-			"description": "Wireless Status",
-			"cmd": "ubus call network.wireless status"
-		},
-		{
-			"description": "Wireless Radio Status",
-			"cmd": "ubus call wifi status"
-		},
-		{
-			"description": "Get radio scan",
-			"cmd": "sh /usr/share/self-diagnostics/helper/wifi_radio_scan.sh"
-		},
-		{
-			"description": "Get Assoc List",
-			"cmd": "sh /usr/share/self-diagnostics/helper/wifi_assoclist.sh"
-		},
-		{
-			"description": "iwinfo interface details",
-			"cmd": "/usr/bin/iwinfo"
-		}
-	]
-}
--- a/stunc/Makefile
+++ b/stunc/Makefile
@@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=stunc
 PKG_RELEASE:=1
-PKG_VERSION:=1.3.3
+PKG_VERSION:=1.3.2

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/stunc.git
-PKG_SOURCE_VERSION:=7984a54a1e5dd95db0f4657ae974671ba7f37f27
+PKG_SOURCE_VERSION:=3e56818cd219f285263d6d1a7d41f751bbb0fe08
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
--- a/sulu/sulu-base/Makefile
+++ b/sulu/sulu-base/Makefile
@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=sulu-base
-PKG_VERSION:=3.1.42
+PKG_VERSION:=3.1.21

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu.git
-PKG_SOURCE_VERSION:=6a0cc2795607895bbe8c8e3598e3f5f435af3499
+PKG_SOURCE_VERSION:=b52092230833fffdec881ed1b91386399f5e2310
 PKG_MIRROR_HASH:=skip

 SULU_MOD:=core
--- a/sulu/sulu-builder/Makefile
+++ b/sulu/sulu-builder/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=sulu-builder
-PKG_VERSION:=3.1.42
+PKG_VERSION:=3.1.21
 PKG_RELEASE:=1

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-builder.git
-PKG_SOURCE_VERSION:=76cb288b1496756e8ed43368348127ecfef5751d
+PKG_SOURCE_VERSION:=eb44f85f1a819f4d5fd6e74d7e2dfd7011381c63
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_BUILD_DIR:=$(BUILD_DIR)/sulu-$(PKG_VERSION)/sulu-builder-$(PKG_SOURCE_VERSION)
@@ -89,12 +89,6 @@ define Package/sulu-builder/config
 			You can specify the list of non core sulu package,
 			so that sulu-builder include them before building the core.

-	config SULU_ENV_DATA
-		depends on PACKAGE_sulu-builder
-		string "Sulu env data"
-		help
-			Use this option to initialize sulu build time environment options.
-
 	config SULU_PWA_APP
 		depends on PACKAGE_sulu-builder
 		bool "Enable SULU PWA App support"
--- a/sulu/sulu-builder/files/etc/config/sulu
+++ b/sulu/sulu-builder/files/etc/config/sulu
@@ -1,4 +1,5 @@
 config global 'global'
+	option role_based_access '1'
 	option SessionMode 'Allow'
 	list user 'admin'
 	list user 'user'
--- a/sulu/sulu-builder/files/etc/init.d/sulu
+++ b/sulu/sulu-builder/files/etc/init.d/sulu
@@ -2,7 +2,7 @@

 USE_PROCD=1

-START=60
+START=99
 STOP=01

 . /lib/functions.sh
@@ -16,11 +16,12 @@ validate_sulu_global_section()
 {
 	uci_validate_section sulu global global \
 		'enabled:bool:1' \
-		'enable_system_credentials:bool:1'
+		'enable_system_credentials:bool:1' \
+		'role_based_access:bool:0'
 }

 start_service() {
-	local enabled enable_system_credentials
+	local enabled enable_system_credentials role_based_access

 	config_load sulu
 	procd_open_instance sulu
@@ -33,8 +34,8 @@ start_service() {
 	fi

 	update_nginx_template
-	configure_sulu "${enable_system_credentials}" 1
-	generate_sulu_conn_config
+	configure_sulu "${enable_system_credentials}" "${role_based_access}" 1
+	generate_sulu_conn_config "${role_based_access}"
 	procd_close_instance
 }

--- a/sulu/sulu-builder/files/etc/sulu/sulu.sh
+++ b/sulu/sulu-builder/files/etc/sulu/sulu.sh
@@ -1,19 +1,19 @@
 #!/bin/sh

-# format using "shfmt"
-
 . /lib/functions.sh

 _RESTART_SERVICES="0"

 mkdir -p /tmp/sulu/

-function slog() {
-	echo "$*" | logger -t sulu.init -p debug
+function slog()
+{
+	echo "$*" |logger -t sulu.init -p debug
 }

-function _get_agent_id() {
-	local oui serial endpointid
+function _get_agent_id()
+{
+        local oui serial endpointid

 	endpointid="$(uci_get obuspa localagent EndpointID)"
 	if [ -z "${endpointid}" ]; then
@@ -21,13 +21,14 @@ function _get_agent_id() {
 		serial="$(db -q get device.deviceinfo.SerialNumber)"
 		echo "${oui}-${serial//+/%2B}"
 	else
-		endpointid="$(echo "${endpointid/::/,}" | cut -d "," -f 2)"
+		endpointid="$(echo "${endpointid/::/,}"|cut -d "," -f 2)"
 		endpointid="${endpointid//+/%2B}"
 	fi
 }

-function _get_endpoint_id() {
-	local oui serial endpointid
+function _get_endpoint_id()
+{
+        local oui serial endpointid

 	endpointid="$(uci_get obuspa localagent EndpointID)"
 	if [ -z "${endpointid}" ]; then
@@ -39,107 +40,228 @@ function _get_endpoint_id() {
 	fi
 }

-function _get_sulu_users() {
+function _get_sulu_users()
+{
 	echo "$(uci -q get sulu.global.user)"
 }

-function _get_sulu_root() {
+function _get_sulu_root()
+{
 	local root

 	root="$(uci -q get nginx._sulu_s.root)"
 	echo "${root:-/sulu}"
 }

-function _get_sulu_connection_config() {
+function _get_sulu_connection_config()
+{
 	local config

 	config="$(_get_sulu_root)/presets/connection-config.json"
 	echo "${config}"
 }

-function _get_sulu_session_mode() {
+function _get_sulu_session_mode()
+{
 	echo "$(uci -q get sulu.global.SessionMode)"
 }

-function _get_usp_upstream_port() {
+function _get_usp_upstream_port()
+{
 	local port

 	port="$(uci -q get mosquitto.sulu.port)"
 	echo "${port:-9009}"
 }

-function _get_sulu_acl_file() {
+function _get_sulu_acl_file()
+{
 	local file

 	file="$(uci -q get mosquitto.sulu.acl_file)"
 	echo "${file}"
 }

-function _get_sulu_http_port() {
+function _get_sulu_tls_port()
+{
+	local port listen
+
+	listen="$(uci -q get nginx._sulu_s.listen)"
+	port="$(echo $listen|grep -Eo '[0-9]+'|head -n 1)"
+
+	echo "${port:-8443}"
+}
+
+function _get_sulu_http_port()
+{
 	local port listen

 	listen="$(uci -q get nginx._sulu_http.listen)"
-	port="$(echo $listen | grep -Eo '[0-9]+' | head -n 1)"
+	port="$(echo $listen|grep -Eo '[0-9]+'|head -n 1)"

 	echo "${port:-8080}"
 }

-function update_nginx_template() {
+function update_nginx_template()
+{
 	local port

 	UCI_TEMPLATE="/etc/nginx/uci.conf.template"
 	port="$(_get_usp_upstream_port)"
-	if ! grep -q "upstream websocket { server 127.0.0.1:${port}; }" ${UCI_TEMPLATE}; then
+        if ! grep -q "upstream websocket { server 127.0.0.1:${port}; }" ${UCI_TEMPLATE}; then
 		sed -i "s/upstream websocket { server 127.0.0.1:[0-9]\+; }/upstream websocket { server 127.0.0.1:${var}; }/" ${UCI_TEMPLATE}
 		log "Restarting nginx"
 		ubus call uci commit '{"config":"nginx"}'
 	fi
 }

-function generate_sulu_conn_config() {
-	local users SCONFIG session
+function generate_sulu_conn_config()
+{
+	local rbac users SCONFIG session

+	rbac="${1}"
 	users="$(_get_sulu_users)"
 	session="$(_get_sulu_session_mode)"
 	SCONFIG="$(_get_sulu_connection_config)"

-	json_init
-	json_add_string 'Current-connection' 'main'
-	json_add_object 'Connections'
-	{
-		json_add_object 'main'
-		{
-			json_add_string 'toId' "$(_get_endpoint_id)"
-			json_add_string 'port' "auto"
-			json_add_string 'path' "/wss"
+	json_init;
+	if [ "${rbac}" -eq "1" ]; then
+		json_add_string 'Current-connection' 'rbac';
+	else
+		json_add_string 'Current-connection' 'main';
+	fi
+	json_add_object 'Connections';
+		json_add_object 'rbac';
+		json_add_string 'toId' "$(_get_endpoint_id)";
+		json_add_int 'port' "$(_get_sulu_tls_port)";
+		json_add_string 'path' "/wss";

-			if [ "${session}" = "Require" ]; then
-				json_add_boolean 'useSession' 1
-			fi
+		if [ "${session}" = "Require" ]; then
+			json_add_boolean 'useSession' 1;
+		fi

-			json_add_string 'protocol' 'autoWs'
-			json_add_object 'overrides'
-			{
-				for user in ${users}; do
-					json_add_object "${user}"
-					{
-						json_add_string 'fromId' "self::sulu-${user}"
-						json_add_string 'publishEndpoint' "/usp/$(_get_agent_id)/${user}/endpoint"
-						json_add_string 'subscribeEndpoint' "/usp/$(_get_agent_id)/${user}/controller"
-						json_close_object
-					}
-				done
+		json_add_string 'protocol' 'wss';
+			json_add_array 'auth';
+			json_close_array;
+
+			json_add_array 'urlOverrides';
+				json_add_object "";
+					json_add_object 'match';
+						json_add_string 'protocol' 'http:'
+					json_close_object
+					json_add_object 'override';
+						json_add_string 'protocol' 'ws'
+						json_add_int 'port' "$(_get_sulu_http_port)";
+					json_close_object
 				json_close_object
-			}
-			json_close_object
-		}
-		json_close_object
-	}
+			json_close_array

-	json_dump >${SCONFIG}
+			json_add_object 'overrides';
+			for f in ${users}; do
+				json_add_object "${f}";
+				json_add_string 'fromId' "self::sulu-${f}";
+				json_add_string 'publishEndpoint' "/usp/$(_get_agent_id)/${f}/endpoint";
+				json_add_string 'subscribeEndpoint' "/usp/$(_get_agent_id)/${f}/controller";
+				json_close_object;
+			done
+			json_close_object;
+		json_close_object;
+
+		# add the default connection
+		json_add_object 'main';
+		json_add_string 'fromId' 'proto::interop-usp-controller';
+		json_add_string 'toId' "$(_get_endpoint_id)";
+		json_add_int 'port' "$(_get_sulu_tls_port)";
+		json_add_string 'path' "/wss";
+		json_add_string 'protocol' 'wss';
+		json_add_string 'publishEndpoint' "/usp/endpoint";
+		json_add_string 'subscribeEndpoint' "/usp/controller";
+			json_add_array 'auth';
+			json_close_array;
+
+			json_add_array 'urlOverrides';
+				json_add_object "";
+					json_add_object 'match';
+						json_add_string 'protocol' 'http:'
+					json_close_object
+					json_add_object 'override';
+						json_add_string 'protocol' 'ws'
+						json_add_int 'port' "$(_get_sulu_http_port)";
+					json_close_object
+				json_close_object
+			json_close_array
+		json_close_object;
+	json_close_object;
+
+	json_dump > ${SCONFIG}
 }

-function _remove_obuspa_config() {
+function set_sulu_connection_mode()
+{
+	local rbac profile config SCONFIG
+
+	SCONFIG="$(_get_sulu_connection_config)"
+	rbac="${1}"
+
+	profile="$(jq '."Current-connection"' ${SCONFIG})"
+	if [ "$rbac" -eq "1" -a "${profile}" == "\"main\"" ]; then
+		config="$(jq '."Current-connection" = "rbac"' ${SCONFIG})"
+		echo "${config}" > ${SCONFIG}
+	elif [ "$rbac" -eq "0" -a "${profile}" == "\"rbac\"" ]; then
+		config="$(jq '."Current-connection" = "main"' ${SCONFIG})"
+		echo "${config}" > ${SCONFIG}
+	fi
+}
+
+function update_sulu_connection_port()
+{
+	local port ws_port SCONF
+
+	SCONF="$(_get_sulu_connection_config)"
+	ws_port="$(_get_sulu_tls_port)"
+
+	port="$(jq '.Connections.rbac.port' ${SCONF})"
+	if [ "${port}" -ne "${ws_port}" ]; then
+		jq ".Connections.main.port = ${ws_port} | .Connections.rbac.port = ${ws_port}" ${SCONF} > /tmp/sulu/ss_port.json
+		mv /tmp/sulu/ss_port.json ${SCONF}
+	fi
+}
+
+function _update_obuspa_config()
+{
+	local restart
+
+	restart=0
+	if ! uci_get obuspa localmqtt >/dev/null 2>&1; then
+		uci_add obuspa mqtt localmqtt
+		uci_set obuspa localmqtt BrokerAddress "127.0.0.1"
+		uci_set obuspa localmqtt BrokerPort "1883"
+		uci_set obuspa localmqtt TransportProtocol "TCP/IP"
+		restart=1
+	fi
+
+	if ! uci_get obuspa agent_mtp >/dev/null 2>&1; then
+		uci_add obuspa mtp agent_mtp
+		uci_set obuspa agent_mtp Protocol "MQTT"
+		uci_set obuspa agent_mtp ResponseTopicConfigured "/usp/endpoint"
+		uci_set obuspa agent_mtp mqtt "localmqtt"
+		restart=1
+	fi
+
+	if ! uci_get obuspa localcontroller >/dev/null 2>&1; then
+		uci_add obuspa controller localcontroller
+		uci_set obuspa localcontroller EndpointID "proto::interop-usp-controller"
+		uci_set obuspa localcontroller Protocol "MQTT"
+		uci_set obuspa localcontroller Topic "/usp/controller"
+		uci_set obuspa localcontroller mqtt "localmqtt"
+		uci_set obuspa localcontroller assigned_role_name "full_access"
+		restart=1
+	fi
+	return "${restart}"
+}
+
+function _remove_obuspa_config()
+{
 	local restart session

 	restart=0
@@ -166,68 +288,86 @@ function _update_obuspa_config_rbac() {
 	session="$(_get_sulu_session_mode)"
 	restart=0

-	for user in ${users}; do
-		local section
+	for f in ${users}; do
+		local sec

 		# Add mqtt
-		section="mqtt_sulu_${user}"
-		if ! uci_get obuspa ${section} >/dev/null 2>&1; then
-			uci_add obuspa mqtt ${section}
-			uci_set obuspa ${section} BrokerAddress "127.0.0.1"
-			uci_set obuspa ${section} BrokerPort "1883"
-			uci_set obuspa ${section} TransportProtocol "TCP/IP"
+		sec="mqtt_sulu_${f}"
+		if ! uci_get obuspa ${sec} >/dev/null 2>&1; then
+			uci_add obuspa mqtt ${sec}
+			uci_set obuspa ${sec} BrokerAddress "127.0.0.1"
+			uci_set obuspa ${sec} BrokerPort "1883"
+			uci_set obuspa ${sec} TransportProtocol "TCP/IP"
 			restart=1
 		fi

 		# Add mtp
-		section="mtp_sulu_${user}"
-		if ! uci_get obuspa ${section} >/dev/null 2>&1; then
-			uci_add obuspa mtp ${section}
-			uci_set obuspa ${section} Protocol "MQTT"
-			uci_set obuspa ${section} ResponseTopicConfigured "/usp/${agent}/${user}/endpoint"
-			uci_set obuspa ${section} mqtt "mqtt_sulu_$user"
+		sec="mtp_sulu_${f}"
+		if ! uci_get obuspa ${sec} >/dev/null 2>&1; then
+			uci_add obuspa mtp ${sec}
+			uci_set obuspa ${sec} Protocol "MQTT"
+			uci_set obuspa ${sec} ResponseTopicConfigured "/usp/${agent}/${f}/endpoint"
+			uci_set obuspa ${sec} mqtt "mqtt_sulu_$f"
 			restart=1
 		fi

 		# Add controller
-		section="controller_sulu_${user}"
-		if ! uci_get obuspa ${section} >/dev/null 2>&1; then
-			uci_add obuspa controller ${section}
-			uci_set obuspa ${section} EndpointID "self::sulu-${user}"
-			uci_set obuspa ${section} Protocol "MQTT"
-			uci_set obuspa ${section} Topic "/usp/${agent}/${user}/controller"
-			uci_set obuspa ${section} mqtt "mqtt_sulu_$user"
-			uci_set obuspa ${section} assigned_role_name "$user"
+		sec="controller_sulu_${f}"
+		if ! uci_get obuspa ${sec} >/dev/null 2>&1; then
+			uci_add obuspa controller ${sec}
+			uci_set obuspa ${sec} EndpointID "self::sulu-${f}"
+			uci_set obuspa ${sec} Protocol "MQTT"
+			uci_set obuspa ${sec} Topic "/usp/${agent}/${f}/controller"
+			uci_set obuspa ${sec} mqtt "mqtt_sulu_$f"
+			uci_set obuspa ${sec} assigned_role_name "$f"
 			restart=1
 		fi

-		obMode="$(uci_get obuspa ${section} SessionMode)"
+		obMode="$(uci_get obuspa ${sec} SessionMode)"
 		if [ "${session}" != "${obMode}" ]; then
-			uci_set obuspa ${section} SessionMode "${session}"
+			uci_set obuspa ${sec} SessionMode "${session}"
 			restart=1
 		fi
 	done
 	return "${restart}"
 }

-function _remove_sulu_section() {
-	local section="$1"
+function _remove_sulu_sec()
+{
+	local sec

-	if [[ "${section}" == *"_sulu_"* ]]; then
+	if [[ "${1}" == *"_sulu_"* ]]; then
 		uci_remove obuspa ${1}
 		return 1
 	fi
 	return 0
 }

+function _remove_obuspa_config_rbac()
+{
+	local restart
+
+	restart=0
+	config_foreach _remove_sulu_sec mqtt
+	restart="$(( restart + $? ))"
+	config_foreach _remove_sulu_sec mtp
+	restart="$(( restart + $? ))"
+	config_foreach _remove_sulu_sec controller
+	restart="$(( restart + $? ))"
+	uci_set obuspa global role_file ""
+
+	return "${restart}"
+}
+
 function _create_acl() {
-	local agentid users restart
+        local agentid rbac users restart
 	local ACL_FILE

+	rbac="${1:-0}"
 	restart="0"

 	ACL_FILE="$(_get_sulu_acl_file)"
-	if [ -z "${ACL_FILE}" ]; then
+	if [ -z "${ACL_FILE}" -o "${rbac}" -eq "0" ]; then
 		return 0
 	fi

@@ -236,18 +376,20 @@ function _create_acl() {
 	fi
 	touch "${ACL_FILE}"

-	users="$(_get_sulu_users)"
-	agentid="$(_get_agent_id)"
-	for user in ${users}; do
-		if ! grep -q "user $user" ${ACL_FILE}; then
-			echo "user ${user}" >>${ACL_FILE}
-			echo "topic read  /usp/${agentid}/${user}/controller/reply-to/#" >>${ACL_FILE}
-			echo "topic write /usp/${agentid}/${user}/endpoint/#" >>${ACL_FILE}
-			echo "topic read  /usp/${agentid}/${user}/controller/#" >>${ACL_FILE}
-			echo "" >>${ACL_FILE}
-			restart="1"
-		fi
-	done
+	if [ "${rbac}" -eq "1" ]; then
+		users="$(_get_sulu_users)"
+		agentid="$(_get_agent_id)"
+		for f in ${users}; do
+			if ! grep -q "user $f" ${ACL_FILE}; then
+				echo "user ${f}" >> ${ACL_FILE}
+				echo "topic read  /usp/${agentid}/${f}/controller/reply-to/#" >> ${ACL_FILE}
+				echo "topic write /usp/${agentid}/${f}/endpoint/#" >> ${ACL_FILE}
+				echo "topic read  /usp/${agentid}/${f}/controller/#" >> ${ACL_FILE}
+				echo "" >> ${ACL_FILE}
+				restart="1"
+			fi
+		done
+	fi

 	if [ "${restart}" -gt "0" ]; then
 		slog "Restarting mosquitto..."
@@ -255,16 +397,25 @@ function _create_acl() {
 	fi
 }

-function update_obuspa_config() {
-	local restart
+function update_obuspa_config()
+{
+	local rbac restart

+	rbac="${1}"
 	restart=0

 	uci_load obuspa
-	_remove_obuspa_config
-	restart="$((restart + $?))"
-	_update_obuspa_config_rbac
-	restart="$((restart + $?))"
+	if [ "${rbac}" -eq "1" ]; then
+		_remove_obuspa_config
+		restart="$(( restart + $? ))"
+		_update_obuspa_config_rbac
+		restart="$(( restart + $? ))"
+	else
+		_remove_obuspa_config_rbac
+		restart="$(( restart + $? ))"
+		_update_obuspa_config
+		restart="$(( restart + $? ))"
+	fi
 	uci_commit obuspa

 	if [ "${_RESTART_SERVICES}" -eq "1" -a "${restart}" -gt "0" ]; then
@@ -273,19 +424,22 @@ function update_obuspa_config() {
 	fi
 }

-function configure_sulu() {
-	local sys_cred restart
+function configure_sulu()
+{
+	local sys_cred rbac restart

 	sys_cred="${1}"
-	restart="${2:-0}"
+	rbac="${2}"
+	restart="${3:-0}"

-	if [ -z "${sys_cred}" ]; then
+	if [ -z "${sys_cred}" -o -z "${rbac}" ]; then
 		slog "Invalid inputs"
 		return 0
 	fi

 	_RESTART_SERVICES="${restart}"

-	update_obuspa_config
-	_create_acl
+	set_sulu_connection_mode "${rbac}"
+	update_obuspa_config "${rbac}"
+	_create_acl "${rbac}"
 }
--- a/sulu/sulu-builder/files/etc/uci-defaults/40-add-sulu-nginx-config
+++ b/sulu/sulu-builder/files/etc/uci-defaults/40-add-sulu-nginx-config
@@ -21,28 +21,25 @@ add_sulu_nginx_uci()
 		uci_set nginx _sulu_s error_log '/dev/null'
 	fi

-	# To host on http, disable _suluredirect and enable _sulu_http
-	if ! uci_get nginx _suluredirect >/dev/null 2>&1; then
-		uci_add nginx server _suluredirect
-		uci_add_list nginx _suluredirect listen "8080"
-		uci_add_list nginx _suluredirect listen "[::]:8080"
-		uci_set nginx _suluredirect server_name '_suluredirect'
-		uci_set nginx _suluredirect return '302 https://$host:8443$request_uri'
-	fi
-	
-	if uci_get nginx _sulu_http >/dev/null 2>&1; then
-		uci_remove nginx _sulu_http
-	fi
-#	if ! uci_get nginx _sulu_http >/dev/null 2>&1; then
-#		uci_add nginx server _sulu_http
-#		uci_set nginx _sulu_http root '/sulu'
-#		uci_add_list nginx _sulu_http listen "8080"
-#		uci_add_list nginx _sulu_http listen "[::]:8080"
-#		uci_set nginx _sulu_http server_name '_sulu_http'
-#		uci_add_list nginx _sulu_http include '/etc/sulu/nginx.locations'
-#	        uci_set nginx _sulu_http ssl_session_cache 'none'
-#		uci_set nginx _sulu_http access_log 'off; # logd openwrt'
+# To host on http, disable _suluredirect and enable _sulu_http
+#	if ! uci_get nginx _suluredirect >/dev/null 2>&1; then
+#		uci_add nginx server _suluredirect
+#		uci_add_list nginx _suluredirect listen "8080"
+#		uci_add_list nginx _suluredirect listen "[::]:8080"
+#		uci_set nginx _suluredirect server_name '_suluredirect'
+#		uci_set nginx _suluredirect return '302 https://$host:8443$request_uri'
 #	fi
+
+	if ! uci_get nginx _sulu_http >/dev/null 2>&1; then
+		uci_add nginx server _sulu_http
+		uci_set nginx _sulu_http root '/sulu'
+		uci_add_list nginx _sulu_http listen "8080"
+		uci_add_list nginx _sulu_http listen "[::]:8080"
+		uci_set nginx _sulu_http server_name '_sulu_http'
+		uci_add_list nginx _sulu_http include '/etc/sulu/nginx.locations'
+	        uci_set nginx _sulu_http ssl_session_cache 'none'
+		uci_set nginx _sulu_http access_log 'off; # logd openwrt'
+	fi
 }


--- a/sulu/sulu-builder/files/etc/uci-defaults/99-fix-sulu-config
+++ b/sulu/sulu-builder/files/etc/uci-defaults/99-fix-sulu-config
@@ -4,6 +4,7 @@

 config_load sulu
 config_get enable_system_credentials global enable_system_credentials 1
+config_get role_based_access global role_based_access 0

-configure_sulu "${enable_system_credentials}" 0
-generate_sulu_conn_config
+configure_sulu "${enable_system_credentials}" "${role_based_access}" 0
+generate_sulu_conn_config "${role_based_access}"
--- a/sulu/sulu-builder/sulu.mk
+++ b/sulu/sulu-builder/sulu.mk
@@ -39,11 +39,6 @@ endif

 define Build/Compile
 	# Skip compilation, will be build with sulu-builder
-ifeq ($(SULU_MOD),core)
-ifneq ($(CONFIG_SULU_ENV_DATA),)
-	echo -e "$(CONFIG_SULU_ENV_DATA)" > $(PKG_BUILD_DIR)/.env
-endif
-endif
 endef

 ifeq ($(SULU_PLUGIN_INSTALL),0)
--- a/sulu/sulu-lcm/Makefile
+++ b/sulu/sulu-lcm/Makefile
@@ -4,11 +4,11 @@

 include $(TOPDIR)/rules.mk
 PKG_NAME:=sulu-lcm
-PKG_VERSION:=3.1.27
+PKG_VERSION:=3.1.21

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-lcm.git
-PKG_SOURCE_VERSION:=6b1d30d7918adeb19c5177dd7c5472cb0dac9896
+PKG_SOURCE_VERSION:=acb0853935ff1f465bb8dc0108b52b26029a61a1
 PKG_MIRROR_HASH:=skip

 include ../sulu-builder/sulu.mk
--- a/sulu/sulu-multi-ap/Makefile
+++ b/sulu/sulu-multi-ap/Makefile
@@ -4,11 +4,11 @@

 include $(TOPDIR)/rules.mk
 PKG_NAME:=sulu-multi-ap
-PKG_VERSION:=3.1.42
+PKG_VERSION:=3.1.21

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-multi-ap.git
-PKG_SOURCE_VERSION:=e209cbc04a92494b96c74cee443e1b385c6687fe
+PKG_SOURCE_VERSION:=e9a6d5e8e14b59afb588140b2f7ff4367c361f84
 PKG_MIRROR_HASH:=skip

 include ../sulu-builder/sulu.mk
--- a/sulu/sulu-parental-control/Makefile
+++ b/sulu/sulu-parental-control/Makefile
@@ -4,11 +4,11 @@

 include $(TOPDIR)/rules.mk
 PKG_NAME:=sulu-parental-control
-PKG_VERSION:=3.1.38
+PKG_VERSION:=3.1.21

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-parental-control.git
-PKG_SOURCE_VERSION:=dd9dab9fb8aca87991cd2cc02c5fedd8baee3b97
+PKG_SOURCE_VERSION:=ac898cf7c1d03eff29991d3850ba0911d803c06f
 PKG_MIRROR_HASH:=skip

 include ../sulu-builder/sulu.mk
--- a/swmodd/Makefile
+++ b/swmodd/Makefile
@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=swmodd
-PKG_VERSION:=2.5.3
+PKG_VERSION:=2.4.2

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/lcm/swmodd.git
-PKG_SOURCE_VERSION:=80d8a2f0dddc8e1575c0a6dee1e496c52104d033
+PKG_SOURCE_VERSION:=ad39d3aa3b69c4efcb9f0230cee17af00fb3337f
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -83,7 +83,6 @@ define Package/swmodd/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/swmodd $(1)/usr/sbin/swmodd
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/opkg_offline.sh $(1)/usr/share/swmodd/opkg_offline
 	$(INSTALL_BIN) ./files/etc/uci-defaults/01-fix-bundle-path $(1)/etc/uci-defaults/01-fix-bundle-path
-	$(INSTALL_BIN) ./files/etc/uci-defaults/03-execenv-ref $(1)/etc/uci-defaults/03-execenv-ref
 ifeq ($(CONFIG_PACKAGE_liblxc),y)
 	$(INSTALL_DIR) $(1)/usr/share/lxc/templates/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/templates/lxc-iopsys $(1)/usr/share/lxc/templates/lxc-iopsys
--- a/swmodd/files/etc/init.d/crun
+++ b/swmodd/files/etc/init.d/crun
@@ -16,14 +16,13 @@ is_container_running() {


 configure_lxc_container() {
-	local requested_state name ctype du_status BUNDLE section
+	local requested_state name ctype du_status BUNDLE

 	ctype="${1}"
 	name="${2}"
 	requested_state="${3}"
-	du_status="${4}"
+	du_state="${4}"
 	BUNDLE="${5}"
-	section="${6}"

 	if [ "${ctype}" != "lxc" ]; then
 		return 0;
@@ -34,18 +33,6 @@ configure_lxc_container() {
 		if [ -d "${BUNDLE:?}/${name:?}" ]; then
 			rm -rf "${BUNDLE:?}/${name:?}"
 		fi
-
-		# If directory still exists then uninstall failed
-		if [ -d "${BUNDLE}/${name}" ]; then
-			uci_set ocicontainer "${section}" du_status Uninstalling_failed
-			uci_set ocicontainer "${section}" fault_string "Failed to remove ${BUNDLE}/${name}"
-			log "LXC container ${name} remove failed"
-		else
-			uci_set ocicontainer "${section}" du_status Uninstalling_success
-			log "LXC container ${name} removed"
-		fi
-
-		return 0;
 	fi

 	if [ "${requested_state}" = "Idle" ]; then
@@ -79,7 +66,7 @@ configure_crun_container() {
 	fi

 	if [ "${type}" != "crun" ]; then
-		configure_lxc_container "${type}" "${name}" "${requested_state}" "${du_status}" "${BUNDLE}" "${1}"
+		configure_lxc_container "${type}" "${name}" "${requested_state}" "${du_status}" "${BUNDLE}"
 		return 0;
 	fi

@@ -216,7 +203,7 @@ boot() {
 }

 start_service() {
-	local bundle root env bridge boot
+	local bundle bridge boot

 	# Check if crun present
 	if ! command -v crun >/dev/null 2>&1; then
@@ -231,17 +218,15 @@ start_service() {
 	fi

 	config_load swmodd
-	config_get root globals root ""
+	config_get bundle globals oci_bundle_root ""
 	config_get bridge globals lan_bridge "br-lan"
 	config_get timeout globals oci_pull_timeout "10"

-	env=$(uci -q get swmodd.@execenv[0].name)
-	if [ -z "${root}" ] || [ -z "${bridge}" ]; then
-		log "Base bundle root[$root] or bridge[$bridge] not defined"
+	if [ -z "${bundle}" ] || [ -z "${bridge}" ]; then
+		log "Empty bundle path or bridge"
 		return 0;
 	fi

-	bundle="${root}/${env}"
 	if [ -f "${bundle}/ocicontainer" ]; then
 		UCI_CONFIG_DIR="${bundle}"
 		config_load ocicontainer
@@ -250,8 +235,6 @@ start_service() {

 		# Add a timer for DuStateChange!
 		(sleep 5 && ubus -t 5 call swmodules reload) &
-	else
-		log "${bundle}/ocicontainer not present"
 	fi
 }

--- a/swmodd/files/etc/init.d/swmodd
+++ b/swmodd/files/etc/init.d/swmodd
@@ -17,7 +17,8 @@ validate_globals_section()
 		'enabled:bool:1' \
 		'debug:bool:false' \
 		'log_level:uinteger:1' \
-		'root:string' \
+		'lxc_bundle_root:string' \
+		'oci_bundle_root:string' \
 		'sock:string'
 }

@@ -78,7 +79,7 @@ stop_lxc_containers() {
 }

 start_service() {
-	local enabled debug log_level sock root
+	local enabled debug log_level sock lxc_bundle_root oci_bundle_root

 	config_load swmodd

@@ -88,35 +89,13 @@ start_service() {

 	[ "${enabled}" -eq 0 ] && return 0

-	[ ! -d "/run" ] && ln -fs /var/run /run
-        if [ ! -d "${root}" ]; then
-                log "# Not staring root [${root}] not present/defined"
+        if [ ! -d "${lxc_bundle_root}" ]; then
+                log "# Not staring lxc [${lxc_bundle_root}] not present/defined"
                return 1
        fi

-	env_name=""
-	execenvs=$(uci show swmodd | grep "=execenv" | cut -d'=' -f 1 | cut -d'.' -f 2)
-	for env in ${execenvs}; do
-		name=$(uci get swmodd.${env}.name)
-		if [ -n "${name}" ]; then
-			env_name="${name}"
-			break
-		fi
-	done
-
-	if [ -z "${env_name}" ]; then
-		log "# Not starting execenv name [${env_name}] not defined"
-		return 1
-	fi
-
-	bundle_root="${root}"
-	if [ "${root: -1}" != '/' ]; then
-		bundle_root="${root}/"
-	fi
-
-	bundle_root="${bundle_root}${env_name}"
-        if [ ! -d "${bundle_root}" ]; then
-                log "# Not staring execenv [${bundle_root}] not present"
+        if [ ! -d "${oci_bundle_root}" ]; then
+                log "# Not staring oci [${oci_bundle_root}] not present/defined"
                return 1
        fi

@@ -137,10 +116,15 @@ start_service() {
 	procd_close_instance

 	# Auto-start the lxc containers
-	if [ -f "${bundle_root}/ocicontainer" ]; then
-		UCI_CONFIG_DIR="${bundle_root}"
+	if [ -f "${lxc_bundle_root}/lxccontainer" ]; then
+		UCI_CONFIG_DIR="${lxc_bundle_root}"
+		config_load lxccontainer
+		config_foreach start_lxc_container container ${lxc_bundle_root}
+	fi
+	if [ -f "${oci_bundle_root}/ocicontainer" ]; then
+		UCI_CONFIG_DIR="${oci_bundle_root}"
 		config_load ocicontainer
-		config_foreach start_lxc_container du_eu_assoc ${bundle_root}
+		config_foreach start_lxc_container du_eu_assoc ${oci_bundle_root}
 	fi
 }

--- a/swmodd/files/etc/uci-defaults/01-fix-bundle-path
+++ b/swmodd/files/etc/uci-defaults/01-fix-bundle-path
@@ -2,48 +2,37 @@

 . /lib/functions.sh

-configure_ee_path() {
-	local lxc_bundle oci_bundle name root
+lxc=""
+lxc_bundle=""
+oci_bundle=""

-	config_load swmodd
-	config_get lxc_bundle globals lxc_bundle_root ""
-	config_get oci_bundle globals oci_bundle_root ""
+if [ -f "/etc/lxc/lxc.conf" ]; then
+	lxc=$(cat /etc/lxc/lxc.conf |grep "lxc.lxcpath"| cut -d "=" -f 2)
+fi

+config_load swmodd
+config_get lxc_bundle globals lxc_bundle_root ""
+config_get oci_bundle globals oci_bundle_root ""
+
+if [ -n "${lxc_bundle}" ]; then
+	# if lxc_bundle_root define in swmodd, update it in lxc path
 	mkdir -p /etc/lxc
-	if [ -n "${oci_bundle}" ]; then
-		# if oci_bundle_root define in swmodd, then remove it
-		name=$(echo ${oci_bundle##/*/})
-		root=$(echo ${oci_bundle%/$name})
-		echo "lxc.lxcpath = ${oci_bundle}" > /etc/lxc/lxc.conf
-	elif [ -n "${lxc_bundle}" ]; then
-		# if lxc_bundle_root define in swmodd, then remove it
-		name=$(echo ${lxc_bundle##/*/})
-		root=$(echo ${lxc_bundle%/$name})
-		echo "lxc.lxcpath = ${lxc_bundle}" > /etc/lxc/lxc.conf
-	elif [ -f /etc/lxc/lxc.conf ]; then
-		bundle_path=$(cat /etc/lxc/lxc.conf | grep "lxc.lxcpath" | cut -d "=" -f 2 | sed 's/[[:blank:]]//g')
-		name=$(echo ${bundle_path##/*/})
-		root=$(echo ${bundle_path%/$name})
-	else
-		name="lxc"
-		root="/srv"
-		echo "lxc.lxcpath = /srv/lxc" > /etc/lxc/lxc.conf
-	fi
+	echo "lxc.lxcpath = ${lxc_bundle}" > /etc/lxc/lxc.conf
+elif [ -n "${lxc}" ]; then
+	# if lxc_bundle_root not define in swmodd, update it with lxc path
+	uci_set swmodd globals lxc_bundle_root ${lxc}
+else
+	mkdir -p /etc/lxc
+	echo "lxc.lxcpath = /srv/" > /etc/lxc/lxc.conf
+	uci_set swmodd globals lxc_bundle_root "/srv/"
+fi

-	uci_set swmodd globals oci_bundle_root ""
-	uci_set swmodd globals lxc_bundle_root ""
-
-	# configure root in globals section
-	if ! uci_get swmodd globals root >/dev/null; then
-		uci_set swmodd globals root ${root}
-	fi
-
-	# configure execenv in swmodd
-	if ! uci_get swmodd.@execenv[0].name >/dev/null; then
-		uci_add swmodd execenv execenv_1
-		uci_set swmodd execenv_1 name ${name}
-	fi
-
-}
-
-configure_ee_path
+if [ -z "${oci_bundle}" ] && [ -n "${lxc_bundle}" ]; then
+	# if oci_bundle_root not defined in swmodd, update it with lxc_bundle_root if defined
+	uci_set swmodd globals oci_bundle_root ${lxc_bundle}
+elif [ -z "${oci_bundle}" ] && [ -n "${lxc}" ]; then
+	# if oci_bundle_root not defined in swmodd, update it with lxc path
+	uci_set swmodd globals oci_bundle_root ${lxc}
+elif [ -z "${oci_bundle}" ]; then
+	uci_set swmodd globals oci_bundle_root "/srv/"
+fi
--- a/swmodd/files/etc/uci-defaults/02-migrate-lxc
+++ b/swmodd/files/etc/uci-defaults/02-migrate-lxc
@@ -2,41 +2,46 @@

 . /lib/functions.sh

-migrate_from_lxc_to_oci_config() {
-	config_load swmodd
+config_change=0

-	env_name=$(uci_get swmodd.@execenv[0].name)
-	bundle_root=$(uci_get swmodd.globals.root)
+migrate_lxc() {
+	config_get name "${1}" name ""

-	if [ -z "${bundle_root}" ]; then
-		return 0
+	if [ -z "${name}" ]; then
+		return 0;
 	fi

-	if [ -z "${env_name}" ]; then
-		return 0
-	fi
-
-	if ! command -v crun_create >/dev/null; then
-		return 0
-	fi
-
-	if [ "${bundle_root: -1}" != '/' ]; then
-		bundle_root="${bundle_root}/"
-	fi
-
-	lxcpath="${bundle_root}${env_name}"
-	touch "${lxcpath}/ocicontainer"
-	rm -rf "${lxcpath}/lxccontainer"
-
-	dirs=$(ls -l "${lxcpath}/" 2>/dev/null | grep '^d' | awk '{print $9}')
-
-	for d in ${dirs}; do
-		config_file="${lxcpath}/${d}/config"
-
-		if [ -f "${config_file}" ]; then
-			crun_create -c -r "${bundle_root}" -e "${env_name}" -n "${d}" --no-reload
+	# Now lets check if already present in lxccontainer
+	exist=$(uci -q -c "${2}" show lxccontainer | grep ".name='$name'")
+	if [ -z "${exist}" ]; then
+		# Not present, need to migrate
+		sec=$(uci -q -c "${2}" add lxccontainer container)
+		if [ -n "${sec}" ]; then
+			uci -q -c "${2}" set lxccontainer."${sec}".name="${name}"
+			uci -q -c "${2}" set lxccontainer."${sec}".type='lxc'
+			uci -q -c "${2}" set lxccontainer."${sec}".autostart='1'
+			uci -q -c "${2}" set lxccontainer."${sec}".timeout='300'
+			config_change=1			
 		fi
-	done
+	fi
 }

-migrate_from_lxc_to_oci_config
+config_load swmodd
+config_get lxc_bundle globals lxc_bundle_root ""
+
+if [ -z "${lxc_bundle}" ]; then
+	return 0
+fi
+
+if [ ! -d "${lxc_bundle}" ]; then
+	return 0
+fi
+
+touch "${lxc_bundle}"/lxccontainer
+
+config_load lxc-auto
+config_foreach migrate_lxc container "${lxc_bundle}"
+
+if [ $config_change -eq 1 ]; then
+	uci -q -c "${lxc_bundle}" commit lxccontainer
+fi
--- a/swmodd/files/etc/uci-defaults/03-execenv-ref
+++ b/swmodd/files/etc/uci-defaults/03-execenv-ref
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-set_execenv_ref() {
-	config_get ee_name "${1}" ee_name ""
-
-	if [ "${ee_name}" != "${2}" ]; then
-		uci_set ocicontainer "${1}" ee_name "${2}"
-	fi
-}
-
-migrate_execenv_ref() {
-	config_load swmodd
-
-	env_name=$(uci_get swmodd.@execenv[0].name)
-	bundle_root=$(uci_get swmodd.globals.root)
-
-	if [ -z "${bundle_root}" ]; then
-		return 0
-	fi
-
-	if [ -z "${env_name}" ]; then
-		return 0
-	fi
-
-	if [ "${bundle_root: -1}" != '/' ]; then
-		bundle_root="${bundle_root}/"
-	fi
-
-	lxcpath="${bundle_root}${env_name}"
-
-	if [ -f "${lxcpath}/ocicontainer" ]; then
-		UCI_CONFIG_DIR="${lxcpath}"
-		config_load ocicontainer
-		config_foreach set_execenv_ref du_eu_assoc ${env_name}
-	fi
-
-	uci -q -c "${lxcpath}" commit ocicontainer
-}
-
-migrate_execenv_ref
--- a/timemngr/Makefile
+++ b/timemngr/Makefile
@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=timemngr
-PKG_VERSION:=1.0.13
+PKG_VERSION:=1.0.6

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/timemngr.git
-PKG_SOURCE_VERSION:=7552c44b6fb4561687e0ce50639fd80396836d51
+PKG_SOURCE_VERSION:=b90e33743155735f8df9e86f2e053fed7601adb2
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -21,8 +21,6 @@ PKG_LICENSE_FILES:=LICENSE

 include $(INCLUDE_DIR)/package.mk

-#RSTRIP:=:
-
 define Package/$(PKG_NAME)
  SECTION:=utils
  CATEGORY:=Utilities
--- a/timemngr/files/etc/hotplug.d/iface/21-timemngr
+++ b/timemngr/files/etc/hotplug.d/iface/21-timemngr
@@ -1,17 +1,15 @@
 #!/bin/sh

-. /usr/share/libubox/jshn.sh
+NAME=time

-log() {
-	echo "${@}"|logger -t time.iface -p info
-}
+. /usr/share/libubox/jshn.sh

 configure_ntp_servers()
 {
 	local ntp_interface

 	# Only change the ntp servers if interface matches with the defined interface
-	ntp_interface="$(uci -q get time.dhcp_driven.interface)"
+	ntp_interface="$(uci -q get ${NAME}.dhcp_driven.interface)"

 	if [ "${ntp_interface}" != "${1}" ]; then
 		return 0
@@ -21,14 +19,13 @@ configure_ntp_servers()
 	json_select data
 	json_get_var servers ntpserver ""

-	exist_dhcp_ntp_server="$(uci -q get time.dhcp_driven.server)"
+	exist_dhcp_ntp_server="$(uci -q get ${NAME}.dhcp_driven.server)"
 	if [ "${servers}" != "${exist_dhcp_ntp_server}" ]; then
-		uci -q del time.dhcp_driven.server
+		uci -q del ${NAME}.dhcp_driven.server
 		for server in ${servers}; do
-			uci -q add_list time.dhcp_driven.server="${server}"
+			uci -q add_list ${NAME}.dhcp_driven.server="${server}"
 		done
-		log "Restarting timemngr"
-		ubus call uci commit '{"config":"time"}'
+		eval ubus call uci commit '{\"config\":\"$NAME\"}'
 	fi
 }

--- a/timemngr/files/etc/init.d/timemngr
+++ b/timemngr/files/etc/init.d/timemngr
@@ -11,21 +11,17 @@ PROG_UBUS=/usr/sbin/timemngr

 DM_INPUT="/etc/timemngr/input.json"

-log() {
-	echo "${@}"|logger -t time.init -p info
-}
-
 validate_global_section() {
 	uci_validate_section time global global \
 	    'enable:bool:1' \
-	    'loglevel:uinteger:4'
+	    'loglevel:uinteger:1'
 }

 start_service() {
 	local enable loglevel

 	if uci -q get system.ntp >/dev/null 2>&1; then
-		log "Not starting timemngr, legacy ntp definition detected"
+		logger -t timemngr.init "Not starting timemngr, legacy ntp definition detected"
 		return 1
 	fi

@@ -40,7 +36,6 @@ start_service() {
 	procd_open_instance timemngr_ubus
 	procd_set_param command $PROG_UBUS
 	procd_append_param command -l ${loglevel}
-	procd_set_param respawn
 	procd_close_instance

 	generate_config
@@ -50,7 +45,6 @@ start_service() {
 }

 reload_service() {
-	log "Restarting timemngr"
 	stop
 	start
 }
@@ -64,9 +58,8 @@ service_triggers() {
 	}

 	if [ "$enable" != 0 ] && [ "$mode" = "Broadcast" ] && [ -n "$interface" ]; then
-		log "Service trigger for interface up event"
 		procd_open_trigger
-		procd_add_interface_trigger "interface.*.up" $interface /etc/init.d/timemngr reload
+		procd_add_interface_trigger "interface.*.up" $interface /etc/init.d/timemngr restart
 		procd_close_trigger
 	fi
 }
--- a/timemngr/files/etc/timemngr/ntpd_config.sh
+++ b/timemngr/files/etc/timemngr/ntpd_config.sh
@@ -180,6 +180,5 @@ generate_config() {
 create_service() {
 	procd_open_instance timemngr
 	procd_set_param command "/sbin/ntpd" -g -u ntp:ntp -n -c ${CONF_FILE}
-	procd_set_param respawn
 	procd_close_instance
 }
--- a/tr104/Config.in
+++ b/tr104/Config.in
@@ -1,9 +1,4 @@
-config TR104_RUNAS_BBFDM_MICROSERVICE
-	bool "Use bbfdmd datamodel microservice to run tr104, preferred if TR104 and BBFDMD are on different base"
+config TR104_DOTSO_PLUGIN
+	bool "Use bbfdm DotSO plugin backend to provide TR104 and extension datamodel"
 	depends on PACKAGE_tr104
 	default n
-
-config TR104_VENDOR_EXTENSIONS
-	bool "Use TR104 vendor extensions"
-	depends on PACKAGE_tr104
-	default y
--- a/tr104/Makefile
+++ b/tr104/Makefile
@@ -5,23 +5,20 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=tr104
-PKG_VERSION:=1.0.12
+PKG_VERSION:=1.0.7

 LOCAL_DEV:=0
 ifeq ($(LOCAL_DEV),0)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/voice/tr104.git
-PKG_SOURCE_VERSION:=393ad165e64413067de84b452126aebf4bcbcb2d
+PKG_SOURCE_VERSION:=cd0c5d1f4a8489e3d93b5cf433f8f0df638bf62b
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

-PKG_CONFIG_DEPENDS:=CONFIG_TR104_RUNAS_BBFDM_MICROSERVICE CONFIG_TR104_VENDOR_EXTENSIONS
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE

-PKG_USE_NINJA:=0
-
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 include ../bbfdm/bbfdm.mk
@@ -46,21 +43,7 @@ endef
 CMAKE_OPTIONS += \
 	-DBBF_VENDOR_PREFIX:String="$(CONFIG_BBF_VENDOR_PREFIX)" \
 	-DDAEMON_JSON_INPUT:String="/etc/tr104/input.json" \
-	-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
-	-DDM_ENABLE_UBUS:BOOL=ON
-
-ifeq ($(CONFIG_TR104_VENDOR_EXTENSIONS),y)
-CMAKE_OPTIONS += \
-	-DTR104_EXTENSION_DIR:String="iowrt"
-endif
-
-ifeq ($(CONFIG_RUNAS_BBFDM_MICROSERVICE),y)
-MAKE_PATH:=libdm
-EXTRA_CFLAGS+= -I$(STAGING_DIR)/usr/include/libbbfdm-api
-CMAKE_OPTIONS += -DRUNAS_BBFDM_MICROSERVICE:BOOL=ON
-else
-EXTRA_CFLAGS+= -I$(STAGING_DIR)/usr/include/tr104
-endif
+	-DDM_ENABLE_UBUS=ON

 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
@@ -70,26 +53,18 @@ endif

 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_DIR) $(1)/etc/tr104/plugins/
-	$(INSTALL_BIN) ./files/etc/tr104/input.json $(1)/etc/tr104/input.json
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libdm/tr104/libtr104.so $(1)/etc/tr104/
-ifeq ($(CONFIG_TR104_VENDOR_EXTENSIONS),y)
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libdm/extensions/iowrt/libtr104ext.so $(1)/etc/tr104/plugins/
-endif
-ifeq ($(CONFIG_RUNAS_BBFDM_MICROSERVICE),y)
-	$(INSTALL_BIN) ./files/etc/init.d/tr104d.bbfdm $(1)/etc/init.d/tr104d
+ifeq ($(CONFIG_TR104_DOTSO_PLUGIN),y)
+	$(call BbfdmInstallPlugin,$(1),$(PKG_BUILD_DIR)/libdm/tr104/libtr104.so)
+	$(call BbfdmInstallPlugin,$(1),$(PKG_BUILD_DIR)/libdm/tr104_ext/libtr104ext.so)
 else
+	$(INSTALL_DIR) $(1)/etc/tr104/plugins/
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/daemon/ubus/tr104d $(1)/usr/sbin/
-	$(INSTALL_BIN) ./files/etc/init.d/tr104d $(1)/etc/init.d/tr104d
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libdm/tr104/libtr104.so $(1)/etc/tr104/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libdm/tr104_ext/libtr104ext.so $(1)/etc/tr104/plugins/
+	$(INSTALL_BIN) ./files/etc/init.d/tr104d $(1)/etc/init.d/
+	$(INSTALL_BIN) ./files/etc/tr104/input.json $(1)/etc/tr104/input.json
 endif
 endef

-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/usr/include/tr104
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libdmtree/*.h $(1)/usr/include/tr104/
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libdm/common/common.h $(1)/usr/include/tr104/
-endef
-
 $(eval $(call BuildPackage,$(PKG_NAME)))
--- a/tr104/files/etc/init.d/tr104d
+++ b/tr104/files/etc/init.d/tr104d
@@ -1,6 +1,6 @@
 #!/bin/sh /etc/rc.common

-START=60
+START=96
 STOP=10

 USE_PROCD=1
--- a/tr104/files/etc/init.d/tr104d.bbfdm
+++ b/tr104/files/etc/init.d/tr104d.bbfdm
@@ -1,12 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=60
-STOP=10
-
-USE_PROCD=1
-. /etc/bbfdm/bbfdm_services.sh
-
-start_service()
-{
-	bbfdm_add_service "tr104" "/etc/tr104/input.json"
-}
--- a/urlfilter/Makefile
+++ b/urlfilter/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk

 PKG_NAME:=urlfilter
-PKG_VERSION:=1.1.8
+PKG_VERSION:=1.1.7

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
@@ -21,7 +21,6 @@ PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE

 include $(INCLUDE_DIR)/package.mk
-include ../bbfdm/bbfdm.mk

 define Package/urlfilter
  SECTION:=utils
@@ -44,13 +43,9 @@ endef
 endif

 define Package/urlfilter/install
+	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/urlfilter $(1)/usr/sbin
-	$(INSTALL_BIN) ./files/etc/init.d/urlfilter $(1)/etc/init.d/
-	$(INSTALL_DATA) ./files/etc/config/urlfilter $(1)/etc/config/
-	$(call BbfdmInstallPlugin,$(1),./files/etc/bbfdm/plugins/urlfilter.json)
 endef

 $(eval $(call BuildPackage,urlfilter))
--- a/urlfilter/files/etc/bbfdm/plugins/urlfilter.json
+++ b/urlfilter/files/etc/bbfdm/plugins/urlfilter.json
@@ -138,40 +138,6 @@
 					}
 				}
 			],
-			"Alias": {
-				"type": "string",
-				"read": true,
-				"write": false,
-				"version": "2.14",
-				"protocols": [
-					"cwmp",
-					"usp"
-				],
-				"datatype": "string",
-				"range": [
-					{
-						"max": 64
-					}
-				],
-				"flags": [
-					"Unique",
-					"Linker"
-				],
-				"mapping": [
-					{
-						"type": "uci",
-						"uci": {
-							"file": "urlfilter",
-							"section": {
-								"type": "profile"
-							},
-							"option": {
-								"name": "@Name"
-							}
-						}
-					}
-				]
-			},
 			"Name": {
 				"type": "string",
 				"read": true,
@@ -341,9 +307,6 @@
 					"cwmp",
 					"usp"
 				],
-			"flags": [
-					"Reference"
-				],
 				"description": "Path of the <<object|Profile>> that should be applied.",
 				"mapping": [
 					{
@@ -357,7 +320,7 @@
 								"name": "profile"
 							}
 						},
-						"linker_obj": "Device.{BBF_VENDOR_PREFIX}URLFilter.Profile.*.Alias"
+						"linker_obj": "Device.{BBF_VENDOR_PREFIX}URLFilter.Profile."
 					}
 				]
 			},
--- a/usermngr/Makefile
+++ b/usermngr/Makefile
@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=usermngr
-PKG_VERSION:=1.2.10
+PKG_VERSION:=1.2.4

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/usermngr.git
-PKG_SOURCE_VERSION:=4f429e25c6e7a69c5171186731bc560befa5a660
+PKG_SOURCE_VERSION:=58c29e91659e79413048b1fd4d8724b89426846d
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
--- a/voicemngr/Makefile
+++ b/voicemngr/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=voicemngr
 PKG_RELEASE:=1
-PKG_VERSION:=1.1.2
+PKG_VERSION:=1.0.12
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE

@@ -19,7 +19,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:=25571796f18c91a2070f98881bd1205f15575fea
+PKG_SOURCE_VERSION:=774409486a4afdcff5ca0d31c1a2f8088bd55015
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
--- a/wifimngr/Makefile
+++ b/wifimngr/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=wifimngr
-PKG_VERSION:=16.2.1
+PKG_VERSION:=16.1.4

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=48082bc03ef03e0c3a9e843523482b017e8676e1
+PKG_SOURCE_VERSION:=91f7746b618c9eb259b9a3d030aad92cb21b1b9b
 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
--- a/wifimngr/files/etc/uci-defaults/gen_wifi_json.sh
+++ b/wifimngr/files/etc/uci-defaults/gen_wifi_json.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+
+[ -f /etc/wifi.json ] && exit 0
+
+. /usr/share/libubox/jshn.sh
+
+is_broadcom() {
+	[ -e /dev/bcm ] && return 0
+	return 1
+}
+
+is_qualcomm() {
+	[ -f /proc/device-tree/compatible ] || return
+	strings /proc/device-tree/compatible | grep -qE '^(qcom,|ipq,)'; return
+}
+
+if is_broadcom; then
+	ifname="wl*"
+	family="bcmwl nl80211"
+	group="scan"
+else
+	ifname="wlan*"
+	family="nl80211"
+	if is_qualcomm; then
+		group="scan"
+	else
+		group="scan config mlme vendor"
+	fi
+fi
+
+json_init
+json_add_array "events"
+for fm in $family; do
+	echo fm=$fm
+	json_add_object ""
+	json_add_string "type" "wifi-event"
+	json_add_string "name" "$fm"
+	json_add_string "ifname" "$ifname"
+	json_add_string "family" "$fm"
+	json_add_array "group"
+	if [ "$fm" == "bcmwl" ]; then
+		json_add_string "" "notify"
+	else
+		for gr in $group; do
+			json_add_string "" "$gr"
+		done
+	fi
+	json_select ..
+	json_select ..
+done
+json_select ..
+json_dump | jq >/etc/wifi.json
--- a/xmppc/Makefile
+++ b/xmppc/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=xmppc
-PKG_VERSION:=2.2.3
+PKG_VERSION:=2.2.2

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/xmppc.git
-PKG_SOURCE_VERSION:=23a7f6005b84fc4d4a1432057ecd2b5a74f9ea3e
+PKG_SOURCE_VERSION:=205d6879807b40c184c457df3cc841440515731b
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -35,7 +35,7 @@ define Package/$(PKG_NAME)
  CATEGORY:=Utilities
  SUBMENU:=TRx69
  TITLE:=BBF xmpp Client
-  DEPENDS:=+libuci +libubox +libstrophe +libubus +libbbfdm-api +@CONFIG_BUSYBOX_CONFIG_PIDOF
+  DEPENDS:=+libuci +libubox +libstrophe +libubus +libbbfdm-api
 endef

 define Package/$(PKG_NAME)/description
--- a/xmppc/files/etc/config/xmpp
+++ b/xmppc/files/etc/config/xmpp
@@ -1,5 +1,37 @@

 config xmpp 'xmpp'
+	option conn_req_connection 'connection_1'
+	option allowed_jid ''
 	#Log levels: Critical=0, Warning=1, Notice=2, Info=3, Debug=4
 	option loglevel '3'

+config connection 'connection_1'
+	option enable '0'
+	option username ''
+	option password ''
+	option domain 	''
+	option resource ''
+	option usetls '0'
+	option interval '30'
+	option attempt '16'
+	option initial_retry_interval '1'
+	option retry_interval_multiplier '1000'
+	option retry_max_interval '1'
+	option serveralgorithm 'DNS-SRV'
+	
+config connection_server 'connection_1_srv_1'
+	option con_name 'connection_1'
+	option enable '0'
+	option priority '0'
+	option weight '-1'
+	option port '5222'
+	option server_address ''
+
+config connection_server 'connection_1_srv_2'
+	option con_name 'connection_1'
+	option enable '0'
+	option priority '0'
+	option weight '-1'
+	option port '5222'
+	option server_address ''
+
--- a/xmppc/files/etc/hotplug.d/iface/91-icwmp_xmpp
+++ b/xmppc/files/etc/hotplug.d/iface/91-icwmp_xmpp
@@ -17,8 +17,5 @@ PROTO="$(uci -q get network."${INTERFACE}".proto)"
 IFNAME="$(uci -q get network."${INTERFACE}".ifname)"
 [ "${IFNAME:0:1}" = "@" ] && exit 0

-# reload xmppc if not running already
-if ! pidof xmppc; then
-	/etc/init.d/xmppc reload &
-fi
+/etc/init.d/xmppc reload &

--- a/xmppc/files/etc/init.d/xmppc
+++ b/xmppc/files/etc/init.d/xmppc
@@ -9,12 +9,12 @@ PROG="/usr/sbin/xmppc"
 start_service() {
 	local con_name=$(uci -q get xmpp.xmpp.conn_req_connection)
 	local con_enable=$(uci -q get xmpp."${con_name}".enable)
-
-	procd_open_instance
 	if [ "$con_enable" = "1" ]; then
+		procd_open_instance
 		procd_set_param command "$PROG"
+		procd_set_param respawn "3" "7" "0"
+		procd_close_instance
 	fi
-	procd_close_instance
 }

 reload_service() {