passwdqc: v2.0.3

- Fix kill sequence of bbfdm services
- Removed support of BBF_CONFIGMNGR_SCRIPT_BACKEND
- Removed support of BBF_MAX_OBJECT_INSTANCES
- Enabled debug release

bbfdm/Config_bbfdmd.in

@@ -7,8 +7,4 @@ config BBF_VENDOR_PREFIX
 config BBF_OBFUSCATION_KEY
 	string "Obfuscation key"
 	default "371d530c95a17d1ca223a29b7a6cdc97e1135c1e0959b51106cca91a0b148b5e42742d372a359760742803f2a44bd88fca67ccdcfaeed26d02ce3b6049cb1e04"
-
-config BBF_MAX_OBJECT_INSTANCES
-	int "Maximum number of instances per object"
-	default 255
 endif

bbfdm/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bbfdm
-PKG_VERSION:=1.14.1
+PKG_VERSION:=1.14.4
 
 USE_LOCAL:=0
 ifneq ($(USE_LOCAL),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bbfdm.git
-PKG_SOURCE_VERSION:=b7e5e0de5a12340f3fa9c9e9e40915c4de79e8c5
+PKG_SOURCE_VERSION:=c8967d6bf47c8bc96cf8df94236b4edfc95aabea
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -19,6 +19,8 @@ endif
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 
+RSTRIP:=true
+
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 include bbfdm.mk
@@ -68,10 +70,6 @@ define Package/bbfdmd/config
 	source "$(SOURCE)/Config_bbfdmd.in"
 endef
 
-define Package/bbf_configmngr/config
-	source "$(SOURCE)/bbf_configmngr.in"
-endef
-
 define Package/libbbfdm-api/description
  Library contains the API(UCI, UBUS, JSON, CLI and Browse) of libbbfdm
 endef
@@ -100,8 +98,9 @@ endif
 
 CMAKE_OPTIONS += \
 	-DBBF_VENDOR_PREFIX:String="$(CONFIG_BBF_VENDOR_PREFIX)" \
-	-DBBF_MAX_OBJECT_INSTANCES:Integer=$(CONFIG_BBF_MAX_OBJECT_INSTANCES) \
-	-DBBFDMD_MAX_MSG_LEN:Integer=10485760
+	-DBBFDMD_MAX_MSG_LEN:Integer=10485760 \
+	-DCMAKE_BUILD_TYPE:String="Debug" \
+
 
 define Package/libbbfdm-api/install
 	$(INSTALL_DIR) $(1)/lib
@@ -134,6 +133,7 @@ define Package/bbfdmd/install
 
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbfdmd/ubus/bbfdmd $(1)/usr/sbin/
+	$(STRIP) $(1)/usr/sbin/bbfdmd
 
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/etc/init.d/bbfdmd $(1)/etc/init.d/bbfdmd
@@ -159,17 +159,14 @@ endef
 define Package/bbf_configmngr/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/bbfdm/
-ifeq ($(CONFIG_BBF_CONFIGMNGR_C_BACKEND),y)
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/bbf_configd $(1)/usr/sbin/
-	$(INSTALL_BIN) ./files/etc/init.d/bbf_configd $(1)/etc/init.d/bbf_configd
 	$(INSTALL_DIR) $(1)/usr/share/bbfdm/scripts
-	$(CP) $(PKG_BUILD_DIR)/utilities/files/usr/share/bbfdm/scripts/bbf_config_notify.sh $(1)/usr/share/bbfdm/scripts/
-endif
-ifeq ($(CONFIG_BBF_CONFIGMNGR_SCRIPT_BACKEND),y)
-	$(INSTALL_DIR) $(1)/usr/libexec/rpcd
-	$(CP) $(PKG_BUILD_DIR)/utilities/files/usr/libexec/rpcd/bbf.config $(1)/usr/libexec/rpcd/bbf.config
-endif
+
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/bbf_configd $(1)/usr/sbin/
+	$(STRIP) $(1)/usr/sbin/bbf_configd
+
+	$(INSTALL_BIN) ./files/etc/init.d/bbf_configd $(1)/etc/init.d/bbf_configd
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/files/usr/share/bbfdm/scripts/bbf_config_notify.sh $(1)/usr/share/bbfdm/scripts/
 	$(INSTALL_DATA) ./files/etc/bbfdm/critical_services.json $(1)/etc/bbfdm/
 endef
 

bbfdm/bbf_configmngr.in

@@ -1,19 +0,0 @@
-if PACKAGE_bbf_configmngr
-choice
-	prompt "Select backend daemon for bbf.config"
-	default BBF_CONFIGMNGR_C_BACKEND
-	help
-		Select which backend daemon should be used for ubus bbf.config
-
-config BBF_CONFIGMNGR_SCRIPT_BACKEND
-	bool "Use shell script backend"
-	help
-		Enable this option to use shell script as the backend for bbf.config. This can be useful for quick and easy scripting of configuration tasks.
-
-config BBF_CONFIGMNGR_C_BACKEND
-	bool "Use C code backend"
-	help
-		Enable this option to use a C code implementation as the backend for bbf.config. This option is generally preferred for performance-critical tasks and scenarios requiring more robust and efficient handling.
-
-endchoice
-endif

bbfdm/files/etc/init.d/bbf_configd

@@ -1,7 +1,7 @@
 #!/bin/sh /etc/rc.common
 
 START=80
-STOP=10
+STOP=07
 
 USE_PROCD=1
 PROG=/usr/sbin/bbf_configd

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

@@ -1,7 +1,7 @@
 #!/bin/sh /etc/rc.common
 
 START=60
-STOP=8
+STOP=05
 
 USE_PROCD=1
 PROG=/usr/sbin/dm-service

bbfdm/files/etc/init.d/bbfdmd

@@ -1,7 +1,7 @@
 #!/bin/sh /etc/rc.common
 
 START=97
-STOP=10
+STOP=06
 
 USE_PROCD=1
 PROG=/usr/sbin/bbfdmd

bbfdm/tools/bbfdm.sh

@@ -9,10 +9,11 @@ SCRIPT=0
 DIAG=0
 PLUGIN=0
 DEST=""
+VENDOR_EXTN=""
 TOOLS="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
 SRC=""
 
-while getopts ":mpsdtu:" opt; do
+while getopts ":mpsdtv:" opt; do
 	case ${opt} in
 	  m)
 	  	MICRO_SERVICE=1
@@ -29,6 +30,9 @@ while getopts ":mpsdtu:" opt; do
 	  t)
 	  	INPUT_FILE=1
 		;;
+	  v)
+	  	VENDOR_EXTN=${OPTARG}
+		;;
 	  ?)
 	  	echo "Invalid option: ${OPTARG}"
 		exit 1
@@ -88,6 +92,10 @@ bbfdm_install_dm()
 		minfile=$(mktemp)
 		jq -c 'del(..|.description?)' ${src} > ${minfile}
 
+		if [ -n "${VENDOR_EXTN}" ]; then
+			sed -i "s/{BBF_VENDOR_PREFIX}/${VENDOR_EXTN}/g" ${minfile}
+		fi
+
 		src=${minfile}
 		if dpkg -s python3-jsonschema >/dev/null 2>&1; then
 			echo "Verifying bbfdm Datamodel JSON file"
@@ -125,6 +133,7 @@ fi
 
 if [ "${INPUT_FILE}" -eq "1" ]; then
 
+	tempfile=""
 	if [ ! -f "${SRC}" ]; then
 		echo "# Datamodel Input file ${SRC} not available"
 		exit 1
@@ -140,9 +149,18 @@ if [ "${INPUT_FILE}" -eq "1" ]; then
 		exit 1
 	fi
 
+	tempfile=$(mktemp)
+	cp ${SRC} ${tempfile}
+	if [ -n "${VENDOR_EXTN}" ]; then
+		sed -i "s/{BBF_VENDOR_PREFIX}/${VENDOR_EXTN}/g" ${tempfile}
+	fi
 
 	install_dir ${DEST}/etc/bbfdm/services
-	install_data ${SRC} ${DEST}/etc/bbfdm/services/${DATA}.json
+	install_data ${tempfile} ${DEST}/etc/bbfdm/services/${DATA}.json
+
+	if [ -f "${tempfile}" ]; then
+		rm ${tempfile}
+	fi
 	exit 0
 fi
 

bridgemngr/Config.in

@@ -1,7 +1,5 @@
 if PACKAGE_bridgemngr
 
-menu "Configuration"
-
 config BRIDGEMNGR_BRIDGE_VLAN
 	bool "Use bridge-vlan backend"
 	help
@@ -13,5 +11,7 @@ config BRIDGEMNGR_BRIDGE_VENDOR_EXT
 	help
 	   Set this option to use bridge BBF vendor extensions.
 
-endmenu
+config BRIDGEMNGR_BRIDGE_VENDOR_PREFIX
+	string "Package specific datamodel Vendor Prefix for TR181 extensions"
+	default ""
 endif

bridgemngr/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bridgemngr
-PKG_VERSION:=1.0.10
+PKG_VERSION:=1.0.11
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 LOCAL_DEV:=0
@@ -40,7 +40,13 @@ endef
 
 MAKE_PATH:=src
 
-TARGET_CFLAGS += -DBBF_VENDOR_PREFIX=\\\"$(CONFIG_BBF_VENDOR_PREFIX)\\\"
+ifeq ($(CONFIG_BRIDGEMNGR_BRIDGE_VENDOR_PREFIX),"")
+VENDOR_PREFIX = $(CONFIG_BBF_VENDOR_PREFIX)
+else
+VENDOR_PREFIX = $(CONFIG_BRIDGEMNGR_BRIDGE_VENDOR_PREFIX)
+endif
+
+TARGET_CFLAGS += -DBBF_VENDOR_PREFIX=\\\"$(VENDOR_PREFIX)\\\"
 
 ifeq ($(CONFIG_BRIDGEMNGR_BRIDGE_VLAN),y)
 	TARGET_CFLAGS += -DBRIDGE_VLAN_BACKEND
@@ -54,7 +60,7 @@ define Package/bridgemngr/install
 	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/libbridgemngr.so $(1) $(PKG_NAME)
 ifeq ($(CONFIG_BRIDGEMNGR_BRIDGE_VENDOR_EXT), y)
 	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/src/libbridgeext.so $(1) $(PKG_NAME)
-	$(BBFDM_INSTALL_MS_PLUGIN) ./files/VLAN_Filtering_Extension.json $(1) $(PKG_NAME)
+	$(BBFDM_INSTALL_MS_PLUGIN) -v ${VENDOR_PREFIX} ./files/VLAN_Filtering_Extension.json $(1) $(PKG_NAME)
 endif
 
 	$(INSTALL_BIN) ./files/etc/init.d/bridging $(1)/etc/init.d/

ethmngr/Config.in

@@ -9,5 +9,9 @@ config ETHMNGR_MACVLAN_EXTENSION
 config ETHMNGR_EXPOSE_ETHERNET_OBJECT
 	bool "Expose ethernet ubus object to fetch and clear interface stats"
 	default y
+
+config ETHMNGR_VENDOR_PREFIX
+	string "Package specific datamodel Vendor Prefix for TR181 extensions"
+	default ""
 endmenu
 endif

ethmngr/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ethmngr
-PKG_VERSION:=3.0.4
+PKG_VERSION:=3.0.5
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
@@ -41,17 +41,25 @@ define Package/$(PKG_NAME)/config
        source "$(SOURCE)/Config.in"
 endef
 
+TARGET_CFLAGS += \
+	-I$(STAGING_DIR)/usr/include \
+	-I$(STAGING_DIR)/usr/include/libnl3 \
+	-D_GNU_SOURCE
+
+ifeq ($(CONFIG_ETHMNGR_VENDOR_PREFIX),"")
+VENDOR_PREFIX = $(CONFIG_BBF_VENDOR_PREFIX)
+else
+VENDOR_PREFIX = $(CONFIG_ETHMNGR_VENDOR_PREFIX)
+endif
+
+TARGET_CFLAGS += -DBBF_VENDOR_PREFIX=\\\"$(VENDOR_PREFIX)\\\"
+
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
         $(CP) -rf ~/git/ethmngr/* $(PKG_BUILD_DIR)/
 endef
 endif
 
-TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/include \
-	-I$(STAGING_DIR)/usr/include/libnl3 \
-	-D_GNU_SOURCE \
-	-DBBF_VENDOR_PREFIX=\\\"$(CONFIG_BBF_VENDOR_PREFIX)\\\"
 
 ifeq ($(CONFIG_ETHMNGR_MACVLAN_EXTENSION),y)
 TARGET_CFLAGS += -DETHMNGR_MACVLAN_EXTENSION

icwmp/Makefile

@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=9.8.27
+PKG_VERSION:=9.8.29
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/icwmp.git
-PKG_SOURCE_VERSION:=868abeb86c2974b3647c7f66e085808c0f296721
+PKG_SOURCE_VERSION:=4075ec2c530fb1590aa484f98ed37c9dda5216f5
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

icwmp/files/etc/config/cwmp

@@ -20,9 +20,8 @@ config cpe 'cpe'
 	option default_lan_interface 'lan'
 	option log_to_console 'disable'
 	option log_to_file 'disable'
-	# log_severity: INFO (Default)	
 	# log_severity possible configs: EMERG, ALERT, CRITIC ,ERROR, WARNING, NOTICE, INFO, DEBUG
-	option log_severity 'ERROR'
+	option log_severity 'WARNING'
 	option log_file_name '/var/log/icwmpd.log'
 	option log_max_size '102400'
 	option userid '' #$OUI-$SER

ieee1905/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=8.6.3
+PKG_VERSION:=8.7.0
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=64a2c525c8b66d10643696fcd51bb916f4fb1d7b
+PKG_SOURCE_VERSION:=e65188bb2a05cf83f50ecf2ef8042cf75abe94a0
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/ieee1905.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
@@ -41,7 +41,8 @@ define Package/libieee1905
   $(call Package/ieee1905/Default)
   TITLE:=libieee1905.so (library for CMDU and TLV handling)
   DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
-	   +libjson-c +libblobmsg-json +libwifiutils
+	   +libjson-c +libblobmsg-json +libwifiutils \
+	   +iputils-arping
 endef
 
 define Package/ieee1905
@@ -50,7 +51,7 @@ define Package/ieee1905
   DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
 	   +libjson-c +libblobmsg-json +ubus +libpthread \
 	   +libieee1905 +IEEE1905_PLATFORM_HAS_WIFI:libwifi \
-	   +libwifiutils
+	   +libwifiutils +iputils-arping
   DEPENDS+=+IEEE1905_BUILD_TR181_PLUGIN:libbbfdm-api \
 	   +IEEE1905_BUILD_TR181_PLUGIN:libbbfdm-ubus \
 	   +IEEE1905_BUILD_TR181_PLUGIN:dm-service

libethernet/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libethernet
-PKG_VERSION:=7.2.116
+PKG_VERSION:=7.2.117
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=243de75f54baa44a7c1aec2460e07478c4479ed9
+PKG_SOURCE_VERSION:=e917cdcfa0beb15a452f204521bea3d3571190b3
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libethernet.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip

libwifi/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libwifi
-PKG_VERSION:=7.8.8
+PKG_VERSION:=7.9.0
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=4a1eaa7bfcaf4d2c0efeb453ea7c40b5ab7904ac
+PKG_SOURCE_VERSION:=b4d974c213eb2ad0b98165241b83bbda013ba452
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libwifi.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz

map-agent/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=6.2.3.13
+PKG_VERSION:=6.3.1.2
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=9e7e81b46a2f0aa0c8fca2024e100af2eb723fb6
+PKG_SOURCE_VERSION:=4547277f0637a4e7f18ff676350400efb4e37138
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
 
 PKG_LICENSE:=BSD-3-Clause

map-agent/files/etc/hotplug.d/ethernet/map-dynamic-backhaul

@@ -63,7 +63,7 @@ else
 		[ $dhcp -eq 1 ] || exit 0
 	else
 		[ -f $map_bh_file ] || exit 0
-		cur_bh="$(cat $map_bh_file  | jsonfilter -e @.ifname)"
+		cur_bh="$(jsonfilter -e @.ifname < "$map_bh_file" 2>/dev/null)" || exit 0
 		[ "$cur_bh" = "$PORT" ] || exit 0
 	fi
 ########################################################

map-controller/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=6.1.2.21
+PKG_VERSION:=6.2.2.1
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=1551c1f2a444ed7c90d81bf8292a89ef88460795
+PKG_SOURCE_VERSION:=f3d3ef332678f6417d78529323119a71ba715337
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
 
 LOCAL_DEV=0

mcastmngr/Config.in

@@ -0,0 +1,5 @@
+if PACKAGE_mcastmngr
+config MCASTMNGR_VENDOR_PREFIX
+	string "Package specific datamodel Vendor Prefix for TR181 extensions"
+	default ""
+endif

mcastmngr/Makefile

@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=mcastmngr
-PKG_VERSION:=1.2.9
+PKG_VERSION:=1.2.10
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 LOCAL_DEV:=0
@@ -39,13 +39,23 @@ define Package/mcastmngr/description
 	Configures IGMP and MLD snooping and proxy
 endef
 
+define Package/$(PKG_NAME)/config
+	source "$(SOURCE)/Config.in"
+endef
+
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
 	$(CP) -rf ~/git/mcastmngr/* $(PKG_BUILD_DIR)/
 endef
 endif
 
-TARGET_CFLAGS += -DBBF_VENDOR_PREFIX=\\\"$(CONFIG_BBF_VENDOR_PREFIX)\\\"
+ifeq ($(CONFIG_MCASTMNGR_VENDOR_PREFIX),"")
+VENDOR_PREFIX = $(CONFIG_BBF_VENDOR_PREFIX)
+else
+VENDOR_PREFIX = $(CONFIG_MCASTMNGR_VENDOR_PREFIX)
+endif
+
+TARGET_CFLAGS += -DBBF_VENDOR_PREFIX=\\\"$(VENDOR_PREFIX)\\\"
 
 define Package/mcastmngr/install
 	$(CP) ./files/common/* $(1)/
@@ -54,7 +64,7 @@ ifneq ($(CONFIG_TARGET_brcmbca),)
 else
 	$(CP) ./files/linux/* $(1)/
 endif
-	$(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME)
+	$(BBFDM_REGISTER_SERVICES) -v ${VENDOR_PREFIX} ./bbfdm_service.json $(1) $(PKG_NAME)
 	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/bbf_plugin/libmcast_bbf.so $(1) $(PKG_NAME)
 endef
 

netmngr/Config.in

@@ -24,4 +24,7 @@ config NETMNGR_IPV6RD_OBJ
 	bool "Enable Device.IPv6rd. Object"
 	default y
 
+config NETMNGR_VENDOR_PREFIX
+	string "Package specific datamodel Vendor Prefix for TR181 extensions"
+	default ""
 endif

netmngr/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=netmngr
-PKG_VERSION:=1.1.2
+PKG_VERSION:=1.1.3
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
@@ -39,7 +39,13 @@ endef
 
 MAKE_PATH:=src
 
-TARGET_CFLAGS += -DBBF_VENDOR_PREFIX=\\\"$(CONFIG_BBF_VENDOR_PREFIX)\\\"
+ifeq ($(CONFIG_NETMNGR_VENDOR_PREFIX),"")
+VENDOR_PREFIX = $(CONFIG_BBF_VENDOR_PREFIX)
+else
+VENDOR_PREFIX = $(CONFIG_NETMNGR_VENDOR_PREFIX)
+endif
+
+TARGET_CFLAGS += -DBBF_VENDOR_PREFIX=\\\"$(VENDOR_PREFIX)\\\"
 
 ifeq ($(CONFIG_NETMNGR_GRE_OBJ),y)
 MAKE_FLAGS += NETMNGR_GRE_OBJ=y

obuspa/Config.in

@@ -62,4 +62,8 @@ config OBUSPA_CWMP_DATAMODEL_SUPPORT
 	help
 	 Expose Device.USPAgent., Device.STOMP., Device.MQTT.Client. objects over
 	 ubus to make it available to bbfdm for CWMP access
+
+config OBUSPA_VENDOR_PREFIX
+	string "Package specific datamodel Vendor Prefix for TR181 extensions"
+	default ""
 endif

obuspa/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=9.0.4.2
+PKG_VERSION:=9.0.4.4
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/obuspa.git
-PKG_SOURCE_VERSION:=ccba361190e42000da16380591df80e5e5225d68
+PKG_SOURCE_VERSION:=1e5638d104075741a62d777ea9a2c508740c3634
 PKG_MAINTAINER:=Vivek Dutta <vivek.dutta@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -50,9 +50,16 @@ TARGET_CFLAGS += \
 	-D_GNU_SOURCE \
 	-DHAVE_STRERROR_R \
 	-Wall \
-	-D_DM_VENDOR_PREFIX=$(CONFIG_BBF_VENDOR_PREFIX) \
 	-Werror
 
+ifeq ($(CONFIG_OBUSPA_VENDOR_PREFIX),"")
+VENDOR_PREFIX = $(CONFIG_BBF_VENDOR_PREFIX)
+else
+VENDOR_PREFIX = $(CONFIG_OBUSPA_VENDOR_PREFIX)
+endif
+
+TARGET_CFLAGS += -D_DM_VENDOR_PREFIX=$(VENDOR_PREFIX)
+
 CMAKE_OPTIONS += -DCMAKE_INSTALL_PREFIX=/tmp
 CMAKE_OPTIONS += -DCMAKE_INSTALL_LOCALSTATEDIR=""
 
@@ -96,7 +103,7 @@ ifeq ($(CONFIG_OBUSPA_SESSION_EXTENSION),y)
 TARGET_CFLAGS += -DOBUSPA_ENABLE_SESSION_EXT
 endif
 
-ifdef $(CONFIG_OBUSPA_MAX_CONTROLLERS_NUM)
+ifneq ($(CONFIG_OBUSPA_MAX_CONTROLLERS_NUM),)
 TARGET_CFLAGS += -DOBUSPA_MAX_CONTROLLERS_NUM=$(CONFIG_OBUSPA_MAX_CONTROLLERS_NUM)
 endif
 
@@ -120,7 +127,7 @@ define Package/obuspa/install
 	$(INSTALL_DATA) ./files/etc/config/obuspa $(1)/etc/config/
 	$(INSTALL_DATA) ./files/etc/users/roles/*.json $(1)/etc/users/roles/
 	$(INSTALL_DATA) ./files/etc/obuspa/usp_utils.sh $(1)/etc/obuspa/
-	echo "$(CONFIG_BBF_VENDOR_PREFIX)" > $(1)/etc/obuspa/vendor_prefix
+	echo "$(VENDOR_PREFIX)" > $(1)/etc/obuspa/vendor_prefix
 	$(INSTALL_BIN) ./files/etc/uci-defaults/01-fix-upgrade-uci $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) ./files/etc/uci-defaults/60-generate-ctrust-defaults $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) ./files/etc/uci-defaults/obuspa-set-dhcp-option $(1)/etc/uci-defaults/

parental-control/Config.in

@@ -1,7 +1,5 @@
 if PACKAGE_parental-control
 
-menu "Configuration"
-
 config PARENTAL_CONTROL_INCLUDE_URLFILTER_BUNDLES
 	bool "Include default bundle files"
 	default n
@@ -9,5 +7,8 @@ config PARENTAL_CONTROL_INCLUDE_URLFILTER_BUNDLES
 	   Set this option to include bundle files by default,
 	   they are also included in the UCI, urlfilter
 	   still needs to be enabled though.
-endmenu
+
+config PARENTAL_CONTROL_VENDOR_PREFIX
+	string "Package specific datamodel Vendor Prefix for TR181 extensions"
+	default ""
 endif

parental-control/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=parental-control
-PKG_VERSION:=1.0.3
+PKG_VERSION:=1.0.4
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/parental-control.git
-PKG_SOURCE_VERSION:=410d1af9de498615090c5d4ac0388701d1870f68
+PKG_SOURCE_VERSION:=eea7793e26b52f45f4e47e849894ac3f8cdc3747
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -39,9 +39,15 @@ define Package/$(PKG_NAME)/config
 	source "$(SOURCE)/Config.in"
 endef
 
-TARGET_CFLAGS += \
-	-D_GNU_SOURCE\
-	-DBBF_VENDOR_PREFIX=\\\"$(CONFIG_BBF_VENDOR_PREFIX)\\\"
+TARGET_CFLAGS += -D_GNU_SOURCE
+
+ifeq ($(CONFIG_PARENTAL_CONTROL_VENDOR_PREFIX),"")
+VENDOR_PREFIX = $(CONFIG_BBF_VENDOR_PREFIX)
+else
+VENDOR_PREFIX = $(CONFIG_PARENTAL_CONTROL_VENDOR_PREFIX)
+endif
+
+TARGET_CFLAGS += -DBBF_VENDOR_PREFIX=\\\"$(VENDOR_PREFIX)\\\"
 
 TARGET_LDFLAGS += \
 	-lcmph
@@ -71,7 +77,8 @@ define Package/parental-control/install
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_DATA) ./files/etc/uci-defaults/95-firewall_parentalcontrol.ucidefaults $(1)/etc/uci-defaults/
 	$(INSTALL_DATA) ./files/etc/uci-defaults/95-migrate_urlfilter.ucidefaults $(1)/etc/uci-defaults/
-	$(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) parentalcontrol
+
+	$(BBFDM_REGISTER_SERVICES) -v ${VENDOR_PREFIX} ./bbfdm_service.json $(1) parentalcontrol
 
 ifeq ($(CONFIG_PARENTAL_CONTROL_INCLUDE_URLFILTER_BUNDLES),y)
 	$(INSTALL_DIR) $(1)/etc/parental-control

passwdqc/Makefile

@@ -0,0 +1,41 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=passwdqc
+PKG_VERSION:=2.0.3
+PKG_RELEASE:=1
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/openwall/passwdqc.git
+PKG_SOURCE_VERSION:=v$(PKG_VERSION)
+PKG_MIRROR_HASH:=skip
+
+PKG_LICENSE:=BSD-3
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/$(PKG_NAME)
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=libpam password checking module
+  DEPENDS:=+libpam +@BUSYBOX_CONFIG_PAM
+endef
+
+define Package/$(PKG_NAME)/description
+	pam_passwdqc is a simple password strength checking module for
+	PAM-aware password changing programs
+endef
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		CC="$(TARGET_CC)" \
+		LDFLAGS="$(TARGET_LDFLAGS)" \
+		pam_wrapped
+endef
+
+define Package/$(PKG_NAME)/install
+	$(INSTALL_DIR) $(1)/usr/lib/security/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libpasswdqc.so* $(1)/usr/lib/security/
+endef
+
+$(eval $(call BuildPackage,$(PKG_NAME)))

qosmngr/Config.in

@@ -0,0 +1,7 @@
+if PACKAGE_qosmngr
+
+config QOSMNGR_VENDOR_PREFIX
+	string "Package specific datamodel Vendor Prefix for TR181 extensions"
+	default ""
+endif
+

qosmngr/Makefile

@@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=qosmngr
-PKG_VERSION:=1.0.18
+PKG_VERSION:=1.0.20
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/qosmngr.git
-PKG_SOURCE_VERSION:=19c4b31eefe45bbbee2ba53f5394b5e32691451e
+PKG_SOURCE_VERSION:=cc1d993b853f360c0aa19f08bfbaf1e05667527a
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -37,7 +37,17 @@ define Package/qosmngr/description
 	Configures L2 QoS and collects queue statistics
 endef
 
-TARGET_CFLAGS += -DBBF_VENDOR_PREFIX=\\\"$(CONFIG_BBF_VENDOR_PREFIX)\\\"
+define Package/$(PKG_NAME)/config
+	source "$(SOURCE)/Config.in"
+endef
+
+ifeq ($(CONFIG_QOSMNGR_VENDOR_PREFIX),"")
+VENDOR_PREFIX = $(CONFIG_BBF_VENDOR_PREFIX)
+else
+VENDOR_PREFIX = $(CONFIG_QOSMNGR_VENDOR_PREFIX)
+endif
+
+TARGET_CFLAGS += -DBBF_VENDOR_PREFIX=\\\"$(VENDOR_PREFIX)\\\"
 
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare

qosmngr/files/common/etc/uci-defaults/60-qos_config_generate

@@ -26,7 +26,9 @@ generate_queue(){
         for i in $no_of_q; do
 		local order=$((total_q - i))
 		uci add qos queue
-		uci rename qos.@queue[-1]="q_${i}_${ifname}"
+		sec_name="q_${i}_${ifname}"
+		sec_name="$(echo $sec_name | sed -r 's/[.]+/_/g')"
+		uci rename qos.@queue[-1]="$sec_name"
 		uci set qos.@queue[-1].enable="1"
 		uci set qos.@queue[-1].ifname="$ifname"
 		uci set qos.@queue[-1].precedence="$order"

self-diagnostics/Makefile

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

self-diagnostics/files/usr/sbin/self-diagnostics

@@ -84,11 +84,11 @@ config_load()
 	fi
 
 	temp="$(db -q get device.deviceinfo.ModelName)"
-	[ -d "${temp}" ] && \
+	[ -n "${temp}" ] && \
 		MODEL="${temp}"
 
 	temp="$(db -q get device.deviceinfo.SerialNumber)"
-	[ -d "${temp}" ] && \
+	[ -n "${temp}" ] && \
 		SERIAL="${temp}"
 
 	temp="$(uci -q get self-diagnostics.globals.extended_spec_dir)"

sulu/sulu-base/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sulu-base
-PKG_VERSION:=4.0.3
+PKG_VERSION:=4.0.4
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu.git
-PKG_SOURCE_VERSION:=ecb31135596a052bb14904a47c42d39cb81ce9d4
+PKG_SOURCE_VERSION:=adc73a288a518735807c4b4334d55bc362bd31c2
 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:=4.0.3
+PKG_VERSION:=4.0.6
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-builder.git
-PKG_SOURCE_VERSION:=f9c98be88d79ecf5499e46f385899e4221f036e1
+PKG_SOURCE_VERSION:=71fa109e12e3cd469ea43adc8a39574bc2eb9e81
 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)
@@ -28,7 +28,7 @@ define Package/sulu/default
 	CATEGORY:=Utilities
 	SUBMENU:=SULU
 	TITLE:=SULU-CE
-	DEPENDS:=+mosquitto-auth-shadow +usermngr +jq
+	DEPENDS:=+mosquitto-auth-shadow +usermngr +jq +userinterface +obuspa
 	EXTRA_DEPENDS:=nginx
 endef
 
@@ -109,13 +109,10 @@ define Package/sulu/install/Default
 	$(INSTALL_DATA) ./files/etc/users/roles/*.json $(1)/etc/users/roles/
 
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
-	$(INSTALL_BIN) ./files/etc/uci-defaults/99-fix-sulu-config $(1)/etc/uci-defaults/
-	$(INSTALL_BIN) ./files/etc/uci-defaults/40-add-sulu-userinterface-config $(1)/etc/uci-defaults/
+	$(INSTALL_BIN) ./files/etc/uci-defaults/40-add-sulu-config $(1)/etc/uci-defaults/
 ifneq ($(CONFIG_SULU_DEFAULT_UI)$(CONFIG_SULU_BUILDER_DEFAULT_UI),)
 	$(INSTALL_BIN) ./files/etc/uci-defaults/41-make-sulu-default-ui $(1)/etc/uci-defaults/
 endif
-	$(INSTALL_BIN) ./files/etc/uci-defaults/01-update-nginx-uci-template $(1)/etc/uci-defaults/
-	$(INSTALL_BIN) ./files/etc/uci-defaults/10-add-mqtt-config $(1)/etc/uci-defaults/
 endef
 
 define Package/sulu/install/Post

sulu/sulu-builder/files/etc/init.d/sulu

@@ -2,7 +2,7 @@
 
 USE_PROCD=1
 
-START=60
+START=90
 STOP=01
 
 . /lib/functions.sh
@@ -30,18 +30,19 @@ start_service() {
 		return 0
 	fi
 
-	update_nginx_template
-
-	/etc/sulu/sulu.sh -r
+	if [ "${1}" = "update" ]; then
+		log "Reloading related services"
+		/etc/sulu/sulu.sh -r
+	fi
 	procd_close_instance
 }
 
 reload_service() {
 	stop
-	start
+	start update
 }
 
 service_triggers()
 {
-	procd_add_reload_trigger "sulu" "userinterface"
+	procd_add_reload_trigger "sulu" "userinterface" "mosquitto"
 }

sulu/sulu-builder/files/etc/sulu/sulu.sh

@@ -11,7 +11,7 @@ _RESTART_SERVICES="0"
 mkdir -p /tmp/sulu/
 
 function slog() {
-	echo "$*" | logger -t sulu.init -p debug
+	echo "$*" | logger -t sulu.sh -p debug
 }
 
 function _get_agent_id() {
@@ -73,13 +73,6 @@ function _get_sulu_session_mode() {
 	echo "$(uci -q get sulu.global.SessionMode)"
 }
 
-function _get_usp_upstream_port() {
-	local port
-
-	port="$(uci -q get mosquitto.sulu.port)"
-	echo "${port:-9009}"
-}
-
 function _get_sulu_acl_file() {
 	local file
 
@@ -87,27 +80,6 @@ function _get_sulu_acl_file() {
 	echo "${file}"
 }
 
-function _get_sulu_http_port() {
-	local port listen
-
-	listen="$(uci -q get nginx._sulu_http.listen)"
-	port="$(echo $listen | grep -Eo '[0-9]+' | head -n 1)"
-
-	echo "${port:-8080}"
-}
-
-function update_nginx_template() {
-	local port
-
-	UCI_TEMPLATE="/etc/nginx/uci.conf.template"
-	port="$(_get_usp_upstream_port)"
-	if ! grep -q "upstream websocket { server 127.0.0.1:${port}; }" ${UCI_TEMPLATE}; then
-		sed -i "s/upstream websocket { server 127.0.0.1:[0-9]\+; }/upstream websocket { server 127.0.0.1:${var}; }/" ${UCI_TEMPLATE}
-		slog "Restarting nginx"
-		ubus call uci commit '{"config":"nginx"}'
-	fi
-}
-
 function generate_sulu_conn_config() {
 	local users SCONFIG session
 
@@ -151,24 +123,6 @@ function generate_sulu_conn_config() {
 	json_dump >${SCONFIG}
 }
 
-cleanup_sulu_usp_config() {
-	local users sec stype tmp
-
-	sec="${1}"
-	stype="${2}"
-	users="${3}"
-
-	if [[ "${sec}" == "${stype}_sulu_"* ]]; then
-		tmp="${sec//${stype}_sulu_/}"
-
-		val="$(echo ${users}|grep -w -o $tmp)"
-		if [ -z "$val" ]; then
-			_remove_sulu_section "${sec}"
-			RESTART_REQ=1
-		fi
-	fi
-}
-
 function _update_obuspa_config_rbac() {
 	local agent users session
 
@@ -176,10 +130,6 @@ function _update_obuspa_config_rbac() {
 	users="$(_get_sulu_user_roles)"
 	session="$(_get_sulu_session_mode)"
 
-	config_foreach cleanup_sulu_usp_config controller controller "${users}"
-	config_foreach cleanup_sulu_usp_config mtp mtp "${users}"
-	config_foreach cleanup_sulu_usp_config mqtt mqtt "${users}"
-
 	for user in ${users}; do
 		local section
 
@@ -223,19 +173,9 @@ function _update_obuspa_config_rbac() {
 	done
 }
 
-function _remove_sulu_section() {
-	local section="$1"
-
-	if [[ "${section}" == *"_sulu_"* ]]; then
-		uci_remove obuspa ${1}
-		return 1
-	fi
-	return 0
-}
-
-function _create_acl() {
+function _create_mosquitto_acl() {
 	local agentid users
-	local ACL_FILE
+	local ACL_FILE acl_users
 
 	RESTART_REQ="0"
 
@@ -244,12 +184,17 @@ function _create_acl() {
 		return 0
 	fi
 
+	users="$(_get_sulu_user_roles)"
 	if [ -f "${ACL_FILE}" ]; then
-		rm -f "${ACL_FILE}"
+		acl_users="$(awk '/^user/ {print $2}' ${ACL_FILE})"
+		for user in ${users}; do
+			if ! grep -q "$user" ${acl_users}; then
+				rm -f "${ACL_FILE}"
+			fi
+		done
 	fi
 	touch "${ACL_FILE}"
 
-	users="$(_get_sulu_user_roles)"
 	agentid="$(_get_agent_id)"
 	for user in ${users}; do
 		if ! grep -q "user $user" ${ACL_FILE}; then
@@ -262,7 +207,7 @@ function _create_acl() {
 		fi
 	done
 
-	if [ "${RESTART_REQ}" -gt "0" ]; then
+	if [ "${_RESTART_SERVICES}" -eq "1" -a "${RESTART_REQ}" -gt "0" ]; then
 		slog "Restarting mosquitto..."
 		ubus call uci commit '{"config":"mosquitto"}'
 	fi
@@ -282,9 +227,9 @@ function update_obuspa_config() {
 }
 
 function configure_sulu() {
-	generate_sulu_conn_config
-	_create_acl
+	_create_mosquitto_acl
 	update_obuspa_config
+	generate_sulu_conn_config
 }
 
 while getopts ":r" opt; do

sulu/sulu-builder/files/etc/uci-defaults/01-update-nginx-uci-template

@@ -1,12 +0,0 @@
-#!/bin/sh
-
-UCI_TEMPLATE="/etc/nginx/uci.conf.template"
-update_nginx_uci_template()
-{
-	if ! grep -q "upstream websocket" ${UCI_TEMPLATE}; then
-		sed -i '/#UCI_HTTP_CONFIG$/i\	map $http_upgrade $connection_upgrade { default upgrade; "" close; }' ${UCI_TEMPLATE}
-		sed -i '/#UCI_HTTP_CONFIG$/i\	upstream websocket { server 127.0.0.1:9009; }' ${UCI_TEMPLATE}
-	fi
-}
-
-update_nginx_uci_template

sulu/sulu-builder/files/etc/uci-defaults/10-add-mqtt-config

@@ -1,37 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-if [ ! -f "/etc/config/mosquitto" ]; then
-	echo "Local mosquitto broker not available"
-	return 0
-fi
-
-add_sulu_config()
-{
-	if ! uci_get mosquitto sulu >/dev/null 2>&1; then
-		uci_add mosquitto listener sulu
-		uci_set mosquitto sulu enabled 1
-		uci_set mosquitto sulu port '9009'
-		uci_set mosquitto sulu no_remote_access '1'
-		uci_set mosquitto sulu protocol 'websockets'
-		uci_set mosquitto sulu require_certificates '0'
-		uci_set mosquitto sulu auth_plugin '/usr/lib/mosquitto_auth_shadow.so'
-		uci_set mosquitto sulu acl_file '/tmp/sulu/mqtt.acl'
-	fi
-}
-
-add_obuspa_config()
-{
-	if ! uci_get mosquitto obuspa >/dev/null 2>&1; then
-		uci_add mosquitto listener obuspa
-		uci_set mosquitto obuspa enabled 1
-		uci_set mosquitto obuspa port '1883'
-		uci_set mosquitto obuspa no_remote_access '1'
-		uci_set mosquitto obuspa allow_anonymous '1'
-	fi
-}
-
-uci_load mosquitto
-add_obuspa_config
-add_sulu_config

sulu/sulu-builder/files/etc/uci-defaults/40-add-sulu-config

@@ -0,0 +1,91 @@
+#!/bin/sh
+
+UCI_TEMPLATE="/etc/nginx/uci.conf.template"
+
+if [ ! -f "/etc/config/mosquitto" ]; then
+	echo "Local mosquitto broker not available"
+	return 0
+fi
+
+if [ ! -f "${UCI_TEMPLATE}" ]; then
+	echo "nginx utils not installed, sulu can't run"
+	return 0
+fi
+
+function _get_usp_upstream_port() {
+	local port
+
+	port="$(uci -q get mosquitto.sulu.port)"
+	echo "${port:-9009}"
+}
+
+update_nginx_uci_template()
+{
+	local port
+
+	UCI_TEMPLATE="/etc/nginx/uci.conf.template"
+	port="$(_get_usp_upstream_port)"
+        if ! grep -q "upstream websocket" ${UCI_TEMPLATE}; then
+		sed -i '/#UCI_HTTP_CONFIG$/i\   map $http_upgrade $connection_upgrade { default upgrade; "" close; }' ${UCI_TEMPLATE}
+		sed -i "/#UCI_HTTP_CONFIG$/i\   upstream websocket { server 127.0.0.1:${port}; }" ${UCI_TEMPLATE}
+        fi
+}
+
+add_sulu_config_to_mosquitto()
+{
+	if ! uci_get mosquitto sulu >/dev/null 2>&1; then
+		uci_add mosquitto listener sulu
+		uci_set mosquitto sulu enabled 1
+		uci_set mosquitto sulu port '9009'
+		uci_set mosquitto sulu no_remote_access '1'
+		uci_set mosquitto sulu protocol 'websockets'
+		uci_set mosquitto sulu require_certificates '0'
+		uci_set mosquitto sulu auth_plugin '/usr/lib/mosquitto_auth_shadow.so'
+		uci_set mosquitto sulu acl_file '/tmp/sulu/mqtt.acl'
+	fi
+}
+
+add_obuspa_config_to_mosquitto()
+{
+	uci_load mosquitto
+	if ! uci_get mosquitto obuspa >/dev/null 2>&1; then
+		uci_add mosquitto listener obuspa
+		uci_set mosquitto obuspa enabled 1
+		uci_set mosquitto obuspa port '1883'
+		uci_set mosquitto obuspa no_remote_access '1'
+		uci_set mosquitto obuspa allow_anonymous '1'
+	fi
+}
+
+add_sulu_userinterface_uci()
+{
+	uci_load userinterface
+
+	if ! uci_get userinterface _sulu_s >/dev/null 2>&1; then
+		uci_add userinterface http_access _sulu_s
+		uci_set userinterface _sulu_s path_prefix '/sulu'
+		uci_set userinterface _sulu_s port '8443'
+		uci_add_list userinterface _sulu_s _nginx_include '/etc/sulu/nginx.locations'
+		uci_set userinterface _sulu_s _nginx_uci_manage_ssl 'self-signed'
+        	uci_set userinterface _sulu_s _nginx_ssl_certificate '/etc/nginx/conf.d/_lan.crt'
+	        uci_set userinterface _sulu_s _nginx_ssl_certificate_key '/etc/nginx/conf.d/_lan.key'
+	        uci_set userinterface _sulu_s _nginx_ssl_session_cache 'none'
+	        uci_set userinterface _sulu_s protocol 'HTTPS'
+		uci_add_list userinterface _sulu_s role 'admin'
+		uci_add_list userinterface _sulu_s role 'user'
+	fi
+
+	if ! uci_get userinterface _suluredirect >/dev/null 2>&1; then
+		uci_add userinterface http_access _suluredirect
+		uci_set userinterface _suluredirect redirect '_sulu_s'
+	        uci_set userinterface _suluredirect protocol 'HTTP'
+		uci_set userinterface _suluredirect port "8080"
+	fi
+}
+
+add_obuspa_config_to_mosquitto
+add_sulu_config_to_mosquitto
+update_nginx_uci_template
+add_sulu_userinterface_uci
+
+/etc/sulu/sulu.sh

sulu/sulu-builder/files/etc/uci-defaults/40-add-sulu-userinterface-config

@@ -1,32 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-add_sulu_userinterface_uci()
-{
-	uci_load userinterface
-
-	if ! uci_get userinterface _sulu_s >/dev/null 2>&1; then
-		uci_add userinterface http_access _sulu_s
-		uci_set userinterface _sulu_s path_prefix '/sulu'
-		uci_set userinterface _sulu_s port '8443'
-		uci_add_list userinterface _sulu_s _nginx_include '/etc/sulu/nginx.locations'
-		uci_set userinterface _sulu_s _nginx_uci_manage_ssl 'self-signed'
-        	uci_set userinterface _sulu_s _nginx_ssl_certificate '/etc/nginx/conf.d/_lan.crt'
-	        uci_set userinterface _sulu_s _nginx_ssl_certificate_key '/etc/nginx/conf.d/_lan.key'
-	        uci_set userinterface _sulu_s _nginx_ssl_session_cache 'none'
-	        uci_set userinterface _sulu_s protocol 'HTTPS'
-		uci_add_list userinterface _sulu_s role 'admin'
-		uci_add_list userinterface _sulu_s role 'user'
-	fi
-
-	if ! uci_get userinterface _suluredirect >/dev/null 2>&1; then
-		uci_add userinterface http_access _suluredirect
-		uci_set userinterface _suluredirect redirect '_sulu_s'
-	        uci_set userinterface _suluredirect protocol 'HTTP'
-		uci_set userinterface _suluredirect port "8080"
-	fi
-}
-
-
-add_sulu_userinterface_uci

sulu/sulu-builder/files/etc/uci-defaults/41-make-sulu-default-ui

@@ -8,7 +8,7 @@ if uci_get nginx _sulu_s >/dev/null 2>&1; then
   exit 0
 fi
 
-move_default_nginx_listener_to_8443() {
+update_default_nginx_listner() {
 
   if [ ! -f /etc/config/nginx ]; then
     return
@@ -18,18 +18,24 @@ move_default_nginx_listener_to_8443() {
     return
   fi
 
-  uci_remove nginx _lan listen
-  uci_add_list nginx _lan listen "8443 ssl default_server"
-  uci_add_list nginx _lan listen "[::]:8443 ssl default_server"
+  if ! opkg list-installed |grep -q "luci "; then
+    echo "Luci not installed, removing luci config"
+    uci_remove nginx _lan
+    uci_remove nginx _redirect2ssl
+  else
+    uci_remove nginx _lan listen
+    uci_add_list nginx _lan listen "8443 ssl default_server"
+    uci_add_list nginx _lan listen "[::]:8443 ssl default_server"
 
-  if ! uci_get nginx _redirect2ssl >/dev/null 2>&1; then
-    return
+    if ! uci_get nginx _redirect2ssl >/dev/null 2>&1; then
+        return
+    fi
+
+    uci_remove nginx _redirect2ssl listen
+    uci_add_list nginx _redirect2ssl listen "8080"
+    uci_add_list nginx _redirect2ssl listen "[::]:8080"
+    uci_set nginx _redirect2ssl return '302 https://$host:8443$request_uri'
   fi
-
-  uci_remove nginx _redirect2ssl listen
-  uci_add_list nginx _redirect2ssl listen "8080"
-  uci_add_list nginx _redirect2ssl listen "[::]:8080"
-  uci_set nginx _redirect2ssl return '302 https://$host:8443$request_uri'
 }
 
 move_sulu_to_443_and_80() {
@@ -50,5 +56,5 @@ move_sulu_to_443_and_80() {
   config_foreach set_port http_access
 }
 
-move_default_nginx_listener_to_8443
+update_default_nginx_listner
 move_sulu_to_443_and_80

sulu/sulu-builder/files/etc/uci-defaults/99-eval-set-sulu-pwa-keys

@@ -1,14 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-set_sulu_pwa_key()
-{
-	if [ -f "/etc/sulu/pwa.crt" -a -f "/etc/sulu/pwa.key" ]; then
-		uci_load nginx
-		uci_set nginx _sulu_s ssl_certificate '/etc/sulu/pwa.crt'
-		uci_set nginx _sulu_s ssl_certificate_key '/etc/sulu/pwa.key'
-	fi
-}
-
-set_sulu_pwa_key

sulu/sulu-builder/files/etc/uci-defaults/99-fix-sulu-config

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-/etc/sulu/sulu.sh

sulu/sulu-builder/files/etc/users/roles/admin.json

@@ -187,7 +187,7 @@
         ]
       },
       {
-        "object":"Device.{BBF_VENDOR_PREFIX}URLFilter.",
+        "object":"Device.{BBF_VENDOR_PREFIX}ParentalControl.",
         "perm": [
           "PERMIT_GET",
           "PERMIT_GET_INST",

timemngr/Config.in

@@ -32,4 +32,8 @@ config TIMEMNGR_VENDOR_EXTENSIONS
 	bool "Iopsys vendor extensions for Device.Time."
 	depends on PACKAGE_timemngr
 	default y
+
+config TIMEMNGR_VENDOR_PREFIX
+	string "Package specific datamodel Vendor Prefix for TR181 extensions"
+	default ""
 endif

timemngr/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=timemngr
-PKG_VERSION:=1.1.5
+PKG_VERSION:=1.1.6
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
@@ -50,7 +50,13 @@ define Build/Prepare
 endef
 endif
 
-TARGET_CFLAGS += -DBBF_VENDOR_PREFIX=\\\"$(CONFIG_BBF_VENDOR_PREFIX)\\\"
+ifeq ($(CONFIG_TIMEMNGR_VENDOR_PREFIX),"")
+VENDOR_PREFIX = $(CONFIG_BBF_VENDOR_PREFIX)
+else
+VENDOR_PREFIX = $(CONFIG_TIMEMNGR_VENDOR_PREFIX)
+endif
+
+TARGET_CFLAGS += -DBBF_VENDOR_PREFIX=\\\"$(VENDOR_PREFIX)\\\"
 
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/etc/timemngr/

tr104/Config.in

@@ -1,3 +1,5 @@
+if PACKAGE_tr104
+
 config TR104_RUNAS_BBFDM_MICROSERVICE
 	bool "Use bbfdmd datamodel microservice to run tr104, preferred if TR104 and BBFDMD are on different base"
 	depends on PACKAGE_tr104
@@ -7,3 +9,8 @@ config TR104_VENDOR_EXTENSIONS
 	bool "Use TR104 vendor extensions"
 	depends on PACKAGE_tr104
 	default y
+
+config TR104_VENDOR_PREFIX
+	string "Package specific datamodel Vendor Prefix for TR181 extensions"
+	default ""
+endif

tr104/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tr104
-PKG_VERSION:=1.0.36
+PKG_VERSION:=1.0.37
 
 LOCAL_DEV:=0
 ifeq ($(LOCAL_DEV),0)
@@ -43,8 +43,14 @@ define Package/$(PKG_NAME)/config
 	source "$(SOURCE)/Config.in"
 endef
 
+ifeq ($(CONFIG_TR104_VENDOR_PREFIX),"")
+VENDOR_PREFIX = $(CONFIG_BBF_VENDOR_PREFIX)
+else
+VENDOR_PREFIX = $(CONFIG_TR104_VENDOR_PREFIX)
+endif
+
 CMAKE_OPTIONS += \
-	-DBBF_VENDOR_PREFIX:String="$(CONFIG_BBF_VENDOR_PREFIX)" \
+	-DBBF_VENDOR_PREFIX:String="$(VENDOR_PREFIX)" \
 	-DDAEMON_JSON_INPUT:String="/etc/tr104/input.json" \
 	-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
 	-DDM_ENABLE_UBUS:BOOL=ON

usermngr/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=usermngr
-PKG_VERSION:=1.3.2
+PKG_VERSION:=1.3.3
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
@@ -30,6 +30,7 @@ define Package/usermngr
   SUBMENU:=TRx69
   DEPENDS:= +shadow-utils +libopenssl +libuci +libubox +ubus
   DEPENDS+=+libbbfdm-api +libbbfdm-ubus +bbfdmd
+  DEPENDS+=+@BUSYBOX_CONFIG_ADDUSER +@BUSYBOX_CONFIG_DELUSER +@BUSYBOX_CONFIG_ADDGROUP +@BUSYBOX_CONFIG_DELGROUP +shadow-usermod
   TITLE:=Package to add Device.Users. datamodel support
 endef
 

wifidmd/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wifidmd
-PKG_VERSION:=1.0.24
+PKG_VERSION:=1.0.27
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/wifidmd.git
-PKG_SOURCE_VERSION:=f6b6a2d68ec5523b8d2b118d7931fb9e590cba03
+PKG_SOURCE_VERSION:=845089fd9cb18157689047cc13ceba18efa55d28
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

wifimngr/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wifimngr
-PKG_VERSION:=17.5.0
+PKG_VERSION:=17.5.3
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=479368d84dca6d98cf0da3707c5f4f35b2168dcb
+PKG_SOURCE_VERSION:=c1030be78a77b3bc5137ce2f4e411c902d41e156
 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