re-add patch

0001-disable-NFS-support-by-default.patch

@@ -0,0 +1,35 @@
+From 31dc49dee987500b0d5b5b536b6da2f3fbfd5b59 Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson@gmail.com>
+Date: Tue, 13 Jun 2023 09:36:50 +0100
+Subject: [v1] disable NFS support by default
+
+While NFS is widely used in data centres, and private
+networks it's quite a nuanced usecase for device firmware.
+A lot of devices already disable it.
+
+Various network protocols should really be opt in, not opt
+out, because they add extra size and are potential attack
+vectors from a security PoV. In the NFS case it doesn't
+really make sense for a lot of devices like tables, SBCs etc.
+It's also something we don't really want for SystemReady-IR
+due to security concerns.
+
+Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
+---
+
+v1: drop RFC tag
+
+ cmd/Kconfig                                               | 1 -
+
+diff --git a/cmd/Kconfig b/cmd/Kconfig
+index 365371fb511..a193929cec4 100644
+--- a/cmd/Kconfig
++++ b/cmd/Kconfig
+@@ -1848,7 +1848,6 @@ config CMD_RARP
+ 
+ config CMD_NFS
+ 	bool "nfs"
+-	default y
+ 	help
+ 	  Boot image via network using NFS protocol.
+ 

fix-release-rev.patch

@@ -0,0 +1,11 @@
+--- u-boot-2023.07/Makefile.orig	2023-07-11 11:47:16.996315851 +0100
++++ u-boot-2023.07/Makefile	2023-07-11 11:47:31.049391730 +0100
+@@ -3,7 +3,7 @@
+ VERSION = 2023
+ PATCHLEVEL = 07
+ SUBLEVEL =
+-EXTRAVERSION = -rc6
++EXTRAVERSION =
+ NAME =
+ 
+ # *DOCUMENTATION*

sources

@@ -1 +1 @@
-SHA512 (u-boot-2023.10-rc3.tar.bz2) = 920190c47faca085c44fbd747669379f47461e3a3de5041e6a0d28d073116f1b18b0711876fb3c49eacd130e6fd2aa9d5ec84cb5fe0b2f7617b2438804317e81
+SHA512 (u-boot-2023.07.tar.bz2) = c11c2dd8e44babf7d5c15c28587139f0fa7e73833bf6d4902b46780a6ed2199d007db4fec579f10b041da478dfa8c6c21e6cee76cfd65ec6cc6860c116bbc0fb

uboot-tools.spec

@@ -1,4 +1,4 @@
-%global candidate rc3
+#global candidate rc0
 %if 0%{?rhel}
 %bcond_with toolsonly
 %else
@@ -6,8 +6,9 @@
 %endif
 
 Name:     uboot-tools
-Version:  2023.10
-Release:  0.4%{?candidate:.%{candidate}}%{?dist}
+Version:  2023.07
+Release:  3%{?candidate:.%{candidate}}%{?dist}
+Epoch:    1
 Summary:  U-Boot utilities
 License:  GPLv2+ BSD LGPL-2.1+ LGPL-2.0+
 URL:      http://www.denx.de/wiki/U-Boot
@@ -20,17 +21,17 @@ Source1:  aarch64-boards
 # Needed to find DT on boot partition that's not the first partition
 Patch1:   uefi-distro-load-FDT-from-any-partition-on-boot-device.patch
 Patch2:   smbios-Simplify-reporting-of-unknown-values.patch
-Patch3:   disable-VBE-by-default.patch
-Patch4:   enable-bootmenu-by-default.patch
-Patch5:   Add-video-damage-tracking.patch
+Patch3:   0001-disable-NFS-support-by-default.patch
+Patch4:   fix-release-rev.patch
 
 # Board fixes and enablement
 # RPi - uses RPI firmware device tree for HAT support
-Patch10:  rpi-Enable-using-the-DT-provided-by-the-Raspberry-Pi.patch
+Patch5:   rpi-Enable-using-the-DT-provided-by-the-Raspberry-Pi.patch
 # Rockchips improvements
-Patch11:  rockchip-Add-initial-support-for-the-PinePhone-Pro.patch
-#Patch12: 0001-Revert-rockchip-rockpro64-Build-u-boot-rockchip-spi..patch
-Patch13:  rpi-Convert-to-standard-boot.patch
+Patch6:   rockchip-Add-initial-support-for-the-PinePhone-Pro.patch
+Patch7:   0001-Revert-rockchip-rockpro64-Build-u-boot-rockchip-spi..patch
+# Other fixes
+Patch8:   disable-VBE-by-default.patch
 
 BuildRequires:  bc
 BuildRequires:  bison
@@ -215,20 +216,11 @@ cp -p board/sunxi/README.nand builds/docs/README.sunxi-nand
 %endif
 
 %changelog
-* Mon Aug 21 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 2023.10-0.4.rc3
-- Update to 2023.10 RC3
+* Wed Oct 25 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 1:2023.07-3
+- Rebuild for rebase
 
-* Mon Aug 21 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 2023.10-0.3.rc2
-- Add patch to speed up firmware UEFI video output
-
-* Sat Aug 19 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 2023.10-0.2.rc2
-- Add patch for Raspberry Pi boot
-
-* Fri Aug 18 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 2023.10-0.1.rc2
-- Update to 2023.10 RC2
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2023.07-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+* Wed Oct 25 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 1:2023.07-2
+- Fixes for release
 
 * Tue Jul 11 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 2023.07-1
 - Update to 2023.07 GA