map-controller: 6.4.2.0

bbfdm/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bbfdm
-PKG_VERSION:=1.18.2
+PKG_VERSION:=1.17.6
 
 USE_LOCAL:=0
 ifneq ($(USE_LOCAL),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bbfdm.git
-PKG_SOURCE_VERSION:=786863cf0ef48dd70610598cdf8e2bbc0462a504
+PKG_SOURCE_VERSION:=c9af4e50cef5336e7842578d3d10f1f7bce2d8b0
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -55,7 +55,7 @@ define Package/dm-service
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=Datamodel ubus backend to expose micro-service tree
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm-api +libbbfdm-ubus +bbf_configmngr +libeasy
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm-api +libbbfdm-ubus +bbf_configmngr
 endef
 
 define Package/bbf_configmngr
@@ -183,7 +183,6 @@ define Package/bbf_configmngr/install
 
 	$(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_BIN) $(PKG_BUILD_DIR)/utilities/files/usr/share/bbfdm/scripts/bbf_default_reload.sh $(1)/etc/bbfdm/
 	$(INSTALL_DATA) ./files/etc/bbfdm/critical_services.json $(1)/etc/bbfdm/
 endef
 

bbfdm/files/etc/bbfdm/critical_services.json

@@ -1,51 +1,23 @@
 {
 	"usp": [
-			"/etc/config/firewall",
-			"/etc/bbfdm/dmmap/dmmap_firewall",
-			"/etc/config/network",
-			"/etc/bbfdm/dmmap/IP",
-			"/etc/bbfdm/dmmap/Ethernet",
-			"/etc/bbfdm/dmmap/GRE",
-			"/etc/bbfdm/dmmap/IPv6rd",
-			"/etc/bbfdm/dmmap/PPP",
-			"/etc/bbfdm/dmmap/Routing",
-			"/etc/config/dhcp",
-			"/etc/bbfdm/dmmap/dmmap_dhcp",
-			"/etc/bbfdm/dmmap/dmmap_dhcp_client",
-			"/etc/bbfdm/dmmap/dmmap_dhcp_relay",
-			"/etc/bbfdm/dmmap/dmmap_dhcpv6",
-			"/etc/config/time",
-			"/etc/bbfdm/dmmap/dmmap_time",
-			"/etc/config/mapcontroller",
-			"/etc/config/wireless",
-			"/etc/bbfdm/dmmap/WiFi",
-			"/etc/config/ieee1905",
-			"/etc/config/mosquitto",
-			"/etc/config/nginx",
-			"/etc/config/netmode",
-			"/etc/bbfdm/dmmap/dmmap_netmode"
+			"firewall",
+			"network",
+			"dhcp",
+			"time",
+			"wireless",
+			"ieee1905",
+			"mapcontroller",
+			"mosquitto",
+			"nginx",
+			"netmode"
 	],
 	"cwmp": [
-			"/etc/config/firewall",
-			"/etc/bbfdm/dmmap/dmmap_firewall",
-			"/etc/config/network",
-			"/etc/bbfdm/dmmap/IP",
-			"/etc/bbfdm/dmmap/Ethernet",
-			"/etc/bbfdm/dmmap/GRE",
-			"/etc/bbfdm/dmmap/IPv6rd",
-			"/etc/bbfdm/dmmap/PPP",
-			"/etc/bbfdm/dmmap/Routing",
-			"/etc/config/dhcp",
-			"/etc/bbfdm/dmmap/dmmap_dhcp",
-			"/etc/bbfdm/dmmap/dmmap_dhcp_client",
-			"/etc/bbfdm/dmmap/dmmap_dhcp_relay",
-			"/etc/bbfdm/dmmap/dmmap_dhcpv6",
-			"/etc/config/mapcontroller",
-			"/etc/config/wireless",
-			"/etc/bbfdm/dmmap/WiFi",
-			"/etc/config/time",
-			"/etc/bbfdm/dmmap/dmmap_time",
-			"/etc/config/netmode",
-			"/etc/bbfdm/dmmap/dmmap_netmode"
+			"firewall",
+			"network",
+			"dhcp",
+			"mapcontroller",
+			"wireless",
+			"time",
+			"netmode"
 	]
 }

bbfdm/files/etc/init.d/bbf_configd

@@ -27,6 +27,6 @@ start_service()
 service_triggers() {
 	for config_file in /etc/config/*; do
 		config_name=$(basename "$config_file")
-		procd_add_config_trigger "config.change" "$config_name" /usr/share/bbfdm/scripts/bbf_config_notify.sh "$config_name"
+		procd_add_config_trigger "config.change" "$config_name" /usr/share/bbfdm/scripts/bbf_config_notify.sh
 	done
 }

decollector/Makefile

@@ -6,12 +6,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=decollector
-PKG_VERSION:=6.2.1.12
+PKG_VERSION:=6.2.1.10
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=ce738316065e4608811312f0a254d1fee22fa343
+PKG_SOURCE_VERSION:=c9fad0fafad290bc19b7ad1a8e6c7e2cc4f55ad1
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/decollector.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

dmexec/Makefile

@@ -1,44 +0,0 @@
-#
-# Copyright (C) 2025 iopsys Software Solutions AB
-#
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=dmexec
-PKG_VERSION:=0.0.1
-PKG_RELEASE:=1
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_LICENSE:=GPL-2.0-only
-
-include $(INCLUDE_DIR)/package.mk
-include $(TOPDIR)/feeds/iopsys/bbfdm/bbfdm.mk
-
-define Package/dmexec
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Datamodel for shell exec
-  DEPENDS:=+dm-service
-endef
-
-define Package/dmexec/description
-  datamodel extension for running shell commands.
-endef
-
-define Build/Compile
-	# pass
-endef
-
-define Package/dmexec/install
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DIR) $(1)/etc/init.d
-
-	$(INSTALL_DATA) ./files/etc/config/dmexec $(1)/etc/config/
-	$(INSTALL_BIN) ./files/etc/init.d/dmexec $(1)/etc/init.d/
-
-	$(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME)
-	$(BBFDM_INSTALL_MS_DM) ./files/dm_exec.json $(1) $(PKG_NAME)
-endef
-
-$(eval $(call BuildPackage,dmexec))

dmexec/bbfdm_service.json

@@ -1,16 +0,0 @@
-{
-  "daemon": {
-    "enable": "1",
-    "service_name": "dmexec",
-    "unified_daemon": false,
-    "services": [
-      {
-        "parent_dm": "Device.",
-        "object": "X_GENEXIS_EU_CLI"
-      }
-    ],
-    "config": {
-      "loglevel": "7"
-    }
-  }
-}

dmexec/files/dm_exec.json

@@ -1,81 +0,0 @@
-{
-  "json_plugin_version": 2,
-  "Device.X_GENEXIS_EU_CLI.": {
-    "type": "object",
-    "protocols": [
-      "cwmp",
-      "usp"
-    ],
-    "access": false,
-    "array": false,
-    "Enable": {
-      "type": "boolean",
-      "read": true,
-      "write": true,
-      "protocols": [
-        "cwmp",
-        "usp"
-      ],
-      "mapping": [
-        {
-          "type": "uci",
-          "uci": {
-            "file": "dmexec",
-            "section": {
-              "name": "dmexec"
-            },
-            "option": {
-              "name": "enable"
-            }
-          }
-        }
-      ]
-    },
-    "REQUEST": {
-      "type": "string",
-      "read": true,
-      "write": true,
-      "protocols": [
-        "cwmp",
-        "usp"
-      ],
-      "mapping": [
-        {
-          "type": "uci",
-          "uci": {
-            "file": "dmexec",
-            "section": {
-              "name": "dmexec"
-            },
-            "option": {
-              "name": "cmd"
-            }
-          }
-        }
-      ]
-    },
-    "RESULT": {
-      "type": "string",
-      "read": true,
-      "write": false,
-      "protocols": [
-        "cwmp",
-	"usp"
-      ],
-      "mapping": [
-        {
-          "type": "uci",
-          "uci": {
-            "file": "dmexec",
-            "section": {
-              "name": "dmexec"
-            },
-            "option": {
-              "name": "result"
-            }
-          }
-        }
-      ]
-    }
-  }
-}

dmexec/files/etc/config/dmexec

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

dmexec/files/etc/init.d/dmexec

@@ -1,40 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=99
-STOP=01
-
-USE_PROCD=1
-
-log() {
-	logger -t dmexec.init "$*"
-}
-
-start_service() {
-	procd_open_instance
-	procd_close_instance
-}
-
-reload_service() {
-	local cmd result enable
-
-	enable="$(uci -q get dmexec.dmexec.enable)"
-	enable="${enable:-0}"
-
-	if [ "${enable}" -eq "0" ]; then
-		log "dmexec is disabled"
-	fi
-
-	uci -q set dmexec.dmexec.result=""
-	cmd="$(uci -q get dmexec.dmexec.cmd)"
-	if [ -n "${cmd}" ]; then
-		log "Executing [${cmd}]"
-		result="$(eval $cmd 2>&1 |head -n 1 |head -c 256)"
-		result="${result//\'/}"
-		uci -q set dmexec.dmexec.result="${result}"
-		uci commit dmexec
-	fi
-}
-
-service_triggers() {
-	procd_add_reload_trigger dmexec
-}

icwmp/Makefile

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

ieee1905/Makefile

@@ -6,12 +6,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=8.7.37
+PKG_VERSION:=8.7.34
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=c711e1e132478d6443ffb5aad15d12b90f0d59b5
+PKG_SOURCE_VERSION:=81c99af824bd5bd217213e4e731798a6469157b8
 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

logmngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=logmngr
-PKG_VERSION:=1.1.4
+PKG_VERSION:=1.1.2
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/system/logmngr.git
-PKG_SOURCE_VERSION:=62441fdfe14a39bff8fff7c62307bd7b54d7240f
+PKG_SOURCE_VERSION:=ad043d5d2e96c1b203a9c5b22ad6e6e1488ad8f2
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

logmngr/files/lib/logmngr/fluent-bit.sh

@@ -92,6 +92,9 @@ create_input_section() {
 	# check if this source section has already been processed
 	syslog_tag_already_processed "$tag" && return
 
+	# the input in our case is always syslog, hence, this section of the
+	# fluent-bit.conf file has hardcoded values as well that do not depend
+	# on any uci value
 	append_conf "[INPUT]"
 	append_conf "    name        syslog"
 	append_conf "    tag         $tag"
@@ -99,172 +102,147 @@ create_input_section() {
 	append_conf ""
 }
 
-populate_allowed_logs() {
-	local facility_level sev_level
-	local section="$1"
-
-	[ -z "$section" ] && return
-
-	# reset
-	match_pattern=""
-	facilities=""
-	all_facilities=0
-	kern_facility=0
-	severities=""
-	sev_compare=1
-	sev_action=0
-
-	# read config
-	config_get match_pattern $section pattern_match
-
-	config_get facility_level $section facility_level
-	config_get sev_level $section severity_level
-	config_get sev_compare $section severity_compare 1
-	config_get sev_action $section severity_action 0
-
-	# normalize facilities
-	if [ -n "$facility_level" ]; then
-		for f in $facility_level; do
-			if [ "$f" = "24" ]; then
-				all_facilities=1
-				# xargs is used to convert from new line separated numbers to space separated numbers
-				facilities="$(seq 0 23 | xargs)"
-				break
-			fi
-
-			if [ "$f" = "0" ]; then
-				kern_facility=1
-			fi
-		done
-
-		if [ "$all_facilities" -eq 0 ]; then
-			facilities="$facility_level"
-		fi
-	else
-		# default to "all facilities" when unset
-        	all_facilities=1
-	        facilities="$(seq 0 23 | xargs)"
-	fi
-
-	# normalize severities
-	case "$sev_level" in
-		8)  	# all severities
-			severities="$(seq 0 7 | xargs)"
-			;;
-		9)  	# none
-			severities="none"
-			;;
-		"") 	# unset, treat as "all"
-			severities="$(seq 0 7 | xargs)"
-			;;
-		*)
-			if [ "$sev_compare" = "0" ]; then
-				# equal
-				severities="$sev_level"
-			else
-				# equl or higher
-				severities="$(seq 0 $sev_level | xargs)"
-			fi
-			;;
-	esac
-}
-
-create_filter_section() {
-	local match_regex="$1"
-	local pattern="$2"
-
-	[ -z "$match_regex" ] && return
-
-	append_conf "[FILTER]"
-	append_conf "    name        grep"
-	append_conf "    match_regex       $match_regex"
-
-	# we need "logical_op or" only in non-pattern sections
-	if [ "$pattern" = "0" ]; then
-		append_conf "    logical_op  or" # handle multiple filters
-	fi
-}
-
 create_kmsg_input_section() {
 	local tag="$1"
-	local max_sev=7
 
 	[ -z "$tag" ] && return
+
+	# check if this source section has already been processed
 	kmsg_tag_already_processed "$tag" && return
 
 	if [ -c "/dev/kmsg" ]; then
 		append_conf "[INPUT]"
 		append_conf "    name       kmsg"
 		append_conf "    tag        $tag"
-
-		# check kern facility (0)
-		if [ "$all_facilities" -eq 1 ] || [ "$kern_facility" -eq 1 ]; then
-			if [ "$severities" != "none" ]; then
-				# severity filtering
-				# only EqualOrHigher is supported by Prio_Level
-				# and only Log action is supported
-				# so set Prio_Level = max severity
-				if [ "$sev_action" = "0" ] && [ "$sev_compare" = "1" ]; then
-					if [ -n "$severities" ]; then
-						max_sev=$(echo $severities | tr ' ' '\n' | sort -n | tail -1)
-					fi
-
-					append_conf "    prio_level $max_sev"
-				fi
-			fi
-		fi
-
 		append_conf ""
-
-		# if severities is none, or
-		# if kern facility has been excluded
-		# then we need to stop kernel logs
-		# sev_action and sev_compare is being checked because we don't want to work with rules that exclude logs
-		if [ "$severities" = "none" ] || { [ "$kern_facility" -eq 0 ] && [ "$all_facilities" -eq 0 ] && [ "$sev_action" = "0" ] && [ "$sev_compare" = "1" ]; }; then
-			# block all
-			# create a filter section that matches on KM* tag
-			# and excludes all messages
-			create_filter_section "KM*" "0"
-			append_conf "    exclude    message ^.*$"
-			append_conf ""
-		fi
 	fi
 }
 
-generate_syslog_filter() {
-	local param="regex"
+generate_facility_regex() {
+	local facility_level=$1
+	local pri=0
 
-	[ "$sev_action" = "1" ] && param="exclude"
-
-	# start adding the fluent-bit filter section
-	create_filter_section "SL*" "0"
-
-	if [ "$severities" = "none" ]; then
-		append_conf "    exclude    pri ^.*$"
+	if [ "$facility_level" == "24" ]; then
+		# value 24 means all facility level, which is as good as not
+		# generating a filter section, so return
 		return
 	fi
 
-	for fval in $facilities; do
-		for sval in $severities; do
-			local pri=$((fval * 8 + sval))
-			append_conf "    $param        pri ^${pri}$"
+	# facility_level is a list value, hence, generate regex for
+	# each value
+	IFS=" "
+	for val in $facility_level; do
+		# as per rfc 5424 and 3164, pri in syslog msg is
+		# facility*8+severity. Severity value can range from 0-7 hence
+		# generate regex for each.
+		for sval in 0 1 2 3 4 5 6 7; do
+			pri=`expr $val \* 8 + $sval`
+			append_conf "    regex        pri $pri"
 		done
 	done
-
-	append_conf ""
 }
 
-generate_pattern_filter() {
+generate_severity_regex() {
+	local sev_level="$1"
+	local sev_compare="$2"
+	local sev_action="$3"
+
+	local pri=0
+	local param="exclude"
+
+	if [ "$sev_action" == "0" ]; then
+		param="regex"
+	fi
+
+	local fval=0
+	if [ "$sev_compare" == "0" ]; then
+		# generate regex for all facility values, with severity=sev_level
+		while [ $fval -le 23 ] ; do
+			pri=`expr $fval \* 8 + $sev_level`
+			append_conf "    $param        pri $pri"
+			fval=$((fval + 1))
+		done
+	elif [ "$sev_compare" == "1" ]; then
+		# generate regex for all severity value greater than or equal to
+		# sev_level. please, lower value have higher precedence, so sev_level
+		# 0 which is emergency has higher precedence than error which is 3
+		while [ $fval -le 23 ] ; do
+			sval=0
+			while [ $sev_level -ge $sval ]; do
+				pri=`expr $fval \* 8 + $sval`
+				append_conf "    $param        pri $pri"
+				sval=$((sval + 1))
+			done
+			fval=$((fval + 1))
+		done
+	fi
+}
+
+handle_filter_conf() {
+	local section="$1" # config filter
+	local filter_name="$2"
+	local name
+
+	# no need to proceed if name of filter section is not one of the values
+	# listed in option filter in config action section
+	config_get name $section name
+	if [ "$name" != "$filter_name" ]; then
+		return
+	fi
+
+	# as per data model, at a time either facility_level or severity_level can
+	# be specified along with pattern_match. hence, first process and generate
+	# regex for pattern_match which is common in both condition. Next, we will
+	# process facility_level and return if facility level is defined and not
+	# process severity related params at all.
+
+	local pattern_match
+	config_get pattern_match $section pattern_match
+	if [ -n "$pattern_match" ]; then
+		append_conf "    regex        $pattern_match"
+	fi
+
+	local facility_level
+	config_get facility_level $section facility_level
+
+	if [ -n "$facility_level" ]; then
+		generate_facility_regex $facility_level
+		# return from here since if facility_level is defined, then no
+		# need to process severity_level
+		return
+	fi
+
+	local sev_level
+	local sev_compare
+	local sev_action
+	config_get sev_level $section severity_level
+
+	if [ -n "$sev_level" ]; then
+		# value 1 of severity compare corresponds to data model
+		# and system default which is EqualorHigher
+		config_get sev_compare $section severity_compare 1
+		# value 0 of severity action corresponds to data model
+		# and system default that is log
+		config_get sev_action $section severity_action 0
+
+		generate_severity_regex $sev_level $sev_compare $sev_action
+	fi
+}
+
+create_filter_section() {
 	local match_regex="$1"
-	local match_pattern="$2"
 
 	[ -z "$match_regex" ] && return
-	[ -z "$match_pattern" ] && return
 
-	# start adding the fluent-bit filter section
-	create_filter_section "$match_regex" "1"
-	append_conf "    regex        message $match_pattern"
-	append_conf ""
+	append_conf "[FILTER]"
+	append_conf "    name        grep"
+	append_conf "    match_regex       $match_regex"
+	append_conf "    logical_op  or" # handle multiple filters
+}
+
+handle_filter_ref() {
+	local filter_name="$1"
+	config_foreach handle_filter_conf filter "$filter_name"
 }
 
 handle_log_file() {
@@ -297,7 +275,6 @@ handle_log_file() {
 	append_conf "    match_regex  $match_regex"
 	append_conf "    file         $file"
 
-
 	if [ -n "$template" ]; then
 		append_conf "    format       template"
 		append_conf "    template     ${template}"
@@ -372,7 +349,7 @@ handle_log_remote() {
 resolve_source_section() {
 	local src_section="$1"
 	local linker="$2"
-	local src_name syslog_en kernel_en
+	local src_name syslog_en kernel_en source_tag_syslog source_tag_kmsg
 
 	config_get src_name "$src_section" name
 	[ "$src_name" = "$linker" ] || return
@@ -387,11 +364,13 @@ resolve_source_section() {
 	if [ "$syslog_en" = "1" ]; then
 		source_tag_syslog="SL$src_name"
 		create_input_section "$source_tag_syslog"
+		action_tags="$source_tag_syslog $action_tags"
 	fi
 
 	if [ "$kernel_en" = "1" ]; then
 		source_tag_kmsg="KM$src_name"
 		create_kmsg_input_section "$source_tag_kmsg"
+		action_tags="$source_tag_kmsg $action_tags"
 	fi
 }
 
@@ -427,30 +406,10 @@ build_match_regex() {
 	echo "$regex"
 }
 
-handle_filter_conf() {
-	local section="$1" # config filter
-	local filter_name="$2"
-	local name
-
-	config_get name $section name
-	[ "$name" = "$filter_name" ] || return
-
-	populate_allowed_logs "$filter_name"
-}
-
 handle_action() {
-	local tag_regex filter source_ref template_ref source_sec log_template finst
+	local tag_regex filter source_ref template_ref source_sec log_template
 	local action_section="$1"
-	local source_tag_syslog source_tag_kmsg
-
-	# shared variables set by populate_allowed_logs
-	match_pattern=""
-	facilities=""
-	all_facilities=0
-	kern_facility=1
-	severities=""
-	sev_compare=1
-	sev_action=0
+	local action_tags=""
 
 	config_get action_name "$action_section" name
 	config_get filter "$action_section" filter
@@ -460,26 +419,27 @@ handle_action() {
 	[ -z "$action_name" ] && return
 	[ -z "$source_ref" ] && return
 
-	# read filter section and populate relevant variables
-	# these variables will be used by create_kmsg_input_section
-	# generate_syslog_filter, and generate_pattern_filter functions
-	if [ -n "$filter" ]; then
-		for finst in $filter; do
-			config_foreach handle_filter_conf filter "$finst"
-		done
-	fi
-
 	# Resolve referenced source sections
 	for source_sec in $source_ref; do
 		config_foreach resolve_source_section source "$source_sec"
 	done
 
 	# build a regex that will match all the sources for this action
-	tag_regex=$(build_match_regex "$source_tag_syslog $source_tag_kmsg")
+	tag_regex=$(build_match_regex "$action_tags")
 
 	if [ -n "$filter" ]; then
-		generate_pattern_filter "$tag_regex" "$match_pattern"
-		generate_syslog_filter
+		# the only fluentbit filter that is useful for the datamodel is
+		# grep. Also, fluentbit does not seem to handle multiple instances
+		# of FILTER of same kind. Hence, each filter section corresponding
+		# to an action entry in the uci would translate for us into a set of
+		# regex/exclude values instead of individual FILTER section per uci
+		# section filter is a list, treat according
+		create_filter_section "$tag_regex"
+
+		IFS=" "
+		for finst in $filter; do
+			handle_filter_ref $finst
+		done
 	fi
 
 	# get the template expression if any is present

map-agent/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=6.4.1.11
+PKG_VERSION:=6.4.1.6
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=671bb0e693adbeb3e06b967350ce7f96ee91321b
+PKG_SOURCE_VERSION:=ed2e65007c2a0bacb642b0e72b803df64ef826ed
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
 
 PKG_LICENSE:=BSD-3-Clause

map-controller/Makefile

@@ -6,9 +6,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=6.4.2.6
+PKG_VERSION:=6.4.2.0
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=5e93ea36c4fb93dd473b233b098ecacf6395a20c
+PKG_SOURCE_VERSION:=59b376c6e4e10ba2e399b1a2ca2a37790039c9d0
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@genexis.eu>
 
 LOCAL_DEV=0

map-plugins/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-plugins
-PKG_VERSION:=1.0.31
+PKG_VERSION:=0.0.8
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=565cade8fe08807b345404c567243fbdfdcb96c8
+PKG_SOURCE_VERSION:=140c18c27e116997295ef88ad8617357af450a2d
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/map-plugins.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
@@ -32,7 +32,8 @@ MAKE_FLAGS += \
 
 plugins := \
 	$(if $(CONFIG_PACKAGE_map-plugins-steer-rate),steer-rate)   \
-	$(if $(CONFIG_PACKAGE_map-plugins-bsteer),bsteer)
+	$(if $(CONFIG_PACKAGE_map-plugins-bsteer),bsteer) \
+	$(if $(CONFIG_PACKAGE_map-plugins-son-maxrate),son-maxrate)
 
 ppkg:=$(patsubst plugins/%.mk,map-plugins-%,$(wildcard plugins/*.mk))
 
@@ -57,7 +58,7 @@ define Package/map-plugins/description
 endef
 
 define Package/map-plugins/install
-	:
+	$(foreach p,$(plugins),$(call Package/map-plugins-$(p)/install, $(1));)
 endef
 
 define Build/Compile

map-plugins/plugins/son-maxrate.mk

@@ -0,0 +1,20 @@
+define Package/map-plugins-son-maxrate
+	$(call Package/map-plugins/Default)
+	TITLE:=Run SON algorithm for optimal Multi-AP network topology
+	DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
+		 +libjson-c +libblobmsg-json +map-controller \
+		 +map-plugins
+endef
+
+define Package/map-plugins-son-maxrate/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/usr/lib/mapcontroller
+	$(CP) $(PKG_BUILD_DIR)/son/maxrate/son.so $(1)/usr/lib/mapcontroller/son.so
+endef
+
+define Build/Compile/map-plugins-son-maxrate
+	$(MAKE) -C $(PKG_BUILD_DIR)/son/maxrate \
+		CC="$(TARGET_CC)" \
+		CFLAGS="$(TARGET_CFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS)";
+endef

mosquitto-auth-shadow/Config.in

@@ -1,7 +0,0 @@
-if PACKAGE_mosquitto-auth-shadow
-
-config MOSQUITTO_AUTH_PAM_SUPPORT
-	bool "Enable support of Linux PAM module for Authentication"
-	default y
-
-endif

mosquitto-auth-shadow/Makefile

@@ -14,13 +14,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mosquitto-auth-shadow
-PKG_VERSION:=1.1.0
+PKG_VERSION:=1.0.1
 
 PKG_MAINTAINER:=Erik Karlsson <erik.karlsson@genexis.eu>
 PKG_LICENSE:=EPL-2.0
 
 PKG_BUILD_PARALLEL:=1
-PKG_CONFIG_DEPENDS:=CONFIG_MOSQUITTO_AUTH_PAM_SUPPORT
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -28,7 +27,7 @@ define Package/mosquitto-auth-shadow
   SECTION:=net
   CATEGORY:=Network
   TITLE:=mosquitto - /etc/shadow authentication plugin
-  DEPENDS:=+mosquitto-ssl +MOSQUITTO_AUTH_PAM_SUPPORT:libpam
+  DEPENDS:=+mosquitto-ssl
   USERID:=mosquitto=200:mosquitto=200 mosquitto=200:shadow=11
 endef
 
@@ -37,14 +36,6 @@ define Package/mosquitto-auth-shadow/description
   users using /etc/shadow
 endef
 
-define Package/mosquitto-auth-shadow/config
-	source "$(SOURCE)/Config.in"
-endef
-
-ifeq ($(CONFIG_MOSQUITTO_AUTH_PAM_SUPPORT),y)
-TARGET_CFLAGS+=-DENABLE_PAM_SUPPORT
-endif
-
 define Package/mosquitto-auth-shadow/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mosquitto_auth_shadow.so $(1)/usr/lib/

mosquitto-auth-shadow/src/Makefile

@@ -19,7 +19,7 @@ all: $(TARGETS)
 	$(CC) $(CFLAGS) -Wall -Werror -fPIC -c -o $@ $<
 
 mosquitto_auth_shadow.so: mosquitto_auth_shadow.pic.o
-	$(CC) $(LDFLAGS) -shared -o $@ $^ $(if $(filter -DENABLE_PAM_SUPPORT,$(CFLAGS)),-lpam)
+	$(CC) $(LDFLAGS) -shared -o $@ $^
 
 clean:
 	rm -f *.o $(TARGETS)

mosquitto-auth-shadow/src/mosquitto_auth_shadow.c

@@ -15,78 +15,22 @@
 #include <string.h>
 #include <shadow.h>
 #include <crypt.h>
-#include <stdlib.h>
 #include <mosquitto.h>
 #include <mosquitto_broker.h>
 #include <mosquitto_plugin.h>
 
-#ifdef ENABLE_PAM_SUPPORT
-#include <security/pam_appl.h>
-
-static int pam_conversation(int num_msg, const struct pam_message **msg, struct pam_response **resp, void *appdata_ptr)
-{
-	int i;
-	const char *pass = (const char *)appdata_ptr;
-
-	*resp = calloc(num_msg, sizeof(struct pam_response));
-	if (*resp == NULL) {
-		mosquitto_log_printf(MOSQ_LOG_ERR, "pam failed to allocate buffer for validation");
-		return PAM_BUF_ERR;
-	}
-
-	if (pass == NULL)
-		return PAM_SUCCESS;
-
-	for (i = 0; i < num_msg; ++i) {
-		if (msg[i]->msg_style == PAM_PROMPT_ECHO_OFF) {
-			(*resp)[i].resp = strdup(pass);
-			if ((*resp)[i].resp == NULL) {
-				for (int j = 0; j < i ; j++)
-					free((*resp)[j].resp);
-
-				free(*resp);
-				*resp = NULL;
-				mosquitto_log_printf(MOSQ_LOG_ERR, "pam failed in strdup");
-				return PAM_BUF_ERR;
-			}
-		}
-	}
-	return PAM_SUCCESS;
-}
-
-static int process_pam_auth_callback(struct mosquitto_evt_basic_auth *ed)
-{
-	struct pam_conv conv;
-	int retval;
-	pam_handle_t *pamh = NULL;
-
-	conv.conv = pam_conversation;
-	conv.appdata_ptr = (void *)ed->password;
-
-	retval = pam_start("mosquitto", ed->username, &conv, &pamh);
-	if (retval != PAM_SUCCESS) {
-		mosquitto_log_printf(MOSQ_LOG_ERR, "pam start failed: %s", pam_strerror(pamh, retval));
-		return MOSQ_ERR_AUTH;
-	}
-
-	retval = pam_authenticate(pamh, 0);
-	pam_end(pamh, retval);
-	if (retval == PAM_SUCCESS) {
-		mosquitto_log_printf(MOSQ_LOG_NOTICE, "pam user [%s] logged in", ed->username);
-		return MOSQ_ERR_SUCCESS;
-	}
-
-	mosquitto_log_printf(MOSQ_LOG_NOTICE, "pam user [%s] failed authentication, err [%s]", ed->username, pam_strerror(pamh, retval));
-	return MOSQ_ERR_AUTH;
-}
-#else
-static int process_shadow_auth_callback(struct mosquitto_evt_basic_auth *ed)
+static int basic_auth_callback(int event, void *event_data, void *userdata)
 {
+	struct mosquitto_evt_basic_auth *ed = event_data;
 	struct spwd spbuf, *sp = NULL;
 	char buf[256];
 	struct crypt_data data;
 	char *hash;
 
+	/* Let other plugins or broker decide about anonymous login */
+	if (ed->username == NULL)
+		return MOSQ_ERR_PLUGIN_DEFER;
+
 	getspnam_r(ed->username, &spbuf, buf, sizeof(buf), &sp);
 
 	if (sp == NULL || sp->sp_pwdp == NULL)
@@ -110,22 +54,6 @@ static int process_shadow_auth_callback(struct mosquitto_evt_basic_auth *ed)
 
 	return MOSQ_ERR_AUTH;
 }
-#endif
-
-static int basic_auth_callback(int event, void *event_data, void *userdata)
-{
-	struct mosquitto_evt_basic_auth *ed = event_data;
-
-	/* Let other plugins or broker decide about anonymous login */
-	if (ed->username == NULL)
-		return MOSQ_ERR_PLUGIN_DEFER;
-
-#ifdef ENABLE_PAM_SUPPORT
-	return process_pam_auth_callback(ed);
-#else
-	return process_shadow_auth_callback(ed);
-#endif
-}
 
 int mosquitto_plugin_version(int supported_version_count,
 			     const int *supported_versions)

obuspa/Makefile

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

packet-capture-diagnostics/files/scripts/packetcapture

@@ -97,13 +97,15 @@ packet_capture_launch() {
 	fi
 
 	if [ -n "${interface}" ]; then
-		intf=$(ifstatus "${interface}" | jsonfilter -e '$.l3_device')
+		intf=$(ifstatus "${interface}" | jq ".l3_device")
 
 		if [ -z "${intf}" ]; then
 			# Error
 			packet_capture_error "Error_Internal" "${proto}"
 			return
 		fi
+
+		intf=$(eval echo "${intf}")
 	fi
 
 	cmd="timeout ${duration} tcpdump -w ${filename}"

parental-control/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=parental-control
-PKG_VERSION:=1.3.2
+PKG_VERSION:=1.3.1
 
 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:=7ae6eaa6cc946ed05693bc84c61edbb16b1727bd
+PKG_SOURCE_VERSION:=b1e5b3f81f08271bdaf9cb4bda8a7696a27be3c6
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

parental-control/files/etc/init.d/parentalcontrol

@@ -48,7 +48,7 @@ configure_fw_rules() {
 				hw_nat -! > /dev/null 2>&1
 			fi
 			if which conntrack > /dev/null 2>&1; then
-				flush_conntrack_for_hosts
+				conntrack -F > /dev/null 2>&1
 			fi
 
 			# this is for urlfilter daemon

parental-control/files/lib/parentalcontrol/parentalcontrol.sh

@@ -551,62 +551,6 @@ remove_internet_schedule_rules() {
 	fi
 }
 
-# Global array for resolved IPs
-URLFILTER_IPS=""
-
-# Resolve hostname or MAC to IP from lease_file
-get_host_ip() {
-	local host="$1"
-	local ip
-	local lease_file="/tmp/dhcp.leases"
-
-	[ -f "$lease_file" ] || lease_file="/etc/parentalcontrol/dhcp.leases"
-	[ -f "$lease_file" ] || { log "Error: get_host_ip(): No DHCP lease file found."; return 1; }
-
-	# try DHCP lease lookup
-	ip="$(awk -v h="$host" '
-	{
-		mac=$2; ipaddr=$3; name=$4
-		if (h == name || h == mac) { print ipaddr; exit }
-	}' "$lease_file")"
-
-	[ -n "$ip" ] && URLFILTER_IPS="$URLFILTER_IPS $ip"
-}
-
-# Process each profile section
-resolve_profile_hosts() {
-	local section="$1"
-	local hostlist
-
-	config_get hostlist "$section" host
-	[ -z "$hostlist" ] && return
-
-	for h in $hostlist; do
-		get_host_ip "$h"
-	done
-}
-
-# Main function to collect IPs and delete conntrack entries
-flush_conntrack_for_hosts() {
-	URLFILTER_IPS=""
-	local count max
-
-	config_foreach resolve_profile_hosts profile
-
-	URLFILTER_IPS="$(echo "$URLFILTER_IPS" | tr ' ' '\n' | sort -u | xargs)"
-	for ip in $URLFILTER_IPS; do
-		count=0
-		max=1000
-		while conntrack -D -s "$ip" >/dev/null 2>&1; do
-			count=$((count+1))
-			if [ $count -ge $max ]; then
-				log "Warning: Forced to stop conntrack delete after $max deletions for $ip (possible loop)"
-				break
-			fi
-		done
-	done
-}
-
 OVERRIDE_JSON="/etc/parentalcontrol/urlbundle_override.json"
 DM_PLUGIN_PATH="/usr/share/bbfdm/micro_services/parentalcontrol/urlbundle_override.json"
 

peripheral_manager/Makefile

@@ -0,0 +1,60 @@
+#
+# Copyright (C) 2019 iopsys
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=peripheral_manager
+PKG_VERSION:=1.0.6
+PKG_RELEASE:=1
+
+PKG_SOURCE_VERSION:=21522c2003b8c61904acc61ff97e54fc9b0c3c92
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/peripheral-manager
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=LICENSE
+
+# support parallel build
+PKG_BUILD_PARALLEL:=1
+
+# run install target when cross compiling. basically, make install DESTDIR=$(PKG_INSTALL_DIR)
+# this way we don't need to pick out the resulting files from the build dir.
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+define Package/peripheral_manager
+	CATEGORY:=Utilities
+	TITLE:=Application deamon for handling of peripheral
+	URL:=
+	DEPENDS:=+libuci +libubus +libblobmsg-json
+endef
+
+define Package/peripheral_manager/description
+	Application handling peripheral
+endef
+
+CMAKE_OPTIONS +=  \
+		-DCMAKE_BUILD_TYPE:String="Release" \
+
+define Package/peripheral_manager/install
+	$(CP) ./files/* $(1)/
+	$(INSTALL_DIR) $(1)/etc/
+	$(INSTALL_DIR) $(1)/etc/init.d/
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/peripheral_manager $(1)/sbin/
+#	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gpio_test $(1)/sbin/
+endef
+
+$(eval $(call BuildPackage,peripheral_manager))

peripheral_manager/files/etc/init.d/ledmngr

@@ -0,0 +1,62 @@
+#!/bin/sh /etc/rc.common
+
+START=20
+USE_PROCD=1
+
+setled() {
+	local enable
+	local brightness
+
+	config_get_bool enable $1 enable 1
+	config_get brightness $1 brightness 100
+	ubus call led.$1 set "{\"enable\":$enable,\"brightness\":$brightness}"
+}
+
+start_service() {
+	local enable
+
+	config_load leds
+	config_foreach setled led
+	config_get_bool enable leds enable 1
+
+	if [ "$enable" == "0" ]; then
+		ubus call leds set  '{"state" : "alloff"}'
+	else
+		ubus call leds set  '{"state" : "normal"}'
+	fi
+}
+
+boot() {
+	local led ledname
+
+	ubus list led* >/dev/null || sleep 1
+	ubus list led* >/dev/null || sleep 1
+
+	[ -f /etc/config/leds ] || touch /etc/config/leds
+
+	if ! uci -q get leds.leds >/dev/null; then
+		uci set leds.leds=leds
+		uci set leds.leds.enable=1
+	fi
+
+	for led in $(ubus list led.*); do
+		ledname=${led:4}
+		case $ledname in
+			*phy*) continue ;;
+		esac
+		if ! uci -q  get leds.$ledname >/dev/null; then
+			uci set leds.$ledname=led
+			uci set leds.$ledname.enable=1
+		fi
+	done
+
+	uci commit leds
+
+	start
+}
+
+service_triggers()
+{
+	procd_add_reload_trigger "leds"
+}
+

peripheral_manager/files/etc/init.d/peripheral_manager

@@ -0,0 +1,25 @@
+#!/bin/sh /etc/rc.common
+
+START=12
+STOP=89
+
+USE_PROCD=1
+NAME=peripheral_manager
+PROG=/sbin/peripheral_manager
+
+start_service() {
+	procd_open_instance
+	procd_set_param command "$PROG" -f
+	procd_set_param respawn
+	procd_close_instance
+}
+
+service_running() {
+	ubus -t 2 wait_for led.status
+	ubus call led.status set '{"state":"notice"}'
+	ubus -t 2 wait_for buttons
+}
+
+stop_service() {
+    ubus call leds set '{"state":"alloff"}'
+}

peripheral_manager/files/sbin/ledctl

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+usage () {
+	echo "Usage: ledctl [normal|test|allon|alloff|production]"
+	exit 1
+}
+
+[ $# -ne 1 ] && usage
+ledstate=$(echo $1 | tr 'A-Z' 'a-z')
+
+case $ledstate in
+	normal|test|allon|alloff|production)
+		ubus call leds set "{\"state\" : \"$ledstate\"}"
+	;;
+	*)
+		usage
+	;;
+esac
+

sulu/sulu-base/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sulu-base
-PKG_VERSION:=5.1.1
+PKG_VERSION:=5.0.4
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu.git
-PKG_SOURCE_VERSION:=08195779cbc2d1d7410cb324b9e35692b0579a7e
+PKG_SOURCE_VERSION:=47f52fb0fe4a9824590c8be9ee7b8985631c39cf
 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:=5.1.1
+PKG_VERSION:=5.1.0
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-builder.git
-PKG_SOURCE_VERSION:=7f646ecf643967f4b4b2c545a31bbef0514b34bc
+PKG_SOURCE_VERSION:=ef5345ea0275e632f021dfcf3b62c8d09fbb5800
 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)

sulu/sulu-theme-genexis/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sulu-theme-genexis
-PKG_VERSION:=5.1.1
+PKG_VERSION:=5.0.3
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/gnx/sulu-theme-genexis

swmodd/Makefile

@@ -33,7 +33,7 @@ define Package/swmodd
   DEPENDS:=+libuci +libubox +ubus +libuuid +opkg +libcurl \
 	    +PACKAGE_lxc:lxc +PACKAGE_lxc:liblxc +@BUSYBOX_CONFIG_BUSYBOX \
 	    +@BUSYBOX_CONFIG_FEATURE_SHOW_SCRIPT +@BUSYBOX_CONFIG_SCRIPT \
-	    +jsonfilter +@CONFIG_KERNEL_CGROUPS +SWMODD_LEGACY_CGROUPS:swmodd-cgroup
+	    +jq +@CONFIG_KERNEL_CGROUPS +SWMODD_LEGACY_CGROUPS:swmodd-cgroup
   DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
 endef
 

swmodd/files/etc/init.d/crun

@@ -101,17 +101,17 @@ configure_crun_container() {
 		uci_set ocicontainer "${1}" password ""
 		result=$(${RUNNER} -b "${BUNDLE}" -n "${name}" -r "${url}" -l "${username}:${password}" -t "${TIMEOUT}")
 		if [ "$?" -eq 0 ]; then
-			result="$(cat ${BUNDLE}/${name}/config.json |jsonfilter -e "@.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}"
 			fi
 
-			result="$(cat ${BUNDLE}/${name}/config.json |jsonfilter -e "@.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}"
 			fi
 
-			result="$(cat ${BUNDLE}/${name}/config.json |jsonfilter -e "@.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}"
 			fi
@@ -159,17 +159,17 @@ configure_crun_container() {
 	if [ "${BOOT}" -eq "1" ]; then
 		if [ "${autostart}" -eq 1 ]; then
 			${RUNNER} -U -b "${BUNDLE}" -n "${name}" -e "${envlist}" ${PERM}
-			result="$(cat ${BUNDLE}/${name}/config.json |jsonfilter -e "@.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}"
 			fi
 
-			result="$(cat ${BUNDLE}/${name}/config.json |jsonfilter -e "@.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}"
 			fi
 
-			result="$(cat ${BUNDLE}/${name}/config.json |jsonfilter -e "@.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}"
 			fi
@@ -192,17 +192,17 @@ configure_crun_container() {
 				crun resume "${name}"
 			else
 				${RUNNER} -U -b "${BUNDLE}" -n "${name}" -e "${envlist}" ${PERM}
-				result="$(cat ${BUNDLE}/${name}/config.json |jsonfilter -e "@.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}"
 				fi
 
-				result="$(cat ${BUNDLE}/${name}/config.json |jsonfilter "@.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}"
 				fi
 
-				result="$(cat ${BUNDLE}/${name}/config.json |jsonfilter -e "@.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}"
 				fi

swmodd/files/etc/swmodd/run.sh

@@ -86,7 +86,7 @@ run_container() {
 	fi
 
 	# Only do the network setup if defined in config
-	network="$(cat ${BUNDLE}/${NAME}/config.json |jsonfilter -e '@.linux.namespaces[@.type="network"]')"
+	network="$(cat ${BUNDLE}/${NAME}/config.json |jq '.linux.namespaces[] |select (.type == "network")')"
 	if [ -n "${network}" ] ; then
 		setup_container_network "${name}" "${bridge}"
 	else
@@ -128,7 +128,7 @@ update_config_json() {
 		exit 1;
 	fi
 	cd "${BUNDLE}/${NAME}"
-	if cat config.json |jsonfilter -e '@.linux.namespaces[@.type="network"].path' |grep -q ${NAME}; then
+	if cat config.json |jq '.linux.namespaces[] |select (.type == "network") |.path' |grep -q ${NAME}; then
 		# If netns already configured and no additional permission bit assigned, exit from here
 		if [ -z "${PERM}" ]; then
 			exit 0;

tr104/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tr104
-PKG_VERSION:=1.0.39
+PKG_VERSION:=1.0.38
 
 LOCAL_DEV:=0
 ifeq ($(LOCAL_DEV),0)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/voice/tr104.git
-PKG_SOURCE_VERSION:=6ce4823424f856f8225a068e7f61f4f69ba8cb04
+PKG_SOURCE_VERSION:=6d4a62fb133a1ba1e229425a0156f19d75c5cf90
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

userinterface/Makefile

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

wifidmd/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wifidmd
-PKG_VERSION:=1.3.9
+PKG_VERSION:=1.3.6
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/wifidmd.git
-PKG_SOURCE_VERSION:=f142eb300da9c0cc772bcc3f10cdcf98d2eecd29
+PKG_SOURCE_VERSION:=33142b3f3560c5e920814ac8a60f4326418ea437
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

wifidmd/bbfdm_service.json

@@ -11,17 +11,6 @@
     ],
     "config": {
       "loglevel": "3"
-    },
-    "apply_handler": {
-      "uci": [
-        {
-          "file": [
-            "wireless",
-            "mapcontroller"
-          ],
-          "external_handler": "/etc/wifidmd/bbf_config_reload.sh"
-        }
-      ]
     }
   }
 }

wifidmd/files/etc/wifidmd/bbf_config_reload.sh

@@ -2,25 +2,27 @@
 
 # Script: bbf_config_reload.sh
 # Description:
-#   This script reloads WiFi Configs based on input args.
-#   Input args should be one of the below or both with space separate
+#   This script reloads WiFi Configs based on JSON input.
+#   Input should be a JSON string with boolean-like values (0 or 1) for:
 #     - "wireless"
 #     - "mapcontroller"
 #
 # Usage:
-#   sh bbf_config_reload.sh wireless mapcontroller
+#   sh bbf_config_reload.sh '{"wireless":"1","mapcontroller":"0"}'
 #
 # Actions:
-#   - If both wireless and mapcontroller → Reload mapcontroller (SIGHUP)
-#   - If only wireless → Commit wireless config via ubus
-#   - If only mapcontroller → Reload mapcontroller (SIGHUP)
+#   - If wireless == 1 and mapcontroller == 1 → Reload mapcontroller (SIGHUP)
+#   - If wireless == 1 and mapcontroller == 0 → Commit wireless config via ubus
+#   - If wireless == 0 and mapcontroller == 1 → Reload mapcontroller (SIGHUP)
 #   - Otherwise → Do nothing
 
+. /usr/share/libubox/jshn.sh
+
 log() {
 	echo "${@}"|logger -t bbf.config.wifi.reload -p info
 }
 
-input="$@"
+input="$1"
 
 # Validate input
 if [ -z "$input" ]; then
@@ -28,19 +30,18 @@ if [ -z "$input" ]; then
 	exit 1
 fi
 
+# Parse JSON input
+json_load "$input" || {
+	log "Error: Failed to parse JSON input"
+	exit 1
+}
+
+json_get_var wireless wireless
+json_get_var mapcontroller mapcontroller
+
 # Normalize inputs (default to 0 if not set)
-wireless=0
-mapcontroller=0
-
-for arg in ${input}; do
-	if [ "${arg}" == "wireless" ]; then
-		wireless=1
-	fi
-
-	if [ "${arg}" == "mapcontroller" ]; then
-		mapcontroller=1
-	fi
-done
+wireless=${wireless:-0}
+mapcontroller=${mapcontroller:-0}
 
 # Define function to reload mapcontroller
 reload_mapcontroller() {
@@ -64,4 +65,9 @@ else
 	exit 1
 fi
 
+# Output success as JSON
+json_init
+json_add_boolean "Success" 1
+json_dump
+
 exit 0

xmppc/files/etc/init.d/xmppc

@@ -13,7 +13,7 @@ start_service() {
 }
 
 reload_service() {
-	xmpp_running="$(ubus call service list '{"name":"xmppc"}' | jsonfilter -e '$.xmppc.instances.instance1.running')"
+	xmpp_running="$(ubus call service list '{"name":"xmppc"}' | jq ".xmppc.instances.instance1.running")"
 	if [ "${xmpp_running}" = "true" ]; then
 		procd_send_signal xmppc '*' SIGKILL
 	fi