Revert "uboot: Remove package"

This reverts commit 31e356de22.

bbf/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libbbfdm
-PKG_VERSION:=6.8.30
+PKG_VERSION:=6.8.42
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
-PKG_SOURCE_VERSION:=2de7dbc43c5ec5931c8f5c057302f81ca80ae49a
+PKG_SOURCE_VERSION:=976744360c6f2b676046aee5cb6f61326e876b13
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 

bbf/files/etc/firewall.userinterface

@@ -15,15 +15,13 @@ if [ ! -f "/etc/config/userinterface" ]; then
 	exit 0;
 fi
 
-function exec_cmd()
-{
-	if ! $@; then
-		log "Failed to run [$@]"
+exec_cmd() {
+	if ! "$@"; then
+		log "Failed to run [$*]"
 	fi
 }
 
-function configure_firewall_rule()
-{
+configure_firewall_rule() {
 	local enable port protocol gui_port
 	local zone interface
 
@@ -32,25 +30,24 @@ function configure_firewall_rule()
 	config_get port remote_access port
 	config_get interface remote_access interface
 
-	if [ "${enable}" -eq "0" -o -z "${port}" -o -z "${interface}" ]; then
+	if [ "${enable}" -eq "0" ] || [ -z "${port}" ] || [ -z "${interface}" ]; then
 		return 0;
 	fi
 
 	zone="zone_${interface}_input"
-	iptables -w 1 -t filter -nL ${zone} 2>/dev/null 1>&2
+	iptables -w 1 -t filter -nL "${zone}" 2>/dev/null 1>&2
 	if [ "$?" -eq 0 ]; then
-		iptables -w 1 -I ${zone} -p tcp -m multiport --dports ${port} -m conntrack --ctstate NEW,ESTABLISHED -m comment --comment "${IDENTIFIER}" -j ACCEPT
+		iptables -w 1 -I "${zone}" -p tcp -m multiport --dports "${port}" -m conntrack --ctstate NEW,ESTABLISHED -m comment --comment "${IDENTIFIER}" -j ACCEPT
 	fi
 
 	zone="zone_${interface}_output"
-	iptables -w 1 -t filter -nL ${zone} 2>/dev/null 1>&2
+	iptables -w 1 -t filter -nL "${zone}" 2>/dev/null 1>&2
 	if [ "$?" -eq 0 ]; then
-		iptables -w 1 -I ${zone} -p tcp -m multiport --dports ${port} -m conntrack --ctstate ESTABLISHED -m comment --comment "${IDENTIFIER}" -j ACCEPT
+		iptables -w 1 -I "${zone}" -p tcp -m multiport --dports "${port}" -m conntrack --ctstate ESTABLISHED -m comment --comment "${IDENTIFIER}" -j ACCEPT
 	fi
 }
 
-function delete_firewall_rule()
-{
+delete_firewall_rule() {
 	local zone interface
 	local CMD
 
@@ -67,7 +64,7 @@ function delete_firewall_rule()
 	while ${CMD} 2>/dev/null | grep "${IDENTIFIER}"; do
 		rule_num="$(${CMD} | grep "${IDENTIFIER}" | head -1|awk '{print $1}')"
 		if [ -n "${rule_num}" ]; then
-			exec_cmd iptables -w 1 -t filter -D ${zone} ${rule_num};
+			exec_cmd iptables -w 1 -t filter -D "${zone}" "${rule_num}";
 		fi
 	done
 
@@ -76,7 +73,7 @@ function delete_firewall_rule()
 	while ${CMD} 2>/dev/null | grep "${IDENTIFIER}"; do
 		rule_num="$(${CMD} | grep "${IDENTIFIER}" | head -1|awk '{print $1}')"
 		if [ -n "${rule_num}" ]; then
-			exec_cmd iptables -w 1 -t filter -D ${zone} ${rule_num};
+			exec_cmd iptables -w 1 -t filter -D "${zone}" "${rule_num}";
 		fi
 	done
 }

bbf/files/etc/uci-defaults/01-mosquitto-config

@@ -4,7 +4,7 @@ config_mosquitto_owrt() {
 	sec=$(uci -q get mosquitto.owrt)
 	if [ -z "${sec}" ]; then
 		sec=$(uci -q add mosquitto owrt)
-		uci -q rename mosquitto."${sec}"="owrt"
+		uci -q rename mosquitto."${sec}=owrt"
 	fi
 
 	uci -q set mosquitto.owrt.use_uci="1"
@@ -16,7 +16,7 @@ config_mosquitto_general() {
 	sec=$(uci -q get mosquitto.mosquitto)
 	if [ -z "${sec}" ]; then
 		sec=$(uci -q add mosquitto mosquitto)
-		uci -q rename mosquitto."${sec}"="mosquitto"
+		uci -q rename mosquitto."${sec}=mosquitto"
 	fi
 
 	uci -q set mosquitto.mosquitto.log_dest="syslog"
@@ -31,7 +31,7 @@ config_mosquitto_persistence() {
 	sec=$(uci -q get mosquitto.persistence)
 	if [ -z "${sec}" ]; then
 		sec=$(uci -q add mosquitto persistence)
-		uci -q rename mosquitto."${sec}"="persistence"
+		uci -q rename mosquitto."${sec}=persistence"
 	fi
 
 	uci -q set mosquitto.persistence.persistence="0"

bulkdata/Makefile

@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bulkdata
-PKG_VERSION:=2.0.9
+PKG_VERSION:=2.0.10
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)

bulkdata/files/etc/uci-defaults/95-bulkdata-translation-options

@@ -16,8 +16,8 @@ get_next_count()
 	fi
 
 	while [ "${found}" -ne 1 ]; do
-		uci -q get ${config}.${default_name}_${count} >/dev/null
-		if [ $? -eq 0 ]; then
+		uci -q get "${config}"."${default_name}"_${count} >/dev/null
+		if [ "$?" -eq 0 ]; then
 			count=$((count + 1))
 		else
 			found=1;
@@ -39,8 +39,8 @@ translate_profile_id_to_profile_name() {
 	
 	[ "${curr_profile_id}" != "${profile_id}" ] && return
 
-	uci -q set bulkdata.${section}.profile_name="${profile_name}"
-	uci -q set bulkdata.${section}.profile_id=""	
+	uci -q set bulkdata."${section}".profile_name="${profile_name}"
+	uci -q set bulkdata."${section}".profile_id=""
 }
 
 update_profile_sections() {
@@ -54,7 +54,7 @@ update_profile_sections() {
 
 	case "${section}" in
 		"cfg"*)
-			profile_name="$(get_next_count bulkdata ${default} ${PROFILE_COUNT})"
+			profile_name="$(get_next_count bulkdata "${default}" ${PROFILE_COUNT})"
 			uci_rename bulkdata "${section}" "${profile_name}"
 		;;
 	esac
@@ -62,7 +62,7 @@ update_profile_sections() {
 
 	[ -n "$profile_name" ] && section="${profile_name}"
 
-	uci -q set bulkdata.${section}.profile_id=""
+	uci -q set bulkdata."${section}".profile_id=""
 
 	config_foreach translate_profile_id_to_profile_name profile_parameter "${profile_id}" "${profile_name}"
 	config_foreach translate_profile_id_to_profile_name profile_http_request_uri_parameter "${profile_id}" "${profile_name}"

easy-soc-libs/Config.in

@@ -1,5 +0,0 @@
-# libeasy configuration
-
-config LIBWIFI_USE_CTRL_IFACE
-	bool "Use UNIX sockets"
-	default n

easy-soc-libs/Makefile

@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=easy-soc-libs
-PKG_VERSION:=7.2.14
+PKG_VERSION:=7.2.16
 PKG_RELEASE:=1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=600dea2a0df974d9049c9fc9a2f85ff9e08f59d4
+PKG_SOURCE_VERSION:=ff2fca6e57f6da1384f6a5f7741d8d1b2aa114fb
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/easy-soc-libs.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
@@ -43,6 +43,10 @@ ifeq ($(CONFIG_TARGET_brcmbca),y)
   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_iopsys_ramips),y)
+  TARGET_PLATFORM=MEDIATEK
+  TARGET_WIFI_TYPE=MAC80211
+  TARGET_CFLAGS +=-DIOPSYS_MAC80211
 else ifeq ($(CONFIG_TARGET_iopsys_x86),y)
   TARGET_PLATFORM=TEST
   TARGET_WIFI_TYPE=TEST

easy-soc-libs/easy.mk

@@ -6,10 +6,6 @@ define Package/libeasy
   DEPENDS+=+libnl +libnl-route
 endef
 
-define Package/libeasy/config
-    source "$(SOURCE)/Config.in"
-endef
-
 define Build/InstallDev/libeasy
 	$(INSTALL_DIR) $(1)/usr/include/easy
 	$(INSTALL_DIR) $(1)/usr/lib

easy-soc-libs/ethernet.mk

@@ -2,7 +2,7 @@
 define Package/libethernet
   $(call Package/easy-soc-libs)
   TITLE:= Ethernet library (libethernet)
-  DEPENDS+=+libnl +libnl-route +libeasy +TARGET_airoha:ecnt_api
+  DEPENDS+=+libnl +libnl-route +libeasy +TARGET_iopsys_ramips:swconfig +TARGET_airoha:ecnt_api
 endef
 
 define Package/libethernet/config

easy-soc-libs/wifi.mk

@@ -27,9 +27,13 @@ endef
 
 define Package/libwifi/config
   if PACKAGE_libwifi
-	  config LIBWIFI_DEBUG
+  	config LIBWIFI_DEBUG
 		depends on PACKAGE_libwifi
-		bool "Enable wifi debugging"
+		bool "Enable debugging in libwifi"
+		default n
+
+	config LIBWIFI_USE_CTRL_IFACE
+		bool "Create UNIX sockets to interface with hostapd/wpa_supplicant"
 		default n
   endif
 endef

ethmngr/Makefile

@@ -23,7 +23,7 @@ define Package/ethmngr
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=Ethernet status and configration utility
-  DEPENDS:=+(TARGET_brcmbca||TARGET_airoha||TARGET_ipq95xx):libethernet +libuci +libubox +ubus +libpthread +libnl-genl
+  DEPENDS:=+(TARGET_brcmbca||TARGET_airoha||TARGET_ipq95xx||TARGET_iopsys_mediatek):libethernet +libuci +libubox +ubus +libpthread +libnl-genl
 endef
 
 define Package/ethmngr/description
@@ -37,7 +37,7 @@ TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
 	-D_GNU_SOURCE
 
-ifeq ($(CONFIG_TARGET_brcmbca)$(CONFIG_TARGET_airoha)$(CONFIG_TARGET_ipq95xx),)
+ifeq ($(CONFIG_TARGET_brcmbca)$(CONFIG_TARGET_airoha)$(CONFIG_TARGET_ipq95xx)$(CONFIG_TARGET_iopsys_mediatek),)
 define Build/Compile
 endef
 endif
@@ -51,7 +51,7 @@ else ifneq ($(CONFIG_TARGET_airoha),)
 else
 	$(CP) ./files/linux/* $(1)/
 endif
-ifneq ($(CONFIG_TARGET_brcmbca)$(CONFIG_TARGET_airoha)$(CONFIG_TARGET_ipq95xx),)
+ifneq ($(CONFIG_TARGET_brcmbca)$(CONFIG_TARGET_airoha)$(CONFIG_TARGET_ipq95xx)$(CONFIG_TARGET_iopsys_mediatek),)
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ethmngr $(1)/usr/sbin/
 endif

gryphon-led-module/src/main.c

@@ -220,7 +220,6 @@ static int canyon_led_probe(struct platform_device *pdev)
 	if (IS_ERR(leds->clock_gpio)) {
 		dev_err(&pdev->dev, "Failed to acquire clock GPIO %ld\n",
 				PTR_ERR(leds->clock_gpio));
-		leds->clock_gpio = NULL;
 		return PTR_ERR(leds->clock_gpio);
 	}
 
@@ -228,7 +227,6 @@ static int canyon_led_probe(struct platform_device *pdev)
 	if (IS_ERR(leds->clock_gpio)) {
 		dev_err(&pdev->dev, "Failed to acquire clock GPIO %ld\n",
 				PTR_ERR(leds->clock_gpio));
-		leds->clock_gpio = NULL;
 		return PTR_ERR(leds->clock_gpio);
 	} else {
 		printk(KERN_INFO "Got clock gpio\n");
@@ -246,7 +244,6 @@ static int canyon_led_probe(struct platform_device *pdev)
 	if (IS_ERR(leds->data_gpio)) {
 		dev_err(&pdev->dev, "Failed to acquire data GPIO %ld\n",
 				PTR_ERR(leds->data_gpio));
-		leds->data_gpio = NULL;
 		return PTR_ERR(leds->data_gpio);
 	}
 
@@ -254,7 +251,6 @@ static int canyon_led_probe(struct platform_device *pdev)
 	if (IS_ERR(leds->data_gpio)) {
 		dev_err(&pdev->dev, "Failed to acquire data GPIO %ld\n",
 				PTR_ERR(leds->data_gpio));
-		leds->data_gpio = NULL;
 		return PTR_ERR(leds->data_gpio);
 	} else {
 		printk(KERN_INFO "Got data gpio\n");

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=9.1.10
+PKG_VERSION:=9.1.14
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
-PKG_SOURCE_VERSION:=fd9ca76bf074522f0110aaf0ff938f7cfe9b8c25
+PKG_SOURCE_VERSION:=d135d87f65e569b504464738e2b0c2041865a20a
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 

icwmp/files/etc/firewall.cwmp

@@ -20,13 +20,13 @@ if [ -z "${zone_name}" ]; then
 	exit 0
 elif [ "$zone_name" = "icwmp" ]; then
 	iptables -nL zone_icwmp_input 2> /dev/null
-	if [ $? != 0 ]; then
+	if [ "$?" != 0 ]; then
 		iptables -w 1 -N zone_icwmp_input
 		iptables -w 1 -t filter -A INPUT -j zone_icwmp_input
-		iptables -w 1 -I zone_icwmp_input -p tcp --dport $port -j REJECT
+		iptables -w 1 -I zone_icwmp_input -p tcp --dport "${port}" -j REJECT
 	else			
 		iptables -w 1 -F zone_icwmp_input
-		iptables -w 1 -I zone_icwmp_input -p tcp --dport $port -j REJECT
+		iptables -w 1 -I zone_icwmp_input -p tcp --dport "${port}" -j REJECT
 	fi			
 else
 	iptables -w 1 -F zone_icwmp_input 2> /dev/null
@@ -64,13 +64,13 @@ else
 	fi
 fi
 
-echo ${cmd}|grep -q "\-\-dport \|\-s "
+echo "${cmd}"|grep -q "\-\-dport \|\-s "
 if [ "$?" -eq 0 ]; then
 	cmd="${cmd} -j ACCEPT -m comment --comment=Open_ACS_port"
 	${cmd}
 fi
 
-echo ${cmd6}|grep -q "\-\-dport \|\-s "
+echo "${cmd6}"|grep -q "\-\-dport \|\-s "
 if [ "$?" -eq 0 ]; then
 	cmd6="${cmd6} -j ACCEPT -m comment --comment=Open_ACS_port"
 	${cmd6}

icwmp/files/etc/icwmpd/update.sh

@@ -16,7 +16,7 @@ handle_icwmp_update() {
 
 	ret=$(ubus call service list '{"name":"icwmpd"}' | jsonfilter -qe '@.icwmpd.instances.icwmp.running')
 
-	if [ "$ret" == "true" ]; then
+	if [ "$ret" = "true" ]; then
 		# read status from var/state/cwmp
 		status=$(uci -q -c /var/state get cwmp.sess_status.current_status)
 		if [ "$status" != "running" ]; then
@@ -29,4 +29,4 @@ handle_icwmp_update() {
 	fi
 }
 
-handle_icwmp_update $@
+handle_icwmp_update "$@"

icwmp/files/etc/init.d/icwmpd

@@ -23,22 +23,22 @@ regenerate_ssl_link()
 	[ ! -d "${cert_dir}" ] && return 0;
 
 	### Generate all ssl link for pem certicates ###
-	all_file=$(ls $cert_dir/*.pem 2>/dev/null)
+	all_file=$(ls "${cert_dir}"/*.pem 2>/dev/null)
 	if [ -n "${all_file}" ]; then
 		for cfile in $all_file; do
-			rehash="$(openssl x509 -hash -noout -in $cfile)"
-			[ -f ${cert_dir}/${rehash}.0 ] || \
-				ln -s $cfile $cert_dir/${rehash}.0
+			rehash="$(openssl x509 -hash -noout -in "${cfile}")"
+			[ -f "${cert_dir}"/"${rehash}".0 ] || \
+				ln -s "${cfile}" "${cert_dir}"/"${rehash}".0
 		done
 	fi
 
 	### Generate all ssl link for crt certicates ###
-	all_file=$(ls $cert_dir/*.crt 2>/dev/null)
+	all_file=$(ls "${cert_dir}"/*.crt 2>/dev/null)
 	if [ -n "${all_file}" ]; then
 		for cfile in $all_file; do
-			rehash="$(openssl x509 -hash -noout -in $cfile)"
-			[ -f ${cert_dir}/${rehash}.0 ] || \
-				ln -s $cfile $cert_dir/${rehash}.0
+			rehash="$(openssl x509 -hash -noout -in "${cfile}")"
+			[ -f "${cert_dir}"/"${rehash}".0 ] || \
+				ln -s "${cfile}" "${cert_dir}"/"${rehash}".0
 		done
 	fi
 }
@@ -47,8 +47,8 @@ enable_dhcp_option43() {
 	local wan="${1}"
 
 	### Ask for DHCP Option 43 only if CWMP is enabled ###
-	local reqopts="$(uci -q get network.$wan.reqopts)"
-	local proto="$(uci -q get network.$wan.proto)"
+	local reqopts="$(uci -q get network."${wan}".reqopts)"
+	local proto="$(uci -q get network."${wan}".proto)"
 	local newreqopts=""
 	local option43_present=0
 
@@ -64,8 +64,8 @@ enable_dhcp_option43() {
 	fi
 
 	newreqopts="$reqopts 43"
-	if [ "${proto}" == "dhcp" ]; then
-		uci -q set network.$wan.reqopts="$newreqopts"
+	if [ "${proto}" = "dhcp" ]; then
+		uci -q set network."${wan}".reqopts="$newreqopts"
 		uci commit network
 		ubus call network reload
 	fi
@@ -122,12 +122,12 @@ configure_send_op125() {
 	serial_len=$(echo -n "${serial}" | wc -m)
 	class_len=$(echo -n "${class}" | wc -m)
 
-	if [ ${oui_len} -eq 0 ] || [ ${serial_len} -eq 0 ]; then
+	if [ "${oui_len}" -eq 0 ] || [ "${serial_len}" -eq 0 ]; then
 		return 0
 	fi
 
 	opt125_len=$((oui_len + serial_len + class_len))
-	if [ ${class_len} -gt 0 ]; then
+	if [ "${class_len}" -gt 0 ]; then
 		opt125_len=$((opt125_len + 6))
 	else
 		opt125_len=$((opt125_len + 4))
@@ -159,7 +159,7 @@ configure_send_op125() {
 		opt125="${opt125}:05:${hex_serial_len}${hex_serial}"
 	fi
 
-	if [ ${class_len} -gt 0 ]; then
+	if [ "${class_len}" -gt 0 ]; then
 		hex_class=$(convert_to_hex "${class}")
 		if [ -z "${hex_class}" ]; then
 			return 0
@@ -176,9 +176,9 @@ configure_send_op125() {
 
 	if [ "${uci}" = "network" ]; then
 		new_send_opt="$sendopt $opt125"
-		uci -q set network.$intf.sendopts="$new_send_opt"
+		uci -q set network."${intf}".sendopts="$new_send_opt"
 	else
-		uci -q add_list dhcp.$intf.dhcp_option="$opt125"
+		uci -q add_list dhcp."${intf}".dhcp_option="$opt125"
 	fi
 }
 
@@ -187,9 +187,9 @@ enable_dnsmasq_option125() {
 	local send125_present=0
 	local opt125="125,"
 
-	local proto="$(uci -q get dhcp.$lan.dhcpv4)"
+	local proto="$(uci -q get dhcp."${lan}".dhcpv4)"
 	if [ "${proto}" = "server" ]; then
-		opt_list="$(uci -q get dhcp.$lan.dhcp_option)"
+		opt_list="$(uci -q get dhcp."${lan}".dhcp_option)"
 
 		for sopt in $opt_list; do
 			if [[ "$sopt" == "$opt125"* ]]; then
@@ -207,15 +207,15 @@ enable_dnsmasq_option125() {
 
 set_vendor_id() {
 	local wan="${1}"
-	local proto="$(uci -q get network.$wan.proto)"
+	local proto="$(uci -q get network."${wan}".proto)"
 
-	if [ "${proto}" == "dhcp" ]; then
-		vendorid="$(uci -q get network.$wan.vendorid)"
+	if [ "${proto}" = "dhcp" ]; then
+		vendorid="$(uci -q get network."${wan}".vendorid)"
 		if [ -z "${vendorid}" ]; then
-			uci -q set network.$wan.vendorid="dslforum.org"
+			uci -q set network."${wan}".vendorid="dslforum.org"
 			ubus call uci commit '{"config":"network"}'
 		elif [[ $vendorid != *"dslforum.org"* ]]; then
-			uci -q set network.$wan.vendorid="${vendorid},dslforum.org"
+			uci -q set network."${wan}".vendorid="${vendorid},dslforum.org"
 			ubus call uci commit '{"config":"network"}'
 		fi
 	fi
@@ -223,9 +223,9 @@ set_vendor_id() {
 
 enable_dhcp_option125() {
 	local wan="${1}"
-	local reqopts="$(uci -q get network.$wan.reqopts)"
-	local sendopts="$(uci -q get network.$wan.sendopts)"
-	local proto="$(uci -q get network.$wan.proto)"
+	local reqopts="$(uci -q get network."${wan}".reqopts)"
+	local sendopts="$(uci -q get network."${wan}".sendopts)"
+	local proto="$(uci -q get network."${wan}".proto)"
 	local newreqopts=""
 	local newsendopts=""
 	local req125_present=0
@@ -247,10 +247,10 @@ enable_dhcp_option125() {
 		fi
 	done
 
-	if [ "${proto}" == "dhcp" ]; then
+	if [ "${proto}" = "dhcp" ]; then
 		if [ ${req125_present} -eq 0 ]; then
 			newreqopts="$reqopts 125"
-			uci -q set network.$wan.reqopts="$newreqopts"
+			uci -q set network."${wan}".reqopts="$newreqopts"
 			network_uci_update=1
 		fi
 
@@ -389,7 +389,7 @@ boot() {
 	config_get dhcp_discovery acs dhcp_discovery "0"
 	config_get wan_interface cpe default_wan_interface "wan"
 
-	if [ "${dhcp_discovery}" == "enable" ] || [ "${dhcp_discovery}" == "1" ]; then
+	if [ "${dhcp_discovery}" = "enable" ] || [ "${dhcp_discovery}" = "1" ]; then
 		# Set dhcp option 43 if not already configured
 		enable_dhcp_option43 "${wan_interface}"
 		# Set dhcp option 60
@@ -473,7 +473,7 @@ reload_service() {
 		return 0
 	fi
 
-	status="$(echo $tr069_status | jsonfilter -qe '@.cwmp.status')"
+	status="$(echo "${tr069_status}" | jsonfilter -qe '@.cwmp.status')"
 	ret="$?"
 	if [ "$status" = "up" ]; then
 		ubus -t 1 call tr069 command '{"command":"reload"}'

ieee1905/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=8.0.0
+PKG_VERSION:=8.0.10
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=a4f0002bcad9b7e525ed5d661f9c5f92b0e9ca2f
+PKG_SOURCE_VERSION:=69b1073cfe3dc936c9cbe3e8a71005e9fa9f57e0
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ieee1905.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip

iop/config

@@ -131,7 +131,7 @@ CONFIG_PACKAGE_atftp=m
 CONFIG_PACKAGE_atftpd=m
 CONFIG_PACKAGE_ddns-scripts=y
 CONFIG_PACKAGE_dnsmasq=y
-CONFIG_PACKAGE_miniupnpd-iptables=y
+CONFIG_PACKAGE_ssdpd=y
 CONFIG_PACKAGE_mosquitto-client-ssl=y
 CONFIG_PACKAGE_mosquitto-ssl=y
 CONFIG_PACKAGE_nginx=y

iop/scripts/genconfig.sh

@@ -14,6 +14,7 @@ function genconfig {
 	target="bogus"
 	target_config_path=""
 	brcmbca_feed="target/linux/feeds/brcmbca"
+	ramips_feed="target/linux/feeds/iopsys-ramips"
 	airoha_feed="target/linux/feeds/airoha"
 	x86_feed="target/linux/feeds/iopsys-x86"
 	armvirt_feed="target/linux/feeds/iopsys-armvirt"
@@ -110,6 +111,8 @@ function genconfig {
 
 		[ -e $brcmbca_feed/genconfig ] &&
 			brcmbca=$(cd $brcmbca_feed; ./genconfig)
+		[ -e $ramips_feed/genconfig ] &&
+			iopsys_ramips=$(cd $ramips_feed; ./genconfig)
 		[ -e $airoha_feed/genconfig ] &&
 			airoha=$(cd $airoha_feed; ./genconfig)
 		[ -e $x86_feed/genconfig ] &&
@@ -122,7 +125,7 @@ function genconfig {
 			ipq95xx=$(cd $qualcomm_ipq95xx_feed; ./genconfig)
 
 	    if [ "$profile" == "LIST" ]; then
-			for list in brcmbca airoha iopsys_x86 iopsys_armvirt iopsys_mediatek ipq95xx; do
+			for list in brcmbca iopsys_ramips airoha iopsys_x86 iopsys_armvirt iopsys_mediatek ipq95xx; do
 				echo "$list based boards:"
 				for b in ${!list}; do
 					echo -e "\t$b"
@@ -139,6 +142,14 @@ function genconfig {
 		fi
 	    done
 
+	    for p in $iopsys_ramips; do
+		if [ $p == $profile ]; then
+		    target="iopsys_ramips"
+			target_config_path="$ramips_feed/config"
+		    return
+		fi
+	    done
+
 	    for p in $airoha; do
 		if [ $p == $profile ]; then
 		    target="airoha"
@@ -342,7 +353,7 @@ function genconfig {
 
 		# Special handling for targets which use TARGET_DEVICES
 		case "$target" in
-		airoha | iopsys_mediatek | brcmbca | ipq95xx)
+		iopsys_ramips | airoha | iopsys_mediatek | brcmbca | ipq95xx)
 			# This assumes the device name to be unique within one target,
 			# which is a fair assumption to make.
 			local mk_file="$(grep -Fx --files-with-matches "define Device/${BOARDTYPE}" "$target_config_path/../image/"*.mk)"

iop/scripts/genconfig_min.sh

@@ -13,6 +13,7 @@ function genconfig_min {
 	target="bogus"
 	target_config_path=""
 	brcmbca_feed="target/linux/feeds/brcmbca"
+	ramips_feed="target/linux/feeds/iopsys-ramips"
 	airoha_feed="target/linux/feeds/airoha"
 	x86_feed="target/linux/feeds/iopsys-x86"
 	armvirt_feed="target/linux/feeds/iopsys-armvirt"
@@ -109,6 +110,8 @@ function genconfig_min {
 
 		[ -e $brcmbca_feed/genconfig ] &&
 			brcmbca=$(cd $brcmbca_feed; ./genconfig)
+		[ -e $ramips_feed/genconfig ] &&
+			iopsys_ramips=$(cd $ramips_feed; ./genconfig)
 		[ -e $airoha_feed/genconfig ] &&
 			airoha=$(cd $airoha_feed; ./genconfig)
 		[ -e $x86_feed/genconfig ] &&
@@ -121,7 +124,7 @@ function genconfig_min {
 			ipq95xx=$(cd $qualcomm_ipq95xx_feed; ./genconfig)
 
 	    if [ "$profile" == "LIST" ]; then
-			for list in brcmbca airoha iopsys_x86 iopsys_armvirt iopsys_mediatek ipq95xx; do
+			for list in brcmbca iopsys_ramips airoha iopsys_x86 iopsys_armvirt iopsys_mediatek ipq95xx; do
 				echo "$list based boards:"
 				for b in ${!list}; do
 					echo -e "\t$b"
@@ -138,6 +141,14 @@ function genconfig_min {
 		fi
 	    done
 
+	    for p in $iopsys_ramips; do
+		if [ $p == $profile ]; then
+		    target="iopsys_ramips"
+			target_config_path="$ramips_feed/config"
+		    return
+		fi
+	    done
+
 	    for p in $airoha; do
 		if [ $p == $profile ]; then
 		    target="airoha"
@@ -316,7 +327,7 @@ function genconfig_min {
 
 		# Special handling for targets which use TARGET_DEVICES
 		case "$target" in
-			airoha | iopsys_mediatek | brcmbca | ipq95xx)
+		iopsys_ramips | airoha | iopsys_mediatek | brcmbca | ipq95xx)
 			# This assumes the device name to be unique within one target,
 			# which is a fair assumption to make.
 			local mk_file="$(grep -Fx --files-with-matches "define Device/${BOARDTYPE}" "$target_config_path/../image/"*.mk)"

libvoice-airoha/Makefile

@@ -16,7 +16,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:=96cdaee6f301b3df8eaa8e9f5c9a4a704740aad2
+PKG_SOURCE_VERSION:=9133eacf5665dc01fa58d819bcc96f0a97ebd63c
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

libvoice-d2/Makefile

@@ -16,7 +16,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:=0569710a2068b4d9832b4348366f4d6f0ad54cf7
+PKG_SOURCE_VERSION:=abedc475cac1a21ad434dbf2131eb42aa495744d
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

map-agent/Config.in

@@ -36,5 +36,14 @@ config AGENT_EASYMESH_VENDOR_EXT_OUI
 config AGENT_UNAUTHORIZED_STA_IN_ASSOCLIST
 	bool "Create STA entry before authorization is completed"
 
+config AGENT_CHANSWITCH_SKIP_DFS_UNAVAILABLE
+	bool "Skip DFS unavailable channels when channel switch"
+
+config AGENT_LOCAL_ACS_SERVICE
+	bool "Enable loacal ACS daemon usage"
+
+config AGENT_STRICT_OPER_CHANNEL_REPORT
+	bool "Report operation channel strictly, skip some unsolicited reports"
+
 endmenu
 endif

map-agent/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=4.2.0.0
+PKG_VERSION:=4.2.0.4
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=22dc5640b1f30dd5bdfa9257fdd673ed39d16526
+PKG_SOURCE_VERSION:=57a01fc4c8846486960a53d4ca808617520a051c
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 
 PKG_LICENSE:=BSD-3-Clause
@@ -82,6 +82,18 @@ ifeq ($(CONFIG_AGENT_UNAUTHORIZED_STA_IN_ASSOCLIST),y)
 TARGET_CFLAGS += -DUNAUTHORIZED_STA_IN_ASSOCLIST
 endif
 
+ifeq ($(CONFIG_AGENT_CHANSWITCH_SKIP_DFS_UNAVAILABLE),y)
+TARGET_CFLAGS += -DCHANSWITCH_SKIP_DFS_UNAVAILABLE
+endif
+
+ifeq ($(CONFIG_AGENT_LOCAL_ACS_SERVICE),y)
+TARGET_CFLAGS += -DLOCAL_ACS_SERVICE
+endif
+
+ifeq ($(CONFIG_AGENT_STRICT_OPER_CHANNEL_REPORT),y)
+TARGET_CFLAGS += -DSTRICT_OPER_CHANNEL_REPORT
+endif
+
 MAKE_PATH:=src
 
 define Package/map-agent/install

map-controller/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=4.2.0.0
+PKG_VERSION:=4.2.0.2
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=3a12ca25ba275c5f1e2bf7ed22d2f96fb78cc677
+PKG_SOURCE_VERSION:=47e0c27b8a4f08e1dbebab98c3c3aa72dae22dd0
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)

map-topology/Makefile

@@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=map-topology
-PKG_VERSION:=2.5.1.16
+PKG_VERSION:=2.5.1.17
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_VERSION:=0dbb7c12a183ee9cf88a47f65668113824c76cbd
+PKG_SOURCE_VERSION:=7683a1b6a08996f07de573c67a33ad143dffeaa8
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/map-topology.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz

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

@@ -2,155 +2,23 @@
 
 . /lib/functions.sh
 . /usr/share/libubox/jshn.sh
+. /lib/mcast/common.sh
 
 include /lib/network
 
+
 CONFFILE=/var/mcpd.conf
 PROG_EXE=/usr/sbin/mcpd
 
-# Parameters available in snooping configuration
-igmp_s_enable=0
-igmp_s_version=2
-igmp_s_query_interval=125
-igmp_s_q_resp_interval=100
-igmp_s_last_mem_q_int=10
-igmp_s_fast_leave=1
-igmp_s_robustness=2
-igmp_s_mode=0
-igmp_s_iface=""
-igmp_s_exceptions=""
-
-mld_s_enable=0
-mld_s_version=2
-mld_s_robustness=2
-mld_s_mode=0
-mld_s_iface=""
-mld_s_exceptions=""
-
-# Global params
-max_groups=25
-max_msf=10
-max_members=25
-mldv1_unsolicited_report_interval=10
-mldv2_unsolicited_report_interval=1
-
-# Parameters available in proxy configuration
-igmp_p_enable=0
-igmp_p_version=2
-igmp_query_interval=125
-igmp_q_resp_interval=100
-igmp_last_mem_q_int=10
-igmp_fast_leave=1
-igmp_p_robustness=2
-igmp_p_mode=0
-igmp_p_up_interfaces=""
-igmp_p_down_interfaces=""
-igmp_p_exceptions=""
-
-mld_p_enable=0
-mld_p_version=1
-mld_query_interval=125
-mld_q_resp_interval=100
-mld_last_mem_q_int=10
-mld_fast_leave=1
-mld_p_robustness=2
-mld_p_mode=0
-mld_p_up_interfaces=""
-mld_p_down_interfaces=""
-mld_p_exceptions=""
-
 proxdevs=""
 ethwan="$(db -q get hw.board.ethernetWanPort)"
 
-read_snooping() {
-	local config="$1"
-	local sec_enable
-	local proto
-
-	config_get sec_enable "$config" enable 0
-	config_get proto "$config" proto
-
-	if [ "$sec_enable" == "0" ]; then
-		return
-	fi
-
-	if [ "$proto" == "igmp" ]; then
-		igmp_s_enable=$sec_enable
-		config_get igmp_s_version "$config" version 2
-		config_get igmp_s_query_interval "$config" query_interval 125
-		config_get igmp_s_q_resp_interval "$config" query_response_interval 100
-		config_get igmp_s_last_mem_q_int "$config" last_member_query_interval 10
-		config_get igmp_s_fast_leave "$config" fast_leave 1
-		config_get igmp_s_robustness "$config" robustness 2
-		config_get igmp_s_mode "$config" snooping_mode 0
-		config_get igmp_s_iface "$config" interface
-		config_get igmp_s_exceptions "$config" filter
-		return
-	fi
-
-	if [ "$proto" == "mld" ]; then
-		mld_s_enable=$sec_enable
-		config_get mld_s_version "$config" version 2
-		config_get mld_s_query_interval "$config" query_interval 125
-		config_get mld_s_q_resp_interval "$config" query_response_interval 100
-		config_get mld_s_last_mem_q_int "$config" last_member_query_interval 10
-		config_get mld_s_fast_leave "$config" fast_leave 1
-		config_get mld_s_robustness "$config" robustness 2
-		config_get mld_s_mode "$config" snooping_mode 0
-		config_get mld_s_iface "$config" interface
-		config_get mld_s_exceptions "$config" filter
-		return
-	fi
-}
-
-read_proxy() {
-	local config="$1"
-	local sec_enable
-	local proto
-
-	config_get sec_enable "$config" enable 0
-	config_get proto "$config" proto
-
-	if [ "$sec_enable" == "0" ]; then
-		return
-	fi
-
-	if [ "$proto" == "igmp" ]; then
-		igmp_p_enable=$sec_enable
-		config_get igmp_p_version "$config" version 2
-		config_get igmp_query_interval "$config" query_interval 125
-		config_get igmp_q_resp_interval "$config" query_response_interval 100
-		config_get igmp_last_mem_q_int "$config" last_member_query_interval 10
-		config_get igmp_fast_leave "$config" fast_leave 1
-		config_get igmp_p_robustness "$config" robustness 2
-		config_get igmp_p_mode "$config" snooping_mode 0
-		config_get igmp_p_up_interfaces "$config" upstream_interface
-		config_get igmp_p_down_interfaces "$config" downstream_interface
-		config_get igmp_p_exceptions "$config" filter
-		return
-	fi
-
-	if [ "$proto" == "mld" ]; then
-		mld_p_enable=$sec_enable
-		config_get mld_p_version "$config" version 2
-		config_get mld_query_interval "$config" query_interval 125
-		config_get mld_q_resp_interval "$config" query_response_interval 100
-		config_get mld_last_mem_q_int "$config" last_member_query_interval 10
-		config_get mld_fast_leave "$config" fast_leave 1
-		config_get mld_p_robustness "$config" robustness 2
-		config_get mld_p_mode "$config" snooping_mode 0
-		config_get mld_p_up_interfaces "$config" upstream_interface
-		config_get mld_p_down_interfaces "$config" downstream_interface
-		config_get mld_p_exceptions "$config" filter
-		return
-	fi
-}
 
 config_snooping_common_params() {
 	local protocol="$1"
 	echo "${protocol}-default-version $2" >> $CONFFILE
 	echo "${protocol}-robustness-value $3" >> $CONFFILE
-	echo "${protocol}-max-groups $max_groups" >> $CONFFILE 
+	echo "${protocol}-max-groups $max_groups" >> $CONFFILE
 	echo "${protocol}-max-sources $max_msf" >> $CONFFILE
 	echo "${protocol}-max-members $max_members" >> $CONFFILE
 	echo "${protocol}-snooping-enable $4" >> $CONFFILE
@@ -254,7 +122,7 @@ configure_mcpd_snooping() {
 	local exceptions
 	local filter_ip=""
 	local fast_leave=0
-	
+
 	# Configure snooping related params
 	if [ "$protocol" == "igmp" ]; then
 		config_snooping_common_params $protocol $igmp_s_version $igmp_s_robustness $igmp_s_mode
@@ -366,44 +234,6 @@ configure_mcpd() {
 	fi
 }
 
-read_mcast_snooping_params() {
-	config_load mcast
-	config_foreach read_snooping snooping
-}
-
-read_mcast_proxy_params() {
-	config_load mcast
-	config_foreach read_proxy proxy
-}
-
-config_global_params() {
-	local igmp_qrv
-	local igmp_force_version
-	local mld_qrv
-	local mld_force_version
-
-	config_load mcast
-	config_get max_msf igmp max_msf 10
-	config_get max_groups igmp max_membership 25
-	config_get igmp_qrv igmp qrv 2
-	config_get igmp_force_version igmp force_version 0
-
-	config_get mld_qrv mld qrv 2
-	config_get mldv1_unsolicited_report_interval mld mldv1_unsolicited_report_interval 10
-	config_get mldv2_unsolicited_report_interval mld mldv2_unsolicited_report_interval 1
-	config_get mld_force_version mld force_version 0
-
-	# mcpd internally writes max_groups and max_msf, no need to modify
-	# here directly
-	echo $igmp_qrv > /proc/sys/net/ipv4/igmp_qrv
-	echo $igmp_force_version > /proc/sys/net/ipv4/conf/all/force_igmp_version
-
-	echo $mld_qrv >  /proc/sys/net/ipv6/mld_qrv
-	echo $mld_force_version > /proc/sys/net/ipv6/conf/all/force_mld_version
-	echo $mldv1_unsolicited_report_interval > /proc/sys/net/ipv6/conf/all/mldv1_unsolicited_report_interval
-	echo $mldv2_unsolicited_report_interval > /proc/sys/net/ipv6/conf/all/mldv2_unsolicited_report_interval
-}
-
 setup_mcast_mode() {
 	# set the mode at chip to allow both tagged and untagged multicast forwarding
 	bs /b/c iptv lookup_method=group_ip_src_ip
@@ -413,6 +243,8 @@ configure_mcast() {
 	rm -f $CONFFILE
 	touch $CONFFILE
 
+	# mcpd internally writes max_groups and max_msf, no need to modify
+	# here directly
 	config_global_params
 
 	read_mcast_snooping_params

mcastmngr/files/common/etc/init.d/mcast

@@ -14,15 +14,36 @@ service_triggers() {
 	procd_add_reload_trigger network $NAME
 }
 
+start_mcast_service() {
+	local param=$@
+
+	procd_open_instance
+
+	procd_set_param command "${PROG_EXE}"
+	if [ -n "${param}" ]; then
+		procd_append_param command ${param}
+	fi
+	procd_set_param respawn
+
+	procd_close_instance
+}
+
 start_service() {
 	if [ -f "/etc/config/mcast" ]; then
 		configure_mcast
 	fi
 
-	procd_open_instance
-	procd_set_param command "$PROG_EXE"
-	procd_set_param respawn
-	procd_close_instance
+	if [ -z "${PROG_PARAMS}" ]; then
+		start_mcast_service
+		return
+	fi
+
+	local prev_IFS="${IFS}"
+	IFS=${PROG_PARAMS_SEPARATOR}
+	for param in ${PROG_PARAMS}; do
+		IFS="${prev_IFS}"
+		start_mcast_service ${param}
+	done
 }
 
 boot() {
@@ -31,11 +52,10 @@ boot() {
 }
 
 stop_service() {
-	service_stop $PROG_EXE
+	service_stop "${PROG_EXE}"
 }
 
 reload_service() {
 	stop
 	start
 }
-

mcastmngr/files/common/etc/uci-defaults/61-mcast_config_generate

@@ -43,6 +43,27 @@ generate_mcast_config(){
 	done
 
 	uci add_list mcast.@proxy[-1].filter="239.0.0.0/8"
+
+
+	uci add mcast proxy
+	uci rename mcast.@proxy[-1]="mc_proxy_MLD"
+	uci set mcast.@proxy[-1].enable="1"
+	uci set mcast.@proxy[-1].proto="mld"
+	uci set mcast.@proxy[-1].version="1"
+	uci set mcast.@proxy[-1].robustness="2"
+	uci set mcast.@proxy[-1].query_interval="125"
+	uci set mcast.@proxy[-1].query_response_interval="100"
+	uci set mcast.@proxy[-1].last_member_query_interval="10"
+	uci set mcast.@proxy[-1].fast_leave="1"
+	uci set mcast.@proxy[-1].snooping_mode="2"
+	uci add_list mcast.@proxy[-1].downstream_interface="br-lan"
+
+	IFS=" "
+	for itf in $up_itf; do
+		uci add_list mcast.@proxy[-1].upstream_interface="$itf"
+	done
+
+
 	uci commit mcast
 }
 

mcastmngr/files/common/lib/mcast/common.sh

@@ -0,0 +1,182 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+include /lib/network
+
+
+# Parameters available in snooping configuration
+igmp_s_enable=0
+igmp_s_version=2
+igmp_s_query_interval=125
+igmp_s_q_resp_interval=100
+igmp_s_last_mem_q_int=10
+igmp_s_fast_leave=1
+igmp_s_robustness=2
+igmp_s_mode=0
+igmp_s_iface=""
+igmp_s_exceptions=""
+
+mld_s_enable=0
+mld_s_version=2
+mld_s_robustness=2
+mld_s_mode=0
+mld_s_iface=""
+mld_s_exceptions=""
+
+# Global params
+max_groups=25
+max_msf=10
+max_members=25
+mldv1_unsolicited_report_interval=10
+mldv2_unsolicited_report_interval=1
+
+# Parameters available in proxy configuration
+igmp_p_enable=0
+igmp_p_version=2
+igmp_query_interval=125
+igmp_q_resp_interval=100
+igmp_last_mem_q_int=10
+igmp_fast_leave=1
+igmp_p_robustness=2
+igmp_p_mode=0
+igmp_p_up_interfaces=""
+igmp_p_down_interfaces=""
+igmp_p_exceptions=""
+
+mld_p_enable=0
+mld_p_version=1
+mld_query_interval=125
+mld_q_resp_interval=100
+mld_last_mem_q_int=10
+mld_fast_leave=1
+mld_p_robustness=2
+mld_p_mode=0
+mld_p_up_interfaces=""
+mld_p_down_interfaces=""
+mld_p_exceptions=""
+
+read_snooping() {
+	local config="$1"
+	local sec_enable
+	local proto
+
+	config_get sec_enable "$config" enable 0
+	config_get proto "$config" proto
+
+	if [ "$sec_enable" == "0" ]; then
+		return
+	fi
+
+	if [ "$proto" == "igmp" ]; then
+		igmp_s_enable=$sec_enable
+		config_get igmp_s_version "$config" version 2
+		config_get igmp_s_query_interval "$config" query_interval 125
+		config_get igmp_s_q_resp_interval "$config" query_response_interval 100
+		config_get igmp_s_last_mem_q_int "$config" last_member_query_interval 10
+		config_get igmp_s_fast_leave "$config" fast_leave 1
+		config_get igmp_s_robustness "$config" robustness 2
+		config_get igmp_s_mode "$config" snooping_mode 0
+		config_get igmp_s_iface "$config" interface
+		config_get igmp_s_exceptions "$config" filter
+		return
+	fi
+
+	if [ "$proto" == "mld" ]; then
+		mld_s_enable=$sec_enable
+		config_get mld_s_version "$config" version 2
+		config_get mld_s_query_interval "$config" query_interval 125
+		config_get mld_s_q_resp_interval "$config" query_response_interval 100
+		config_get mld_s_last_mem_q_int "$config" last_member_query_interval 10
+		config_get mld_s_fast_leave "$config" fast_leave 1
+		config_get mld_s_robustness "$config" robustness 2
+		config_get mld_s_mode "$config" snooping_mode 0
+		config_get mld_s_iface "$config" interface
+		config_get mld_s_exceptions "$config" filter
+		return
+	fi
+}
+
+read_proxy() {
+	local config="$1"
+	local sec_enable
+	local proto
+
+	config_get sec_enable "$config" enable 0
+	config_get proto "$config" proto
+
+	if [ "$sec_enable" == "0" ]; then
+		return
+	fi
+
+	if [ "$proto" == "igmp" ]; then
+		igmp_p_enable=$sec_enable
+		config_get igmp_p_version "$config" version 2
+		config_get igmp_query_interval "$config" query_interval 125
+		config_get igmp_q_resp_interval "$config" query_response_interval 100
+		config_get igmp_last_mem_q_int "$config" last_member_query_interval 10
+		config_get igmp_fast_leave "$config" fast_leave 1
+		config_get igmp_p_robustness "$config" robustness 2
+		config_get igmp_p_mode "$config" snooping_mode 0
+		config_get igmp_p_up_interfaces "$config" upstream_interface
+		config_get igmp_p_down_interfaces "$config" downstream_interface
+		config_get igmp_p_exceptions "$config" filter
+		return
+	fi
+
+	if [ "$proto" == "mld" ]; then
+		mld_p_enable=$sec_enable
+		config_get mld_p_version "$config" version 2
+		config_get mld_query_interval "$config" query_interval 125
+		config_get mld_q_resp_interval "$config" query_response_interval 100
+		config_get mld_last_mem_q_int "$config" last_member_query_interval 10
+		config_get mld_fast_leave "$config" fast_leave 1
+		config_get mld_p_robustness "$config" robustness 2
+		config_get mld_p_mode "$config" snooping_mode 0
+		config_get mld_p_up_interfaces "$config" upstream_interface
+		config_get mld_p_down_interfaces "$config" downstream_interface
+		config_get mld_p_exceptions "$config" filter
+		return
+	fi
+}
+
+read_mcast_snooping_params() {
+	config_load mcast
+	config_foreach read_snooping snooping
+}
+
+read_mcast_proxy_params() {
+	config_load mcast
+	config_foreach read_proxy proxy
+}
+
+config_global_params() {
+	local igmp_qrv
+	local igmp_force_version
+	local mld_qrv
+	local mld_force_version
+
+	config_load mcast
+	config_get max_msf igmp max_msf 10
+	config_get max_groups igmp max_membership 25
+	config_get igmp_qrv igmp qrv 2
+	config_get igmp_force_version igmp force_version 0
+
+	config_get mld_qrv mld qrv 2
+	config_get mldv1_unsolicited_report_interval mld mldv1_unsolicited_report_interval 10
+	config_get mldv2_unsolicited_report_interval mld mldv2_unsolicited_report_interval 1
+	config_get mld_force_version mld force_version 0
+
+	if [ "$1" == "set_max_groups_and_sources" ]; then
+		echo $max_groups > /proc/sys/net/ipv4/igmp_max_memberships
+		echo $max_msf > /proc/sys/net/ipv4/igmp_max_msf
+		echo $max_msf > /proc/sys/net/ipv6/mld_max_msf
+	fi
+	echo $igmp_qrv > /proc/sys/net/ipv4/igmp_qrv
+	echo $igmp_force_version > /proc/sys/net/ipv4/conf/all/force_igmp_version
+
+	echo $mld_qrv >  /proc/sys/net/ipv6/mld_qrv
+	echo $mld_force_version > /proc/sys/net/ipv6/conf/all/force_mld_version
+	echo $mldv1_unsolicited_report_interval > /proc/sys/net/ipv6/conf/all/mldv1_unsolicited_report_interval
+	echo $mldv2_unsolicited_report_interval > /proc/sys/net/ipv6/conf/all/mldv2_unsolicited_report_interval
+}

mcastmngr/files/linux/etc/firewall.mcast

@@ -0,0 +1,2 @@
+# Forward multicast packets from wan to lan
+iptables -t filter -A zone_wan_forward -p udp -d 224.0.0.0/240.0.0.0 -m comment --comment "!fw3: Allow-Multicast-UDP" -j zone_lan_dest_ACCEPT

mcastmngr/files/linux/etc/uci-defaults/60-mcast_config_generate

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+# Add firewall include instance
+uci -q batch <<-EOT
+	delete firewall.mcast
+	set firewall.mcast=include
+	set firewall.mcast.path=/etc/firewall.mcast
+	set firewall.mcast.reload=1
+	commit firewall
+EOT

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

@@ -1,6 +1,149 @@
 #!/bin/sh
 
-configure_mcast() {
-	#TODO
-	return 0
+. /lib/mcast/common.sh
+
+include /lib/network
+
+CONFFILE=
+PROG_EXE=/usr/sbin/mcproxy
+PROG_PARAMS=
+PROG_PARAMS_SEPARATOR=:
+
+setup_mcast_mode() {
+	 unused(){ :;}
+}
+
+config_mcproxy_interfaces() {
+	local upstreams="$1"
+	local downstreams="$2"
+	local exceptions="$3"
+
+	local str_up=""
+	if [ -n "$upstreams" ]; then
+		for upstream in $upstreams; do
+			str_up="$str_up \"$upstream\""
+		done
+	fi
+
+	local str_down=""
+	if [ -n "$downstreams" ]; then
+		for downstream in $downstreams; do
+			str_down="$str_down \"$downstream\""
+		done
+	fi
+
+	if [ ! -z $downstream ]; then
+		echo -e "pinstance main:$str_up ==>$str_down;\n" >> $CONFFILE
+	fi
+
+
+	if [ -z "$exceptions" ] || [ -z "$upstreams" ]; then
+		return
+	fi
+
+	for upstream in $upstreams; do
+		local filter=""
+		for excp in $exceptions; do
+			case $excp in
+			*/*)
+				ip_start="$(ipcalc.sh $excp | grep IP | awk '{print substr($0,4)}')"
+				ip_end="$(ipcalc.sh $excp | grep BROADCAST | awk '{print substr($0,11)}')"
+				filter="$filter ($ip_start - $ip_end | *)"
+				;;
+			*)
+				filter="$filter ($excp | *)"
+				;;
+			esac
+		done
+		echo "pinstance main upstream \"$upstream\" in blacklist table{$filter };" >> $CONFFILE
+		echo "pinstance main upstream \"$upstream\" out blacklist table{$filter };" >> $CONFFILE
+	done
+}
+
+config_mcproxy_instance() {
+	local protocol="$1"
+	local version="$2"
+
+	local robustness=
+	local query_interval=
+	local q_resp_interval=
+	local last_mem_q_int=
+	local fast_leave=0
+	local exceptions=
+	local upstreams=
+	local downstreams=
+
+	CONFFILE=/var/etc/mcproxy_"$protocol".conf
+	rm -f $CONFFILE
+	touch $CONFFILE
+
+	if [ "$protocol" == "igmp" ]; then
+		case "$version" in
+			[1-3])
+				echo -e "protocol IGMPv${version};\n" >> $CONFFILE
+				;;
+			*)
+				echo -e "protocol IGMPv2;\n" >> $CONFFILE
+				;;
+		esac
+
+		robustness=$igmp_p_robustness
+		query_interval=$igmp_query_interval
+		q_resp_interval=$igmp_q_resp_interval
+		last_mem_q_int=$igmp_last_mem_q_int
+		fast_leave=$igmp_fast_leave
+		exceptions=$igmp_p_exceptions
+
+		upstreams=$igmp_p_up_interfaces
+		downstreams=$igmp_p_down_interfaces
+	elif [ "$protocol" == "mld" ]; then
+		case "$version" in
+			[1-2])
+				echo -e "protocol MLDv${version};\n" >> $CONFFILE
+				;;
+			*)
+				echo -e "protocol MLDv2;\n" >> $CONFFILE
+				;;
+		esac
+
+		robustness=$mld_p_robustness
+		query_interval=$mld_query_interval
+		q_resp_interval=$mld_q_resp_interval
+		last_mem_q_int=$mld_last_mem_q_int
+		fast_leave=$mld_fast_leave
+		exceptions=$mld_p_exceptions
+
+		upstreams=$mld_p_up_interfaces
+		downstreams=$mld_p_down_interfaces
+	fi
+
+	[ -n "$robustness" ] && echo -e "rv $robustness;" >> $CONFFILE
+	[ -n "$query_interval" ] && echo -e "qi $query_interval;" >> $CONFFILE
+	[ -n "$q_resp_interval" ] && echo -e "qri $q_resp_interval;" >> $CONFFILE
+	[ -n "$last_mem_q_int" ] && echo -e "lmqi $last_mem_q_int;" >> $CONFFILE
+	[ -n "$fast_leave" ] && echo -e "fastleave $fast_leave;\n" >> $CONFFILE
+
+	[ -n "$upstreams" ] && [ -n "$downstreams" ] &&
+		config_mcproxy_interfaces "$upstreams" "$downstreams" "$exceptions"
+
+	PROG_PARAMS="${PROG_PARAMS} -f ${CONFFILE}${PROG_PARAMS_SEPARATOR}"
+}
+
+config_mcproxy() {
+	if [ "$igmp_p_enable" == "1" ]; then
+		config_mcproxy_instance igmp "$igmp_p_version"
+	fi
+
+	if [ "$mld_p_enable" == "1" ]; then
+		config_mcproxy_instance mld "$mld_p_version"
+	fi
+}
+
+configure_mcast() {
+	config_global_params "set_max_groups_and_sources"
+
+	read_mcast_snooping_params
+	read_mcast_proxy_params
+
+	config_mcproxy
 }

obuspa/Makefile

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

obuspa/files/etc/init.d/obuspa

@@ -970,7 +970,7 @@ delete_sql_db_entry_with_pattern()
 		return 0;
 	fi
 
-	params="$(grep ${pattern} ${DB_DUMP}|awk '{print $1}')"
+	params="$(grep "${pattern}" ${DB_DUMP}|awk '{print $1}')"
 	for p in ${params}; do
 		db_del_sql "${p}"
 	done
@@ -981,7 +981,7 @@ check_n_delete_db()
 	local sec t r path
 
 	sec="${1}"
-	if uci -q get obuspa.${sec} >/dev/null 2>&1; then
+	if uci -q get obuspa."${sec}" >/dev/null 2>&1; then
 		return 0
 	fi
 
@@ -1032,7 +1032,7 @@ db_init()
 	fi
 
 	# remove entries from db if deleted from uci
-	if [ -f "${DB_DUMP}" ] && [ "${reason}" == "update" ] && [ -f "/tmp/obuspa/obuspa" ]; then
+	if [ -f "${DB_DUMP}" ] && [ "${reason}" = "update" ] && [ -f "/tmp/obuspa/obuspa" ]; then
 		reverse_update_db_with_uci
 	fi
 

obuspa/files/etc/obuspa/dmcaching_exclude.json

@@ -1,6 +1,5 @@
 {
   "dmcaching_exclude": [
-    "Device.InterfaceStack.",
     "Device.Hosts.Host.",
     "Device.IEEE1905.",
     "Device.WiFi.DataElements."

obuspa/files/etc/uci-defaults/01-fix-upgrade-uci

@@ -5,10 +5,10 @@
 fix_stomp_section() {
 	local encryption
 
-	config_get_bool encryption $1 encryption ""
+	config_get_bool encryption "${1}" encryption ""
 	if [ -n "${encryption}" ]; then
-		uci_set obuspa $1 encryption ""
-		uci_set obuspa $1 EnableEncryption "$encryption"
+		uci_set obuspa "${1}" encryption ""
+		uci_set obuspa "${1}" EnableEncryption "$encryption"
 	fi
 }
 

obuspa/patches/0005-optimise_ubus_calls_cli.patch

@@ -0,0 +1,22 @@
+diff --git a/src/core/data_model.c b/src/core/data_model.c
+index 2cf4b6c..b92cf59 100644
+--- a/src/core/data_model.c
++++ b/src/core/data_model.c
+@@ -136,6 +136,7 @@ void DumpDataModelNodeMap(void);
+ int GetVendorParam(dm_node_t *node, char *path, dm_instances_t *inst, char *buf, int len, dm_req_t *req);
+ int SetVendorParam(dm_node_t *node, char *path, dm_instances_t *inst, char *value, dm_req_t *req);
+ 
++extern bool is_running_cli_local_command;
+ /*********************************************************************//**
+ **
+ ** DATA_MODEL_Init
+@@ -223,7 +224,9 @@ int DATA_MODEL_Init(void)
+     }
+ 
+     // Set the default values of OUI, Serial Number and (LocalAgent) EndpointID, and cache EndpointID
++    if (is_running_cli_local_command == false) {
+     err = DEVICE_LOCAL_AGENT_SetDefaults();
++    }
+     if (err != USP_ERR_OK)
+     {
+         return err;

sulu/Readme.md

@@ -1,9 +1,13 @@
 # SULU-CE
 SULU is a ReactJS based USP controller, for more details please check sulu [documentation](https://dev.iopsys.eu/websdk/sulu/-/blob/devel/README.md). This directory contains the recipes to build sulu for IOWRT.
 
-SULU has two variants
-1. sulu - This package usages the prebuilt distribution, so it faster but only include iopsys default packages
-2. sulu-builder - This package builds the sulu along with selected plugins from source
+There are two ways to include SULU in iowrt, by
+  1. Adding a pre-build sulu distribution with all the plugins
+  2. Compile sulu at the iowrt build time, which then include all the selected plugins
+
+Align with above two ways, SULU has two variants
+  1. sulu - This package usages the pre-built distribution, so it faster but only include iopsys default sulu plugins
+  2. sulu-builder - This package builds the sulu along with selected plugins from sources, so user can include their sulu-plugins
 
 # Directory structure
 This directory contains iowrt sulu plugins packages along with sulu builder.
@@ -15,7 +19,13 @@ This directory contains iowrt sulu plugins packages along with sulu builder.
 - sulu-parental-control - Sulu plugin for Parental control, can be used with sulu-builder
 - sulu-theme-iopsys - Sulu example theme plugin, can be used with sulu-builder
 
-User can select 'CONFIG_PACKAGE_sulu=y' to use the sulu prebuilt distribution, or can select 'CONFIG_PACKAGE_sulu-builder=y' to build sulu along with customized plugins.
+# Packages
+  - Select 'CONFIG_PACKAGE_sulu=y' to use pre-build sulu distribution binaries, OR
+  - Select 'CONFIG_PACKAGE_sulu-builder=y' to build sulu along with customized plugins from their source code, this is the preferred way if user wants to include/exclude more/default plugins in sulu.
+  - CONFIG_PACKAGE_sulu-lcm=y, handles life-cycle-management, should only be used with sulu-builder
+  - CONFIG_PACKAGE_sulu-multi-ap=y, handles easy-mesh, should only be used with sulu-builder
+  - CONFIG_PACKAGE_sulu-parental-control=y, Provides access-control and url-filter, should only be used with sulu-builder
+  - CONFIG_PACKAGE_sulu-theme-iopsys=y, Provides an example theme, should only be used with sulu-builder
 
 # How to select a sulu plugins
 While building sulu from source, user has to select the all plugins they want to include in sulu, which can be done with 'make menuconfig', below are the list of sulu plugins available currently.
@@ -41,14 +51,35 @@ PKG_MIRROR_HASH:=skip
 
 include ../sulu-builder/sulu.mk
 
+# call BuildPackage - OpenWrt buildroot signature
+```
+
+# How to add a new sulu plugin with additional install requirements
+Sometimes it is required to install additional config files along with the package, to do so such sulu plugins need to have below syntax in Makefile
+```bash
+include $(TOPDIR)/rules.mk
+PKG_NAME:=sulu-lcm
+PKG_VERSION:=2.0.0
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-lcm.git
+PKG_SOURCE_VERSION:=b3f6028fd168e58b93ae56f616e96712849c656a
+PKG_MIRROR_HASH:=skip
+
+SULU_PLUGIN_INSTALL:=1
+
 define Package/$(PKG_NAME)/install
-        $(INSTALL_DIR) $(1)/sulu/config/widgets
+	$(INSTALL_DIR) $(1)/sulu/config/widgets
+	$(CP) $(PKG_BUILD_DIR)/src/config/widgets/lcm-store.json $(1)/sulu/config/widgets/
 endef
 
+include ../sulu-builder/sulu.mk
+
+
 # call BuildPackage - OpenWrt buildroot signature
 ```
 
-In the above example makefile, if user need to install any plugin specific component, that can be added inside 'Package/$(PKG_NAME)/install' definition.
+In the above example Makefile, if user need to install any plugin specific component, that can be added inside 'Package/$(PKG_NAME)/install' definition.
 
 After adding the makefile, user need to specify the list of plugins in below config option, so that sulu-builder selects them and build them along with it.
 ```bash

sulu/sulu-base/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sulu-base
-PKG_VERSION:=2.0.1
+PKG_VERSION:=2.0.3
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu.git
-PKG_SOURCE_VERSION:=72235b4f6eaf8dcd70a1e16504a5381a3fbded47
+PKG_SOURCE_VERSION:=424fb2c76b8b59d235705c5ea8cb0a188d72024d
 PKG_MIRROR_HASH:=skip
 
 SULU_MOD:=core

sulu/sulu-builder/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sulu-builder
-PKG_VERSION:=2.0.1
+PKG_VERSION:=2.0.4
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-builder.git
-PKG_SOURCE_VERSION:=079153c3acda3ba8fe37c17851857f5b6c39cdc7
+PKG_SOURCE_VERSION:=fc2b367cb949fd247fce78e7bf06bd24c97aa9b4
 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)
@@ -20,6 +20,7 @@ PKG_LICENSE:=PROPRIETARY IOPSYS
 PKG_LICENSE_FILES:=LICENSE
 
 SULU_PLUGINS:=$(filter-out Readme.md,$(notdir $(wildcard ../*)))
+SULU_PLUGINS:=$(filter-out sulu-builder,$(notdir $(wildcard ../*)))
 SULU_EXTRA:=$(subst $\",,$(CONFIG_SULU_EXTRA_PACKAGES))
 include $(INCLUDE_DIR)/package.mk
 

sulu/sulu-builder/sulu.mk

@@ -7,6 +7,7 @@ SULU_NAME?=$(notdir $(CURDIR))
 SULU_URL?=https://dev.iopsys.eu/websdk
 SULU_MAINTAINER?=IOPSYS SuLu team
 
+SULU_PLUGIN_INSTALL?=0
 SULU_MOD?=plugins
 
 PKG_NAME?=$(SULU_NAME)
@@ -37,11 +38,13 @@ endef
 endif
 
 define Build/Compile
-	# Pass
+	# Skip compilation, will be build with sulu-builder
 endef
 
+ifeq ($(SULU_PLUGIN_INSTALL),0)
 define Package/$(PKG_NAME)/install
-	$(INSTALL_DIR) $(1)/sulu/config/
+	# Nothing to be install
 endef
+endif
 
 $(eval $(call BuildPackage,$(PKG_NAME)))

sulu/sulu-lcm/Makefile

@@ -4,14 +4,14 @@
 
 include $(TOPDIR)/rules.mk
 PKG_NAME:=sulu-lcm
-PKG_VERSION:=2.0.0
+PKG_VERSION:=2.0.4
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-lcm.git
 PKG_SOURCE_VERSION:=b3f6028fd168e58b93ae56f616e96712849c656a
 PKG_MIRROR_HASH:=skip
 
-include ../sulu-builder/sulu.mk
+SULU_PLUGIN_INSTALL:=1
 
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/sulu/config/widgets
@@ -20,4 +20,7 @@ ifeq ($(CONFIG_PACKAGE_skopeo)$(CONFIG_PACKAGE_umoci),yy)
 endif
 endef
 
+include ../sulu-builder/sulu.mk
+
+
 # call BuildPackage - OpenWrt buildroot signature

sulu/sulu-multi-ap/Makefile

@@ -4,11 +4,11 @@
 
 include $(TOPDIR)/rules.mk
 PKG_NAME:=sulu-multi-ap
-PKG_VERSION:=2.0.0
+PKG_VERSION:=2.0.3
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-multi-ap.git
-PKG_SOURCE_VERSION:=1eca5af280789cef3feeeb4d296ed01f87b15bb0
+PKG_SOURCE_VERSION:=b1e144f1c9bbf641754a6a88693d1c7f8700e6bf
 PKG_MIRROR_HASH:=skip
 
 include ../sulu-builder/sulu.mk

sulu/sulu-parental-control/Makefile

@@ -4,11 +4,11 @@
 
 include $(TOPDIR)/rules.mk
 PKG_NAME:=sulu-parental-control
-PKG_VERSION:=2.0.0
+PKG_VERSION:=2.0.2
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-parental-control.git
-PKG_SOURCE_VERSION:=65491b1d1939f9946261d05735f50b8aee60f262
+PKG_SOURCE_VERSION:=484c0bcb1ced835a3ca2f26cadb7180fd7572ddd
 PKG_MIRROR_HASH:=skip
 
 include ../sulu-builder/sulu.mk

swmodd/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=swmodd
-PKG_VERSION:=2.1.21
+PKG_VERSION:=2.1.22
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=8dca3cd5b3963821d4abf397740ce735938fb078
+PKG_SOURCE_VERSION:=0a85f80e93c14a6adddd74ce0a2138f7d3f971ae
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/swmodd.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

swmodd/files/etc/init.d/crun

@@ -23,14 +23,14 @@ configure_crun_container() {
 	BRIDGE="${3}"
 	BOOT="${4}"
 
-	config_get name ${1} name ""
-	config_get type ${1} type ""
-	config_get_bool autostart ${1} autostart 1
-	config_get du_status ${1} du_status ""
-	config_get requested_state ${1} requested_state ""
-	config_get url ${1} url ""
-	config_get username ${1} username ""
-	config_get password ${1} password ""
+	config_get name "${1}" name ""
+	config_get type "${1}" type ""
+	config_get_bool autostart "${1}" autostart 1
+	config_get du_status "${1}" du_status ""
+	config_get requested_state "${1}" requested_state ""
+	config_get url "${1}" url ""
+	config_get username "${1}" username ""
+	config_get password "${1}" password ""
 
 	if [ -z "${name}" ] || [ -z "${type}" ] || [ -z "${du_status}" ]; then
 		return 0;
@@ -40,39 +40,39 @@ configure_crun_container() {
 		return 0;
 	fi
 
-	if [ "${du_status}" == "Installing" ]; then
+	if [ "${du_status}" = "Installing" ]; then
 		local result
 		log "Pull image from registry"
-		uci_set ocicontainer ${1} du_status Installing_start
-		uci_set ocicontainer ${1} username ""
-		uci_set ocicontainer ${1} password ""
+		uci_set ocicontainer "${1}" du_status Installing_start
+		uci_set ocicontainer "${1}" username ""
+		uci_set ocicontainer "${1}" password ""
 		result=$(${RUNNER} -b "${BUNDLE}" -n "${name}" -r "${url}" -l "${username}:${password}")
 		if [ "$?" -eq 0 ]; then
-			result=$(cat ${BUNDLE}/${name}/config.json |jq ".annotations.org_opencontainers_image_description")
+			result=$(cat "${BUNDLE}"/"${name}"/config.json |jq ".annotations.org_opencontainers_image_description")
 			if [ "${result}" != "null" ]; then
-				uci_set ocicontainer ${1} description "${result}"
+				uci_set ocicontainer "${1}" description "${result}"
 			fi
 
-			result=$(cat ${BUNDLE}/${name}/config.json |jq ".annotations.org_opencontainers_image_vendor")
+			result=$(cat "${BUNDLE}"/"${name}"/config.json |jq ".annotations.org_opencontainers_image_vendor")
 			if [ "${result}" != "null" ]; then
-				uci_set ocicontainer ${1} vendor "${result}"
+				uci_set ocicontainer "${1}" vendor "${result}"
 			fi
 
-			result=$(cat ${BUNDLE}/${name}/config.json |jq ".annotations.org_opencontainers_image_version")
+			result=$(cat "${BUNDLE}"/"${name}"/config.json |jq ".annotations.org_opencontainers_image_version")
 			if [ "${result}" != "null" ]; then
-				uci_set ocicontainer ${1} version "${result}"
+				uci_set ocicontainer "${1}" version "${result}"
 			fi
 
-			uci_set ocicontainer ${1} du_status Installing_success
+			uci_set ocicontainer "${1}" du_status Installing_success
 			du_status="Installed"
 		else
-			uci_set ocicontainer ${1} du_status Installing_failed
-			uci_set ocicontainer ${1} fault_string "${result}"
+			uci_set ocicontainer "${1}" du_status Installing_failed
+			uci_set ocicontainer "${1}" fault_string "${result}"
 			return 0;
 		fi
 	fi
 
-	if [ "${du_status}" == "Uninstalling" ]; then
+	if [ "${du_status}" = "Uninstalling" ]; then
 		ubus call service delete "{\"name\":\"crun\",\"instance\":\"${name}\"}"
 		if is_container_running "${name}"; then
 			crun kill --all "${name}" 9
@@ -84,10 +84,10 @@ configure_crun_container() {
 
 		# If directory still exists then uninstall failed
 		if [ -d "${BUNDLE}/${name}" ]; then
-			uci_set ocicontainer ${1} du_status Uninstalling_failed
-			uci_set ocicontainer ${1} fault_string "Failed to remove ${BUNDLE}/${name}"
+			uci_set ocicontainer "${1}" du_status Uninstalling_failed
+			uci_set ocicontainer "${1}" fault_string "Failed to remove ${BUNDLE}/${name}"
 		else
-			uci_set ocicontainer ${1} du_status Uninstalling_success
+			uci_set ocicontainer "${1}" du_status Uninstalling_success
 		fi
 		# Delete the uci config section after uninstall
 		log "CRUN container ${name} removed"
@@ -106,52 +106,52 @@ configure_crun_container() {
 	if [ "${BOOT}" -eq "1" ]; then
 		if [ "${autostart}" -eq 1 ]; then
 			${RUNNER} -U -b "${BUNDLE}" -n "${name}"
-			result=$(cat ${BUNDLE}/${name}/config.json |jq ".annotations.org_opencontainers_image_description")
+			result=$(cat "${BUNDLE}"/"${name}"/config.json |jq ".annotations.org_opencontainers_image_description")
 			if [ "${result}" != "null" ]; then
-				uci_set ocicontainer ${1} description "${result}"
+				uci_set ocicontainer "${1}" description "${result}"
 			fi
 
-			result=$(cat ${BUNDLE}/${name}/config.json |jq ".annotations.org_opencontainers_image_vendor")
+			result=$(cat "${BUNDLE}"/"${name}"/config.json |jq ".annotations.org_opencontainers_image_vendor")
 			if [ "${result}" != "null" ]; then
-				uci_set ocicontainer ${1} vendor "${result}"
+				uci_set ocicontainer "${1}" vendor "${result}"
 			fi
 
-			result=$(cat ${BUNDLE}/${name}/config.json |jq ".annotations.org_opencontainers_image_version")
+			result=$(cat "${BUNDLE}"/"${name}"/config.json |jq ".annotations.org_opencontainers_image_version")
 			if [ "${result}" != "null" ]; then
-				uci_set ocicontainer ${1} version "${result}"
+				uci_set ocicontainer "${1}" version "${result}"
 			fi
-			uci_set ocicontainer ${1} requested_state "Active"
+			uci_set ocicontainer "${1}" requested_state "Active"
 		else
-			uci_set ocicontainer ${1} requested_state "Idle"
+			uci_set ocicontainer "${1}" requested_state "Idle"
 			return 0;
 		fi
 	else
 		log "Container [$name] req_status [${requested_state}]"
-		if [ "${requested_state}" == "Idle" ]; then
+		if [ "${requested_state}" = "Idle" ]; then
 			if is_container_running "${name}"; then
 				crun pause "${name}"
 			else
 				return 0;
 			fi
-		elif [ "${requested_state}" == "Active" ]; then
+		elif [ "${requested_state}" = "Active" ]; then
 			if is_container_running "${name}"; then
 				${RUNNER} -u -n "${name}" -i "${BRIDGE}"
 				crun resume "${name}"
 			else
 				${RUNNER} -U -b "${BUNDLE}" -n "${name}"
-				result=$(cat ${BUNDLE}/${name}/config.json |jq ".annotations.org_opencontainers_image_description")
+				result=$(cat "${BUNDLE}"/"${name}"/config.json |jq ".annotations.org_opencontainers_image_description")
 				if [ "${result}" != "null" ]; then
-					uci_set ocicontainer ${1} description "${result}"
+					uci_set ocicontainer "${1}" description "${result}"
 				fi
 
-				result=$(cat ${BUNDLE}/${name}/config.json |jq ".annotations.org_opencontainers_image_vendor")
+				result=$(cat "${BUNDLE}"/"${name}"/config.json |jq ".annotations.org_opencontainers_image_vendor")
 				if [ "${result}" != "null" ]; then
-					uci_set ocicontainer ${1} vendor "${result}"
+					uci_set ocicontainer "${1}" vendor "${result}"
 				fi
 
-				result=$(cat ${BUNDLE}/${name}/config.json |jq ".annotations.org_opencontainers_image_version")
+				result=$(cat "${BUNDLE}"/"${name}"/config.json |jq ".annotations.org_opencontainers_image_version")
 				if [ "${result}" != "null" ]; then
-					uci_set ocicontainer ${1} version "${result}"
+					uci_set ocicontainer "${1}" version "${result}"
 				fi
 			fi
 		else
@@ -181,7 +181,7 @@ start_service() {
 		return 0;
 	fi
 
-	if [ "${1}" == "bootstrap" ]; then
+	if [ "${1}" = "bootstrap" ]; then
 		boot=1
 	else
 		boot=0

swmodd/files/etc/init.d/swmodd_cgroup

@@ -3,7 +3,7 @@
 START=01
 
 log() {
-	echo "swmodd_cgroup: ${@}" >/dev/console
+	echo "swmodd_cgroup: ${*}" >/dev/console
 }
 
 cgroup_remounting_required()
@@ -35,12 +35,12 @@ mount_cgroup()
 	fi
 
 	mount -t tmpfs -o uid=0,gid=0,mode=0755 cgroup /sys/fs/cgroup
-	cd /sys/fs/cgroup
+	cd /sys/fs/cgroup || return 1
 	for sys in $(awk '!/^#/ { if ($4 == 1) print $1 }' /proc/cgroups); do
-		mkdir -p $sys
-		if ! mountpoint -q $sys; then
-			if ! mount -n -t cgroup -o $sys cgroup $sys; then
-				rm -f $sys || true
+		mkdir -p "${sys}"
+		if ! mountpoint -q "${sys}"; then
+			if ! mount -n -t cgroup -o "${sys}" cgroup "${sys}"; then
+				rm -f "${sys}" || true
 			fi
 		fi
 	done

swmodd/files/etc/swmodd/run.sh

@@ -92,11 +92,11 @@ run_container() {
 
 update_network_ns() {
     local type
-    json_select $2
+    json_select "${2}"
     json_get_var type type
-    if [ "${type}" == "network" ]; then
+    if [ "${type}" = "network" ]; then
         json_add_string path "/var/run/netns/${NAME}"
-	break;
+	return;
     fi
     json_select ..
 }
@@ -121,7 +121,7 @@ update_config_json() {
 		log "jshn.sh missing in the system"
 		exit 1;
 	fi
-	cd "${BUNDLE}/${NAME}"
+	cd "${BUNDLE}/${NAME}" || exit 1;
 	if cat config.json |jq '.linux.namespaces[] |select (.type == "network") |.path' |grep -q ${NAME}; then
 		exit 0;
 	fi
@@ -139,7 +139,7 @@ update_config_json() {
 pull_image_from_registry() {
 	local temp disksize exsize
 
-	if [ -z "${BUNDLE}" -o -z "${NAME}" -o -z "${REGURL}" ]; then
+	if [ -z "${BUNDLE}" ] || [ -z "${NAME}" ] || [ -z "${REGURL}" ]; then
 		log "Information missing for installation"
 		exit 1
 	fi
@@ -157,20 +157,20 @@ pull_image_from_registry() {
 		exit 1
 	fi
 
-	cd "${temp}"
+	cd "${temp}" || exit 1;
 	OPTS=""
 	INSPECT_OPT=""
 	if [ "${#LOGIN}" -gt 3 ]; then
 		OPTS="--src-creds ${LOGIN}"
 		INSPECT_OPT="--creds ${LOGIN}"
 	fi
-	if ! skopeo --command-timeout 4m copy ${OPTS} ${REGURL} oci:${NAME}_tmp:latest >/dev/null 2>&1; then
+	if ! skopeo --command-timeout 4m copy "${OPTS}" "${REGURL}" oci:"${NAME}"_tmp:latest >/dev/null 2>&1; then
 		log "Failed to download image"
 		cd -
 		rm -rf "${temp}"
 		exit 1
 	fi
-	if ! umoci unpack --image ${NAME}_tmp:latest ${NAME} >/dev/null 2>&1; then
+	if ! umoci unpack --image "${NAME}"_tmp:latest "${NAME}" >/dev/null 2>&1; then
 		log "Failed to unpack image"
 		cd -
 		rm -rf "${temp}"
@@ -185,8 +185,8 @@ pull_image_from_registry() {
 	fi
 
 	# Check disk available space before copy
-	disksize=$(df -P -k ${BUNDLE} |tail -n +2 |awk '{print $4}')
-	exsize=$(du -s ${temp} |awk '{print $1}')
+	disksize=$(df -P -k "${BUNDLE}" |tail -n +2 |awk '{print $4}')
+	exsize=$(du -s "${temp}" |awk '{print $1}')
 	if [ "${disksize}" -lt "${exsize}" ]; then
 		log "Disk space ${disksize} less than required ${exsize}"
 		cd -
@@ -194,12 +194,12 @@ pull_image_from_registry() {
 		exit 1
 	fi
 
-	mv ${NAME} ${BUNDLE}/
+	mv "${NAME}" "${BUNDLE}"/
 	if [ "$?" -ne 0 ]; then
 		log "Failed ${name} move in ${BUNDLE}"
 		cd -
 		rm -rf "${temp}"
-		rm -rf ${BUNDLE}/${NAME}
+		rm -rf "${BUNDLE}"/"${NAME}"
 		exit 1
 	fi
 

swmodd/files/etc/uci-defaults/01-fix-bundle-path

@@ -20,7 +20,7 @@ if [ -n "${lxc_bundle}" ]; then
 	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}
+	uci_set swmodd globals lxc_bundle_root "${lxc}"
 	uci_commit
 else
 	mkdir -p /etc/lxc
@@ -35,7 +35,7 @@ if [ -z "${oci_bundle}" ] && [ -n "${lxc_bundle}" ]; then
 	uci_commit
 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}
+	uci_set swmodd globals oci_bundle_root "${lxc}"
 	uci_commit
 elif [ -z "${oci_bundle}" ]; then
 	uci_set swmodd globals oci_bundle_root "/srv/"

twamp/Makefile

@@ -6,7 +6,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=twamp
-PKG_VERSION:=1.2.4
+PKG_VERSION:=1.2.5
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)

twamp/files/etc/firewall.twamp

@@ -10,29 +10,27 @@ if [ ! -f "/etc/config/twamp" ]; then
 	exit 0;
 fi
 
-function configure_firewall()
-{
+configure_firewall() {
 	local enable port interface
 
-	config_get enable ${1} enable "1"
-	config_get port ${1} port
-	config_get interface ${1} interface
-	if [ "$enable" -eq 0 -o -z "${port}" -o -z "${interface}" ]; then
+	config_get enable "${1}" enable "1"
+	config_get port "${1}" port
+	config_get interface "${1}" interface
+	if [ "$enable" -eq 0 ] || [ -z "${port}" ] || [ -z "${interface}" ]; then
 		return 0;
 	fi
 
-	iptables -w 1 -nL zone_${interface}_input 2>/dev/null 1>&2
+	iptables -w 1 -nL zone_"${interface}"_input 2>/dev/null 1>&2
 	if [ "$?" -eq 0 ]; then
-		iptables -w 1 -I zone_${interface}_input -p udp --dport "${port}" -j ACCEPT -m comment --comment "TWAMP reflector port"
+		iptables -w 1 -I zone_"${interface}"_input -p udp --dport "${port}" -j ACCEPT -m comment --comment "TWAMP reflector port"
 	fi
 }
 
-function delete_rule()
-{
-        while iptables -w 1 -nL zone_${1}_input --line-numbers 2>/dev/null | grep "TWAMP reflector port"; do
-		rule_num="$(iptables -w 1 -nL zone_${1}_input --line-numbers | grep "TWAMP reflector port" | head -1|awk '{print $1}')"
+delete_rule() {
+        while iptables -w 1 -nL zone_"${1}"_input --line-numbers 2>/dev/null | grep "TWAMP reflector port"; do
+		rule_num="$(iptables -w 1 -nL zone_"${1}"_input --line-numbers | grep "TWAMP reflector port" | head -1|awk '{print $1}')"
 		if [ -n "${rule_num}" ]; then
-			iptables -w 1 -D zone_${1}_input ${rule_num};
+			iptables -w 1 -D zone_"${1}"_input "${rule_num}";
 		fi
 	done
 }

twamp/files/etc/init.d/twampd

@@ -10,7 +10,7 @@ USE_PROCD=1
 PROG="/usr/sbin/twampd"
 
 start_service() {
-	local enable=`uci -q get twamp.twamp.enable`
+	local enable=$(uci -q get twamp.twamp.enable)
 	if [ "$enable" = "1" ]; then
 		procd_open_instance
 		procd_set_param command "$PROG"

twamp/files/etc/uci-defaults/93-twamp_fix_reflector

@@ -2,17 +2,16 @@
 
 . /lib/functions.sh
 
-function rename_section()
-{
+rename_section() {
 	local enable inst
 
-	config_get interface ${1} interface ""
+	config_get interface "${1}" interface ""
 	if [ -z "${interface}" ]; then
 		return 0
 	fi
 
-	inst="$(echo ${1}|cut -d '_' -f 2)"
-	uci_rename twamp ${1} "${interface}_${inst}"
+	inst="$(echo "${1}"|cut -d '_' -f 2)"
+	uci_rename twamp "${1}" "${interface}_${inst}"
 }
 
 config_load twamp

uboot/Makefile

@@ -0,0 +1,137 @@
+#
+# Copyright (C) 2013-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=u-boot
+PKG_VERSION:=2016.08
+
+PKG_SOURCE_PROTO:=git
+
+ifdef CONFIG_TARGET_airoha
+PKG_SOURCE_URL:=https://dev.iopsys.eu/ensemble/u-boot.git
+PKG_SOURCE_VERSION:=1b320f0656bfc8504fa4f771dd77d8e403ed00e0
+else
+PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/uboot.git
+PKG_SOURCE_VERSION:=4cd73fe5db0ebfc1242ca9c85c14d7f0718eaf73
+endif
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+
+PKG_LICENSE:=GPL-2.0-or-later
+
+# u-boot for mips_intel do not build in parallel. 
+#PKG_BUILD_PARALLEL:=1
+
+# we currently do not use OpenWRT u_boot make files
+#include $(INCLUDE_DIR)/u-boot.mk
+include $(INCLUDE_DIR)/package.mk
+
+# prevent openwrt source date to be used as build date by u-boot
+unexport SOURCE_DATE_EPOCH
+
+
+define uboot/Default
+  TITLE:=
+  CONFIG:=
+  IMAGE:=
+endef
+
+UBOOT_IMG:=uboot.img
+
+define uboot/ex400
+  TITLE:=U-Boot for the ex400
+  DEPENDS:=@TARGET_iopsys_ramips
+  PKG_RELEASE:=7
+endef
+
+define uboot/en7562
+  TITLE:=U-Boot for the en7562
+  CONFIG:=econet-en7562-ram
+  DEPENDS:=@TARGET_airoha
+  UBOOT_IMG:=u-boot-nand.bin
+endef
+
+UBOOTS := \
+	ex400 \
+	en7562
+
+define Package/uboot/template
+define Package/uboot-$(1)
+  SECTION:=boot
+  CATEGORY:=Boot Loaders
+  TITLE:=$(2)
+  URL:=http://www.denx.de/wiki/U-Boot
+  VARIANT:=$(1)
+endef
+endef
+
+define BuildUBootPackage
+	$(eval $(uboot/Default))
+	$(eval $(uboot/$(1)))
+	$(call Package/uboot/template,$(1),$(TITLE))
+endef
+
+ifdef BUILD_VARIANT
+$(eval $(call uboot/$(BUILD_VARIANT)))
+UBOOT_CONFIG:=$(if $(CONFIG),$(CONFIG),$(BUILD_VARIANT))
+UBOOT_IMAGE:=$(if $(IMAGE),$(IMAGE),openwrt-$(BOARD)-$(BUILD_VARIANT)-u-boot.bin)
+UBOOT_IOPSYS_VERSION:=$(PKG_RELEASE)
+endif
+
+define Build/Configure
+	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+		$(UBOOT_CONFIG)_config
+
+	$(SED) "s,CONFIG_INTENO_MAJOR=\"0\",CONFIG_INTENO_MAJOR=\"$(UBOOT_IOPSYS_VERSION)\"," $(PKG_BUILD_DIR)/.config
+
+	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+		oldconfig
+endef
+
+define Build/Compile
+	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+		CROSS_COMPILE=$(TARGET_CROSS)
+	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+		CROSS_COMPILE=$(TARGET_CROSS) env
+endef
+
+# don't install /etc/init.d/uboot for intel-mips as it's not needed
+define Package/uboot/install/default
+	$(INSTALL_DIR) $$(1)/lib/upgrade
+	$(CP) ./files/uboot-upgrade $$(1)/lib/upgrade/
+
+	$(INSTALL_DIR) $(BIN_DIR)/$(TARGET)
+	$(CP) \
+		$(PKG_BUILD_DIR)/$(UBOOT_IMG) \
+		$(BIN_DIR)/$(TARGET)/uboot.img
+	$(CP) \
+		$(PKG_BUILD_DIR)/$(UBOOT_IMG) \
+		$(wildcard $(BUILD_DIR)/linux-$(BOARD)*)/uboot.img
+
+	$(INSTALL_DIR) $$(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/env/fw_printenv $$(1)/usr/sbin/
+	ln -s /usr/sbin/fw_printenv $$(1)/usr/sbin/fw_setenv
+endef
+
+define Package/uboot/install/template
+define Package/uboot-$(1)/install
+	$(call Package/uboot/install/default,$(2))
+endef
+endef
+
+$(foreach u,$(UBOOTS), \
+	$(eval $(call Package/uboot/install/template,$(u),$(u))) \
+)
+
+$(foreach u,$(UBOOTS), \
+	$(eval $(call BuildUBootPackage,$(u))) \
+	$(eval $(call BuildPackage,uboot-$(u))) \
+)

uboot/files/uboot

@@ -0,0 +1,8 @@
+#!/bin/sh /etc/rc.common
+
+START=50
+
+start() {
+	. /lib/upgrade/uboot-upgrade
+	uboot_upgrade /boot/uboot.img
+}

uboot/files/uboot-upgrade

@@ -0,0 +1,87 @@
+
+. /usr/share/libubox/jshn.sh
+
+sanity_check_env(){
+
+    # make sure iboot is used to start board, but only if verify_boot != 1
+    # that allows a person to change the bootcmd and not have it overwritten automatically
+    # but still force it to iboot for old boards.
+    vb=$(fw_printenv -n verify_boot 2>/dev/null)
+
+    if [ "1" != "$verify_boot" ]
+    then
+	if ! fw_printenv -n bootcmd 2>/dev/null| grep iboot >/dev/null
+	then
+	    echo "update uboot boot command"
+	    fw_setenv bootcmd "rescue;iboot"
+	    fw_setenv verify_boot 1
+	fi
+    fi
+
+    # just set 115200 baudrate as it is really hardcoded in the binary blob
+    fw_setenv baudrate 115200
+}
+
+do_uboot_upgrade(){
+    local u_ver
+    echo "doing upgrade of u-boot old version $cur_Major.$cur_Minor new version $Major.$Minor"
+    mtd erase /dev/mtd0
+    mtd write $1 /dev/mtd0
+    u_ver=$(strings  /dev/mtd0 | grep 938f0820-2ffb-11e7-bbc9-2f21351ee6fb)
+    [ -n "$u_ver" ] && fw_setenv uboot_inteno_version "$u_ver"
+    sanity_check_env
+}
+
+
+# Return:
+# 0: update is successfull
+# 1: update is not needed
+# 2: error occured
+uboot_upgrade() {
+    [ ! -f $1 ] && return 2
+
+    iver=$(fw_printenv -n uboot_inteno_version 2>/dev/null)
+
+    # Fixup improper json string for major and minor key.
+    # this adds the missing "
+    iver=$(echo $iver | sed -e 's/{Major:/{"Major":/' | sed -e 's/,Minor:/,"Minor":/')
+    
+    if [ -z "$iver" ]
+    then
+	# if this variable is not set by u-boot the u-boot version is too old.
+	do_uboot_upgrade $1
+	return 0
+    fi
+
+    # read in current version into Major Minor variables
+    json_init
+    json_load $(echo $iver |sed -e 's/938f0820-2ffb-11e7-bbc9-2f21351ee6fb: //')
+    json_get_vars Major Minor
+
+#    echo "Major $Major"
+#    echo "Minor $Minor"
+    
+    cur_Major=$Major
+    cur_Minor=$Minor
+
+    # read in new uboot version into Major Minor variables
+    json_load $(strings $1 | grep 938f0820-2ffb-11e7-bbc9-2f21351ee6fb |sed -e 's/938f0820-2ffb-11e7-bbc9-2f21351ee6fb: //')
+    json_get_vars Major Minor
+
+#    echo "Major $Major"
+#    echo "Minor $Minor"
+    
+    if [ $Major -gt $cur_Major ]
+    then
+	do_uboot_upgrade $1
+	return 0
+    fi
+
+    if [ $Major -eq $cur_Major -a $Minor -gt $cur_Minor ]
+    then
+	do_uboot_upgrade $1
+	return 0
+    fi
+
+    return 1
+}

udpecho/Makefile

@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=udpecho
-PKG_VERSION:=2.0.3
+PKG_VERSION:=2.0.4
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)

udpecho/files/etc/init.d/udpechoserverd

@@ -37,11 +37,11 @@ start_service() {
 stop_service() {
 	# Remove the USPechoserver ports created earlier
 	while iptables -nL zone_wan_input --line-numbers | grep "Open UDPechoserver port" > /dev/null; do
-		iptables -D zone_wan_input $(iptables -nL zone_wan_input --line-numbers | grep "Open UDPechoserver port" | head -1|awk '{print $1}');
+		iptables -D zone_wan_input "$(iptables -nL zone_wan_input --line-numbers | grep "Open UDPechoserver port" | head -1|awk '{print $1}')";
 	done
 
 	while ip6tables -nL zone_wan_input --line-numbers | grep "Open UDPechoserver port" > /dev/null; do
-		ip6tables -D zone_wan_input $(ip6tables -nL zone_wan_input --line-numbers | grep "Open UDPechoserver port" | head -1|awk '{print $1}');
+		ip6tables -D zone_wan_input "$(ip6tables -nL zone_wan_input --line-numbers | grep "Open UDPechoserver port" | head -1|awk '{print $1}')";
 	done
 
 	plus_enable="$(uci -q -c /var/state get udpechoserver.udpechoserver.plus)"

usermngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=usermngr
-PKG_VERSION:=1.0.6
+PKG_VERSION:=1.0.7
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/usermngr.git
-PKG_SOURCE_VERSION:=099723ded69859623aca11a0bb3321452542efe5
+PKG_SOURCE_VERSION:=22dc3260872080b63677654c401c33ce57ae9fbb
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

uspd/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uspd
-PKG_VERSION:=2.2.23
+PKG_VERSION:=2.2.25
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/uspd.git
-PKG_SOURCE_VERSION:=828abe8f0234eb7cd36115bb2e4a5b4113c0510f
+PKG_SOURCE_VERSION:=d29d9581ac2d1a31e0a55ba472d1fc1c494cb392
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

uspd/files/etc/init.d/uspd

@@ -28,20 +28,20 @@ configure_uspd()
 		return 1;
 	}
 
-	[ ${enabled} -eq 0 ] && return 0
+	[ "${enabled}" -eq 0 ] && return 0
 
 	procd_set_param command ${PROG}
-	if [ ${debug} -eq 1 ]; then
+	if [ "${debug}" -eq 1 ]; then
 		procd_set_param stdout 1
 		procd_set_param stderr 1
 	fi
 
 	if [ -f "${sock}" ]; then
-		procd_append_param command -s ${sock}
+		procd_append_param command -s "${sock}"
 	fi
 
 	if [ -n "${transaction_timeout}" ]; then
-		procd_append_param command -t ${transaction_timeout}
+		procd_append_param command -t "${transaction_timeout}"
 	fi
 }
 

voicemngr/Makefile

@@ -18,7 +18,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:=db518f730a1668a61a5f497e7d6fc5514f323f8b
+PKG_SOURCE_VERSION:=049933cc516d7cd6105e13b7ac5a61c8c2aed55f
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

voicemngr/files/etc/init.d/voicemngr

@@ -10,8 +10,8 @@ start_service() {
 	[ "$(db -q get hw.board.hasVoice)" = "1" ] || return
 
 	procd_open_instance
-	procd_set_param env hw_board_hasDect="$(db get hw.board.hasDect)"
-	procd_set_param env hw_board_VoicePortNames="$(db get hw.board.VoicePortNames)"
+	procd_set_param env hw_board_hasDect="$(db get hw.board.hasDect)" \
+			    hw_board_VoicePortNames="$(db get hw.board.VoicePortNames)"
 	procd_set_param command $NAME
 	procd_set_param respawn "5" "0" "3"
 	procd_set_param nice -12

wfadatad/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wfadatad
-PKG_VERSION:=4.0.1.0
+PKG_VERSION:=4.0.1.6
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=8258aab08d2a331af9c8027d81f77b83dd8f9514
+PKG_SOURCE_VERSION:=7f882307d34a09b1cf09ea3335c2fa71a59ce92f
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wfadatad.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

wifimngr/Makefile

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

xmppc/Makefile

@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xmppc
-PKG_VERSION:=2.0.3
+PKG_VERSION:=2.0.4
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)

xmppc/files/etc/hotplug.d/iface/91-icwmp_xmpp

@@ -6,15 +6,15 @@
 [ "$INTERFACE" = "loopback" ] && exit 0
 
 DEFWAN=$(uci -q get cwmp.cpe.default_wan_interface)
-[ -n "$DEFWAN" -a "$(uci -q get network.${DEFWAN})" = "interface" -a "$DEFWAN" != "$INTERFACE" ] && exit 0
+[ -n "$DEFWAN" ] && [ "$(uci -q get network."${DEFWAN}")" = "interface" ] && [ "$DEFWAN" != "$INTERFACE" ] && exit 0
 
-ISLAN="$(uci -q get network.${INTERFACE}.is_lan)"
+ISLAN="$(uci -q get network."${INTERFACE}".is_lan)"
 [ "$ISLAN" = "1" ] && exit 0
 
-PROTO="$(uci -q get network.${INTERFACE}.proto)"
+PROTO="$(uci -q get network."${INTERFACE}".proto)"
 [ "$PROTO" = "none" ] && exit 0
 
-IFNAME="$(uci -q get network.${INTERFACE}.ifname)"
+IFNAME="$(uci -q get network."${INTERFACE}".ifname)"
 [ "${IFNAME:0:1}" = "@" ] && exit 0
 
 /etc/init.d/xmppc reload &

xmppc/files/etc/init.d/xmppc

@@ -8,8 +8,8 @@ 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)
-	if [ "$con_enable" == "1" ]; then
+	local con_enable=$(uci -q get xmpp."${con_name}".enable)
+	if [ "$con_enable" = "1" ]; then
 		procd_open_instance
 		procd_set_param command "$PROG"
 		procd_set_param respawn "3" "7" "0"