obuspa: Rebase with obuspa-4.0

- missing library files under /usr/lib/bbfdm
	- Added global enable for periodicstats & disabled by default
	- updated to latest devel

bbf/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libbbfdm
-PKG_VERSION:=4.1.2
+PKG_VERSION:=4.1.5
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=3034c1b324937fdccafa92e706e5986dc7a78df7
+PKG_SOURCE_VERSION:=838372a16ed0029cd681626bb5adb722f6a7681e
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

dectmngr/Makefile

@@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dectmngr
 PKG_RELEASE:=3
-PKG_VERSION:=3.0.12
+PKG_VERSION:=3.0.13
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=db155c063a9875026e573bbd292dec484fc3f103
+PKG_SOURCE_VERSION:=2c4fdf3f3ffc299c7596e6d0dc4be86485250533
 PKG_MIRROR_HASH:=skip
 endif
 

easy-soc-libs/Makefile

@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=easy-soc-libs
-PKG_VERSION:=6.2.12
+PKG_VERSION:=6.2.19
 PKG_RELEASE:=1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=48b9abce9acace69a9b270ed4438b80434fc3446
+PKG_SOURCE_VERSION:=d1fd660106d9ac3c937d005775608df43e1aa17c
 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

endptmngr/Makefile

@@ -7,11 +7,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=endptmngr
-PKG_VERSION:=0.4
+PKG_VERSION:=0.5
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/endptmngr.git
-PKG_SOURCE_VERSION:=b94de01a4ff24bb4d31bb16b3be9e1b1859359dd
+PKG_SOURCE_VERSION:=d3938443caffea15641bff72837d2de0cf87d62c
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 
@@ -28,7 +28,7 @@ PKG_BUILD_PARALLEL:=1
 PKG_CONFIG_DEPENDS:=CONFIG_TARGET_BOARD
 
 export CONFIG_BRCM_SDK_VER_504002
-
+export CONFIG_BCM_CHIP_ID
 
 include $(INCLUDE_DIR)/package.mk
 

icwmp/Makefile

@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=7.0.1-2021-04-15
+PKG_VERSION:=7.0.1-2021-05-14
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
 PKG_SOURCE_PROTO:=git

icwmp/files/etc/config/cwmp

@@ -30,7 +30,6 @@ config cpe 'cpe'
 	option userid '' #$OUI-$SER
 	option passwd 'iopsys'
 	option port '7547'
-	option ubus_socket '/var/run/ubus.sock'
 	option provisioning_code ''
 	option amd_version '5'
 	# compression possible configs: InstanceNumber, InstanceAlias

imonitor/Makefile

@@ -5,14 +5,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=imonitor
-PKG_VERSION:=1.0.0
+PKG_VERSION:=1.0.1
 PKG_RELEASE:=1
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 
 PKG_SOURCE_PROTO=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/imonitor.git
-PKG_SOURCE_VERSION:=532f4900862bcb45d8cd4bf37555fabda81750b6
+PKG_SOURCE_VERSION:=4beb1d5d6925507f1850a84c0b83aaf12a082f7f
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}

iop/config

@@ -39,20 +39,14 @@ CONFIG_PACKAGE_iptables-mod-filter=y
 CONFIG_PACKAGE_iptables-mod-ipopt=y
 # CONFIG_PACKAGE_iwatchdog is not set
 CONFIG_PACKAGE_jq=y
-CONFIG_PACKAGE_juci=y
-CONFIG_PACKAGE_juci-dnsmasq-dhcp=y
-CONFIG_PACKAGE_juci-firewall-fw3=y
-CONFIG_PACKAGE_juci-mod-status=y
-CONFIG_PACKAGE_juci-mod-system=y
-CONFIG_PACKAGE_juci-network-device=y
-CONFIG_PACKAGE_juci-network-dsl=y
-CONFIG_PACKAGE_juci-network-netifd=y
-CONFIG_PACKAGE_juci-sysupgrade=y
-CONFIG_PACKAGE_juci-wireless=y
-CONFIG_PACKAGE_juci-theme-iopsys=y
 CONFIG_PACKAGE_libreswan=m
 CONFIG_PACKAGE_libwifi=y
 CONFIG_PACKAGE_lscpu=y
+CONFIG_PACKAGE_luci=y
+# CONFIG_LUCI_JSMIN is not set
+# CONFIG_LUCI_CSSTIDY is not set
+CONFIG_PACKAGE_luci-mod-dashboard=y
+CONFIG_PACKAGE_luci-theme-openwrt-2020=y
 CONFIG_PACKAGE_map=y
 CONFIG_PACKAGE_miniupnpd=y
 CONFIG_PACKAGE_mwan3=y

map-topology/Makefile

@@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=map-topology
-PKG_VERSION:=1.5.22
+PKG_VERSION:=2.0.1
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_VERSION:=f10842f576fc29f6c3145a4b4b0efcb931d0e643
+PKG_SOURCE_VERSION:=eec19fb7f18863312760fe0db953d2f4e5ec9f5a
 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

obuspa/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=3.0.0.32
+PKG_VERSION:=3.0.0.28
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=7afcb04746566f19478dfdb5dd922d57d9e60166
+PKG_SOURCE_VERSION:=31d80ee826076953c24bdd1a67bc61560ed3e69f
 PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/obuspa.git
 PKG_MAINTAINER:=Vivek Dutta <vivek.dutta@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
@@ -30,8 +30,7 @@ define Package/obuspa
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=USP agent
-  PKG_BUILD_DEPENDS:=+openssl +ubus +sqlite3 +curl +ubox +uci
-  DEPENDS:=+libopenssl +libcurl +libsqlite3 +libubox +libubus +libmosquitto +uspd +libuci
+  DEPENDS:=+libopenssl +libcurl +libsqlite3 +libubox +libubus +uspd +libmosquitto
 endef
 
 define Package/obuspa/description

obuspa/files/etc/init.d/obuspa

@@ -214,7 +214,7 @@ configure_localagent() {
 
 	validate_localagent_section 'localagent' || {
 		log "Validation of localagent section failed"
-		exit 1;
+		return 1;
 	}
 
 	if [ -n "${EndpointID}" ]; then
@@ -239,7 +239,7 @@ configure_controller() {
 
 	validate_controller_section "${1}" || {
 		log "Validation of controller section failed"
-		exit 1;
+		return 1;
 	}
 
 	if [ -z "${EndpointID}" -o -z "${Protocol}" ]; then
@@ -272,6 +272,7 @@ configure_controller() {
 
 	controller_num=$(( controller_num + 1 ))
 
+	db_set Device.LocalAgent.Controller.${controller_num}.Alias "cpe-${controller_num}"
 	db_set Device.LocalAgent.Controller.${controller_num}.Enable "${Enable}"
 	db_set Device.LocalAgent.Controller.${controller_num}.EndpointID "${EndpointID}"
 	if [ -n "${AssignedRole}" ]; then
@@ -293,6 +294,7 @@ configure_controller() {
 	db_set Device.LocalAgent.Controller.${controller_num}.USPNotifRetryIntervalMultiplier "${USPNotifRetryIntervalMultiplier}"
 	db_set Device.LocalAgent.Controller.${controller_num}.ControllerCode "${ControllerCode}"
 
+	db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.Alias "cpe-${controller_num}"
 	db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.Enable "${Enable}"
 	db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.Protocol "${Protocol}"
 	# only support configuration of one mtp path per controller using uci
@@ -319,7 +321,7 @@ configure_subscription(){
 
 	validate_subscription_section "${1}" || {
 		log "Validation of subscription section failed"
-		exit 1;
+		return 1;
 	}
 
 	if [ -z "${Recipient}" -a -z "${controller}" ]; then
@@ -337,6 +339,7 @@ configure_subscription(){
 
 	subs_num=$(( subs_num + 1))
 
+	db_set Device.LocalAgent.Subscription.${subs_num}.Alias "cpe-${subs_num}"
 	db_set Device.LocalAgent.Subscription.${subs_num}.Enable "${Enable}"
 	db_set Device.LocalAgent.Subscription.${subs_num}.ID "${ID}"
 	db_set Device.LocalAgent.Subscription.${subs_num}.NotifType "${NotifType}"
@@ -419,7 +422,7 @@ configure_mtp() {
 
 	validate_mtp_section "${1}" || {
 		log "Validation of mtp section failed"
-		exit 1;
+		return 1;
 	}
 
 	if [ -z ${Reference} ]; then
@@ -441,6 +444,7 @@ configure_mtp() {
 	fi
 	mtp_num=$(( mtp_num + 1 ))
 
+	db_set Device.LocalAgent.MTP.${mtp_num}.Alias "cpe-${mtp_num}"
 	db_set Device.LocalAgent.MTP.${mtp_num}.Enable "${Enable}"
 	db_set Device.LocalAgent.MTP.${mtp_num}.Protocol "${Protocol}"
 	if [ "${Protocol}" = "MQTT" ]; then
@@ -469,7 +473,7 @@ configure_stomp_connection() {
 
 	validate_stomp_connection_section "${1}" || {
 		log "Validation of stomp section failed"
-		exit 1;
+		return 1;
 	}
 
 	stomp_num=$(( stomp_num + 1 ))
@@ -478,6 +482,7 @@ configure_stomp_connection() {
 	db_set Device.STOMP.Connection.${stomp_num}.Username "${Username}"
 	db_set Device.STOMP.Connection.${stomp_num}.Password "${Password}"
 
+	db_set Device.STOMP.Connection.${stomp_num}.Alias "cpe-${stomp_num}"
 	db_set Device.STOMP.Connection.${stomp_num}.Enable "${Enable}"
 	db_set Device.STOMP.Connection.${stomp_num}.Port "${Port}"
 	db_set Device.STOMP.Connection.${stomp_num}.EnableEncryption "${encryption}"
@@ -497,7 +502,7 @@ configure_mqtt_client(){
 
 	validate_mqtt_client_section "${1}" || {
 		log "Validation of mqtt section failed"
-		exit 1;
+		return 1;
 	}
 
 	if [ -z "${BrokerAddress}" ]; then
@@ -507,6 +512,7 @@ configure_mqtt_client(){
 
 	mqtt_num=$(( mqtt_num + 1 ))
 
+	db_set Device.MQTT.Client.${mqtt_num}.Alias "cpe-${mqtt_num}"
 	db_set Device.MQTT.Client.${mqtt_num}.Enable "${Enable}"
 	db_set Device.MQTT.Client.${mqtt_num}.BrokerAddress "${BrokerAddress}"
 	db_set Device.MQTT.Client.${mqtt_num}.BrokerPort "${BrokerPort}"
@@ -529,11 +535,11 @@ configure_obuspa() {
 
 	validate_obuspa_section "global" || {
 		log "Validation of global section failed"
-		exit 1;
+		return 1;
 	}
 
 	role_def_file="${role_file}"
-	[ ${enabled} -eq 0 ] && exit 0
+	[ ${enabled} -eq 0 ] && return 0
 
 	if [ ${debug} -eq 1 ]; then
 		# Forward stdout of the command to logd
@@ -652,7 +658,7 @@ start_service() {
 	ubus wait_for usp.raw
 	if [ "$?" -ne 0 ]; then
 		log "OBUSPA failed to start usp.raw not available"
-		exit 0
+		return 0
 	fi
 
 	procd_open_instance ${CONFIGURATION}

owsd/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=owsd
-PKG_VERSION:=1.1.2
+PKG_VERSION:=1.1.3
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/owsd.git
-PKG_SOURCE_VERSION:=fd696e9d1be8278db3eb1d9be97e1a66afd6e1f6
+PKG_SOURCE_VERSION:=f78f7198944758cd2140887ecd8970432f678fc1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}

owsd/files/owsd.config

@@ -1,5 +1,6 @@
 config owsd 'global'
-	option sock '/var/run/ubus.sock'
+	option enable '0'
+#	option sock '/var/run/ubus/ubus.sock'
 	option www '/www'
 #	option redirect '/cgi-bin/luci:/cacheflush.html'
 #	option www_maxage '3600'

owsd/files/owsd.init

@@ -124,6 +124,7 @@ validate_owsd_ubusproxy() {
 
 validate_owsd_global() {
 	uci_validate_section "owsd" "owsd" "global" \
+		'enable:bool:1' \
 		'sock:string' \
 		'redirect:string' \
 		'www:string' \
@@ -320,6 +321,10 @@ start_service() {
 	load_dhcp_domains
 
 	config_load owsd # note: do not overload a config while parsing it
+
+	config_get_bool owsd_enable global enable 1
+	[ $owsd_enable -eq 1 ] || return 0
+
 	procd_open_instance
 	procd_set_param command $PROG
 

periodicstats/Makefile

@@ -0,0 +1,51 @@
+#
+# Copyright (C) 2021 IOPSYS
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=periodicstats
+PKG_VERSION:=1.0.0
+
+LOCAL_DEV:=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=91b15f9779baccc93213ce3ca164c326235d3096
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/periodicstats.git
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
+endif
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_LICENSE:=GPL-2.0-only
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/periodicstats
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=Periodic Statistics Daemon
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm
+endef
+
+define Package/periodicstats/description
+	Manage periodic statistics
+endef
+
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+        $(CP) -rf ./periodicstats/* $(PKG_BUILD_DIR)/
+endef
+endif
+
+define Package/periodicstats/install
+	$(CP) ./files/* $(1)/
+	$(INSTALL_DIR) $(1)/usr
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
+	$(CP) $(PKG_BUILD_DIR)/bbf_plugin/libperiodicstats.so $(1)/usr/lib/bbfdm
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/periodicstatsd $(1)/usr/sbin
+endef
+
+$(eval $(call BuildPackage,periodicstats))

periodicstats/files/etc/config/periodicstats

@@ -0,0 +1,3 @@
+config globals 'globals'
+	option enable '0'
+

periodicstats/files/etc/init.d/periodicstats

@@ -0,0 +1,43 @@
+#!/bin/sh /etc/rc.common
+
+START=99
+STOP=10
+
+USE_PROCD=1
+NAME=periodicstatsd
+PROG=/usr/sbin/periodicstatsd
+
+. /lib/functions.sh
+
+start_service() {
+	if [ -f "/etc/config/periodicstats" ]; then
+		if [ "$(uci -q get periodicstats.globals.enable)" == "1" ]; then
+			procd_open_instance periodicstatsd
+			procd_set_param command ${PROG}
+			procd_set_param respawn
+			procd_close_instance
+		fi
+	fi
+}
+
+stop() {
+	#stop_service() is called after procd killed the service
+	echo ;
+}
+
+boot() {
+	start
+}
+
+service_triggers() {
+	procd_add_reload_trigger periodicstats
+}
+
+reload_service() {
+	stop
+	start
+}
+
+restart() {
+	start
+}

prj-unish/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=prj-unish
-PKG_VERSION:=0.7.0
+PKG_VERSION:=1.0.0
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=595bd811428f4c1271cc8e2f61a9b6311f4672f0
+PKG_SOURCE_VERSION:=a47110968d57fa1d0765900254b63c8ef983e741
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/prj-unish.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz

rulengd/Makefile

@@ -5,14 +5,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rulengd
-PKG_VERSION:=1.2.2
+PKG_VERSION:=1.2.3
 PKG_RELEASE:=1
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 
 PKG_SOURCE_PROTO=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/rulengd.git
-PKG_SOURCE_VERSION:=e5afe7734674d416138a54526cc589c57ba28279
+PKG_SOURCE_VERSION:=f5ded45562189a05f3912182d708bcb1427912f8
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}

stunc/Makefile

@@ -8,9 +8,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=stunc
-PKG_VERSION:=1.0.1
+PKG_VERSION:=1.0.2
 
-PKG_SOURCE_VERSION:=cd7c5d70bc97a2f1a26d5587ccf6f4c1e9ca82c8
+PKG_SOURCE_VERSION:=d578df0c8e4e7d1b642a5cf037ce468379270534
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/stunc.git
 
@@ -29,7 +29,7 @@ define Package/$(PKG_NAME)
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=BBF STUN Client
-  DEPENDS:=+libubus +libuci +libubox +libjson-c +libopenssl +libblobmsg-json
+  DEPENDS:=+libubus +libuci +libubox +libjson-c +libopenssl +libblobmsg-json +libbbf_api
 endef
 
 define Package/$(PKG_NAME)/description
@@ -43,9 +43,11 @@ define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libstunc.so $(1)/usr/lib/bbfdm/libstunc.so
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/stunc $(1)/usr/sbin/
 	$(INSTALL_BIN) ./files/etc/init.d/stunc $(1)/etc/init.d/stunc
-	$(INSTALL_DATA) ./files/etc/config/stun $(1)/etc/config/stun
+	$(INSTALL_DATA) ./files/etc/config/stunc $(1)/etc/config/stunc
 endef
 
 $(eval $(call BuildPackage,$(PKG_NAME)))

stunc/files/etc/config/stunc

@@ -1,6 +1,6 @@
 
-config stun 'stun'
-	option enable '0'
+config stunc 'stunc'
+	option enabled '0'
 	option username 'stun'
 	option password 'stun'
 	option server_address 'stun.l.google.com'

stunc/files/etc/init.d/stunc

@@ -1,23 +1,20 @@
 #!/bin/sh /etc/rc.common
-# STUN client software
-# Copyright (C) 2020 iopsys Software Solutions AB
-# Author: Omar Kallel <omar.kallel@pivasoftware.com>
 
-START=90
+START=99
+STOP=15
 
 USE_PROCD=1
 PROG="/usr/sbin/stunc"
 
-
 log() {
 	#echo "${@}" >/dev/console
-	echo "${@}"|logger -t stun -p info
+	echo "${@}"|logger -t stunc -p info
 }
 
 validate_stun_section()
 {
-	uci_validate_section stun stun stun \
-		'enable:bool' \
+	uci_validate_section stunc stunc stunc \
+		'enabled:bool' \
 		'Username:string' \
 		'Password:string' \
 		'server_address:host' \
@@ -26,31 +23,26 @@ validate_stun_section()
 		'log_level:uinteger:0'
 }
 
-service_running() {
-	ubus wait_for tr069
-	return $?;
-}
-
 start_service() {
-	local enable server_address
+	local enabled server_address
 
-	config_load stun
+	config_load stunc
 	validate_stun_section || {
-		log "Validation failed for stun section";
-		exit 1;
+		log "Validation failed for stunc section";
+		return 1;
 	}
 
-	if [ "$enable" -eq 0 ]; then
-		exit 0;
+	if [ "$enabled" -eq 0 ]; then
+		return 0;
 	fi
 
 	if [ -z "${server_address}" ]; then
 		log "Stun server address not defined or invalid"
-		exit 0;
+		return 0;
 	fi
 
-	procd_open_instance stun
-	procd_set_param command "$PROG"
+	procd_open_instance stunc
+	procd_set_param command ${PROG}
 	procd_set_param respawn "3" "7" "0"
 	procd_close_instance
 
@@ -63,5 +55,5 @@ reload_service() {
 
 service_triggers()
 {
-	procd_add_reload_trigger stun
+	procd_add_reload_trigger stunc
 }

sulu/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sulu
-PKG_VERSION:=0.2.1
+PKG_VERSION:=0.2.3
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/sulu.git
-PKG_SOURCE_VERSION:=a41d8edde15be3f22e358fb31e0b4786047dab53
+PKG_SOURCE_VERSION:=5f9c2ffb64a4cc46ffee59b6bbfafdaa26a7ab4f
 
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
@@ -29,6 +29,7 @@ define Package/sulu
   CATEGORY:=Utilities
   MENU=1
   TITLE:=SULU-CE ReactJS based Web UI Package
+  DEPENDS:=+nginx
 endef
 
 define Package/sulu/description
@@ -36,8 +37,8 @@ define Package/sulu/description
 endef
 
 define Package/sulu/install
-	$(INSTALL_DIR) $(1)/www
-	$(CP) $(PKG_BUILD_DIR)/out/* $(1)/www
+	$(INSTALL_DIR) $(1)/sulu
+	$(CP) $(PKG_BUILD_DIR)/dist/* $(1)/sulu
 #	$(CP) ./files/* $(1)/
 endef
 

urlfilter/Makefile

@@ -26,7 +26,7 @@ define Package/urlfilter
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=URL filter
-  DEPENDS:=+libuci +libnetfilter-queue +libnfnetlink +libpthread +libubox +ubus
+  DEPENDS:=+libuci +libnetfilter-queue +libnfnetlink +iptables-mod-nfqueue +libpthread +libubox +ubus
 endef
 
 define Package/urlfilter/description

urlfilter/files/etc/config/urlfilter

@@ -1,2 +1,2 @@
 config globals globals
-	option enable 1
+	option enable 0

uspd/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uspd
-PKG_VERSION:=2.1.15
+PKG_VERSION:=2.1.17
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=8463c05d8bf6ed9145e018a9816baefce08bd2ec
+PKG_SOURCE_VERSION:=8f31734007fa2d9d4c551578f9f3436ca55a5c17
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/uspd.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

uspd/files/uspd.init

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

wifimngr/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wifimngr
-PKG_VERSION:=9.3.2
+PKG_VERSION:=10.0.4
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=a3a5ed150a9d2f267f9a15e927fa030831807674
+PKG_SOURCE_VERSION:=c0df4e9898c76f28a4b12550e804a8bef89985d1
 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,9 +8,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xmppc
-PKG_VERSION:=1.0.0
+PKG_VERSION:=1.0.1
 
-PKG_SOURCE_VERSION:=231b010d5578bedee5f37de3ad7bd65e57f13a31
+PKG_SOURCE_VERSION:=a98cdda759418dab1c12a18c345112d94ed4c02e
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/xmppc.git
 
@@ -29,7 +29,7 @@ define Package/$(PKG_NAME)
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=BBF xmpp Client
-  DEPENDS:=+libuci +libubox +libstrophe +libbbf_api
+  DEPENDS:=+libuci +libubox +libstrophe +libbbf_api +libubus
 endef
 
 define Package/$(PKG_NAME)/description
@@ -41,7 +41,7 @@ TARGET_CFLAGS += \
 
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/xmppd $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/xmppc $(1)/usr/sbin/
 	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/*.so $(1)/usr/lib/bbfdm
 	$(CP) ./files/* $(1)/

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

@@ -17,5 +17,5 @@ local proto="$(uci -q get network.$INTERFACE.proto)"
 local ifname="$(uci -q get network.$INTERFACE.ifname)"
 [ "${ifname:0:1}" == "@" ] && exit 0
 
-/etc/init.d/xmppd reload &
+/etc/init.d/xmppc reload &
 

xmppc/files/etc/init.d/xmppc

@@ -1,13 +1,10 @@
 #!/bin/sh /etc/rc.common
-# XMPP client software
-# Copyright (C) 2020 iopsys Software Solutions AB
-# Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
 
 START=99
 STOP=10
 
 USE_PROCD=1
-PROG="/usr/sbin/xmppd"
+PROG="/usr/sbin/xmppc"
 
 start_service() {
 	local xmpp_enable=`uci -q get xmpp.xmpp.enable`
@@ -19,7 +16,7 @@ start_service() {
 		local con_enable=`uci -q get xmpp.$con.enable`
 		local srv_enable=`uci -q get xmpp.$con_srv.enable`
 		if ([ "$serveralgorithm" = "DNS-SRV" ] && [ "$con_enable" = "1" ]) || ([ "$serveralgorithm" = "ServerTable" ] && [ "$con_enable" = "1" ] && [ "$srv_enable" = "1" ]); then
-			procd_open_instance
+			procd_open_instance xmppc
 			procd_set_param command "$PROG"
 			procd_set_param respawn "3" "7" "0"
 			procd_close_instance