Merge pull request #1 from T0biii/patch-2

v2.3.2
freifunkMUC · May 15, 2024 · c32579e · c32579e
2 parents 333d487 + ff23a98
commit c32579e
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -11,7 +11,7 @@ RUN \
   cd openwrt; \
   git reset --hard 6fc02f2a45e151ce16677d6131251af86ab4fc06; \
   \
-  git clone -b v2.3.1 https://github.com/ffulm/firmware.git; \
+  git clone -b v2.3.2 https://github.com/freifunkMUC/ffulm-firmware.git; \
   cp -rf firmware/files firmware/package firmware/feeds.conf .; \
   \
   ./scripts/feeds update -a; \

diff --git a/files/etc/config/autoupdater b/files/etc/config/autoupdater
@@ -6,6 +6,10 @@ config branch stable
 	# The branch name given in the manifest
 	option name 'stable'
 
+	list mirror 'http://5.1.66.255/ulm'
+	list mirror 'http://185.150.99.255/ulm'
+	list mirror 'http://[2001:678:e68:f000::]/ulm'
+	list mirror 'http://[2001:678:ed0:f000::]/ulm'
 	list mirror 'http://[fdef:17a0:fff1:300::4]/freifunk/firmware/autoupdater'
 	list mirror 'http://[fdef:17a0:fff1:300::5]/freifunk/firmware/autoupdater'
 
@@ -27,3 +31,14 @@ config branch stable
 	list pubkey '65c273c3fab43f81b8620d30700a30ed49d8035c3072941cadd94f1339a7e850' #foschum
 	list pubkey '1ac49f73f9de9943634b2cf25e2212e67f654dbb0c8a913743ef3087d35f7b0a' #mk070'
 	list pubkey '761cf21ec0161173469e6adbc04247d4c9085dc3a7ecb4a462ef7ef9a7123e7b' #flo
+        list pubkey '6dcfc670a4150e16962c1852066669d9b337f168d0f6a863ed930968c2f047eb' #awlnx
+        list pubkey 'dc44c9810a0470b2de63990128dbae392a836f4385d23e57eb72880ea8fbcf16' #django
+        list pubkey '5700c7a266d80aa1c6c33f29835a7b200bdd500e88ee86c0a63e24a0023364f6' #krombel
+        list pubkey '216a34d34a15688e127d8d90e6c57587aa8c682b0648322f68338487657fd5ff' #lukesix
+        list pubkey '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b' #ole
+        list pubkey '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc' #chris
+        list pubkey '3cc6dc6d0d7499d4d17cacad5f16336634e0b26700807f29cc241eaabbde481f' #goligo
+        list pubkey 'e7a50df4bc8875113eaf75dff5204e8753a9189baeed40c6db0509398a428820' #thegoliath
+        list pubkey '50bafd8216cab2ee1c11c215b528dd7c6396f3edfdab689c70ca04a9f284b931' #grische
+        list pubkey 'cc7e3a6a4788d4246075923b298634f14a4fd179020ef6369fb74d601f55cc84' #ff_mgk
+        list pubkey '18fecc717a237ea5702fb97fa4689f9307d0267e3ee8f09377dbed99397b77b9' #t0biii
diff --git a/files/etc/config/freifunk b/files/etc/config/freifunk
@@ -5,7 +5,7 @@ config settings
 	option longitude ''
 	option contact ''
 	option community 'ulm'
-	option version '2.3.1'
+	option version '2.3.2'
 	option publish_map 'basic'
 	option allow_access_from 'lan'
 	option service_link ''

diff --git a/files/etc/uci-defaults/50_freifunk-setup b/files/etc/uci-defaults/50_freifunk-setup
@@ -630,6 +630,12 @@ update_230_to_231() {
 	cp /rom/etc/uhttpd.key /etc/ 2> /dev/null
 }
 
+update_231_to_232() {
+	# Preserve self signed certificates
+	cp /rom/etc/uhttpd.crt /etc/ 2> /dev/null
+	cp /rom/etc/uhttpd.key /etc/ 2> /dev/null
+}
+
 start()
 {
 	echo "(I) Start freifunk_setup"
@@ -665,6 +671,7 @@ start()
 			update_210_to_220
 			update_220_to_230
 			update_230_to_231
+			update_231_to_232
 			update_version
 			;;
 		0.5.1*)
@@ -681,6 +688,7 @@ start()
 			update_210_to_220
 			update_220_to_230
 			update_230_to_231
+			update_231_to_232
 			update_version
 			;;
 		0.6.0*)
@@ -696,6 +704,7 @@ start()
 			update_210_to_220
 			update_220_to_230
 			update_230_to_231
+			update_231_to_232
 			update_version
 			;;
 		0.6.1*)
@@ -710,6 +719,7 @@ start()
 			update_210_to_220
 			update_220_to_230
 			update_230_to_231
+			update_231_to_232
 			update_version
 			;;
 		0.6.2*)
@@ -723,6 +733,7 @@ start()
 			update_210_to_220
 			update_220_to_230
 			update_230_to_231
+			update_231_to_232
 			update_version
 			;;
 		0.6.3*)
@@ -735,6 +746,7 @@ start()
 			update_210_to_220
 			update_220_to_230
 			update_230_to_231
+			update_231_to_232
 			update_version
 			;;
 		0.6.4*)
@@ -746,6 +758,7 @@ start()
 			update_210_to_220
 			update_220_to_230
 			update_230_to_231
+			update_231_to_232
 			update_version
 			;;
 		0.6.5*)
@@ -756,6 +769,7 @@ start()
 			update_210_to_220
 			update_220_to_230
 			update_230_to_231
+			update_231_to_232
 			update_version
 			;;
 		1.0.0*)
@@ -765,6 +779,7 @@ start()
 			update_210_to_220
 			update_220_to_230
 			update_230_to_231
+			update_231_to_232
 			update_version
 			;;
 		2.0.0*)
@@ -773,25 +788,35 @@ start()
 			update_210_to_220
 			update_220_to_230
 			update_230_to_231
+			update_231_to_232
 			update_version
 			;;
 		2.1.0*)
 			echo "(I) Apply update."
 			update_210_to_220
 			update_220_to_230
 			update_230_to_231
+			update_231_to_232
 			update_version
 			;;
 		2.2.0*)
 			echo "(I) Apply update."
 			update_220_to_230
 			update_230_to_231
+			update_231_to_232
 			update_version
 			;;
 
 		2.3.0*)
 			echo "(I) Apply update."
 			update_230_to_231
+			update_231_to_232
+			update_version
+			;;
+
+		2.3.1*)
+			echo "(I) Apply update."
+			update_231_to_232
 			update_version
 			;;
 

diff --git a/package/autoupdater/files/usr/sbin/autoupdater b/package/autoupdater/files/usr/sbin/autoupdater
@@ -166,7 +166,7 @@ autoupdate() {
     fi
     echo "Upgrading firmware."
     [ $force -eq 0 ] && sleep $APPLY_DELAY
-    sysupgrade "${fw_image}"
+    sysupgrade -F "${fw_image}"
   else
     echo "No new firmware available" >&2
   fi