OpenWrt: bump to v21.02.0-rc3

Bump core, packages and routing. Refresh patches. This includes babeld 1.10. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
fff-sysupgrade: Keep ed25519 and ecdsa host key on system upgrade
2021-06-20 20:24:13 +02:00 · 2021-06-20 20:23:58 +02:00 · 2021-06-20 20:01:18 +02:00
6 changed files with 13 additions and 20 deletions
--- a/6
+++ b/6
@ -4,9 +4,9 @@
 builddir=./build

 # OpenWrt: package hashes correspond to core repo version
-OPENWRTREV="v21.02.0-rc1"
-PACKAGEREV="4ceeb8fc90ed2c2e650ddddc855e7ed1df071c22"
-ROUTINGREV="5b4d4c7fb6a97cac68c7d8b156fd0ab27bab4dcc"
+OPENWRTREV="v21.02.0-rc3"
+PACKAGEREV="e738d2faf1c4ed68094f1d5da075d2d92fb35049"
+ROUTINGREV="2baff33918c089fd3744c7192f8ae7a29c47a8d7"

 # Gluon packages: master from 2020-02-04
 GLUONREV="12e41d0ff07ec54bbd67a31ab50d12ca04f2238c"
--- a/feed_patches/openwrt/0020-fastd_generate_key_from_urandom.patch
+++ b/feed_patches/openwrt/0020-fastd_generate_key_from_urandom.patch
@ -1,16 +1,10 @@
-From 8e7de199282ba76a94a1b4370ac7712325b81fc2 Mon Sep 17 00:00:00 2001
 From: Robert Langhammer <rlanghammer@web.de>
 Date: Mon, 13 Nov 2017 21:04:55 +0100
-Subject: [PATCH] fastd_generate_key_from_urandom
-
---
- net/fastd/patches/001-generate_key_from_urandom.patch | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
- create mode 100644 net/fastd/patches/001-generate_key_from_urandom.patch
+Subject: fastd_generate_key_from_urandom

 diff --git a/net/fastd/patches/001-generate_key_from_urandom.patch b/net/fastd/patches/001-generate_key_from_urandom.patch
 new file mode 100644
-index 000000000..e06739a1e
+index 0000000000000000000000000000000000000000..e06739a1e715ab310d9b30ae704f615572d6b4b9
 --- /dev/null
 +++ b/net/fastd/patches/001-generate_key_from_urandom.patch
@@ -0,0 +1,14 @@
@ -28,6 +22,3 @@ index 000000000..e06739a1e
 + 	ecc_25519_gf_sanitize_secret(&secret_key, &secret_key);
 +
 + 	ecc_25519_work_t work;
-- 
-2.25.1
-
--- a/feed_patches/routing/0001-babeld-Include-PKG_RELEASE-in-babeld-version.patch
+++ b/feed_patches/routing/0001-babeld-Include-PKG_RELEASE-in-babeld-version.patch
@ -10,10 +10,10 @@ Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 Signed-off-by: Fabian Bläse <fabian@blaese.de>

 diff --git a/babeld/Makefile b/babeld/Makefile
-index 0b611286092464528135c15e100b3d6928f5a677..b0ed749e98714bf146b4e4be34d71484447b8ecb 100644
+index 056ce43d5ddb461ba94e51a5b18ffac0ef971468..16cc86fe5c2ae8731b0d7d2f64517e9b92d029f9 100644
 --- a/babeld/Makefile
 +++ b/babeld/Makefile
-@@ -49,6 +49,11 @@ MAKE_FLAGS+= \
+@@ -50,6 +50,11 @@ MAKE_FLAGS+= \
 	LDLIBS="" \
 	LDLIBS+="-lubus -lubox"
 
--- a/src/packages/fff/fff-sysupgrade/Makefile
+++ b/src/packages/fff/fff-sysupgrade/Makefile
@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=fff-sysupgrade
-PKG_RELEASE:=12
+PKG_RELEASE:=13

 include $(INCLUDE_DIR)/package.mk

--- a/src/packages/fff/fff-sysupgrade/files/etc/uci-defaults/99-fff-sysupgrade
+++ b/src/packages/fff/fff-sysupgrade/files/etc/uci-defaults/99-fff-sysupgrade
@ -4,8 +4,9 @@

 cat > /etc/sysupgrade.conf <<-__EOF__
 /etc/shadow
-/etc/dropbear/dropbear_dss_host_key
 /etc/dropbear/dropbear_rsa_host_key
+/etc/dropbear/dropbear_ecdsa_host_key
+/etc/dropbear/dropbear_ed25519_host_key
 /etc/dropbear/authorized_keys
 /etc/network.config
 /etc/config/fff
--- a/src/packages/fff/fff-wireguard/Makefile
+++ b/src/packages/fff/fff-wireguard/Makefile
@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=fff-wireguard
-PKG_RELEASE:=6
+PKG_RELEASE:=7

 include $(INCLUDE_DIR)/package.mk

@ -11,8 +11,9 @@ define Package/fff-wireguard
 	TITLE:=Freifunk-Franken wireguard
 	URL:=https://www.freifunk-franken.de
 	DEPENDS:= \
+		+kmod-wireguard \
 		+owipcalc \
-		+wireguard \
+		+wireguard-tools \
 		+fff-babeld \
 		+fff-network
 endef