Merge pull request #2920 from herbetom/next-23.05

modules: switch to openwrt-23.05

patches/packages/routing/0008-oonf-olsrd2-add-git-version-for-compile-in.patch

-From: Patrick Grimm <patrick@lunatiki.de>
-Date: Sat, 14 Jan 2023 00:09:34 +0100
-Subject: oonf-olsrd2: add git version for compile in
-
-Compile tested: mips_24kc, arm_cortex-a9_vfpv3-d16, i386_pentium4, x86_64, i386_pentium-mmx, mipsel_24kc
-
-Signed-off-by: Patrick Grimm <patrick@lunatiki.de>
-
-diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile
-index fe00dd1bc7969016856d5c3a19241d7750366352..15e5731a1612ae35cdc1d842dc0087cc31d4b290 100644
---- a/oonf-olsrd2/Makefile
-+++ b/oonf-olsrd2/Makefile
-@@ -37,6 +37,7 @@ CMAKE_OPTIONS+=-D CMAKE_BUILD_TYPE:String=$(BUILD_TYPE) \
-                -D UCI:Bool=true \
-                -D OONF_APP_DEFAULT_CFG_HANDLER:String=uci \
-                -D OONF_STATIC_PLUGINS:String="class;clock;duplicate_set;layer2;packet_socket;rfc5444;socket;stream_socket;telnet;timer;viewer;os_clock;os_fd;os_interface;os_routing;os_system;nhdp;olsrv2;ff_dat_metric;neighbor_probing;nl80211_listener;link_config;layer2info;systeminfo;cfg_uciloader;cfg_compact;nhdpinfo;olsrv2info;netjsoninfo;${CMAKE_OPTIONAL_PLUGINS}" \
-+               -D OONF_LIB_GIT:String=$(PKG_SOURCE_VERSION) \
-                -D VERSION_SUB_TAG:String=$(PKG_SOURCE_DATE) \
-                -D INSTALL_LIB_DIR:Path=lib/oonf \
-                -D INSTALL_INCLUDE_DIR:Path=include/oonf \

patches/packages/routing/0009-oonf-olsrd2-a-usable-default-configuration.patch

-From: Patrick Grimm <patrick@lunatiki.de>
-Date: Sat, 28 Jan 2023 11:28:00 +0100
-Subject: oonf-olsrd2: a usable default configuration
-
-Compile tested: mips_24kc, arm_cortex-a9_vfpv3-d16, i386_pentium4, x86_64, i386_pentium-mmx, mipsel_24kc
-
-Description:
-- OONF_OLSRV2_LAN_IMPORT for integration off other routing protocol (OLSR1, BGP, ...)
-- OONF_OLSRV2_ROUTE_MODIFIER for overwriting the link qualitty of a neighbor, called LinkQuality Multiplicator in OLSR1
-- OONF_GENERIC_REMOTECONTROL one of the goal of olsrv2
-- OONF_OLSRV2_MPR reduce the routing graph when the network gets bigger
-
-Signed-off-by: Patrick Grimm <patrick@lunatiki.de>
-
-diff --git a/oonf-olsrd2/Config.in b/oonf-olsrd2/Config.in
-index b0d7d7cb2767f7b12d089ccd44042e6788dcf9de..e4621e44e5a4ff55fbfe94ff7b4d5b9f27909034 100644
---- a/oonf-olsrd2/Config.in
-+++ b/oonf-olsrd2/Config.in
-@@ -12,13 +12,13 @@
- 		bool "Lan_import plugin enabled"
- 		help
- 			The lan_import plugin can read routing tables and automatically export them as locally attached networks in olsrd2.
--		default n
-+		default y
- 
- 	config OONF_OLSRV2_ROUTE_MODIFIER
- 		bool "route_modifier plugin enabled"
- 		help
- 			The route_modifier plugin allows you to overwrite aspects of routes (like table/protocol) for certain destinations. 
--		default n
-+		default y
- 
- 	config OONF_GENERIC_DLEP_ROUTER
- 		bool "dlep_router plugin enabled"
-@@ -30,7 +30,7 @@
- 		bool "remotecontrol plugin enabled"
- 		help
- 			The remotecontrol plugin allows you to control configuration and logging over the telnet plugin. Be careful not to open this functionality over the network without securing it.
--		default n
-+		default y
- 
- 	config OONF_GENERIC_HTTP
- 		bool "http plugin enabled"
-@@ -42,7 +42,7 @@
- 		bool "MPR plugin enabled"
- 		help
- 			The MPR plugin reduce the routing graph to limit the overhead of the OLSRv2 protocol
--		default n
-+		default y
- 
- 	config OONF_OLSRV2_LAN
- 		bool "New config option for Locally attached entries"

targets/ath79-generic

@@ -412,12 +412,6 @@ device('tp-link-archer-c6-v2-eu-ru-jp', 'tplink_archer-c6-v2', {
 	},
 })
 
-device('tp-link-archer-c60-v1', 'tplink_archer-c60-v1', {
-	packages = ATH10K_PACKAGES_QCA9888,
-	broken = true, -- OOM with 5GHz enabled in most environments
-	class = 'tiny', -- 64M ath9k + ath10k
-})
-
 device('tp-link-archer-c7-v2', 'tplink_archer-c7-v2', {
 	packages = ATH10K_PACKAGES_QCA9880,
 })
@@ -474,23 +468,6 @@ device('tp-link-eap225-outdoor-v1', 'tplink_eap225-outdoor-v1', {
 	packages = ATH10K_PACKAGES_QCA9888,
 })
 
-device('tp-link-re355-v1', 'tplink_re355-v1', {
-	manifest_aliases = {
-		'tp-link-re355', -- upgrade from OpenWrt 19.07
-	},
-	packages = ATH10K_PACKAGES_SMALLBUFFERS_QCA9880,
-	broken = true, -- OOM with 5GHz enabled in most environments if device is 64M RAM variant
-	class = 'tiny', -- Only 6M of usable Firmware space
-})
-
-device('tp-link-re450-v1', 'tplink_re450-v1', {
-	packages = ATH10K_PACKAGES_QCA9880,
-	manifest_aliases = {
-		'tp-link-re450', -- upgrade from OpenWrt 19.07
-	},
-	class = 'tiny', -- Only 6M of usable Firmware space
-})
-
 device('tp-link-tl-wdr3500-v1', 'tplink_tl-wdr3500-v1')
 device('tp-link-tl-wdr3600-v1', 'tplink_tl-wdr3600-v1')
 device('tp-link-tl-wdr4300-v1', 'tplink_tl-wdr4300-v1')
@@ -582,7 +559,7 @@ device('ubiquiti-unifi-ac-pro', 'ubnt_unifiac-pro', {
 	packages = ATH10K_PACKAGES_QCA9880,
 })
 
-device('ubiquiti-unifi-ap', 'ubnt_unifi', {
+device('ubiquiti-unifi-ap', 'ubnt_unifi-ap', {
 	aliases = {
 		'ubiquiti-unifi-ap-lr',
 	},

targets/generic

@@ -39,6 +39,8 @@ config('DEVEL', true)
 config('ALL_NONSHARED', true)
 
 try_config('PACKAGE_usbip', false) -- fails to build
+try_config('PACKAGE_coova-chilli', false) -- fails to build
+try_config('PACKAGE_kmod-ipt-coova', false) -- fails to build
 
 try_config('PACKAGE_ATH_DEBUG', true)
 
@@ -95,15 +97,17 @@ packages {
 	'-dnsmasq',
 	'-kmod-ipt-offload',
 	'-kmod-nft-offload',
+	'-libustream-mbedtls',
 	'-libustream-wolfssl',
 	'-libwolfssl',
+	'-mbedtls',
 	'-nftables',
 	'-odhcpd-ipv6only',
 	'-ppp',
 	'-ppp-mod-pppoe',
 	'-wpad-mini',
 	'-wpad-basic',
-	'-wpad-basic-wolfssl',
+	'-wpad-basic-mbedtls',
 	'-firewall4',
 	'gluon-core',
 	'ip6tables-zz-legacy',

targets/ipq40xx-generic

@@ -14,14 +14,6 @@ local ATH10K_PACKAGES_IPQ40XX_QCA9888 = {
 	'ath10k-firmware-qca9888',
 	'-ath10k-firmware-qca9888-ct',
 }
-local ATH10K_PACKAGES_IPQ40XX_SMALLBUFFERS = {
-	'-kmod-ath10k',
-	'kmod-ath10k-smallbuffers',
-	'-kmod-ath10k-ct',
-	'-kmod-ath10k-ct-smallbuffers',
-	'ath10k-firmware-qca4019',
-	'-ath10k-firmware-qca4019-ct',
-}
 
 
 defaults {
@@ -66,24 +58,10 @@ device('avm-fritz-repeater-1200', 'avm_fritzrepeater-1200', {
 })
 
 
--- EnGenius
-
-device('engenius-ens620ext', 'engenius_ens620ext', {
-	factory = false,
-	extra_images = {
-		{'-squashfs-factory_30', '-factory_fw30', '.bin'},
-		{'-squashfs-factory_35', '-factory_fw35', '.bin'},
-	},
-})
-
-
 -- GL.iNet
 
 device('gl.inet-gl-ap1300', 'glinet_gl-ap1300', {
-	factory = '-squashfs-nand-factory',
 	factory_ext = '.ubi',
-	sysupgrade = '-squashfs-nand-sysupgrade',
-	sysupgrade_ext = '.bin',
 })
 
 device('gl.inet-gl-b1300', 'glinet_gl-b1300', {
@@ -146,18 +124,9 @@ device('plasma-cloud-pa2200', 'plasmacloud_pa2200', {
 
 device('zyxel-nbg6617', 'zyxel_nbg6617')
 
-device('zyxel-wre6606', 'zyxel_wre6606', {
-	packages = ATH10K_PACKAGES_IPQ40XX_SMALLBUFFERS,
-	factory = false,
-	class = 'tiny', -- 128M ath10k + ath10k
-})
-
 
 -- 8devices
 
 device('8devices-jalapeno', '8dev_jalapeno', {
-	factory = '-squashfs-nand-factory',
 	factory_ext = '.ubi',
-	sysupgrade = '-squashfs-nand-sysupgrade',
-	sysupgrade_ext = '.bin',
 })

targets/ramips-mt7621

 -- ASUS
 
-device('asus-rt-ac57u', 'asus_rt-ac57u', {
+device('asus-rt-ac57u-v1', 'asus_rt-ac57u-v1', {
 	factory = false,
+	manifest_aliases = {
+		'asus-rt-ac57u', -- Upgrade from OpenWrt 22.03
+	},
 })
 
 
 -- Cudy
 
-device('cudy-wr1300', 'cudy_wr1300', {
+device('cudy-wr1300-v1', 'cudy_wr1300-v1', {
 	factory = false,
+	manifest_aliases = {
+		'cudy-wr1300', -- Upgrade from OpenWrt 22.03
+	},
 })
 
 device('cudy-wr2100', 'cudy_wr2100', {

targets/ramips-mt76x8

@@ -62,10 +62,6 @@ device('tp-link-re200-v2', 'tplink_re200-v2')
 
 device('tp-link-re200-v3', 'tplink_re200-v3')
 
-device('tp-link-re305', 'tplink_re305-v1', {
-	class = 'tiny', -- Only 6M of usable Firmware space
-})
-
 device('tp-link-tl-mr3020-v3', 'tplink_tl-mr3020-v3', {
 	factory = false,
 	extra_images = {