Merge pull request #3370 from freifunk-gluon/openwrt-24.10

base: update to OpenWrt 24.10

contrib/docker/Dockerfile

@@ -9,7 +9,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     file \
     git \
     python3 \
+    python3-dev \
     python3-distutils \
+    python3-pyelftools \
+    python3-setuptools \
     build-essential \
     gawk \
     unzip \
@@ -26,6 +29,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     shellcheck \
     libnss-unknown \
     openssh-client \
+    swig \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 

docs/user/supported_devices.rst

@@ -339,10 +339,6 @@ mediatek-mt7622
 
   - UniFi 6 LR (v1)
 
-* Xiaomi
-
-  - AX3200 (RB03)
-
 mpc85xx-p1010
 -------------
 
@@ -461,8 +457,6 @@ ramips-mt7621
 
 * Ubiquiti
 
-  - EdgeRouter X
-  - EdgeRouter X-SFP
   - UniFi 6 Lite
   - UniFi nanoHD
 

modules

@@ -1,16 +1,16 @@
 GLUON_FEEDS='gluon packages routing'
 
 OPENWRT_REPO=https://github.com/openwrt/openwrt.git
-OPENWRT_BRANCH=openwrt-23.05
-OPENWRT_COMMIT=cd9998ef1b7b842bf052fc5e7034f23a22e67bf7
+OPENWRT_BRANCH=openwrt-24.10
+OPENWRT_COMMIT=45f9f1551223b516cccbcca1e252e722bb3dbc08
 
 PACKAGES_GLUON_REPO=https://github.com/freifunk-gluon/packages.git
 PACKAGES_GLUON_COMMIT=3d08b0fee8dc5d96d8bcdb985fad1d5564de4022
 
 PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git
-PACKAGES_PACKAGES_BRANCH=openwrt-23.05
-PACKAGES_PACKAGES_COMMIT=7ee4fe7705f8b44ccfd2ec9470e91c8d900a65ab
+PACKAGES_PACKAGES_BRANCH=openwrt-24.10
+PACKAGES_PACKAGES_COMMIT=d364dcb7e55ac4202853c48e2788f0d4fbb5c513
 
 PACKAGES_ROUTING_REPO=https://github.com/openwrt/routing.git
-PACKAGES_ROUTING_BRANCH=openwrt-23.05
-PACKAGES_ROUTING_COMMIT=67fb1bc0cbe1cf26748e83acb872513434bd0471
+PACKAGES_ROUTING_BRANCH=openwrt-24.10
+PACKAGES_ROUTING_COMMIT=3f15699240c076d5ee9ed697fa5ef45355423f6f

package/gluon-mesh-batman-adv/files/lib/netifd/proto/gluon_bat0.sh

@@ -47,7 +47,6 @@ proto_gluon_bat0_setup() {
 
 	batctl orig_interval 5000
 	batctl hop_penalty "$(lookup_uci 'gluon.mesh_batman_adv.hop_penalty' 15)"
-	batctl noflood_mark 0x4/0x4
 
 	case "$gw_mode" in
 		server)

patches/openwrt/0003-dropbear-add-a-failsafe-mode-that-will-always-allow-password-less-root-login.patch

@@ -6,13 +6,13 @@ Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
 
 diff --git a/package/network/services/dropbear/patches/700-failsafe-mode.patch b/package/network/services/dropbear/patches/700-failsafe-mode.patch
 new file mode 100644
-index 0000000000000000000000000000000000000000..bd9cf1ce4234d94bcc5b782cc753f59993f999bc
+index 0000000000000000000000000000000000000000..9b619ce80b2963c67ac62bcf95b33b28b505ad2a
 --- /dev/null
 +++ b/package/network/services/dropbear/patches/700-failsafe-mode.patch
 @@ -0,0 +1,57 @@
-+--- a/svr-auth.c
-++++ b/svr-auth.c
-+@@ -125,10 +125,11 @@ void recv_msg_userauth_request() {
++--- a/src/svr-auth.c
+++++ b/src/svr-auth.c
++@@ -124,10 +124,11 @@ void recv_msg_userauth_request() {
 + 				AUTH_METHOD_NONE_LEN) == 0) {
 + 		TRACE(("recv_msg_userauth_request: 'none' request"))
 + 		if (valid_user
@@ -28,38 +28,38 @@ index 0000000000000000000000000000000000000000..bd9cf1ce4234d94bcc5b782cc753f599
 + 		{
 + 			dropbear_log(LOG_NOTICE, 
 + 					"Auth succeeded with blank password for '%s' from %s",
-+--- a/svr-runopts.c
-++++ b/svr-runopts.c
-+@@ -77,6 +77,7 @@ static void printhelp(const char * progn
++--- a/src/svr-runopts.c
+++++ b/src/svr-runopts.c
++@@ -82,6 +82,7 @@ static void printhelp(const char * progn
 + 					"-s		Disable password logins\n"
 + 					"-g		Disable password logins for root\n"
 + 					"-B		Allow blank password logins\n"
-++					"-f		Failsafe mode: always allow password-less root login\n"
+++					"-f             Failsafe mode: always allow password-less root login\n"
++ 					"-t		Enable two-factor authentication (both password and public key required)\n"
 + #endif
 + 					"-T		Maximum authentication tries (default %d)\n"
-+ #if DROPBEAR_SVR_LOCALTCPFWD
-+@@ -144,6 +145,7 @@ void svr_getopts(int argc, char ** argv)
++@@ -166,6 +167,7 @@ void svr_getopts(int argc, char ** argv)
 + 	svr_opts.noauthpass = 0;
 + 	svr_opts.norootpass = 0;
 + 	svr_opts.allowblankpass = 0;
 ++	svr_opts.failsafe_mode = 0;
++ 	svr_opts.multiauthmethod = 0;
 + 	svr_opts.maxauthtries = MAX_AUTH_TRIES;
 + 	svr_opts.inetdmode = 0;
-+ 	svr_opts.portcount = 0;
-+@@ -266,6 +268,9 @@ void svr_getopts(int argc, char ** argv)
-+ 				case 'B':
-+ 					svr_opts.allowblankpass = 1;
++@@ -263,6 +265,9 @@ void svr_getopts(int argc, char ** argv)
++ 				case '2':
++ 					next = &reexec_fd_arg;
 + 					break;
 ++				case 'f':
 ++					svr_opts.failsafe_mode = 1;
 ++					break;
 + #endif
-+ 				case 'h':
-+ 					printhelp(argv[0]);
-+--- a/runopts.h
-++++ b/runopts.h
-+@@ -106,6 +106,8 @@ typedef struct svr_runopts {
-+ 	int allowblankpass;
++ 				case 'p':
++ 					nextisport = 1;
++--- a/src/runopts.h
+++++ b/src/runopts.h
++@@ -110,6 +110,8 @@ typedef struct svr_runopts {
++ 	int multiauthmethod;
 + 	unsigned int maxauthtries;
 + 
 ++	int failsafe_mode;