ucentral-schema: update to latest HEAD

* minor fixes to handling of boolean values Signed-off-by: John Crispin <john@phrozen.org>
proxy_arp: fix a race condition between hostapd and netifd
2025-10-29 09:32:34 +00:00 · 2021-09-08 08:22:32 +02:00 · 2021-09-02 13:55:54 +02:00 · 2021-08-30 19:25:00 +02:00 · 2021-08-30 07:01:37 +02:00 · 2021-08-30 07:01:37 +02:00
27 changed files with 6462 additions and 1434 deletions
--- a/backports/0007-uboot-envtools-add-defaults-for-linksys-e8450-ubi.patch
+++ b/backports/0007-uboot-envtools-add-defaults-for-linksys-e8450-ubi.patch
@@ -1,7 +1,7 @@
-From 7837219939ea5d8ecab21acf943a8199bea7e89a Mon Sep 17 00:00:00 2001
+From 256daf33ec9c8cc8b094d7612ba7384db18d0a6b Mon Sep 17 00:00:00 2001
 From: Daniel Golle <daniel@makrotopia.org>
 Date: Fri, 12 Feb 2021 03:09:39 +0000
-Subject: [PATCH 7/9] uboot-envtools: add defaults for linksys-e8450-ubi
+Subject: [PATCH 04/64] uboot-envtools: add defaults for linksys-e8450-ubi

 Add U-Boot environment configuration for the Linksys E8450 (UBI) to
 allow access to the bootloader environment from OpenWrt via
@@ -9,17 +9,16 @@ allow access to the bootloader environment from OpenWrt via

 Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 ---
- package/boot/uboot-envtools/files/mediatek | 25 ++++++++++++++++++++++
- 1 file changed, 25 insertions(+)
+ package/boot/uboot-envtools/files/mediatek | 46 ++++++++++++++++++++++
+ 1 file changed, 46 insertions(+)
 create mode 100644 package/boot/uboot-envtools/files/mediatek

 diff --git a/package/boot/uboot-envtools/files/mediatek b/package/boot/uboot-envtools/files/mediatek
 new file mode 100644
-index 0000000000..92a04ea73d
+index 0000000000..495a837274
 --- /dev/null
 +++ b/package/boot/uboot-envtools/files/mediatek
-@@ -0,0 +1,25 @@
-+#!/bin/sh
+@@ -0,0 +1,46 @@
 +#
 +# Copyright (C) 2021 OpenWrt.org
 +#
@@ -34,10 +33,32 @@ index 0000000000..92a04ea73d
 +board=$(board_name)
 +
 +case "$board" in
-+"linksys,e8450,ubi")
+linksys,e8450-ubi)
 +	ubootenv_add_uci_config "/dev/ubi0_0" "0x0" "0x1f000" "0x1f000" "1"
 +	ubootenv_add_uci_config "/dev/ubi0_1" "0x0" "0x1f000" "0x1f000" "1"
 +	;;
+bananapi,bpi-r64)
+	. /lib/upgrade/common.sh
+	export_bootdevice
+	export_partdevice rootdev 0
+	case "$rootdev" in
+	mmc*)
+		local envdev=/dev/$(get_partition_by_name $rootdev ubootenv)
+		ubootenv_add_uci_config "$envdev" "0x0" "0x80000" "0x80000" "1"
+		ubootenv_add_uci_config "$envdev" "0x80000" "0x80000" "0x80000" "1"
+		;;
+	*)
+		ubootenv_add_uci_config "/dev/ubi0_0" "0x0" "0x1f000" "0x1f000" "1"
+		ubootenv_add_uci_config "/dev/ubi0_1" "0x0" "0x1f000" "0x1f000" "1"
+		;;
+	esac
+	;;
+buffalo,wsr-2533dhp2)
+	ubootenv_add_uci_config "/dev/mtd3" "0x0" "0x1000" "0x20000"
+	;;
+ubnt,unifi-6-lr-ubootmod)
+	ubootenv_add_uci_config "/dev/mtd2" "0x0" "0x4000" "0x10000"
+	;;
 +esac
 +
 +config_load ubootenv
--- a/backports/0008-realtek-update-to-latest-owrt-HEAD.patch
+++ b/backports/0008-realtek-update-to-latest-owrt-HEAD.patch
--- a/backports/0017-kernel-add-bdpu-filter-support.patch
+++ b/backports/0017-kernel-add-bdpu-filter-support.patch
@@ -0,0 +1,242 @@
+From 97fb5323a826e6b5ad89b5281c0b9d9e92bfc0b4 Mon Sep 17 00:00:00 2001
+From: John Crispin <john@phrozen.org>
+Date: Fri, 27 Aug 2021 16:52:34 +0200
+Subject: [PATCH 59/59] kernel: add bdpu filter support
+
+Signed-off-by: John Crispin <john@phrozen.org>
+---
+ ...l-knob-for-filtering-rx-tx-BPDU-pack.patch | 107 ++++++++++++++++++
+ ...l-knob-for-filtering-rx-tx-BPDU-pack.patch | 107 ++++++++++++++++++
+ 2 files changed, 214 insertions(+)
+ create mode 100644 target/linux/generic/pending-5.10/710-bridge-add-sysctl-knob-for-filtering-rx-tx-BPDU-pack.patch
+ create mode 100644 target/linux/generic/pending-5.4/710-bridge-add-sysctl-knob-for-filtering-rx-tx-BPDU-pack.patch
+
+diff --git a/target/linux/generic/pending-5.10/710-bridge-add-sysctl-knob-for-filtering-rx-tx-BPDU-pack.patch b/target/linux/generic/pending-5.10/710-bridge-add-sysctl-knob-for-filtering-rx-tx-BPDU-pack.patch
+new file mode 100644
+index 0000000000..918ae05d12
+--- /dev/null
+++ b/target/linux/generic/pending-5.10/710-bridge-add-sysctl-knob-for-filtering-rx-tx-BPDU-pack.patch
+@@ -0,0 +1,107 @@
+From: Felix Fietkau <nbd@nbd.name>
+Date: Fri, 27 Aug 2021 12:22:32 +0200
+Subject: [PATCH] bridge: add sysctl knob for filtering rx/tx BPDU packets on a
+ port
+
+Some devices (e.g. wireless APs) can't have devices behind them be part of
+a bridge topology with redundant links, due to address limitations.
+Additionally, broadcast traffic on these devices is somewhat expensive, due to
+the low data rate and wakeups of clients in powersave mode.
+This sysctl knob can be used to ensure that BPDU packets are never sent
+or forwarded to/from these devices
+
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
+---
+
+--- a/include/linux/if_bridge.h
++++ b/include/linux/if_bridge.h
+@@ -56,6 +56,7 @@ struct br_ip_list {
+ #define BR_MRP_AWARE		BIT(17)
+ #define BR_MRP_LOST_CONT	BIT(18)
+ #define BR_MRP_LOST_IN_CONT	BIT(19)
++#define BR_BPDU_FILTER		BIT(20)
+ 
+ #define BR_DEFAULT_AGEING_TIME	(300 * HZ)
+ 
+--- a/net/bridge/br_forward.c
++++ b/net/bridge/br_forward.c
+@@ -191,6 +191,7 @@ out:
+ void br_flood(struct net_bridge *br, struct sk_buff *skb,
+ 	      enum br_pkt_type pkt_type, bool local_rcv, bool local_orig)
+ {
++	const unsigned char *dest = eth_hdr(skb)->h_dest;
+ 	struct net_bridge_port *prev = NULL;
+ 	struct net_bridge_port *p;
+ 
+@@ -206,6 +207,10 @@ void br_flood(struct net_bridge *br, str
+ 		case BR_PKT_MULTICAST:
+ 			if (!(p->flags & BR_MCAST_FLOOD) && skb->dev != br->dev)
+ 				continue;
++			if ((p->flags & BR_BPDU_FILTER) &&
++			    unlikely(is_link_local_ether_addr(dest) &&
++				     dest[5] == 0))
++				continue;
+ 			break;
+ 		case BR_PKT_BROADCAST:
+ 			if (!(p->flags & BR_BCAST_FLOOD) && skb->dev != br->dev)
+--- a/net/bridge/br_input.c
++++ b/net/bridge/br_input.c
+@@ -305,6 +305,8 @@ static rx_handler_result_t br_handle_fra
+ 		fwd_mask |= p->group_fwd_mask;
+ 		switch (dest[5]) {
+ 		case 0x00:	/* Bridge Group Address */
++			if (p->flags & BR_BPDU_FILTER)
++				goto drop;
+ 			/* If STP is turned off,
+ 			   then must forward to keep loop detection */
+ 			if (p->br->stp_enabled == BR_NO_STP ||
+--- a/net/bridge/br_sysfs_if.c
++++ b/net/bridge/br_sysfs_if.c
+@@ -233,6 +233,7 @@ BRPORT_ATTR_FLAG(multicast_flood, BR_MCA
+ BRPORT_ATTR_FLAG(broadcast_flood, BR_BCAST_FLOOD);
+ BRPORT_ATTR_FLAG(neigh_suppress, BR_NEIGH_SUPPRESS);
+ BRPORT_ATTR_FLAG(isolated, BR_ISOLATED);
++BRPORT_ATTR_FLAG(bpdu_filter, BR_BPDU_FILTER);
+ 
+ #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
+ static ssize_t show_multicast_router(struct net_bridge_port *p, char *buf)
+@@ -285,6 +286,7 @@ static const struct brport_attribute *br
+ 	&brport_attr_group_fwd_mask,
+ 	&brport_attr_neigh_suppress,
+ 	&brport_attr_isolated,
++	&brport_attr_bpdu_filter,
+ 	&brport_attr_backup_port,
+ 	NULL
+ };
+--- a/net/bridge/br_stp_bpdu.c
++++ b/net/bridge/br_stp_bpdu.c
+@@ -80,7 +80,8 @@ void br_send_config_bpdu(struct net_brid
+ {
+ 	unsigned char buf[35];
+ 
+-	if (p->br->stp_enabled != BR_KERNEL_STP)
++	if (p->br->stp_enabled != BR_KERNEL_STP ||
++	    (p->flags & BR_BPDU_FILTER))
+ 		return;
+ 
+ 	buf[0] = 0;
+@@ -127,7 +128,8 @@ void br_send_tcn_bpdu(struct net_bridge_
+ {
+ 	unsigned char buf[4];
+ 
+-	if (p->br->stp_enabled != BR_KERNEL_STP)
++	if (p->br->stp_enabled != BR_KERNEL_STP ||
++	    (p->flags & BR_BPDU_FILTER))
+ 		return;
+ 
+ 	buf[0] = 0;
+@@ -172,6 +174,9 @@ void br_stp_rcv(const struct stp_proto *
+ 	if (!(br->dev->flags & IFF_UP))
+ 		goto out;
+ 
++	if (p->flags & BR_BPDU_FILTER)
++		goto out;
++
+ 	if (p->state == BR_STATE_DISABLED)
+ 		goto out;
+ 
+diff --git a/target/linux/generic/pending-5.4/710-bridge-add-sysctl-knob-for-filtering-rx-tx-BPDU-pack.patch b/target/linux/generic/pending-5.4/710-bridge-add-sysctl-knob-for-filtering-rx-tx-BPDU-pack.patch
+new file mode 100644
+index 0000000000..586d264cd5
+--- /dev/null
+++ b/target/linux/generic/pending-5.4/710-bridge-add-sysctl-knob-for-filtering-rx-tx-BPDU-pack.patch
+@@ -0,0 +1,107 @@
+From: Felix Fietkau <nbd@nbd.name>
+Date: Fri, 27 Aug 2021 12:22:32 +0200
+Subject: [PATCH] bridge: add sysctl knob for filtering rx/tx BPDU packets on a
+ port
+
+Some devices (e.g. wireless APs) can't have devices behind them be part of
+a bridge topology with redundant links, due to address limitations.
+Additionally, broadcast traffic on these devices is somewhat expensive, due to
+the low data rate and wakeups of clients in powersave mode.
+This sysctl knob can be used to ensure that BPDU packets are never sent
+or forwarded to/from these devices
+
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
+---
+
+--- a/include/linux/if_bridge.h
++++ b/include/linux/if_bridge.h
+@@ -47,6 +47,7 @@ struct br_ip_list {
+ #define BR_BCAST_FLOOD		BIT(14)
+ #define BR_NEIGH_SUPPRESS	BIT(15)
+ #define BR_ISOLATED		BIT(16)
++#define BR_BPDU_FILTER		BIT(17)
+ 
+ #define BR_DEFAULT_AGEING_TIME	(300 * HZ)
+ 
+--- a/net/bridge/br_forward.c
++++ b/net/bridge/br_forward.c
+@@ -191,6 +191,7 @@ out:
+ void br_flood(struct net_bridge *br, struct sk_buff *skb,
+ 	      enum br_pkt_type pkt_type, bool local_rcv, bool local_orig)
+ {
++	const unsigned char *dest = eth_hdr(skb)->h_dest;
+ 	struct net_bridge_port *prev = NULL;
+ 	struct net_bridge_port *p;
+ 
+@@ -206,6 +207,10 @@ void br_flood(struct net_bridge *br, str
+ 		case BR_PKT_MULTICAST:
+ 			if (!(p->flags & BR_MCAST_FLOOD) && skb->dev != br->dev)
+ 				continue;
++			if ((p->flags & BR_BPDU_FILTER) &&
++			    unlikely(is_link_local_ether_addr(dest) &&
++				     dest[5] == 0))
++				continue;
+ 			break;
+ 		case BR_PKT_BROADCAST:
+ 			if (!(p->flags & BR_BCAST_FLOOD) && skb->dev != br->dev)
+--- a/net/bridge/br_input.c
++++ b/net/bridge/br_input.c
+@@ -300,6 +300,8 @@ rx_handler_result_t br_handle_frame(stru
+ 		fwd_mask |= p->group_fwd_mask;
+ 		switch (dest[5]) {
+ 		case 0x00:	/* Bridge Group Address */
++			if (p->flags & BR_BPDU_FILTER)
++				goto drop;
+ 			/* If STP is turned off,
+ 			   then must forward to keep loop detection */
+ 			if (p->br->stp_enabled == BR_NO_STP ||
+--- a/net/bridge/br_sysfs_if.c
++++ b/net/bridge/br_sysfs_if.c
+@@ -233,6 +233,7 @@ BRPORT_ATTR_FLAG(multicast_flood, BR_MCA
+ BRPORT_ATTR_FLAG(broadcast_flood, BR_BCAST_FLOOD);
+ BRPORT_ATTR_FLAG(neigh_suppress, BR_NEIGH_SUPPRESS);
+ BRPORT_ATTR_FLAG(isolated, BR_ISOLATED);
++BRPORT_ATTR_FLAG(bpdu_filter, BR_BPDU_FILTER);
+ 
+ #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
+ static ssize_t show_multicast_router(struct net_bridge_port *p, char *buf)
+@@ -285,6 +286,7 @@ static const struct brport_attribute *br
+ 	&brport_attr_group_fwd_mask,
+ 	&brport_attr_neigh_suppress,
+ 	&brport_attr_isolated,
++	&brport_attr_bpdu_filter,
+ 	&brport_attr_backup_port,
+ 	NULL
+ };
+--- a/net/bridge/br_stp_bpdu.c
++++ b/net/bridge/br_stp_bpdu.c
+@@ -80,7 +80,8 @@ void br_send_config_bpdu(struct net_brid
+ {
+ 	unsigned char buf[35];
+ 
+-	if (p->br->stp_enabled != BR_KERNEL_STP)
++	if (p->br->stp_enabled != BR_KERNEL_STP ||
++	    (p->flags & BR_BPDU_FILTER))
+ 		return;
+ 
+ 	buf[0] = 0;
+@@ -125,7 +126,8 @@ void br_send_tcn_bpdu(struct net_bridge_
+ {
+ 	unsigned char buf[4];
+ 
+-	if (p->br->stp_enabled != BR_KERNEL_STP)
++	if (p->br->stp_enabled != BR_KERNEL_STP ||
++	    (p->flags & BR_BPDU_FILTER))
+ 		return;
+ 
+ 	buf[0] = 0;
+@@ -168,6 +170,9 @@ void br_stp_rcv(const struct stp_proto *
+ 	if (!(br->dev->flags & IFF_UP))
+ 		goto out;
+ 
++	if (p->flags & BR_BPDU_FILTER)
++		goto out;
++
+ 	if (p->state == BR_STATE_DISABLED)
+ 		goto out;
+ 
+-- 
+2.25.1
+
--- a/backports/0037-netifd-update-to-latest-HEAD.patch
+++ b/backports/0037-netifd-update-to-latest-HEAD.patch
@@ -1,7 +1,7 @@
-From 79a45074651c08e0036d4b05b9714bd0f714a115 Mon Sep 17 00:00:00 2001
+From a622ab0c15a2f58b724362339d6b467c02ee7576 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Thu, 27 May 2021 13:24:47 +0200
-Subject: [PATCH 06/52] netifd: update to latest HEAD
+Subject: [PATCH 01/57] netifd: update to latest HEAD

 Signed-off-by: John Crispin <john@phrozen.org>
 ---
@@ -14,7 +14,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
 create mode 100644 package/network/config/netifd/patches/002-fix-dhcp-issue.patch

 diff --git a/package/network/config/netifd/Makefile b/package/network/config/netifd/Makefile
-index 7061456b08..c33e0c2134 100644
+index 7061456b08..13c1d96ed7 100644
 --- a/package/network/config/netifd/Makefile
 +++ b/package/network/config/netifd/Makefile
@@ -5,16 +5,14 @@ PKG_RELEASE:=1
@@ -24,9 +24,9 @@ index 7061456b08..c33e0c2134 100644
 -PKG_SOURCE_DATE:=2021-01-09
 -PKG_SOURCE_VERSION:=c00c8335d6188daa326ecfe5a62da15a9b9987e1
 -PKG_MIRROR_HASH:=c740e51e0cec13eec336ba1c7a643db3b64a9a2235f8c1b73a566cb89e841190
-+PKG_SOURCE_DATE:=2021-08-24
-+PKG_SOURCE_VERSION:=454e9c33c90691d5bea12263f1801a7dc38c20b1
-+PKG_MIRROR_HASH:=b8c6d8a1d0cb60c353c0272b8a526d8e28e6ee7d385e96b18018d1bc13b54cc2
+PKG_SOURCE_DATE:=2021-09-01
+PKG_SOURCE_VERSION:=300b1220fab38600f102bb8cfcc59a29ce41b095
+PKG_MIRROR_HASH:=310fa90059795b1c956f9822db712ecc58bc19725b0f05f98c9e0a6824c8ca36
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 
 PKG_LICENSE:=GPL-2.0
--- a/backports/0039-hostapd-upsate-to-latest-HEAD.patch
+++ b/backports/0039-hostapd-upsate-to-latest-HEAD.patch
@@ -1,7 +1,7 @@
-From bb2c5ff83be37b0bb951059e457192a7bed9388f Mon Sep 17 00:00:00 2001
+From b70c9429587452776241c95729481accb9c193ae Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Thu, 27 May 2021 13:25:19 +0200
-Subject: [PATCH 01/43] hostapd: upsate to latest HEAD
+Subject: [PATCH 03/57] hostapd: upsate to latest HEAD

 Signed-off-by: John Crispin <john@phrozen.org>
 ---
@@ -66,13 +66,13 @@ Signed-off-by: John Crispin <john@phrozen.org>
 .../720-ACS-fix-channel-100-frequency.patch   |  30 ++
 .../patches/720-iface_max_num_sta.patch       |  82 ++++++
 .../hostapd/patches/730-ft_iface.patch        |  38 +++
- .../hostapd/patches/740-snoop_iface.patch     |  37 +++
+ .../hostapd/patches/740-snoop_iface.patch     |  66 +++++
 ...ate-if-no-available-channel-is-found.patch |  37 ---
 ...of-secondary-device-types-for-P2P-gr.patch |  33 ---
 .../services/hostapd/src/src/ap/ubus.c        | 214 +++++++++++++-
 .../services/hostapd/src/src/ap/ubus.h        |  16 +
 .../hostapd/src/src/utils/build_features.h    |   2 -
- 67 files changed, 1300 insertions(+), 2331 deletions(-)
+ 67 files changed, 1329 insertions(+), 2331 deletions(-)
 delete mode 100644 package/network/services/hostapd/patches/001-HE-VHT-fix-frequency-setup-with-HE-enabled.patch
 create mode 100644 package/network/services/hostapd/patches/001-wolfssl-init-RNG-with-ECC-key.patch
 delete mode 100644 package/network/services/hostapd/patches/002-mesh-fix-channel-init-order-disable-pri-sec-channel-.patch
@@ -5325,10 +5325,10 @@ index 0000000000..793e8e0194
 + 		if (!hapd->l2) {
 diff --git a/package/network/services/hostapd/patches/740-snoop_iface.patch b/package/network/services/hostapd/patches/740-snoop_iface.patch
 new file mode 100644
-index 0000000000..722d1e713a
+index 0000000000..8d928f8505
 --- /dev/null
 +++ b/package/network/services/hostapd/patches/740-snoop_iface.patch
-@@ -0,0 +1,37 @@
+@@ -0,0 +1,66 @@
 +--- a/src/ap/ap_config.h
 ++++ b/src/ap/ap_config.h
 +@@ -278,6 +278,7 @@ struct hostapd_bss_config {
@@ -5341,7 +5341,36 @@ index 0000000000..722d1e713a
 + 
 +--- a/src/ap/x_snoop.c
 ++++ b/src/ap/x_snoop.c
-+@@ -71,8 +71,12 @@ x_snoop_get_l2_packet(struct hostapd_dat
+@@ -31,14 +31,16 @@ int x_snoop_init(struct hostapd_data *ha
+ 		return -1;
+ 	}
+ 
+-	if (hostapd_drv_br_port_set_attr(hapd, DRV_BR_PORT_ATTR_HAIRPIN_MODE,
++	if (!conf->snoop_iface[0] &&
++	    hostapd_drv_br_port_set_attr(hapd, DRV_BR_PORT_ATTR_HAIRPIN_MODE,
+ 					 1)) {
+ 		wpa_printf(MSG_DEBUG,
+ 			   "x_snoop: Failed to enable hairpin_mode on the bridge port");
+ 		return -1;
+ 	}
+ 
+-	if (hostapd_drv_br_port_set_attr(hapd, DRV_BR_PORT_ATTR_PROXYARP, 1)) {
++	if (!conf->snoop_iface[0] &&
++	    hostapd_drv_br_port_set_attr(hapd, DRV_BR_PORT_ATTR_PROXYARP, 1)) {
+ 		wpa_printf(MSG_DEBUG,
+ 			   "x_snoop: Failed to enable proxyarp on the bridge port");
+ 		return -1;
+@@ -52,7 +54,8 @@ int x_snoop_init(struct hostapd_data *ha
+ 	}
+ 
+ #ifdef CONFIG_IPV6
+-	if (hostapd_drv_br_set_net_param(hapd, DRV_BR_MULTICAST_SNOOPING, 1)) {
++	if (!conf->snoop_iface[0] &&
++	    hostapd_drv_br_set_net_param(hapd, DRV_BR_MULTICAST_SNOOPING, 1)) {
+ 		wpa_printf(MSG_DEBUG,
+ 			   "x_snoop: Failed to enable multicast snooping on the bridge");
+ 		return -1;
+@@ -71,8 +74,12 @@ x_snoop_get_l2_packet(struct hostapd_dat
 + {
 + 	struct hostapd_bss_config *conf = hapd->conf;
 + 	struct l2_packet_data *l2;
--- a/backports/0100-procd-add-uxc-support.patch
+++ b/backports/0100-procd-add-uxc-support.patch
@@ -0,0 +1,170 @@
+From 8897bab871fb43701fad786c94af5d1b1ef123ae Mon Sep 17 00:00:00 2001
+From: John Crispin <john@phrozen.org>
+Date: Sun, 25 Jul 2021 13:32:37 +0200
+Subject: [PATCH 01/46] procd: add uxc support
+
+Signed-off-by: John Crispin <john@phrozen.org>
+---
+ package/system/procd/Makefile       | 12 ++---
+ package/system/procd/files/procd.sh | 79 +++++++++++++++++++++++++++++
+ package/system/procd/files/uxc.init |  4 ++
+ 3 files changed, 89 insertions(+), 6 deletions(-)
+
+diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile
+index fff9faa1bf..98f1ed1775 100644
+--- a/package/system/procd/Makefile
+++ b/package/system/procd/Makefile
+@@ -12,9 +12,9 @@ PKG_RELEASE:=$(AUTORELEASE)
+ 
+ PKG_SOURCE_PROTO:=git
+ PKG_SOURCE_URL=$(PROJECT_GIT)/project/procd.git
+-PKG_SOURCE_DATE:=2021-02-08
+-PKG_SOURCE_VERSION:=08938fe1cbc06eeaafa39448057368391d165272
+-PKG_MIRROR_HASH:=efc3deac56057e929789d44742858b2a16d976f6bfa0a2036e413d10afcaeee4
+PKG_SOURCE_DATE:=2021-08-15
+PKG_SOURCE_VERSION:=104b49d6ab25a8cf067e6d8d1f2da7defb9876d4
+PKG_MIRROR_HASH:=d13b566a14e84f6babe8b7d3dfb88e34c3dff0e97d7770d6fe71174685bca628
+ CMAKE_INSTALL:=1
+ 
+ PKG_LICENSE:=GPL-2.0
+@@ -32,7 +32,7 @@ include $(INCLUDE_DIR)/package.mk
+ include $(INCLUDE_DIR)/cmake.mk
+ 
+ ifeq ($(DUMP),)
+-  STAMP_CONFIGURED:=$(strip $(STAMP_CONFIGURED))_$(shell echo $(CONFIG_TARGET_INIT_PATH) | mkhash md5)
+  STAMP_CONFIGURED:=$(strip $(STAMP_CONFIGURED))_$(shell echo $(CONFIG_TARGET_INIT_PATH) | $(MKHASH) md5)
+ endif
+ 
+ CMAKE_OPTIONS += -DEARLY_PATH="$(TARGET_INIT_PATH)"
+@@ -82,7 +82,7 @@ endef
+ define Package/procd-seccomp
+   SECTION:=base
+   CATEGORY:=Base system
+-  DEPENDS:=@(arm||armeb||mips||mipsel||i386||powerpc||x86_64) @!TARGET_uml \
+  DEPENDS:=@(aarch64||arm||armeb||mips||mipsel||i386||powerpc||x86_64) @!TARGET_uml \
+ 	  @KERNEL_SECCOMP +libubox +libblobmsg-json
+   TITLE:=OpenWrt process seccomp helper + utrace
+ endef
+@@ -90,7 +90,7 @@ endef
+ define Package/uxc
+   SECTION:=base
+   CATEGORY:=Base system
+-  DEPENDS:=+procd-ujail +libubus +libubox +libblobmsg-json
+  DEPENDS:=+procd-ujail +libubus +libubox +libblobmsg-json +blockd +rpcd
+   TITLE:=OpenWrt container management
+   MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
+ endef
+diff --git a/package/system/procd/files/procd.sh b/package/system/procd/files/procd.sh
+index d86b7219da..3549a5a914 100644
+--- a/package/system/procd/files/procd.sh
+++ b/package/system/procd/files/procd.sh
+@@ -329,6 +329,82 @@ _procd_add_config_trigger() {
+ 	json_close_array
+ }
+ 
+_procd_add_mount_trigger() {
+	json_add_array
+	_procd_add_array_data "$1"
+	local action="$2"
+	local multi=0
+	shift ; shift
+
+	json_add_array
+	_procd_add_array_data "if"
+
+	if [ "$2" ]; then
+		json_add_array
+		_procd_add_array_data "or"
+		multi=1
+	fi
+
+	while [ "$1" ]; do
+		json_add_array
+		_procd_add_array_data "eq" "target" "$1"
+		shift
+		json_close_array
+	done
+
+	[ $multi = 1 ] && json_close_array
+
+	json_add_array
+	_procd_add_array_data "run_script" /etc/init.d/$name $action
+	json_close_array
+
+	json_close_array
+	_procd_add_timeout
+	json_close_array
+}
+
+_procd_add_action_mount_trigger() {
+	local script=$(readlink "$initscript")
+	local name=$(basename ${script:-$initscript})
+	local action="$1"
+	local mpath
+	shift
+
+	_procd_open_trigger
+	_procd_add_mount_trigger mount.add $action "$@"
+	_procd_close_trigger
+}
+
+procd_get_mountpoints() {
+	(
+		__procd_check_mount() {
+			local cfg="$1"
+			local path="${2%%/}/"
+			local target
+			config_get target "$cfg" target
+			target="${target%%/}/"
+			[ "$path" != "${path##$target}" ] && echo "${target%%/}"
+		}
+
+		config_load fstab
+		for mpath in "$@"; do
+			config_foreach __procd_check_mount mount "$mpath"
+		done
+	) | sort -u
+}
+
+_procd_add_restart_mount_trigger() {
+	local mountpoints="$(procd_get_mountpoints "$@")"
+	[ "${mountpoints//[[:space:]]}" ] &&
+		_procd_add_action_mount_trigger restart $mountpoints
+}
+
+_procd_add_reload_mount_trigger() {
+	local mountpoints="$(procd_get_mountpoints "$@")"
+	[ "${mountpoints//[[:space:]]}" ] &&
+		_procd_add_action_mount_trigger reload $mountpoints
+}
+
+ _procd_add_raw_trigger() {
+ 	json_add_array
+ 	_procd_add_array_data "$1"
+@@ -560,8 +636,11 @@ _procd_wrapper \
+ 	procd_add_raw_trigger \
+ 	procd_add_config_trigger \
+ 	procd_add_interface_trigger \
+	procd_add_mount_trigger \
+ 	procd_add_reload_trigger \
+ 	procd_add_reload_interface_trigger \
+	procd_add_reload_mount_trigger \
+	procd_add_restart_mount_trigger \
+ 	procd_open_trigger \
+ 	procd_close_trigger \
+ 	procd_open_instance \
+diff --git a/package/system/procd/files/uxc.init b/package/system/procd/files/uxc.init
+index 035c8b0b9e..1e75b796f8 100644
+--- a/package/system/procd/files/uxc.init
+++ b/package/system/procd/files/uxc.init
+@@ -16,3 +16,7 @@ boot() {
+ 	__BOOT_UXC=1
+ 	start
+ }
+
+service_triggers() {
+	procd_add_raw_trigger "mount.add" 3000 /etc/init.d/uxc boot
+}
+-- 
+2.25.1
+
--- a/backports/0101-build-create-APK-files-parrallel-to-IPK.patch
+++ b/backports/0101-build-create-APK-files-parrallel-to-IPK.patch
@@ -0,0 +1,174 @@
+From 0a31ac2bfc8aa43c2a5e43eac81c4647dbf2d1b7 Mon Sep 17 00:00:00 2001
+From: Paul Spooren <mail@aparcar.org>
+Date: Fri, 2 Oct 2020 23:30:30 -1000
+Subject: [PATCH 01/45] build: create APK files parrallel to IPK
+
+Create APK files based on the folder and control files of IPK packages.
+
+Signed-off-by: Paul Spooren <mail@aparcar.org>
+---
+ include/package-ipkg.mk     | 48 +++++++++++++++++++++++++------------
+ package/Makefile            |  2 ++
+ package/base-files/Makefile |  4 ++++
+ rules.mk                    |  2 ++
+ scripts/apk-make-index.sh   | 20 ++++++++++++++++
+ 5 files changed, 61 insertions(+), 15 deletions(-)
+ create mode 100755 scripts/apk-make-index.sh
+
+diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
+index c2017cd220..b0177070f8 100644
+--- a/include/package-ipkg.mk
+++ b/include/package-ipkg.mk
+@@ -102,6 +102,7 @@ ifeq ($(DUMP),)
+     ABIV_$(1):=$(if $(filter-out kmod-%,$(1)),$(ABI_VERSION))
+     PDIR_$(1):=$(call FeedPackageDir,$(1))
+     IPKG_$(1):=$$(PDIR_$(1))/$(1)$$(ABIV_$(1))_$(VERSION)_$(PKGARCH).ipk
+    APK_$(1):=$$(PDIR_$(1))/$(1)$$(ABIV_$(1))_$(VERSION)_$(PKGARCH).apk
+     IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg-$(PKGARCH)/$(1)
+     KEEP_$(1):=$(strip $(call Package/$(1)/conffiles))
+ 
+@@ -200,7 +201,7 @@ $(_endef)
+     $(PKG_INFO_DIR)/$(1).provides $$(IPKG_$(1)): $(STAMP_BUILT) $(INCLUDE_DIR)/package-ipkg.mk
+ 	@rm -rf $$(IDIR_$(1)); \
+ 		$$(call remove_ipkg_files,$(1),$$(call opkg_package_files,$(call gen_ipkg_wildcard,$(1))))
+-	mkdir -p $(PACKAGE_DIR) $$(IDIR_$(1))/CONTROL $(PKG_INFO_DIR)
+	mkdir -p $(PACKAGE_DIR) $$(IDIR_$(1)) $(PKG_INFO_DIR)
+ 	$(call Package/$(1)/install,$$(IDIR_$(1)))
+ 	$(if $(Package/$(1)/install-overlay),mkdir -p $(PACKAGE_DIR) $$(IDIR_$(1))/rootfs-overlay)
+ 	$(call Package/$(1)/install-overlay,$$(IDIR_$(1))/rootfs-overlay)
+@@ -226,6 +227,37 @@ $(_endef)
+ 		) || true \
+ 	)
+     endif
+
+    ifneq ($$(KEEP_$(1)),)
+		@( \
+			keepfiles=""; \
+			for x in $$(KEEP_$(1)); do \
+				[ -f "$$(IDIR_$(1))/$$$$x" ] || keepfiles="$$$${keepfiles:+$$$$keepfiles }$$$$x"; \
+			done; \
+			[ -z "$$$$keepfiles" ] || { \
+				mkdir -p $$(IDIR_$(1))/lib/upgrade/keep.d; \
+				for x in $$$$keepfiles; do echo $$$$x >> $$(IDIR_$(1))/lib/upgrade/keep.d/$(1); done; \
+			}; \
+		)
+    endif
+
+	$(INSTALL_DIR) $$(PDIR_$(1))
+
+	$(FAKEROOT) apk mkpkg \
+	  --info "name:$(1)" \
+	  --info "version:$(VERSION)" \
+	  --info "description:$()" \
+	  --info "arch:$(PKGARCH)" \
+	  --info "license:$(LICENSE)" \
+	  --info "origin:$(SOURCE)" \
+	  --info "maintainer:$(MAINTAINER)" \
+	  $$(foreach dep,$$(Package/$(1)/DEPENDS),--info "depends:$$(subst $$(comma),,$$(dep))") \
+	  --files "$$(IDIR_$(1))" \
+	  --output "$$(APK_$(1))" \
+	  --sign "$(BUILD_KEY_APK_SEC)"
+
+	mkdir -p $$(IDIR_$(1))/CONTROL
+
+ 	(cd $$(IDIR_$(1))/CONTROL; \
+ 		( \
+ 			echo "$$$$CONTROL"; \
+@@ -249,20 +281,6 @@ $(_endef)
+ 		$($(1)_COMMANDS) \
+ 	)
+ 
+-    ifneq ($$(KEEP_$(1)),)
+-		@( \
+-			keepfiles=""; \
+-			for x in $$(KEEP_$(1)); do \
+-				[ -f "$$(IDIR_$(1))/$$$$x" ] || keepfiles="$$$${keepfiles:+$$$$keepfiles }$$$$x"; \
+-			done; \
+-			[ -z "$$$$keepfiles" ] || { \
+-				mkdir -p $$(IDIR_$(1))/lib/upgrade/keep.d; \
+-				for x in $$$$keepfiles; do echo $$$$x >> $$(IDIR_$(1))/lib/upgrade/keep.d/$(1); done; \
+-			}; \
+-		)
+-    endif
+-
+-	$(INSTALL_DIR) $$(PDIR_$(1))
+ 	$(FAKEROOT) $(SCRIPT_DIR)/ipkg-build -m "$(FILE_MODES)" $$(IDIR_$(1)) $$(PDIR_$(1))
+ 	@[ -f $$(IPKG_$(1)) ]
+ 
+diff --git a/package/Makefile b/package/Makefile
+index ec503dc527..18a19fff13 100644
+--- a/package/Makefile
+++ b/package/Makefile
+@@ -60,6 +60,7 @@ $(curdir)/merge-index: $(curdir)/merge
+ 
+ ifndef SDK
+   $(curdir)/compile: $(curdir)/system/opkg/host/compile
+  $(patsubst %,$(curdir)/%/compile,$(filter-out %/apk/host,$($(curdir)/builddirs))): $(curdir)/system/apk/host/compile
+ endif
+ 
+ $(curdir)/install: $(TMP_DIR)/.build $(curdir)/merge $(if $(CONFIG_TARGET_PER_DEVICE_ROOTFS),$(curdir)/merge-index)
+@@ -84,6 +85,7 @@ $(curdir)/index: FORCE
+ 	@for d in $(PACKAGE_SUBDIRS); do ( \
+ 		mkdir -p $$d; \
+ 		cd $$d || continue; \
+		$(SCRIPT_DIR)/apk-make-index.sh . 2>&1; \
+ 		$(SCRIPT_DIR)/ipkg-make-index.sh . 2>&1 > Packages.manifest; \
+ 		grep -vE '^(Maintainer|LicenseFiles|Source|SourceName|Require|SourceDateEpoch)' Packages.manifest > Packages; \
+ 		case "$$(((64 + $$(stat -L -c%s Packages)) % 128))" in 110|111) \
+diff --git a/package/base-files/Makefile b/package/base-files/Makefile
+index 8a1ddf96f5..9db4812981 100644
+--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
+@@ -107,6 +107,10 @@ ifdef CONFIG_SIGNED_PACKAGES
+ 	[ -s $(BUILD_KEY).ucert ] || \
+ 		$(STAGING_DIR_HOST)/bin/ucert -I -c $(BUILD_KEY).ucert -p $(BUILD_KEY).pub -s $(BUILD_KEY)
+ 
+	[ -s $(BUILD_KEY_APK_SEC) -a -s $(BUILD_KEY_APK_PUB) ] || \
+		openssl ecparam -name prime256v1 -genkey -noout -out $(BUILD_KEY_APK_SEC); \
+		openssl ec -in $(BUILD_KEY_APK_SEC) -pubout > $(BUILD_KEY_APK_PUB)
+
+   endef
+ 
+ ifndef CONFIG_BUILDBOT
+diff --git a/rules.mk b/rules.mk
+index f31d9bb113..de81b65d46 100644
+--- a/rules.mk
+++ b/rules.mk
+@@ -258,6 +258,8 @@ else
+ endif
+ 
+ BUILD_KEY=$(TOPDIR)/key-build
+BUILD_KEY_APK_SEC=$(TOPDIR)/private-key.pem
+BUILD_KEY_APK_PUB=$(TOPDIR)/public-key.pem
+ 
+ FAKEROOT:=$(STAGING_DIR_HOST)/bin/fakeroot
+ 
+diff --git a/scripts/apk-make-index.sh b/scripts/apk-make-index.sh
+new file mode 100755
+index 0000000000..df1f1a2e2b
+--- /dev/null
+++ b/scripts/apk-make-index.sh
+@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+set -e
+
+pkg_dir=$1
+
+if [ -z "$pkg_dir" ] || [ ! -d "$pkg_dir" ]; then
+	echo "Usage: apk-make-index <package_directory>" >&2
+	exit 1
+fi
+
+(
+	cd "$pkg_dir" || exit 1
+	GLOBIGNORE="kernel*:libc*"
+	set -- *.apk
+	if [ "$1" = '*.apk' ]; then
+		echo "No APK packages found"
+	fi
+	apk index --output APKINDEX.tar.gz "$@"
+	unset GLOBIGNORE
+)
+-- 
+2.25.1
+
--- a/backports/0102-fstools-update-to-git-HEAD.patch
+++ b/backports/0102-fstools-update-to-git-HEAD.patch
@@ -0,0 +1,69 @@
+From 2239c3c87a723bee8efa64ecf22c61a15433517e Mon Sep 17 00:00:00 2001
+From: Daniel Golle <daniel@makrotopia.org>
+Date: Sun, 25 Jul 2021 01:20:31 +0100
+Subject: [PATCH 102/146] fstools: update to git HEAD
+
+ bad1835 fstools: add partname volume driver
+ 19d7d93 libfstools: partname: several fixes
+ 3c38f0c libfstools: fix build with glibc
+ d05ad93 libfstools: remove superflus include
+ 964d1e3 partname: allow skipping existing 'rootfs_data' partition
+ c44b40b overlay: fix syncronizing typo
+ b5397a1 fstools: block: fix segfault on mount with no target
+ bd7cc8d block: use dynamically allocated target string
+ 6d8450e blockd: use allocated strings instead of fixed buffers
+ d47909e libblkid-tiny: fix buffer overflow
+ 67d2297 block: match device path instead of assuming /dev/%s
+ 2aeba88 block: allow autofs and umount commands also on MTD/UBI
+ 3d40a1b blockd: add missing #define _GNU_SOURCE
+ 4d4dcfb blockd: detect mountpoint of /dev/mapper/*
+ 2f42515 block: resolve /dev/mapper/* name for /dev/dm-0 when hotplugging
+ 39558a1 blockd: also send ubus notification on mount hotplug
+ 3386b6b blockd: fix trigger name
+ cdc9939 blockd: move to its own POSIX process group
+ 59f7c11 blockd: create mountpoint parent folder if needed
+ 9cc96af Revert "block: resolve /dev/mapper/* name for /dev/dm-0 when hotplugging"
+ 06334ac Revert "blockd: detect mountpoint of /dev/mapper/*"
+ 9ab3551 block: use /dev/dm-* instead of /dev/mapper/*
+ 5114595 block: allow remove hotplug event to arrive at blockd
+ a846c6b blockd: fix length of timeout int passed to ioctl
+ 1d681ca block: support umount device basename
+
+Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+---
+ package/system/fstools/Makefile          | 6 +++---
+ package/system/fstools/files/blockd.init | 1 +
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/package/system/fstools/Makefile b/package/system/fstools/Makefile
+index 2da508d541..b582a17bae 100644
+--- a/package/system/fstools/Makefile
+++ b/package/system/fstools/Makefile
+@@ -12,9 +12,9 @@ PKG_RELEASE:=1
+ 
+ PKG_SOURCE_PROTO:=git
+ PKG_SOURCE_URL=$(PROJECT_GIT)/project/fstools.git
+-PKG_MIRROR_HASH:=a485792d90c71cd4fb396ce97f42a57ee4d2a3d78e5f3fd0748270ffb14209e6
+-PKG_SOURCE_DATE:=2021-01-04
+-PKG_SOURCE_VERSION:=c53b18820756f6f32ad0782d3bf489422b7c4ad3
+PKG_MIRROR_HASH:=6a457b812166e04e2244ee1be92a4957666b5d1554315c0e18db1b30376cc617
+PKG_SOURCE_DATE:=2021-07-28
+PKG_SOURCE_VERSION:=cc63933faedd8d4fcdabb872cf4661ac04fe4ba2
+ CMAKE_INSTALL:=1
+ 
+ PKG_LICENSE:=GPL-2.0
+diff --git a/package/system/fstools/files/blockd.init b/package/system/fstools/files/blockd.init
+index a4ce57d40d..bdd8bbf622 100755
+--- a/package/system/fstools/files/blockd.init
+++ b/package/system/fstools/files/blockd.init
+@@ -16,6 +16,7 @@ reload_service() {
+ start_service() {
+ 	procd_open_instance
+ 	procd_set_param command "$PROG"
+	procd_set_param watch block
+ 	procd_set_param respawn
+ 	procd_close_instance
+ }
+-- 
+2.25.1
+
--- a/backports/0103-tools-libressl-update-to-3.3.3.patch
+++ b/backports/0103-tools-libressl-update-to-3.3.3.patch
@@ -0,0 +1,40 @@
+From c40bb49f31443d9c03043c4361e4af56e5c3eba4 Mon Sep 17 00:00:00 2001
+From: Rosen Penev <rosenp@gmail.com>
+Date: Sat, 19 Jun 2021 14:45:11 -0700
+Subject: [PATCH 103/146] tools/libressl: update to 3.3.3
+
+Fix wrong FPIC variable usage. Fixes compilation under sparc64 host.
+
+Signed-off-by: Rosen Penev <rosenp@gmail.com>
+(cherry picked from commit bf4dbbb55e2b8e23f186e1334f1e9ce6a3a8ddfe)
+---
+ tools/libressl/Makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tools/libressl/Makefile b/tools/libressl/Makefile
+index 2b5a33450c..e25b5661ee 100644
+--- a/tools/libressl/Makefile
+++ b/tools/libressl/Makefile
+@@ -8,8 +8,8 @@
+ include $(TOPDIR)/rules.mk
+ 
+ PKG_NAME:=libressl
+-PKG_VERSION:=3.3.1
+-PKG_HASH:=a6d331865e0164a13ac85a228e52517f7cf8f8488f2f95f34e7857302f97cfdb
+PKG_VERSION:=3.3.3
+PKG_HASH:=a471565b36ccd1a70d0bd7d37c6e95c43a26a62829b487d9d2cdebfe58be3066
+ PKG_RELEASE:=1
+ 
+ PKG_CPE_ID:=cpe:/a:openbsd:libressl
+@@ -25,7 +25,7 @@ include $(INCLUDE_DIR)/host-build.mk
+ 
+ HOSTCC := $(HOSTCC_NOCACHE)
+ HOST_CONFIGURE_ARGS += --enable-static --disable-shared --disable-tests
+-HOST_CFLAGS += $(FPIC)
+HOST_CFLAGS += $(HOST_FPIC)
+ 
+ ifeq ($(GNU_HOST_NAME),x86_64-linux-gnux32)
+ HOST_CONFIGURE_ARGS += --disable-asm
+-- 
+2.25.1
+
--- a/backports/0104-uvol-backport-package.patch
+++ b/backports/0104-uvol-backport-package.patch
--- a/backports/0105-apk-backport-package.patch
+++ b/backports/0105-apk-backport-package.patch
@@ -0,0 +1,312 @@
+From 6741963067c4be8999896a5e653dc0d72487e392 Mon Sep 17 00:00:00 2001
+From: John Crispin <john@phrozen.org>
+Date: Fri, 13 Aug 2021 08:47:11 +0200
+Subject: [PATCH 06/46] apk: backport package
+
+Signed-off-by: John Crispin <john@phrozen.org>
+---
+ package/system/apk/Makefile                   | 93 +++++++++++++++++++
+ ...vel@lists.alpinelinux.org-4a6a0840.rsa.pub |  9 ++
+ ...vel@lists.alpinelinux.org-5243ef4b.rsa.pub |  9 ++
+ ...vel@lists.alpinelinux.org-5261cecb.rsa.pub |  9 ++
+ package/system/apk/files/alpine-repositories  |  3 +
+ .../apk/patches/000-Makefile-version.patch    | 11 +++
+ .../patches/0001-remove-doc-generation.patch  | 21 +++++
+ package/system/apk/patches/100-link.patch     | 16 ++++
+ package/system/apk/patches/100-phtread.patch  | 12 +++
+ ...ude-limits.h-to-fix-build-with-glibc.patch | 20 ++++
+ package/system/apk/test.sh                    |  9 ++
+ 11 files changed, 212 insertions(+)
+ create mode 100644 package/system/apk/Makefile
+ create mode 100644 package/system/apk/files/alpine-keys/alpine-devel@lists.alpinelinux.org-4a6a0840.rsa.pub
+ create mode 100644 package/system/apk/files/alpine-keys/alpine-devel@lists.alpinelinux.org-5243ef4b.rsa.pub
+ create mode 100644 package/system/apk/files/alpine-keys/alpine-devel@lists.alpinelinux.org-5261cecb.rsa.pub
+ create mode 100644 package/system/apk/files/alpine-repositories
+ create mode 100644 package/system/apk/patches/000-Makefile-version.patch
+ create mode 100644 package/system/apk/patches/0001-remove-doc-generation.patch
+ create mode 100644 package/system/apk/patches/100-link.patch
+ create mode 100644 package/system/apk/patches/100-phtread.patch
+ create mode 100644 package/system/apk/patches/100-tar-include-limits.h-to-fix-build-with-glibc.patch
+ create mode 100644 package/system/apk/test.sh
+
+diff --git a/package/system/apk/Makefile b/package/system/apk/Makefile
+new file mode 100644
+index 0000000000..335f50c155
+--- /dev/null
+++ b/package/system/apk/Makefile
+@@ -0,0 +1,93 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=apk
+PKG_VERSION:=3.0.0_pre0
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://git.alpinelinux.org/apk-tools.git
+PKG_SOURCE_DATE:=2021-08-17
+PKG_SOURCE_VERSION:=a46043bcc4cc15b456ef1eac5c5f9d93bd905d53
+PKG_MIRROR_HASH:=e16fd04b18043e78a177acd8c6958fa03fd1484b62c879c2dd0bed8ce9c50625
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_DATE)-$(call version_abbrev,$(PKG_SOURCE_VERSION))
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
+HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_SOURCE_SUBDIR)
+PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.xz
+PKG_RELEASE:=r$(PKG_SOURCE_DATE)-$(call version_abbrev,$(PKG_SOURCE_VERSION))-$(AUTORELEASE)
+
+PKG_MAINTAINER:=Paul Spooren <mail@aparcar.org>
+PKG_LICENSE:=GPL-2.0-only
+PKG_LICENSE_FILES:=LICENSE
+
+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
+
+HOST_BUILD_DEPENDS:=lua/host lua-lzlib/host
+PKG_BUILD_DEPENDS:=$(HOST_BUILD_DEPENDS)
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/host-build.mk
+
+define Package/apk
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=apk package manager
+  DEPENDS:=+liblua +libopenssl +zlib @!arc
+  URL:=$(PKG_SOURCE_URL)
+endef
+
+define Package/alpine-keys
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=Alpine apk public signing keys
+  DEPENDS:=apk
+endef
+
+define Package/alpine-repositories
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=Official Alpine repositories
+  DEPENDS:=apk
+endef
+
+MAKE_FLAGS += \
+	LUA=$(STAGING_DIR_HOSTPKG)/bin/lua \
+	LUA_VERSION=5.1 \
+	LUA_PC=lua
+
+HOST_MAKE_FLAGS += \
+	LUA=$(STAGING_DIR_HOSTPKG)/bin/lua \
+	LUA_VERSION=5.1 \
+	DESTDIR=$(STAGING_DIR_HOSTPKG) \
+	SBINDIR=/bin \
+	PREFIX=
+
+HOST_LDFLAGS+=-Wl,-rpath=$(STAGING_DIR_HOSTPKG)/lib -lpthread
+
+define Package/apk/install
+	$(INSTALL_DIR) $(1)/lib/apk/db
+
+	$(INSTALL_DIR) $(1)/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/apk $(1)/bin/apk
+
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/lib/*.so.* $(1)/usr/lib/
+
+	$(INSTALL_DIR) $(1)/etc/apk/
+	echo $(ARCH) > $(1)/etc/apk/arch
+	touch $(1)/etc/apk/world
+endef
+
+define Package/alpine-keys/install
+	$(INSTALL_DIR) $(1)/etc/apk/keys
+	$(INSTALL_DATA) ./files/alpine-keys/* $(1)/etc/apk/keys
+endef
+
+define Package/alpine-repositories/install
+	$(INSTALL_DIR) $(1)/etc/apk/keys
+	$(INSTALL_DATA) ./files/alpine-repositories $(1)/etc/apk/repositories
+endef
+
+$(eval $(call BuildPackage,apk))
+$(eval $(call BuildPackage,alpine-keys))
+$(eval $(call BuildPackage,alpine-repositories))
+$(eval $(call HostBuild))
+diff --git a/package/system/apk/files/alpine-keys/alpine-devel@lists.alpinelinux.org-4a6a0840.rsa.pub b/package/system/apk/files/alpine-keys/alpine-devel@lists.alpinelinux.org-4a6a0840.rsa.pub
+new file mode 100644
+index 0000000000..bb4bdc80fd
+--- /dev/null
+++ b/package/system/apk/files/alpine-keys/alpine-devel@lists.alpinelinux.org-4a6a0840.rsa.pub
+@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1yHJxQgsHQREclQu4Ohe
+qxTxd1tHcNnvnQTu/UrTky8wWvgXT+jpveroeWWnzmsYlDI93eLI2ORakxb3gA2O
+Q0Ry4ws8vhaxLQGC74uQR5+/yYrLuTKydFzuPaS1dK19qJPXB8GMdmFOijnXX4SA
+jixuHLe1WW7kZVtjL7nufvpXkWBGjsfrvskdNA/5MfxAeBbqPgaq0QMEfxMAn6/R
+L5kNepi/Vr4S39Xvf2DzWkTLEK8pcnjNkt9/aafhWqFVW7m3HCAII6h/qlQNQKSo
+GuH34Q8GsFG30izUENV9avY7hSLq7nggsvknlNBZtFUcmGoQrtx3FmyYsIC8/R+B
+ywIDAQAB
+-----END PUBLIC KEY-----
+diff --git a/package/system/apk/files/alpine-keys/alpine-devel@lists.alpinelinux.org-5243ef4b.rsa.pub b/package/system/apk/files/alpine-keys/alpine-devel@lists.alpinelinux.org-5243ef4b.rsa.pub
+new file mode 100644
+index 0000000000..6cbfad7441
+--- /dev/null
+++ b/package/system/apk/files/alpine-keys/alpine-devel@lists.alpinelinux.org-5243ef4b.rsa.pub
+@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvNijDxJ8kloskKQpJdx+
+mTMVFFUGDoDCbulnhZMJoKNkSuZOzBoFC94omYPtxnIcBdWBGnrm6ncbKRlR+6oy
+DO0W7c44uHKCFGFqBhDasdI4RCYP+fcIX/lyMh6MLbOxqS22TwSLhCVjTyJeeH7K
+aA7vqk+QSsF4TGbYzQDDpg7+6aAcNzg6InNePaywA6hbT0JXbxnDWsB+2/LLSF2G
+mnhJlJrWB1WGjkz23ONIWk85W4S0XB/ewDefd4Ly/zyIciastA7Zqnh7p3Ody6Q0
+sS2MJzo7p3os1smGjUF158s6m/JbVh4DN6YIsxwl2OjDOz9R0OycfJSDaBVIGZzg
+cQIDAQAB
+-----END PUBLIC KEY-----
+diff --git a/package/system/apk/files/alpine-keys/alpine-devel@lists.alpinelinux.org-5261cecb.rsa.pub b/package/system/apk/files/alpine-keys/alpine-devel@lists.alpinelinux.org-5261cecb.rsa.pub
+new file mode 100644
+index 0000000000..83f0658e9c
+--- /dev/null
+++ b/package/system/apk/files/alpine-keys/alpine-devel@lists.alpinelinux.org-5261cecb.rsa.pub
+@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwlzMkl7b5PBdfMzGdCT0
+cGloRr5xGgVmsdq5EtJvFkFAiN8Ac9MCFy/vAFmS8/7ZaGOXoCDWbYVLTLOO2qtX
+yHRl+7fJVh2N6qrDDFPmdgCi8NaE+3rITWXGrrQ1spJ0B6HIzTDNEjRKnD4xyg4j
+g01FMcJTU6E+V2JBY45CKN9dWr1JDM/nei/Pf0byBJlMp/mSSfjodykmz4Oe13xB
+Ca1WTwgFykKYthoLGYrmo+LKIGpMoeEbY1kuUe04UiDe47l6Oggwnl+8XD1MeRWY
+sWgj8sF4dTcSfCMavK4zHRFFQbGp/YFJ/Ww6U9lA3Vq0wyEI6MCMQnoSMFwrbgZw
+wwIDAQAB
+-----END PUBLIC KEY-----
+diff --git a/package/system/apk/files/alpine-repositories b/package/system/apk/files/alpine-repositories
+new file mode 100644
+index 0000000000..5babbb23b4
+--- /dev/null
+++ b/package/system/apk/files/alpine-repositories
+@@ -0,0 +1,3 @@
+https://dl-cdn.alpinelinux.org/alpine/edge/main
+https://dl-cdn.alpinelinux.org/alpine/edge/community
+
+diff --git a/package/system/apk/patches/000-Makefile-version.patch b/package/system/apk/patches/000-Makefile-version.patch
+new file mode 100644
+index 0000000000..2e7f5b0f15
+--- /dev/null
+++ b/package/system/apk/patches/000-Makefile-version.patch
+@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -4,7 +4,7 @@
+ -include config.mk
+ 
+ PACKAGE := apk-tools
+-VERSION := 2.12.0
++VERSION := 3.0.0_pre0
+ 
+ export VERSION
+ 
+diff --git a/package/system/apk/patches/0001-remove-doc-generation.patch b/package/system/apk/patches/0001-remove-doc-generation.patch
+new file mode 100644
+index 0000000000..dee05c56f2
+--- /dev/null
+++ b/package/system/apk/patches/0001-remove-doc-generation.patch
+@@ -0,0 +1,21 @@
+From b05a93c48fdbb50f0c464310dc2ce45777d32ea2 Mon Sep 17 00:00:00 2001
+From: Paul Spooren <mail@aparcar.org>
+Date: Fri, 2 Oct 2020 14:08:52 -1000
+Subject: [PATCH] remove doc generation
+
+Signed-off-by: Paul Spooren <mail@aparcar.org>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/Makefile
++++ b/Makefile
+@@ -25,7 +25,7 @@ export DESTDIR SBINDIR LIBDIR CONFDIR MA
+ ##
+ # Top-level subdirs
+ 
+-subdirs		:= libfetch/ src/ doc/
++subdirs		:= libfetch/ src/
+ 
+ ##
+ # Include all rules and stuff
+diff --git a/package/system/apk/patches/100-link.patch b/package/system/apk/patches/100-link.patch
+new file mode 100644
+index 0000000000..9cae2787d9
+--- /dev/null
+++ b/package/system/apk/patches/100-link.patch
+@@ -0,0 +1,16 @@
+diff -urN apk-2021-08-17-a46043bc.orig/src/Makefile apk-2021-08-17-a46043bc/src/Makefile
+--- apk-2021-08-17-a46043bc.orig/src/Makefile	2021-08-17 14:21:04.117760513 +0200
++++ apk-2021-08-17-a46043bc/src/Makefile	2021-08-17 14:21:16.653830180 +0200
+@@ -65,7 +65,11 @@
+ 	app_convdb.o app_convndx.o app_del.o app_dot.o app_extract.o app_fetch.o \
+ 	app_fix.o app_index.o app_info.o app_list.o app_manifest.o app_mkndx.o \
+ 	app_mkpkg.o app_policy.o app_update.o app_upgrade.o app_search.o \
+-	app_stats.o app_verify.o app_version.o app_vertest.o applet.o
++	app_stats.o app_verify.o app_version.o app_vertest.o applet.o \
++	adb.o adb_comp.o adb_walk_adb.o adb_walk_genadb.o adb_walk_gentext.o adb_walk_text.o apk_adb.o \
++	atom.o blob.o commit.o common.o context.o crypto_openssl.o database.o hash.o \
++	extract.o extract_v2.o extract_v3.o io.o io_gunzip.o io_url.o tar.o \
++	package.o pathbuilder.o print.o solver.o trust.o version.o
+ 
+ ifeq ($(ADB),y)
+ libapk.so.$(libapk_soname)-objs += apk_adb.o
+diff --git a/package/system/apk/patches/100-phtread.patch b/package/system/apk/patches/100-phtread.patch
+new file mode 100644
+index 0000000000..c252e14dc1
+--- /dev/null
+++ b/package/system/apk/patches/100-phtread.patch
+@@ -0,0 +1,12 @@
+diff -urN apk-2021-07-23-3d203e8f.orig/src/Makefile apk-2021-07-23-3d203e8f/src/Makefile
+--- apk-2021-07-23-3d203e8f.orig/src/Makefile	2021-07-25 12:55:05.576564663 +0200
++++ apk-2021-07-23-3d203e8f/src/Makefile	2021-07-25 12:55:48.660862181 +0200
+@@ -87,7 +87,7 @@
+ apk.static-libs		:= $(apk-static-libs)
+ LDFLAGS_apk.static	:= -static
+ LIBS_apk.static		:= -Wl,--as-needed -ldl -Wl,--no-as-needed
+-LDFLAGS_apk		+= -L$(obj)
++LDFLAGS_apk		+= -L$(obj) -pthread
+ LDFLAGS_apk-test	+= -L$(obj)
+ 
+ CFLAGS_ALL		+= $(OPENSSL_CFLAGS) $(ZLIB_CFLAGS)
+diff --git a/package/system/apk/patches/100-tar-include-limits.h-to-fix-build-with-glibc.patch b/package/system/apk/patches/100-tar-include-limits.h-to-fix-build-with-glibc.patch
+new file mode 100644
+index 0000000000..43ec7d5f1a
+--- /dev/null
+++ b/package/system/apk/patches/100-tar-include-limits.h-to-fix-build-with-glibc.patch
+@@ -0,0 +1,20 @@
+From c72ea983e287ec1d8b1f2b3aab1bf40aa7a30b03 Mon Sep 17 00:00:00 2001
+From: Daniel Golle <daniel@makrotopia.org>
+Date: Wed, 4 Aug 2021 21:37:40 +0100
+Subject: [PATCH] tar: include <limits.h> to fix build with glibc
+
+Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+---
+ src/tar.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/tar.c
++++ b/src/tar.c
+@@ -9,6 +9,7 @@
+ 
+ #include <sys/stat.h>
+ #include <sys/sysmacros.h>
++#include <limits.h> /* for SSIZE_MAX with glibc */
+ 
+ #include "apk_defines.h"
+ #include "apk_tar.h"
+diff --git a/package/system/apk/test.sh b/package/system/apk/test.sh
+new file mode 100644
+index 0000000000..814777fd70
+--- /dev/null
+++ b/package/system/apk/test.sh
+@@ -0,0 +1,9 @@
+#!/bin/sh
+
+case "$1" in
+    "apk")
+        apk --version | grep "${2/-r*/}"
+        ;;
+    *)
+        return 0;
+esac
+-- 
+2.25.1
+
--- a/backports/0106-lua-lzlib-backport-package.patch
+++ b/backports/0106-lua-lzlib-backport-package.patch
@@ -0,0 +1,104 @@
+From 900d18f3ae2cd5bb3d8d6e2584d2280cb5302e01 Mon Sep 17 00:00:00 2001
+From: John Crispin <john@phrozen.org>
+Date: Fri, 13 Aug 2021 08:48:02 +0200
+Subject: [PATCH 106/146] lua-lzlib: backport package
+
+Signed-off-by: John Crispin <john@phrozen.org>
+---
+ package/libs/lua-lzlib/Makefile               | 64 +++++++++++++++++++
+ .../patches/001-allow_optim_flags.patch       | 12 ++++
+ 2 files changed, 76 insertions(+)
+ create mode 100644 package/libs/lua-lzlib/Makefile
+ create mode 100644 package/libs/lua-lzlib/patches/001-allow_optim_flags.patch
+
+diff --git a/package/libs/lua-lzlib/Makefile b/package/libs/lua-lzlib/Makefile
+new file mode 100644
+index 0000000000..5e0a16b135
+--- /dev/null
+++ b/package/libs/lua-lzlib/Makefile
+@@ -0,0 +1,64 @@
+#
+# Copyright (C) 2015 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=lua-lzlib
+PKG_VERSION:=0.4.3
+PKG_RELEASE:=1
+PKG_MAINTAINER:=Dirk Chang <dirk@kooiot.com>
+PKG_LICENSE:=MIT
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_MIRROR_HASH:=b6ef5e3f04b7f2137b39931a175ee802489a2486e70537770919bcccca10e723
+PKG_SOURCE_URL:=https://github.com/LuaDist/lzlib.git
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=79329a07d8f79c19eadd7ea2752b4c4e1574b015
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+
+HOST_BUILD_DEPENDS:=lua/host
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/host-build.mk
+
+define Package/lua-lzlib
+  SUBMENU:=Lua
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=Lua zlib binding
+  URL:=http://github.com/LuaDist/lzlib
+  DEPENDS:= +lua +zlib
+endef
+
+define Package/lua-lzlib/description
+	A library to access zlib library functions and also to read/write gzip files using an interface similar to the base io package. 
+endef
+
+MAKE_FLAGS += \
+	LUA="$(STAGING_DIR)/usr" \
+	OFLAGS="$(TARGET_CFLAGS)" \
+
+HOST_MAKE_FLAGS += \
+	LUA="$(STAGING_DIR_HOSTPKG)" \
+	OFLAGS="$(HOST_CFLAGS)" \
+
+define Package/lua-lzlib/install
+	$(INSTALL_DIR) $(1)/usr/lib/lua
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/zlib.so $(1)/usr/lib/lua/
+
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/gzip.lua $(1)/usr/lib/lua/
+endef
+
+define Host/Install
+	$(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/lib/lua/5.1
+	$(INSTALL_BIN) $(HOST_BUILD_DIR)/zlib.so $(STAGING_DIR_HOSTPKG)/lib/lua/5.1
+
+	$(INSTALL_DATA) $(HOST_BUILD_DIR)/gzip.lua $(STAGING_DIR_HOSTPKG)/lib/lua/5.1
+endef
+
+$(eval $(call BuildPackage,lua-lzlib))
+$(eval $(call HostBuild))
+diff --git a/package/libs/lua-lzlib/patches/001-allow_optim_flags.patch b/package/libs/lua-lzlib/patches/001-allow_optim_flags.patch
+new file mode 100644
+index 0000000000..78f981d237
+--- /dev/null
+++ b/package/libs/lua-lzlib/patches/001-allow_optim_flags.patch
+@@ -0,0 +1,12 @@
+--- a/Makefile
++++ b/Makefile
+@@ -14,7 +14,8 @@ LUABIN= $(LUA)/bin
+ ZLIB=../zlib-1.2.3
+ 
+ # no need to change anything below here
+-CFLAGS= $(INCS) $(DEFS) $(WARN) -O0 -fPIC
++CFLAGS= $(INCS) $(DEFS) $(WARN) $(OFLAGS) -fPIC
++OFLAGS= -O0
+ WARN= -g -Werror -Wall -pedantic #-ansi
+ INCS= -I$(LUAINC) -I$(ZLIB)
+ LIBS= -L$(ZLIB) -lz -L$(LUALIB) -L$(LUABIN) #-llua51
+-- 
+2.25.1
+
--- a/backports/0107-lua-make-it-easier-to-detect-host-built-Lua.patch
+++ b/backports/0107-lua-make-it-easier-to-detect-host-built-Lua.patch
@@ -0,0 +1,35 @@
+From 5c8a575ec759105e63a3aad033289d124516ec69 Mon Sep 17 00:00:00 2001
+From: Daniel Golle <daniel@makrotopia.org>
+Date: Sat, 10 Jul 2021 20:21:26 +0100
+Subject: [PATCH 107/146] lua: make it easier to detect host-built Lua
+
+Install pkg-config file also for host-build, clean up Lua symlinks.
+
+Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+(cherry picked from commit 315f52e0f3bfa3d65ad14ca21a696c6d31c4edcd)
+---
+ package/utils/lua/Makefile | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/package/utils/lua/Makefile b/package/utils/lua/Makefile
+index a54ef7d25a..be18880cb1 100644
+--- a/package/utils/lua/Makefile
+++ b/package/utils/lua/Makefile
+@@ -134,8 +134,12 @@ define Host/Install
+ 		INSTALL_TOP="$(STAGING_DIR_HOSTPKG)" \
+ 		install
+ 
+-	$(LN) $(STAGING_DIR_HOSTPKG)/bin/lua5.1 $(STAGING_DIR_HOSTPKG)/bin/lua
+-	$(LN) $(STAGING_DIR_HOSTPKG)/bin/luac5.1 $(STAGING_DIR_HOSTPKG)/bin/luac
+	$(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/lib/pkgconfig
+	$(CP) $(HOST_BUILD_DIR)/etc/lua.pc $(STAGING_DIR_HOSTPKG)/lib/pkgconfig/lua5.1.pc
+
+	$(LN) lua5.1 $(STAGING_DIR_HOSTPKG)/bin/lua
+	$(LN) luac5.1 $(STAGING_DIR_HOSTPKG)/bin/luac
+	$(LN) lua5.1.pc $(STAGING_DIR_HOSTPKG)/lib/pkgconfig/lua.pc
+ endef
+ 
+ define Build/InstallDev
+-- 
+2.25.1
+
--- a/feeds/third-party/chilli-redirect/files/usr/share/ucentral/templates/third-party/chilli-redirect.uc
+++ b/feeds/third-party/chilli-redirect/files/usr/share/ucentral/templates/third-party/chilli-redirect.uc
@@ -20,6 +20,8 @@ let keys = {
 	uamserver: true,
 	radiussecret: true,
 	nasmac: true,
+	macauth: true,
+	macpassword: true,
 };
 %}

--- a/feeds/ucentral/ucentral-schema/Makefile
+++ b/feeds/ucentral/ucentral-schema/Makefile
@@ -6,7 +6,7 @@ PKG_RELEASE:=1
 PKG_SOURCE_URL=https://github.com/blogic/ucentral-schema.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_DATE:=2021-02-15
-PKG_SOURCE_VERSION:=2415d8838d44bd8a110c90f1d5d35f8499ac72b2
+PKG_SOURCE_VERSION:=8dd7c83a1c7a290edf0575cbcba450d3bc91bbbe

 PKG_MAINTAINER:=John Crispin <john@phrozen.org>
 PKG_LICENSE:=BSD-3-Clause
--- a/feeds/ucentral/ucentral-schema/files/etc/ucentral/examples/loop-detect.json
+++ b/feeds/ucentral/ucentral-schema/files/etc/ucentral/examples/loop-detect.json
@@ -0,0 +1,104 @@
+{
+	"uuid": 2,
+	"radios": [
+		{
+			"band": "2G",
+			"country": "CA",
+			"channel-mode": "HE",
+			"channel-width": 80,
+			"channel": 32
+		}
+	],
+
+	"switch": {
+		"loop-detection": {
+			"roles": [ "downstream" ]
+		}
+	},
+
+	"interfaces": [
+		{
+			"name": "WAN",
+			"role": "upstream",
+			"services": [ "lldp" ],
+			"ethernet": [
+				{
+					"select-ports": [
+						"WAN*"
+					]
+				}
+			],
+			"ipv4": {
+				"addressing": "dynamic"
+			},
+			"ssids": [
+				{
+					"name": "OpenWifi",
+					"wifi-bands": [
+						"2G"
+					],
+					"bss-mode": "ap",
+					"encryption": {
+						"proto": "psk2",
+						"key": "OpenWifi",
+						"ieee80211w": "optional"
+					}
+				}
+			]
+		},
+		{
+			"name": "LAN",
+			"role": "downstream",
+			"services": [ "ssh", "lldp" ],
+			"ethernet": [
+				{
+					"select-ports": [
+						"LAN*"
+					]
+				}
+			],
+			"ipv4": {
+				"addressing": "static",
+				"subnet": "192.168.1.1/24",
+				"dhcp": {
+					"lease-first": 10,
+					"lease-count": 100,
+					"lease-time": "6h"
+				}
+			},
+			"ssids": [
+				{
+					"name": "OpenWifi",
+					"wifi-bands": [
+						"2G"
+					],
+					"bss-mode": "ap",
+					"encryption": {
+						"proto": "psk2",
+						"key": "OpenWifi",
+						"ieee80211w": "optional"
+					}
+				}
+			]
+
+		}
+	],
+	"metrics": {
+		"statistics": {
+			"interval": 120,
+			"types": [ "ssids", "lldp", "clients" ]
+		},
+		"health": {
+			"interval": 120
+		}
+	},
+	"services": {
+		"lldp": {
+			"describe": "uCentral",
+			"location": "universe"
+		},
+		"ssh": {
+			"port": 22
+		}
+	}
+}
--- a/feeds/ucentral/ustp/Makefile
+++ b/feeds/ucentral/ustp/Makefile
@@ -10,11 +10,11 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=ustp
 PKG_RELEASE:=1

-PKG_SOURCE_URL:=https://github.com/nbd168/ustp
+PKG_SOURCE_URL=$(PROJECT_GIT)/project/ustp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2021-08-24
-PKG_SOURCE_VERSION:=fd93aaef9ba99188e30731651c589a2ab9bfc421
-PKG_MIRROR_HASH:=ef99770c4992e236feb46efef7ded68b77de8dbd0a8aa99ab71788e7b35f9b58
+PKG_SOURCE_DATE:=2021-08-27
+PKG_SOURCE_VERSION:=25555611be916da7fe8cb53f85c741a51ddffa1c
+PKG_MIRROR_HASH:=d84d05b1a05279f2efe4aa6a27ac9590381636091cb1ec2aba72a604f58cddae

 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name
 PKG_LICENSE:=GPL-2.0
--- a/feeds/wifi-ax/hostapd/patches/740-snoop_iface.patch
+++ b/feeds/wifi-ax/hostapd/patches/740-snoop_iface.patch
@@ -10,7 +10,36 @@
 
 --- a/src/ap/x_snoop.c
 +++ b/src/ap/x_snoop.c
-@@ -71,8 +71,12 @@ x_snoop_get_l2_packet(struct hostapd_dat
+@@ -31,14 +31,16 @@ int x_snoop_init(struct hostapd_data *ha
+ 		return -1;
+ 	}
+ 
+-	if (hostapd_drv_br_port_set_attr(hapd, DRV_BR_PORT_ATTR_HAIRPIN_MODE,
+	if (!conf->snoop_iface[0] &&
+	    hostapd_drv_br_port_set_attr(hapd, DRV_BR_PORT_ATTR_HAIRPIN_MODE,
+ 					 1)) {
+ 		wpa_printf(MSG_DEBUG,
+ 			   "x_snoop: Failed to enable hairpin_mode on the bridge port");
+ 		return -1;
+ 	}
+ 
+-	if (hostapd_drv_br_port_set_attr(hapd, DRV_BR_PORT_ATTR_PROXYARP, 1)) {
+	if (!conf->snoop_iface[0] &&
+	    hostapd_drv_br_port_set_attr(hapd, DRV_BR_PORT_ATTR_PROXYARP, 1)) {
+ 		wpa_printf(MSG_DEBUG,
+ 			   "x_snoop: Failed to enable proxyarp on the bridge port");
+ 		return -1;
+@@ -52,7 +54,8 @@ int x_snoop_init(struct hostapd_data *ha
+ 	}
+ 
+ #ifdef CONFIG_IPV6
+-	if (hostapd_drv_br_set_net_param(hapd, DRV_BR_MULTICAST_SNOOPING, 1)) {
+	if (!conf->snoop_iface[0] &&
+	    hostapd_drv_br_set_net_param(hapd, DRV_BR_MULTICAST_SNOOPING, 1)) {
+ 		wpa_printf(MSG_DEBUG,
+ 			   "x_snoop: Failed to enable multicast snooping on the bridge");
+ 		return -1;
+@@ -71,8 +74,12 @@ x_snoop_get_l2_packet(struct hostapd_dat
 {
 	struct hostapd_bss_config *conf = hapd->conf;
 	struct l2_packet_data *l2;
--- a/patches/0032-ipq40xx-add-tplink-ec420-support.patch
+++ b/patches/0032-ipq40xx-add-tplink-ec420-support.patch
@@ -1,25 +1,38 @@
-From 07b09c01d002572c58d37de90d9b69d89a179de8 Mon Sep 17 00:00:00 2001
+From fa71a84201e148d5eb9c36cb7acb9d9d2fa8fca9 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Fri, 18 Jun 2021 11:07:02 +0200
 Subject: [PATCH 1/7] ipq40xx: add tplink ec420 support

 Signed-off-by: John Crispin <john@phrozen.org>
 ---
+ package/boot/uboot-envtools/files/ipq40xx     |   1 +
 package/firmware/ipq-wifi/Makefile            |   4 +-
 .../ipq-wifi/board-tp-link_ec420-g1.qca4019   | Bin 0 -> 607304 bytes
 .../ipq-wifi/board-tp-link_ec420-g1.qca9984   | Bin 0 -> 171916 bytes
 .../ipq40xx/base-files/etc/board.d/02_network |   3 +-
 .../etc/hotplug.d/firmware/11-ath10k-caldata  |  11 +-
 .../base-files/lib/upgrade/platform.sh        |   3 +-
- .../dts/qcom-ipq4019-tp-link-ec420-g1.dts     | 276 ++++++++++++++++++
+ .../dts/qcom-ipq4019-tp-link-ec420-g1.dts     | 275 ++++++++++++++++++
 target/linux/ipq40xx/image/generic.mk         |  15 +
 .../patches-5.4/998-tp-link-ec420-g1.patch    |  12 +
- 9 files changed, 316 insertions(+), 8 deletions(-)
+ 10 files changed, 316 insertions(+), 8 deletions(-)
 create mode 100644 package/firmware/ipq-wifi/board-tp-link_ec420-g1.qca4019
 create mode 100644 package/firmware/ipq-wifi/board-tp-link_ec420-g1.qca9984
 create mode 100755 target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-tp-link-ec420-g1.dts
 create mode 100644 target/linux/ipq40xx/patches-5.4/998-tp-link-ec420-g1.patch

+diff --git a/package/boot/uboot-envtools/files/ipq40xx b/package/boot/uboot-envtools/files/ipq40xx
+index b24cbf979e..44a8688dbe 100644
+--- a/package/boot/uboot-envtools/files/ipq40xx
+++ b/package/boot/uboot-envtools/files/ipq40xx
+@@ -59,6 +59,7 @@ linksys,ea8300 |\
+ linksys,mr8300)
+ 	ubootenv_add_uci_config "/dev/mtd7" "0x0" "0x40000" "0x20000"
+ 	;;
+tp-link,ec420-g1 |\
+ zyxel,nbg6617)
+ 	ubootenv_add_uci_config "/dev/mtd6" "0x0" "0x10000" "0x10000"
+ 	;;
 diff --git a/package/firmware/ipq-wifi/Makefile b/package/firmware/ipq-wifi/Makefile
 index 513ad4ea67..87dcf9a769 100644
 --- a/package/firmware/ipq-wifi/Makefile
@@ -1148,10 +1161,10 @@ index 5582696759..530545e442 100644
 	alfa-network,ap120c-ac)
 diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-tp-link-ec420-g1.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-tp-link-ec420-g1.dts
 new file mode 100755
-index 0000000000..fc48e605d5
+index 0000000000..9f6fdd5e76
 --- /dev/null
 +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-tp-link-ec420-g1.dts
-@@ -0,0 +1,276 @@
+@@ -0,0 +1,275 @@
 +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 +
 +#include "qcom-ipq4019.dtsi"
@@ -1344,7 +1357,6 @@ index 0000000000..fc48e605d5
 +			partition5@e0000 {
 +				label = "0:APPSBLENV";
 +				reg = <0x000e0000 0x00010000>;
-+				read-only;
 +			};
 +			partition6@f0000 {
 +				label = "0:APPSBL";
@@ -1429,7 +1441,7 @@ index 0000000000..fc48e605d5
 +};
 +
 diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk
-index 487bba77b0..ee648edc50 100644
+index 487bba77b0..860b5e03bf 100644
 --- a/target/linux/ipq40xx/image/generic.mk
 +++ b/target/linux/ipq40xx/image/generic.mk
@@ -820,3 +820,18 @@ define Device/zyxel_wre6606
@@ -1448,7 +1460,7 @@ index 487bba77b0..ee648edc50 100644
 +	BLOCKSIZE := 128k
 +	PAGESIZE := 2048
 +	SUPPORTED_DEVICES := tp-link,ec420-g1
-+	DEVICE_PACKAGES := ath10k-firmware-qca9984-ct ipq-wifi-tp-link_ec420-g1
+	DEVICE_PACKAGES := ath10k-firmware-qca9984-ct ipq-wifi-tp-link_ec420-g1 uboot-envtools
 +endef
 +TARGET_DEVICES += tp-link_ec420_g1
 diff --git a/target/linux/ipq40xx/patches-5.4/998-tp-link-ec420-g1.patch b/target/linux/ipq40xx/patches-5.4/998-tp-link-ec420-g1.patch
--- a/patches/0042-base-files-fix-rootfs_data_max-support-during-sysupg.patch
+++ b/patches/0042-base-files-fix-rootfs_data_max-support-during-sysupg.patch
@@ -0,0 +1,26 @@
+From b673b8dad0cb6392c7097dfe75b2919b13ecd1c6 Mon Sep 17 00:00:00 2001
+From: John Crispin <john@phrozen.org>
+Date: Tue, 17 Aug 2021 17:29:22 +0200
+Subject: [PATCH] base-files: fix rootfs_data_max support during sysupgrade
+
+Signed-off-by: John Crispin <john@phrozen.org>
+---
+ package/base-files/files/sbin/sysupgrade | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade
+index 7e0a00e13b..5a2d459013 100755
+--- a/package/base-files/files/sbin/sysupgrade
+++ b/package/base-files/files/sbin/sysupgrade
+@@ -357,6 +357,8 @@ if [ $TEST -eq 1 ]; then
+ 	exit 0
+ fi
+ 
+fw_printenv > /dev/null
+
+ install_bin /sbin/upgraded
+ v "Commencing upgrade. Closing all shell sessions."
+ 
+-- 
+2.25.1
+
--- a/patches/0043-ipq40xx-add-HFCL-ION4-support.patch
+++ b/patches/0043-ipq40xx-add-HFCL-ION4-support.patch
@@ -1,4 +1,4 @@
-From e3a96108c0773915b53a08d04a98192338c5aeb9 Mon Sep 17 00:00:00 2001
+From f9a7699980b31760712245ea1dab0641ac7425e1 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Thu, 26 Aug 2021 17:34:47 +0200
 Subject: [PATCH] ipq40xx: add HFCL ION4 support
@@ -12,17 +12,17 @@ Signed-off-by: John Crispin <john@phrozen.org>
 .../etc/hotplug.d/firmware/11-ath10k-caldata  |   6 +
 .../base-files/lib/upgrade/platform.sh        |   1 +
 .../arm/boot/dts/qcom-ipq4019-hfcl-ion4.dts   | 226 ++++++++++++++++++
- target/linux/ipq40xx/image/generic.mk         |  19 ++
+ target/linux/ipq40xx/image/generic.mk         |  18 ++
 .../ipq40xx/patches-5.4/999-hfcl_ion.patch    |  12 +
- 9 files changed, 276 insertions(+), 1 deletion(-)
+ 9 files changed, 275 insertions(+), 1 deletion(-)
 create mode 100644 target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-hfcl-ion4.dts
 create mode 100644 target/linux/ipq40xx/patches-5.4/999-hfcl_ion.patch

 diff --git a/package/boot/uboot-envtools/files/ipq40xx b/package/boot/uboot-envtools/files/ipq40xx
-index ac66a7f2bd..9d39350544 100644
+index ab489a6e18..fd7ad69eff 100644
 --- a/package/boot/uboot-envtools/files/ipq40xx
 +++ b/package/boot/uboot-envtools/files/ipq40xx
-@@ -63,6 +63,10 @@ linksys,mr8300)
+@@ -64,6 +64,10 @@ tp-link,ec420-g1 |\
 zyxel,nbg6617)
 	ubootenv_add_uci_config "/dev/mtd6" "0x0" "0x10000" "0x10000"
 	;;
@@ -55,7 +55,7 @@ index 23fc4caa2e..e887e5ad1c 100644
 
 $(foreach PACKAGE,$(ALLWIFIPACKAGES),$(eval $(call BuildPackage,$(PACKAGE))))
 diff --git a/target/linux/ipq40xx/base-files/etc/board.d/01_leds b/target/linux/ipq40xx/base-files/etc/board.d/01_leds
-index efd5d002db..57d3664423 100755
+index efd5d002db..85fa1bcfbf 100755
 --- a/target/linux/ipq40xx/base-files/etc/board.d/01_leds
 +++ b/target/linux/ipq40xx/base-files/etc/board.d/01_leds
@@ -70,6 +70,10 @@ zyxel,wre6606)
@@ -119,7 +119,7 @@ index 7ebe0396f6..c404f32f41 100644
 		;;
 diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-hfcl-ion4.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-hfcl-ion4.dts
 new file mode 100644
-index 0000000000..662eb7dff0
+index 0000000000..7437b98c02
 --- /dev/null
 +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-hfcl-ion4.dts
@@ -0,0 +1,226 @@
@@ -350,11 +350,11 @@ index 0000000000..662eb7dff0
 +	vlan_tag = <0 0x20>;
 +};
 diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk
-index 7cbfecb233..896f2a657c 100644
+index 93a896e75d..ac7a5c7dfa 100644
 --- a/target/linux/ipq40xx/image/generic.mk
 +++ b/target/linux/ipq40xx/image/generic.mk
-@@ -861,3 +861,22 @@ define Device/tp-link_ec420_g1
- 	DEVICE_PACKAGES := ath10k-firmware-qca9984-ct ipq-wifi-tp-link_ec420-g1
+@@ -861,3 +861,21 @@ define Device/tp-link_ec420_g1
+ 	DEVICE_PACKAGES := ath10k-firmware-qca9984-ct ipq-wifi-tp-link_ec420-g1 uboot-envtools
 endef
 TARGET_DEVICES += tp-link_ec420_g1
 +
@@ -373,7 +373,6 @@ index 7cbfecb233..896f2a657c 100644
 +	IMAGES := nand-sysupgrade.bin
 +	IMAGE/nand-sysupgrade.bin := sysupgrade-tar | append-metadata
 +	DEVICE_PACKAGES := uboot-envtools
-+	_DEVICE_PACKAGES := ipq-wifi-hfcl_ion4 uboot-envtools
 +endef
 +TARGET_DEVICES += hfcl_ion4
 diff --git a/target/linux/ipq40xx/patches-5.4/999-hfcl_ion.patch b/target/linux/ipq40xx/patches-5.4/999-hfcl_ion.patch
--- a/profiles/container.yml
+++ b/profiles/container.yml
@@ -1,6 +1,12 @@
 ---
 description: Add the container dependencies
+feeds:
+  - name: container
+    path: ../../feeds/container
 packages:
-  - procd-ujail
-  - procd-ujail-console
+  - apk
+  - uvol
  - uxc
+  - blockd
+  - procd-ujail-console
+  - kmod-veth
--- a/profiles/edgecore_ecw5211.yml
+++ b/profiles/edgecore_ecw5211.yml
@@ -6,6 +6,7 @@ description: Build image for the Edgecore ECW5211
 image: bin/targets/ipq40xx/generic/openwrt-ipq40xx-generic-edgecore_ecw5211-squashfs-nand-sysupgrade.bin
 include:
  - ucentral-ap
+  - container
 packages:
  - ath10k-firmware-qca4019-ct-htt
  - ath10k-firmware-qca9888-ct-htt
--- a/profiles/edgecore_spw2ac1200.yml
+++ b/profiles/edgecore_spw2ac1200.yml
@@ -6,6 +6,7 @@ description: Build image for the Edgecore spw2ac1200
 image: bin/targets/ipq40xx/generic/openwrt-ipq40xx-generic-edgecore_spw2ac1200-squashfs-nand-sysupgrade.bin
 include:
  - ucentral-ap
+  - container
 packages:
  - ath10k-firmware-qca4019-ct-htt
  - ath10k-firmware-qca9888-ct-htt
--- a/profiles/indio_um-305ac.yml
+++ b/profiles/indio_um-305ac.yml
--- a/profiles/linksys_e8450-ubi.yml
+++ b/profiles/linksys_e8450-ubi.yml
@@ -6,6 +6,7 @@ description: Build image for the Linksys E8450
 image: bin/targets/mediatek/mt7622/openwrt-mediatek-mt7622-linksys_e8450-ubi-squashfs-sysupgrade.itb
 include:
  - ucentral-ap
+  - container
 diffconfig: |
  CONFIG_TESTING_KERNEL=y
  CONFIG_TARGET_ROOTFS_INITRAMFS=y
--- a/profiles/tplink_ec420.yml
+++ b/profiles/tplink_ec420.yml
@@ -6,6 +6,7 @@ description: Build image for the TP-Link EC420
 image: bin/targets/ipq40xx/generic/openwrt-ipq40xx-generic-tp-link_ec420_g1-squashfs-nand-sysupgrade.bin
 include:
  - ucentral-ap
+  - container
 packages:
  - ath10k-firmware-qca4019-ct-htt
  - ath10k-firmware-qca9888-ct-htt
Author	SHA1	Message	Date
John Crispin	bcd07e4a15	ucentral-schema: update to latest HEAD * minor fixes to handling of boolean values Signed-off-by: John Crispin <john@phrozen.org>	2021-09-08 08:22:32 +02:00
John Crispin	958e14efb0	proxy_arp: fix a race condition between hostapd and netifd * both daemons were racing against eachother causing the wifi to sometimes not get started Signed-off-by: John Crispin <john@phrozen.org>	2021-09-02 13:55:54 +02:00
John Crispin	d0a0715628	chilli-redirect: add 2 more parameters Signed-off-by: John Crispin <john@phrozen.org>	2021-08-30 19:25:00 +02:00
John Crispin	e5630c6a57	profiles: remove executable bit from indio profile Signed-off-by: John Crispin <john@phrozen.org>	2021-08-30 07:01:37 +02:00
John Crispin	6524e6ab7f	ipq40xx: drop dead code from image Makefile Signed-off-by: John Crispin <john@phrozen.org>	2021-08-30 07:01:37 +02:00
John Crispin	2303a32b9c	uxc: backport required packages for container support Signed-off-by: John Crispin <john@phrozen.org>	2021-08-30 06:55:36 +02:00
John Crispin	72d33747fe	spanning-tree: finalize support * update realtek kernel * update netifd * add to data-model * add bdpu filtewr support to the bridge layer Signed-off-by: John Crispin <john@phrozen.org>	2021-08-30 06:54:13 +02:00