SOURCES/0001-Add-install-all-target-to-top-side-of-HAVE_FIRMWARE.patch

@@ -1,4 +1,4 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From ca745cdfc27b83b6bcef9f856d858a68c64429de Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 8 Apr 2014 15:28:12 -0400
 Subject: [PATCH] Add "install-all target" to top side of HAVE_FIRMWARE.
@@ -8,7 +8,7 @@ Subject: [PATCH] Add "install-all target" to top side of HAVE_FIRMWARE.
  1 file changed, 10 insertions(+)
 
 diff --git a/Makefile b/Makefile
-index b472945b..6606d319 100644
+index b472945..6606d31 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -275,6 +275,16 @@ efi64:
@@ -28,3 +28,5 @@ index b472945b..6606d319 100644
  else # FIRMWARE
  
  all: all-local subdirs
+-- 
+2.5.5

SOURCES/0002-ext4-64bit-feature.patch

@@ -1,4 +1,4 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From af7e95c32cea40c1e443ae301e64b27f068b4915 Mon Sep 17 00:00:00 2001
 From: Paulo Alcantara <pcacjr@zytor.com>
 Date: Wed, 11 Oct 2017 07:00:31 -0400
 Subject: [PATCH] ext4: Fix 64bit feature
@@ -28,7 +28,7 @@ Signed-off-by: Paulo Alcantara <pcacjr@zytor.com>
  2 files changed, 15 insertions(+), 9 deletions(-)
 
 diff --git a/core/fs/ext2/ext2.c b/core/fs/ext2/ext2.c
-index 76bd1d5a..4bc0a535 100644
+index 76bd1d5..4bc0a53 100644
 --- a/core/fs/ext2/ext2.c
 +++ b/core/fs/ext2/ext2.c
 @@ -25,22 +25,17 @@ static enum dirent_type ext2_cvt_type(unsigned int d_file_type)
@@ -85,7 +85,7 @@ index 76bd1d5a..4bc0a535 100644
  			       + EXT2_BLOCKS_PER_GROUP(fs) - 1)
  	                      / EXT2_BLOCKS_PER_GROUP(fs);
 diff --git a/core/fs/ext2/ext2_fs.h b/core/fs/ext2/ext2_fs.h
-index 803a9954..d8d07ebd 100644
+index 803a995..d8d07eb 100644
 --- a/core/fs/ext2/ext2_fs.h
 +++ b/core/fs/ext2/ext2_fs.h
 @@ -278,6 +278,7 @@ struct ext2_sb_info {
@@ -96,3 +96,6 @@ index 803a9954..d8d07ebd 100644
  };
  
  static inline struct ext2_sb_info *EXT2_SB(struct fs_info *fs)
+-- 
+2.7.4.GIT
+

SOURCES/0003-include-sysmacros-h.patch

@@ -1,4 +1,4 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From 1a74985b2a404639b08882c57f3147229605dfd5 Mon Sep 17 00:00:00 2001
 From: Mike Frysinger <vapier@gentoo.org>
 Date: Tue, 19 Apr 2016 06:50:31 -0400
 Subject: [PATCH] extlinux: pull in sys/sysmacros.h for major/minor/makedev
@@ -17,7 +17,7 @@ Signed-off-by: Gene Cumm <gene.cumm@gmail.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/extlinux/main.c b/extlinux/main.c
-index a7ebd49a..ebff7eae 100644
+index a7ebd49..ebff7ea 100644
 --- a/extlinux/main.c
 +++ b/extlinux/main.c
 @@ -38,6 +38,7 @@
@@ -28,3 +28,6 @@ index a7ebd49a..ebff7eae 100644
  #include <sys/types.h>
  #include <sys/mount.h>
  #include <sys/vfs.h>
+-- 
+2.10.5.GIT
+

SOURCES/0004-Add-RPMOPTFLAGS-to-CFLAGS-for-some-stuff.patch

@@ -1,4 +1,4 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From 5c24d725d5a5f50f0544fbcc544f08a3f9e90e5d Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 8 Aug 2019 05:41:36 -0400
 Subject: [PATCH] Add 'RPMOPTFLAGS' to CFLAGS for some stuff.
@@ -11,7 +11,7 @@ Subject: [PATCH] Add 'RPMOPTFLAGS' to CFLAGS for some stuff.
  4 files changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/extlinux/Makefile b/extlinux/Makefile
-index 1721ee54..d504e231 100644
+index 1721ee54aff..d504e23133e 100644
 --- a/extlinux/Makefile
 +++ b/extlinux/Makefile
 @@ -18,9 +18,9 @@ include $(MAKEDIR)/syslinux.mk
@@ -27,7 +27,7 @@ index 1721ee54..d504e231 100644
  SRCS     = main.c \
  	   mountinfo.c \
 diff --git a/linux/Makefile b/linux/Makefile
-index 5a49d813..9fed68d0 100644
+index 5a49d813de1..9fed68d02c6 100644
 --- a/linux/Makefile
 +++ b/linux/Makefile
 @@ -18,8 +18,8 @@ include $(MAKEDIR)/syslinux.mk
@@ -42,7 +42,7 @@ index 5a49d813..9fed68d0 100644
  SRCS     = syslinux.c \
  	   ../libinstaller/syslxopt.c \
 diff --git a/mtools/Makefile b/mtools/Makefile
-index 632b185b..b6e5ebdb 100755
+index 632b185ba2f..b6e5ebdba6b 100755
 --- a/mtools/Makefile
 +++ b/mtools/Makefile
 @@ -2,8 +2,8 @@ include $(MAKEDIR)/syslinux.mk
@@ -57,7 +57,7 @@ index 632b185b..b6e5ebdb 100755
  SRCS     = syslinux.c \
  	   ../libinstaller/fs.c \
 diff --git a/utils/Makefile b/utils/Makefile
-index dfe62590..b4962353 100644
+index dfe625902ce..b4962353f20 100644
 --- a/utils/Makefile
 +++ b/utils/Makefile
 @@ -17,8 +17,8 @@
@@ -71,3 +71,6 @@ index dfe62590..b4962353 100644
  
  C_TARGETS	 = isohybrid gethostip memdiskfind
  SCRIPT_TARGETS	 = mkdiskimage
+-- 
+2.21.0
+

SOURCES/0005-Workaround-multiple-definition-of-symbol-errors.patch

@@ -1,4 +1,4 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From 951928f2cad5682c2844e6bd0f7201236c5d9b66 Mon Sep 17 00:00:00 2001
 From: Merlin Mathesius <mmathesi@redhat.com>
 Date: Wed, 13 May 2020 08:02:27 -0500
 Subject: [PATCH] Workaround multiple definition of symbol errors
@@ -104,3 +104,6 @@ index bbf23f24..3dd922d5 100644
  
  # We need to rename the .hash section because the EFI firmware
  # linker really doesn't like it.
+-- 
+2.25.1
+

SOURCES/0006-Replace-builtin-strlen-that-appears-to-get-optimized.patch

@@ -1,4 +1,4 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From eae06bdce9468d7fde263de1c53f80f2faff0c9e Mon Sep 17 00:00:00 2001
 From: Merlin Mathesius <mmathesi@redhat.com>
 Date: Wed, 13 May 2020 11:58:37 -0500
 Subject: [PATCH] Replace builtin strlen that appears to get optimized away
@@ -35,3 +35,6 @@ index f648de2d..407d0233 100644
  
  /* This only returns true or false */
  static inline int memcmp(const void *__m1, const void *__m2, unsigned int __n)
+-- 
+2.25.1
+

SOURCES/0007-Fix-backspace-when-editing-a-multiline-cmdline.patch

@@ -1,4 +1,4 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From 7ebe10128eef978e99667d741ed4588d80b38441 Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Thu, 21 Oct 2021 15:15:33 -0400
 Subject: [PATCH] Fix backspace when editing a multiline cmdline
@@ -132,3 +132,6 @@ index 3119b11f..4913f038 100644
  
      /* Add the command to the history if its length is larger than 0 */
      len = strlen(ret);
+-- 
+2.33.0
+

SOURCES/0008-Fix-build-with-GCC-14.patch

@@ -0,0 +1,61 @@
+From 321433861cc9cd3c7e0ee02830e561bc0f956998 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Sun, 4 Feb 2024 11:46:02 -0500
+Subject: [PATCH] Fix build with GCC 14
+
+com32/lib/syslinux/debug.c: In function ‘syslinux_debug’:
+com32/lib/syslinux/debug.c:91:5: error: implicit declaration of function ‘printf’
+
+com32/libupload/upload_tftp.c: In function ‘upload_tftp_write’:
+com32/libupload/upload_tftp.c:64:11: error: implicit declaration of function ‘tftp_put’
+
+com32/chain/chain.c: In function ‘main’:
+com32/chain/chain.c:517:44: error: passing argument 3 of ‘loadfile’ from incompatible pointer type
+com32/include/syslinux/loadfile.h:11:37: note: expected ‘size_t *’ but argument is of type ‘addr_t *’
+
+---
+ com32/chain/chain.c        | 2 +-
+ com32/lib/syslinux/debug.c | 1 +
+ com32/libupload/tftp.h     | 3 +++
+ 3 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/com32/chain/chain.c b/com32/chain/chain.c
+index 4e9e32d..b11b880 100644
+--- a/com32/chain/chain.c
++++ b/com32/chain/chain.c
+@@ -514,7 +514,7 @@ int main(int argc, char *argv[])
+     if (opt.file) {
+ 	fdat.base = (opt.fseg << 4) + opt.foff;
+ 
+-	if (loadfile(opt.file, &fdat.data, &fdat.size)) {
++	if (loadfile(opt.file, &fdat.data, (size_t*)&fdat.size)) {
+ 	    error("Couldn't read the boot file.");
+ 	    goto bail;
+ 	}
+diff --git a/com32/lib/syslinux/debug.c b/com32/lib/syslinux/debug.c
+index d9ab863..e8f53d5 100644
+--- a/com32/lib/syslinux/debug.c
++++ b/com32/lib/syslinux/debug.c
+@@ -1,6 +1,7 @@
+ #include <linux/list.h>
+ #include <string.h>
+ #include <stdbool.h>
++#include <stdio.h>
+ 
+ #ifdef DYNAMIC_DEBUG
+ 
+diff --git a/com32/libupload/tftp.h b/com32/libupload/tftp.h
+index 323dc16..09aa40b 100644
+--- a/com32/libupload/tftp.h
++++ b/com32/libupload/tftp.h
+@@ -19,4 +19,7 @@ TFTP_OK	= 11, /* Not in RFC */
+ };
+ 
+ extern const char *tftp_string_error_message[];
++
++extern int tftp_put(struct url_info *url, int flags, struct inode *inode,
++                               const char **redir, char *data, int data_length);
+ #endif
+-- 
+2.43.0
+

SOURCES/0009-Rewrite_Digest_SHA1_to_SHA.patch

@@ -0,0 +1,33 @@
+From c5a4d036fff8925bc10f17d68837b862a9a894e4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michal=20Josef=20=C5=A0pa=C4=8Dek?= <mspacek@redhat.com>
+Date: Wed, 10 Jul 2024 15:58:33 +0200
+Subject: [PATCH] Rewrite Digest::SHA1 to SHA
+
+---
+ utils/sha1pass | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/utils/sha1pass b/utils/sha1pass
+index 3be2dbc..34cc99c 100755
+--- a/utils/sha1pass
++++ b/utils/sha1pass
+@@ -1,7 +1,7 @@
+ #!/usr/bin/perl
+ 
+ use bytes;
+-use Digest::SHA1;
++use Digest::SHA;
+ use MIME::Base64;
+ 
+ sub random_bytes($) {
+@@ -29,6 +29,6 @@ sub random_bytes($) {
+ unless (defined($salt)) {
+     $salt = MIME::Base64::encode(random_bytes(6), '');
+ }
+-$pass = Digest::SHA1::sha1_base64($salt, $pass);
++$pass = Digest::SHA::sha1_base64($salt, $pass);
+ 
+ print '$4$', $salt, '$', $pass, "\$\n";
+-- 
+2.45.2
+

SOURCES/syslinux.patches

@@ -1,7 +0,0 @@
-Patch0001: 0001-Add-install-all-target-to-top-side-of-HAVE_FIRMWARE.patch
-Patch0002: 0002-ext4-Fix-64bit-feature.patch
-Patch0003: 0003-extlinux-pull-in-sys-sysmacros.h-for-major-minor-mak.patch
-Patch0004: 0004-Add-RPMOPTFLAGS-to-CFLAGS-for-some-stuff.patch
-Patch0005: 0005-Workaround-multiple-definition-of-symbol-errors.patch
-Patch0006: 0006-Replace-builtin-strlen-that-appears-to-get-optimized.patch
-Patch0007: 0007-Fix-backspace-when-editing-a-multiline-cmdline.patch

SPECS/syslinux.spec

@@ -1,3 +1,6 @@
+# No, please don't break the build.  Thanks.
+%undefine _auto_set_build_flags
+
 %global buildarches %{ix86} x86_64
 %ifnarch %{buildarches}
 %global debug_package %{nil}
@@ -7,13 +10,19 @@ Summary: Simple kernel loader which boots from a FAT filesystem
 Name: syslinux
 Version: 6.04
 %define tarball_version 6.04-pre1
-Release: 0.20%{?dist}
-License: GPLv2+
+Release: 0.30%{?dist}
+License: GPL-2.0-or-later
 URL: http://syslinux.zytor.com/wiki/index.php/The_Syslinux_Project
 Source0: http://www.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{tarball_version}.tar.xz
-Source1: syslinux.patches
-
-%include %{SOURCE1}
+Patch0001: 0001-Add-install-all-target-to-top-side-of-HAVE_FIRMWARE.patch
+Patch0002: 0002-ext4-64bit-feature.patch
+Patch0003: 0003-include-sysmacros-h.patch
+Patch0004: 0004-Add-RPMOPTFLAGS-to-CFLAGS-for-some-stuff.patch
+Patch0005: 0005-Workaround-multiple-definition-of-symbol-errors.patch
+Patch0006: 0006-Replace-builtin-strlen-that-appears-to-get-optimized.patch
+Patch0007: 0007-Fix-backspace-when-editing-a-multiline-cmdline.patch
+Patch0008: 0008-Fix-build-with-GCC-14.patch
+Patch0009: 0009-Rewrite_Digest_SHA1_to_SHA.patch
 
 # this is to keep rpmbuild from thinking the .c32 / .com / .0 / memdisk files
 # in noarch packages are a reason to stop the build.
@@ -25,7 +34,7 @@ BuildRequires: git
 BuildRequires:  gcc
 BuildRequires: nasm >= 0.98.38-1, perl-interpreter, perl-generators, netpbm-progs
 BuildRequires: perl(FileHandle)
-BuildRequires: /usr/include/gnu/stubs-32.h
+BuildRequires: (glibc-devel(x86-32) or glibc32)
 BuildRequires: libuuid-devel
 Requires: syslinux-nonlinux = %{version}-%{release}
 %endif
@@ -35,7 +44,7 @@ BuildRequires: mingw32-gcc
 %endif
 %ifarch x86_64
 Requires: mtools, libc.so.6()(64bit)
-BuildRequires: mingw64-gcc
+BuildRequires: mingw32-gcc mingw64-gcc
 %endif
 
 # NOTE: extlinux belongs in /sbin, not in /usr/sbin, since it is typically
@@ -70,7 +79,7 @@ Requires: syslinux-extlinux-nonlinux = %{version}-%{release}
 The EXTLINUX bootloader, for booting the local system, as well as all
 the SYSLINUX/PXELINUX modules in /boot.
 
-%ifarch %{ix86}
+%ifarch x86_64
 %package tftpboot
 Summary: SYSLINUX modules in /tftpboot, available for network booting
 BuildArch: noarch
@@ -162,7 +171,6 @@ rm -f %{buildroot}%{_includedir}/syslinux.h
 %doc sample
 %{_mandir}/man1/gethostip*
 %{_mandir}/man1/syslinux*
-%{_mandir}/man1/extlinux*
 %{_mandir}/man1/isohybrid*
 %{_mandir}/man1/memdiskfind*
 %{_bindir}/gethostip
@@ -204,9 +212,10 @@ rm -f %{buildroot}%{_includedir}/syslinux.h
 
 %files extlinux
 %{_sbindir}/extlinux
+%{_mandir}/man1/extlinux*
 %config /etc/extlinux.conf
 
-%ifarch %{ix86}
+%ifarch x86_64
 %files tftpboot
 /tftpboot
 
@@ -253,16 +262,51 @@ fi
 %endif
 
 %changelog
-* Wed Aug 03 2022 Robbie Harwood <rharwood@redhat.com> - 6.04-0.20
-- Sync with fedora (same NVR)
-- Resolves: #2018260
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 6.04-0.30
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
+
+* Tue Jul 23 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 6.04-0.29
+- Build tftpboot and nonlinux on x86_64
+
+* Thu Jul 11 2024 Michal Josef Špaček <mspacek@redhat.com> - 6.04-0.28
+- Rewrite Digest::SHA1 to SHA
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 6.04-0.27
+- Bump release for June 2024 mass rebuild
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6.04-0.26
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Wed Dec 13 2023 Nicolas Frayer <nfrayer@redhat.com>
+- Migrate to SPDX license
+- Please refer to https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_2
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 6.04-0.25
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 6.04-0.24
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.04-0.23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Thu Jan 27 2022 Robbie Harwood <rharwood@redhat.com> - 6.04-0.22
+- Cope with Fedora insisting harder on default buildflags
+- Resolves: #2047034
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.04-0.21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Oct 21 2021 Robbie Harwood <rharwood@redhat.com> - 6.04-0.20
+- Fix behavior of backspace in multiline cmdline editing
 
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 6.04-0.19
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Wed Sep 01 2021 Robbie Harwood <rharwood@redhat.com> - 6.04-0.19
+- Place extlinux(1) in the extlinux subpackage
+- Resolves: #977004
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 6.04-0.18
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.04-0.18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.04-0.17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild