From 0a58e79a84a00c3e122bc760160e56732013a4a9 Mon Sep 17 00:00:00 2001
From: Bob Idle <102661087+bobidle@users.noreply.github.com>
Date: Mon, 1 Jul 2024 12:01:36 +0200
Subject: [PATCH] Update to Gluon v2023.2.3 (#49)

* Update to Gluon v2023.2.2

* Update to Gluon v2023.2.3
---
 gluon                   |  2 +-
 image-customization.lua | 27 +++++++++++++++++++++++++++
 site.mk                 | 35 +----------------------------------
 3 files changed, 29 insertions(+), 35 deletions(-)
 create mode 100644 image-customization.lua

diff --git a/gluon b/gluon
index b9a621f..ec72498 160000
--- a/gluon
+++ b/gluon
@@ -1 +1 @@
-Subproject commit b9a621f68c909fc1de550ce165681ae14b75d915
+Subproject commit ec72498a44c66a512ceeb45d89cf9ea8f4e5eda8
diff --git a/image-customization.lua b/image-customization.lua
new file mode 100644
index 0000000..d3b4764
--- /dev/null
+++ b/image-customization.lua
@@ -0,0 +1,27 @@
+features {
+	'alfred',
+	'autoupdater',
+	'config-mode-domain-select',
+	'ebtables-filter-multicast',
+	'ebtables-filter-ra-dhcp',
+	'ebtables-limit-arp',
+	'ebtables-source-filter',
+	'mesh-batman-adv-15',
+	'mesh-vpn-fastd',
+	'respondd',
+	'scheduled-domain-switch',
+	'status-page',
+	'web-admin',
+	'web-advanced',
+	'web-private-wifi',
+	'web-wizard',
+}
+
+packages {
+	'iwinfo',
+	'respondd-module-airtime',
+}
+
+if not device_class('tiny') then
+	features {'wireless-encryption-wpa3'}
+end
diff --git a/site.mk b/site.mk
index 64ab898..531ade5 100644
--- a/site.mk
+++ b/site.mk
@@ -1,48 +1,15 @@
-##	GLUON_FEATURES
-#		Specify Gluon features/packages to enable;
-#		Gluon will automatically enable a set of packages
-#		depending on the combination of features listed
-
-GLUON_FEATURES := \
-	alfred \
-	autoupdater \
-	config-mode-domain-select \
-	scheduled-domain-switch \
-	ebtables-filter-multicast \
-	ebtables-filter-ra-dhcp \
-	ebtables-limit-arp \
-	ebtables-source-filter \
-	mesh-batman-adv-15 \
-	mesh-vpn-fastd \
-	respondd \
-	status-page \
-	web-admin \
-	web-advanced \
-	web-private-wifi \
-	web-wizard
-
 ##	GLUON_MULTIDOMAIN
 #		Build gluon with multidomain support.
 
 GLUON_MULTIDOMAIN := 1
 
-##	GLUON_SITE_PACKAGES
-#		Specify additional Gluon/OpenWrt packages to include here;
-#		A minus sign may be prepended to remove a packages from the
-#		selection that would be enabled by default or due to the
-#		chosen feature flags
-
-GLUON_SITE_PACKAGES := \
-	iwinfo \
-	respondd-module-airtime
-
 ##	DEFAULT_GLUON_RELEASE
 #		version string to use for images
 #		gluon relies on
 #			opkg compare-versions "$1" '>>' "$2"
 #		to decide if a version is newer or not.
 
-DEFAULT_GLUON_RELEASE := 2022.1.4
+DEFAULT_GLUON_RELEASE := 2023.2.3.0
 
 # Variables set with ?= can be overwritten from the command line