From 6e9685048bd484b5afac98fa9ab141e1e5c95674 Mon Sep 17 00:00:00 2001
From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Date: Sun, 20 Jun 2021 20:17:44 +0200
Subject: [PATCH] OpenWrt: bump to v21.02.0-rc3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bump core, packages and routing.

Refresh patches.

This includes babeld 1.10.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Reviewed-by: Fabian Bläse <fabian@blaese.de>
---
 buildscript                                         |  6 +++---
 .../0020-fastd_generate_key_from_urandom.patch      | 13 ++-----------
 ...beld-Include-PKG_RELEASE-in-babeld-version.patch |  4 ++--
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/buildscript b/buildscript
index 47b29c1..b33624e 100755
--- a/buildscript
+++ b/buildscript
@@ -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"
diff --git a/feed_patches/openwrt/0020-fastd_generate_key_from_urandom.patch b/feed_patches/openwrt/0020-fastd_generate_key_from_urandom.patch
index 4b7beb1..55ed709 100644
--- 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
-
diff --git 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
index e85bd91..db594e5 100644
--- 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"