icwmp: 8.2.26

The luci-nginx metapackage selects some packages that we do not want to
select

1. luci-theme-bootstrap: Not needed, we use luci-theme-openwrt-2020
2. libiwinfo-lua: Not needed on non-WiFi targets such as panther, but
   will be pulled in by other LuCI dependencies

gryphon-led-module/Makefile

@@ -45,12 +45,12 @@ MODULE_INCLUDE=-I$(PKG_BUILD_DIR)
 ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
 	LINUX_DIR:=$(BUILD_DIR)/bcmkernel/bcm963xx/kernel/linux-4.19
 	MODULES_SUBDIR:=lib/modules/4.19.183
-	TARGET_CROSS:=$(CONFIG_BCM_TOOLCHAIN)/bin/$(CONFIG_BCM_TOOLTUPLE)
+	TARGET_CROSS:=$(CONFIG_BRCM_ALT_TOOLCHAIN_BASE)/$(CONFIG_BRCM_ALT_ARM_TOOLCHAIN_TOPDIR)/bin/$(CONFIG_BRCM_ALT_ARM_TOOLCHAIN_PREFIX)-
 
 	ifeq ($(CONFIG_BCM_CHIP_ID),$(filter $(CONFIG_BCM_CHIP_ID),"63158" "6856" "6858"))
 		# These targets use a 64-bit kernel
 		LINUX_KARCH:=arm64
-		TARGET_CROSS:=/opt/toolchains/crosstools-aarch64-gcc-9.2-linux-4.19-glibc-2.30-binutils-2.32/bin/aarch64-buildroot-linux-gnu-
+		TARGET_CROSS:=$(CONFIG_BRCM_ALT_TOOLCHAIN_BASE)/$(CONFIG_BRCM_ALT_AARCH64_TOOLCHAIN_TOPDIR)/bin/$(CONFIG_BRCM_ALT_AARCH64_TOOLCHAIN_PREFIX)-
 	endif
 	# For some reason, Broadcom's kernel does not set the include paths correctly when compiling out-of-tree modules
 	EXTRA_KCPPFLAGS:="-I $(LINUX_DIR)/../bcmkernel/include -I $(LINUX_DIR)/arch/arm/mach-bcm963xx/include"

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=8.2.25
+PKG_VERSION:=8.2.26
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=22a1606d972d2dd05b23abe94323f72232727b37
+PKG_SOURCE_VERSION:=5785827b6e28ec878df142c2d9a7cbac8f8bad54
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

iop/config

@@ -39,11 +39,26 @@ CONFIG_PACKAGE_jq=y
 CONFIG_PACKAGE_libreswan=m
 CONFIG_PACKAGE_libwifi=y
 CONFIG_PACKAGE_lscpu=y
-CONFIG_PACKAGE_luci-nginx=y
+
+# BEGIN: luci-nginx metapackage with some changes
+# We do not need luci-theme-bootstrap
+# We do not want libiwinfo-lua on non-WiFi targets, but it is already
+# depended on by other luci-packages, so no need to take it in explicitly
+CONFIG_PACKAGE_nginx=y
+CONFIG_PACKAGE_nginx-mod-luci=y
+CONFIG_PACKAGE_luci-mod-admin-full=y
+CONFIG_PACKAGE_luci-app-firewall=y
+CONFIG_PACKAGE_luci-app-opkg=y
+CONFIG_PACKAGE_luci-proto-ppp=y
+CONFIG_PACKAGE_luci-proto-ipv6=y
+CONFIG_PACKAGE_rpcd-mod-rrdns=y
+# END: luci-nginx metapackage with some changes
+
 # CONFIG_LUCI_JSMIN is not set
 # CONFIG_LUCI_CSSTIDY is not set
 CONFIG_PACKAGE_luci-mod-dashboard=y
 CONFIG_PACKAGE_luci-theme-openwrt-2020=y
+
 CONFIG_PACKAGE_map=y
 CONFIG_PACKAGE_miniupnpd=y
 CONFIG_PACKAGE_mwan3=y

libmicroxml/patches/101-fix-seg-fault.patch

@@ -0,0 +1,30 @@
+diff --git a/mxml-attr.c b/mxml-attr.c
+index 5df4bbd..bd75aa6 100644
+--- a/mxml-attr.c
++++ b/mxml-attr.c
+@@ -183,8 +183,10 @@ mxmlElementSetAttr(mxml_node_t *node,	/* I - Element node */
+   else
+     valuec = NULL;
+ 
+-  if (mxml_set_attr(node, name, valuec))
+-    free(valuec);
++  if (mxml_set_attr(node, name, valuec)) {
++	if (valuec != NULL)
++		free(valuec);
++  }
+ }
+ 
+ 
+@@ -233,8 +235,10 @@ mxmlElementSetAttrf(mxml_node_t *node,	/* I - Element node */
+   if (!value)
+     mxml_error("Unable to allocate memory for attribute '%s' in element %s!",
+                name, node->value.element.name);
+-  else if (mxml_set_attr(node, name, value))
+-    free(value);
++  else if (mxml_set_attr(node, name, value)) {
++	  if (value != NULL)
++		  free(value);
++  }
+ }
+ 
+ 

wifimngr/files/etc/hotplug.d/button/05-wifi

@@ -1,6 +1,9 @@
 #!/bin/sh
 
 . /lib/functions.sh
+. /usr/share/libubox/jshn.sh
+
+MAPFILE="/tmp/multiap.backhaul"
 
 wifi_onoff() {
 	local devices="$(uci show wireless | grep '=wifi-device' | awk -F'[.,=]' '{print$2}')"
@@ -30,6 +33,7 @@ start_ap_wps() {
 
 supp_status() {
 	wpasupp=$1
+	ul_type=""
 
 	ifname="$(echo $wpasupp | cut -d . -f 2)"
 
@@ -57,7 +61,14 @@ supp_status() {
 		return
 	fi
 
-	if [ -f "/tmp/map.agent.bsta_global_disable" ]; then
+	if [ -f $MAPFILE ]; then
+		# check if uplink is eth
+		json_load "$(cat $MAPFILE)"
+		json_get_var ul_type "type"
+		json_cleanup
+	fi
+
+	if [ "$ul_type" = "eth" ]; then
 		echo "CONFIGURED"
 		return
 	fi