xmppc: switch to libstrophe-libxml2

It was used to update branches of feeds according to the commit hashes
in feeds.conf. Mostly used when doing release branches for the
first time. We do it manually now, so it is not needed anymore.

decollector/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=decollector
-PKG_VERSION:=6.1.0.0
+PKG_VERSION:=6.1.0.2
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=2efa50c2bb5b8d5ed3e72c27395a7f2516bcbd44
+PKG_SOURCE_VERSION:=6fa2e4c29fcaba554211b82ba93c608eeb9356f3
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/decollector.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

icwmp/Makefile

@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=9.8.13
+PKG_VERSION:=9.8.15
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/icwmp.git
-PKG_SOURCE_VERSION:=14f3375ab8f1a586da7c9fd94c46bd16e3ae0ac6
+PKG_SOURCE_VERSION:=78e522060b0f1adf563cd709215532508db6e9f8
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

iop/iop.completion

@@ -36,7 +36,7 @@ _iop()
              feeds_update genconfig \
              generate_tarballs install_key \
              scp_changes setup_host ssh_install_key status \
-             update_feed_branches ssh_upgrade smoketest"
+             ssh_upgrade smoketest"
 
     if [ $COMP_CWORD -eq 1 ] ; then
 

iop/scripts/update_feed_branches.sh

@@ -1,61 +0,0 @@
-#!/bin/sh
-
-# Exported interface
-function update_feed_branches {
-	local release="$1"
-	local ipath="$(pwd)"
-	local branch="$2"
-	local curbranch
-
-	[ -n "$release" ] || {
-		echo "Usage: ./update_feeds <RELEASE> <BRANCH>"
-		echo ""
-		echo "If you do not give a branch as argument,"
-		echo "<RELEASE> branch will be updated to commit"
-		echo "hash given in feeds.conf for each feed repo"
-		exit 1
-	}
-
-	if [ -n "$branch" ]; then
-		echo "Updating release branch $release to specific commit hash given in feeds.conf for each feed repo at branch $branch"
-		if git diff-index --quiet HEAD; then
-			curbranch=`git symbolic-ref HEAD 2>/dev/null`
-			curbranch=${curbranch##refs/heads/}
-			if [ -z $curbranch ]; then
-				curbranch=`git log -1 --pretty=format:"%H"`
-			fi
-			git checkout $branch || {
-				echo "couldn't checkout branch $branch"
-				exit 99
-			}
-		else
-			echo "You have unsaved changes."
-			exit 99
-		fi
-	else
-		echo "Updating release branch $release to specific commit hash given in feeds.conf for each feed repo"
-	fi
-
-	ifeeds="$(grep -r 'dev.iopsys.eu' feeds.conf | awk '{print$2}' | tr '\n' ' ')"
-
-	for f in $ifeeds; do
-		commith=$(grep $f feeds.conf | cut -d'^' -f2)
-		cd $ipath/feeds/$f
-		git branch -D $release 2>/dev/null
-		echo "$f: updating release branch $release to commit $commith"
-		git checkout $commith
-		git push origin :$release
-		git checkout -b $release
-		git push --set-upstream origin $release
-		cd $ipath
-	done
-
-	if [ -n "$branch" ]; then
-		echo "Release branch $release is updated to specific commit hash given in feeds.conf in in branch $branch for each feed repo"
-		git checkout $curbranch
-	else
-		echo "Release branch $release is updated to specific commit hash given in feeds.conf for each feed repo"
-	fi
-}
-
-register_command "update_feed_branches" "<release> [branch] Update branches in feeds from the current top level commit or specified top level branch"

libvoice-broadcom/Makefile

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libvoice-broadcom
 PKG_RELEASE:=1
-PKG_VERSION:=1.0.14
+PKG_VERSION:=1.0.15
 PKG_LICENSE:=PROPRIETARY
 PKG_LICENSE_FILES:=LICENSE
 
@@ -17,7 +17,7 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/$(PKG_NAME).git
-PKG_SOURCE_VERSION:=7fde62b9634c63b9bc71d1c20541798971a78dc8
+PKG_SOURCE_VERSION:=baf5ebfb45404714bbfcc3068080f93265934d8a
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

libwifi/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libwifi
-PKG_VERSION:=7.6.3
+PKG_VERSION:=7.6.8
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=34d9fca18002b08f135805c7bc3cb00024943784
+PKG_SOURCE_VERSION:=7479e5b9a4e106b2603d16028eedaca645936a39
 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.1.0
+PKG_VERSION:=6.2.1.5
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=f02e84b263659cf1cdd377597f976abe151bc5cd
+PKG_SOURCE_VERSION:=05f073655187c1400c8a6bd7189f4aeba0028a25
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
 
 PKG_LICENSE:=BSD-3-Clause

obuspa/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=9.0.0.2
+PKG_VERSION:=9.0.0.7
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/obuspa.git
-PKG_SOURCE_VERSION:=b56fa3b8ce8d33239cbda3156d936a8d6f73cd0b
+PKG_SOURCE_VERSION:=4aba89c67ba57322d112d11e038bc6071252cbd8
 PKG_MAINTAINER:=Vivek Dutta <vivek.dutta@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -114,7 +114,6 @@ define Package/obuspa/install
 	$(INSTALL_DIR) $(1)/etc/users/roles
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_DIR) $(1)/etc/udhcpc.user.d
-	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/obuspa $(1)/usr/sbin/
 	$(INSTALL_BIN) ./files/etc/init.d/obuspa $(1)/etc/init.d/
 	$(INSTALL_DATA) ./files/etc/config/obuspa $(1)/etc/config/
@@ -125,8 +124,9 @@ define Package/obuspa/install
 	$(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/
+	$(INSTALL_BIN) ./files/etc/uci-defaults/92-obuspa_firewall $(1)/etc/uci-defaults/
+	$(INSTALL_BIN) ./files/etc/firewall.usp $(1)/etc/
 	$(INSTALL_BIN) ./files/etc/udhcpc.user.d/udhcpc_obuspa_opt125.user $(1)/etc/udhcpc.user.d/udhcpc_obuspa_opt125.user
-	$(INSTALL_BIN) ./files/obuspa.hotplug $(1)/etc/hotplug.d/iface/21-obuspa
 	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/libuspagentdm.so $(1) $(PKG_NAME)
 ifeq ($(CONFIG_OBUSPA_ENABLE_TEST_CONTROLLER),y)
 	$(INSTALL_BIN) ./files/etc/uci-defaults/54-test-usp-remote $(1)/etc/uci-defaults/

obuspa/files/etc/config/obuspa

@@ -2,12 +2,12 @@ config obuspa 'global'
 	option enabled '1'
 	option debug '1'
 	option dhcp_discovery '1'
-	option log_level '3'
+	option log_level '2'
 	option prototrace '0'
 	option db_file '/etc/obuspa/usp.db'
-	option max_group_sep '2'
-	option ipc_timeout '30'
-	option max_cache_time '600'
+	#option max_group_sep '2'
+	#option ipc_timeout '30'
+	#option max_cache_time '600'
 	option dm_caching_exclude '/etc/obuspa/dmcaching_exclude.json'
 	#option trust_cert '/etc/obuspa/ca.pem'
 	#option client_cert '/etc/obuspa/client.pem'

obuspa/files/etc/firewall.usp

@@ -0,0 +1,16 @@
+#!/bin/sh
+
+log() {
+	echo "$*"|logger -t obuspa.firewall -p debug
+}
+
+config_load obuspa
+config_get_bool enable_obuspa global enabled 1
+
+if [ "$enable_obuspa" = "0" ]; then
+	return 0;
+fi
+
+sleep 1
+log "ForceReconnect MQTT clients, due firewall reload"
+obuspa -c operate "Device.MQTT.Client.*.ForceReconnect()"

obuspa/files/etc/init.d/obuspa

@@ -907,6 +907,12 @@ db_init()
 	config_get SQL_DB_FILE global db_file "/tmp/obuspa/usp.db"
 	config_get role_file global role_file ""
 
+	if [ -f "${SQL_DB_FILE}" ]; then
+		if [ "${reason}" != "update" ]; then
+			return 0;
+		fi
+	fi
+
 	if [ -f "${SQL_DB_FILE}.old" ] && [ ! -f "${SQL_DB_FILE}" ]; then
 		log "Copying old db, since new db not present ..."
 		mv ${SQL_DB_FILE}.old ${SQL_DB_FILE}

obuspa/files/etc/uci-defaults/92-obuspa_firewall

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+uci -q batch <<-EOT
+        delete firewall.usp
+        set firewall.usp=include
+        set firewall.usp.path=/etc/firewall.usp
+        set firewall.usp.reload=1
+        commit firewall
+EOT
+
+exit 0
+

obuspa/files/obuspa.hotplug

@@ -1,44 +0,0 @@
-#!/bin/sh
-
-log() {
-	echo "$*"|logger -t obuspa.hotplug -p debug
-}
-
-get_access_role() {
-	local mode lan_proto
-
-	lan_proto="$(uci -q get network.lan.proto)"
-
-	if [ "${lan_proto}" == "dhcp" ]; then
-		mode="extender"
-	else
-		mode="full_access"
-	fi
-
-	echo "$mode"
-}
-
-config_load obuspa
-config_get_bool enable_obuspa global enabled 1
-config_get intf global interface
-
-if [ "$enable_obuspa" = "0" ]; then
-	return 0;
-fi
-
-if [ -z "${intf}" ]; then
-	role="$(get_access_role)"
-
-	if [ "${role}" = "extender" ]; then
-		intf="lan"
-	else
-		intf="wan"
-	fi
-fi
-
-[ "$ACTION" = "ifup" -a "${intf}" = "${INTERFACE}" ] && {
-	sleep 1
-	log "Sending WakeUp event, due to [${ACTION}] on ${intf}"
-	obuspa -c event Device.LocalAgent.WakeUp!
-}
-

stunc/Makefile

@@ -7,14 +7,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=stunc
-PKG_VERSION:=1.4.4
+PKG_VERSION:=1.4.5
 PKG_RELEASE:=1
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/stunc.git
-PKG_SOURCE_VERSION:=7dfe9ae494cb74d24d0264b6870fc4b84eca7860
+PKG_SOURCE_VERSION:=741ef6aa2f07e77bb4e5d12f3c3bc6cad8d04a61
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

timemngr/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=timemngr
-PKG_VERSION:=1.1.2
+PKG_VERSION:=1.1.3
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)

timemngr/files/etc/config/time

@@ -1,6 +1,7 @@
 config global 'global'
         option enable '1'
         option dst '1'
+        option loglevel '2'
 
 config client 'client'
         option enable '1'

timemngr/files/etc/init.d/timemngr

@@ -15,7 +15,7 @@ log() {
 validate_global_section() {
 	uci_validate_section time global global \
 	    'enable:bool:1' \
-	    'loglevel:uinteger:4' \
+	    'loglevel:uinteger:3' \
 	    'mdns:bool:1'
 }
 

tr104/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tr104
-PKG_VERSION:=1.0.32
+PKG_VERSION:=1.0.34
 
 LOCAL_DEV:=0
 ifeq ($(LOCAL_DEV),0)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/voice/tr104.git
-PKG_SOURCE_VERSION:=5632a71e0da8d498c214469dec76d2774f3a8a15
+PKG_SOURCE_VERSION:=51c55b680f02c75cf329871f33d9a4ae43731f50
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

urlfilter/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=urlfilter
-PKG_VERSION:=2.0.0
+PKG_VERSION:=2.0.1
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
@@ -44,13 +44,20 @@ endif
 
 define Package/urlfilter/install
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
-	$(INSTALL_DIR) $(1)/etc/urlfilter
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/urlfilter $(1)/usr/sbin
+
+	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/etc/init.d/urlfilter $(1)/etc/init.d/
+
+	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DATA) ./files/etc/config/urlfilter $(1)/etc/config/
+
+	$(INSTALL_DIR) $(1)/etc/
+	$(INSTALL_DATA) ./files/etc/firewall.urlfilter $(1)/etc/
+
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_DATA) ./files/etc/uci-defaults/95-urlfilter_add_firewall_rule $(1)/etc/uci-defaults
+
 	$(BBFDM_INSTALL_MS_DM) ./files/etc/urlfilter/urlfilter.json $(1) $(PKG_NAME)
 endef
 

urlfilter/files/etc/firewall.urlfilter

@@ -0,0 +1,31 @@
+
+iptables -w -nL FORWARD|grep -iqE "NFQUEUE"
+if [ "$?" -ne 0 ]; then
+	# setup netfilter queue 0, use queue bypass so that if no application is
+	# listening to this queue then traffic is unaffected.
+	iptables -w -I FORWARD 1 -p tcp --match multiport --ports 80,443,53 -j NFQUEUE --queue-num 0 --queue-bypass
+	iptables -w -I FORWARD 1 -p udp --match multiport --ports 80,443,53 -j NFQUEUE --queue-num 0 --queue-bypass
+	
+	iptables -w -I INPUT 1 -p tcp --match multiport --ports 80,443,53 -j NFQUEUE --queue-num 0 --queue-bypass
+	iptables -w -I INPUT 1 -p udp --match multiport --ports 80,443,53 -j NFQUEUE --queue-num 0 --queue-bypass
+	
+	# disable acceleration for https packet so that they can be read by urlfilter
+	ebtables --concurrent -A FORWARD -p ip --ip-protocol 6 --ip-destination-port 443 -j SKIPLOG 2> /dev/null
+	ebtables --concurrent -A FORWARD -p ip --ip-protocol 6 --ip-source-port 53 -j SKIPLOG 2> /dev/null
+	ebtables --concurrent -A FORWARD -p ip --ip-protocol 17 --ip-source-port 53 -j SKIPLOG 2> /dev/null
+fi
+
+ip6tables -w -nL FORWARD|grep -iqE "NFQUEUE"
+if [ "$?" -ne 0 ]; then
+	#ip6table rules
+	ip6tables -w -I FORWARD 1 -p tcp --match multiport --ports 80,443,53 -j NFQUEUE --queue-num 0 --queue-bypass
+	ip6tables -w -I FORWARD 1 -p udp --match multiport --ports 80,443,53 -j NFQUEUE --queue-num 0 --queue-bypass
+	
+	ip6tables -w -I INPUT 1 -p tcp --match multiport --ports 80,443,53 -j NFQUEUE --queue-num 0 --queue-bypass
+	ip6tables -w -I INPUT 1 -p udp --match multiport --ports 80,443,53 -j NFQUEUE --queue-num 0 --queue-bypass
+	
+	# disable acceleration for https packet so that they can be read by urlfilter
+	ebtables --concurrent -A FORWARD -p ip6 --ip6-protocol 6 --ip6-destination-port 443 -j SKIPLOG 2> /dev/null
+	ebtables --concurrent -A FORWARD -p ip6 --ip6-protocol 6 --ip6-source-port 53 -j SKIPLOG 2> /dev/null
+	ebtables --concurrent -A FORWARD -p ip6 --ip6-protocol 17 --ip6-source-port 53 -j SKIPLOG 2> /dev/null
+fi

urlfilter/files/etc/init.d/urlfilter

@@ -7,44 +7,9 @@ USE_PROCD=1
 NAME=urlfilter
 PROG=/usr/sbin/urlfilter
 
-configure_firewall()
-{
-	iptables -w -nL FORWARD|grep -iqE "NFQUEUE"
-	if [ "$?" -ne 0 ]; then
-		# setup netfilter queue 0, use queue bypass so that if no application is
-		# listening to this queue then traffic is unaffected.
-		iptables -w -I FORWARD 1 -p tcp --match multiport --ports 80,443,53 -j NFQUEUE --queue-num 0 --queue-bypass
-		iptables -w -I FORWARD 1 -p udp --match multiport --ports 80,443,53 -j NFQUEUE --queue-num 0 --queue-bypass
-
-		iptables -w -I INPUT 1 -p tcp --match multiport --ports 80,443,53 -j NFQUEUE --queue-num 0 --queue-bypass
-		iptables -w -I INPUT 1 -p udp --match multiport --ports 80,443,53 -j NFQUEUE --queue-num 0 --queue-bypass
-
-		# disable acceleration for https packet so that they can be read by urlfilter
-		ebtables --concurrent -A FORWARD -p ip --ip-protocol 6 --ip-destination-port 443 -j SKIPLOG 2> /dev/null
-		ebtables --concurrent -A FORWARD -p ip --ip-protocol 6 --ip-source-port 53 -j SKIPLOG 2> /dev/null
-		ebtables --concurrent -A FORWARD -p ip --ip-protocol 17 --ip-source-port 53 -j SKIPLOG 2> /dev/null
-	fi
-	ip6tables -w -nL FORWARD|grep -iqE "NFQUEUE"
-	if [ "$?" -ne 0 ]; then
-		#ip6table rules
-		ip6tables -w -I FORWARD 1 -p tcp --match multiport --ports 80,443,53 -j NFQUEUE --queue-num 0 --queue-bypass
-		ip6tables -w -I FORWARD 1 -p udp --match multiport --ports 80,443,53 -j NFQUEUE --queue-num 0 --queue-bypass
-
-		ip6tables -w -I INPUT 1 -p tcp --match multiport --ports 80,443,53 -j NFQUEUE --queue-num 0 --queue-bypass
-		ip6tables -w -I INPUT 1 -p udp --match multiport --ports 80,443,53 -j NFQUEUE --queue-num 0 --queue-bypass
-
-		# disable acceleration for https packet so that they can be read by urlfilter
-		ebtables --concurrent -A FORWARD -p ip6 --ip6-protocol 6 --ip6-destination-port 443 -j SKIPLOG 2> /dev/null
-		ebtables --concurrent -A FORWARD -p ip6 --ip6-protocol 6 --ip6-source-port 53 -j SKIPLOG 2> /dev/null
-		ebtables --concurrent -A FORWARD -p ip6 --ip6-protocol 17 --ip6-source-port 53 -j SKIPLOG 2> /dev/null
-	fi
-
-}
-
 start_service() {
 
 	if [ "$(uci -q get urlfilter.globals.enable)" == "1" ]; then
-		configure_firewall
 		procd_open_instance urlfilter
 		procd_set_param command ${PROG}
 		procd_set_param respawn
@@ -59,40 +24,11 @@ start_service() {
 	fi
 }
 
-stop_service() {
-	iptables -w -nL FORWARD|grep -iqE "NFQUEUE"
-	if [ "$?" -eq 0 ]; then
-		iptables -w -D FORWARD -p tcp --match multiport --ports 80,443,53 -j NFQUEUE --queue-num 0 --queue-bypass
-		iptables -w -D FORWARD -p udp --match multiport --ports 80,443,53 -j NFQUEUE --queue-num 0 --queue-bypass
-
-		iptables -w -D INPUT -p tcp --match multiport --ports 80,443,53 -j NFQUEUE --queue-num 0 --queue-bypass
-		iptables -w -D INPUT -p udp --match multiport --ports 80,443,53 -j NFQUEUE --queue-num 0 --queue-bypass
-
-		ebtables --concurrent -D FORWARD -p ip --ip-protocol 6 --ip-destination-port 443 -j SKIPLOG 2> /dev/null
-		ebtables --concurrent -D FORWARD -p ip --ip-protocol 6 --ip-source-port 53 -j SKIPLOG 2> /dev/null
-		ebtables --concurrent -D FORWARD -p ip --ip-protocol 17 --ip-source-port 53 -j SKIPLOG 2> /dev/null
-	fi
-	ip6tables -w -nL FORWARD|grep -iqE "NFQUEUE"
-	if [ "$?" -eq 0 ]; then
-		#ip6table rules
-		ip6tables -w -D FORWARD -p tcp --match multiport --ports 80,443,53 -j NFQUEUE --queue-num 0 --queue-bypass
-		ip6tables -w -D FORWARD -p udp --match multiport --ports 80,443,53 -j NFQUEUE --queue-num 0 --queue-bypass
-
-		ip6tables -w -D INPUT -p tcp --match multiport --ports 80,443,53 -j NFQUEUE --queue-num 0 --queue-bypass
-		ip6tables -w -D INPUT -p udp --match multiport --ports 80,443,53 -j NFQUEUE --queue-num 0 --queue-bypass
-
-		ebtables --concurrent -D FORWARD -p ip6 --ip6-protocol 6 --ip6-destination-port 443 -j SKIPLOG 2> /dev/null
-		ebtables --concurrent -D FORWARD -p ip6 --ip6-protocol 6 --ip6-source-port 53 -j SKIPLOG 2> /dev/null
-		ebtables --concurrent -D FORWARD -p ip6 --ip6-protocol 17 --ip6-source-port 53 -j SKIPLOG 2> /dev/null
-	fi
-}
 reload_service() {
 	stop
 	start
 }
 
-
 service_triggers() {
 	procd_add_reload_trigger "urlfilter"
-	procd_add_reload_trigger "firewall"
 }

urlfilter/files/etc/uci-defaults/95-urlfilter_add_firewall_rule

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+
+if uci -q get firewall.urlfilter >/dev/null; then
+	exit
+fi
+
+uci set firewall.urlfilter=include
+uci set firewall.urlfilter.reload=1
+uci set firewall.urlfilter.path=/etc/firewall.urlfilter
+uci commit firewall

usbmngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=usbmngr
-PKG_VERSION:=1.0.4
+PKG_VERSION:=1.0.5
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/system/usbmngr.git
-PKG_SOURCE_VERSION:=8854939163cc60154a52834fa70677b3d1a53d46
+PKG_SOURCE_VERSION:=387298c97e384502d1df786346ec6a96e98be057
 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.0.9
+PKG_VERSION:=1.0.10
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/wifidmd.git
-PKG_SOURCE_VERSION:=766793f6e66af1522224351810d6593b4cf23359
+PKG_SOURCE_VERSION:=20a367d52d84ad253736075d6dab30c4bf51a20d
 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.4.0
+PKG_VERSION:=17.4.1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=fd4140665844894313805c9e2fb23ddace618b76
+PKG_SOURCE_VERSION:=7937ad854b45d445a9e6109eba14a57ad92a3f69
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wifimngr.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz

xmppc/Makefile

@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xmppc
-PKG_VERSION:=2.2.12
+PKG_VERSION:=2.2.13
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
@@ -35,7 +35,7 @@ define Package/$(PKG_NAME)
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=BBF xmpp Client
-  DEPENDS:=+libuci +libubox +libstrophe +libubus +libbbfdm-api +@CONFIG_BUSYBOX_CONFIG_PIDOF
+  DEPENDS:=+libuci +libubox +libstrophe +@libstrophe-libxml2 +libubus +libbbfdm-api +@CONFIG_BUSYBOX_CONFIG_PIDOF
 endef
 
 define Package/$(PKG_NAME)/description