[packages/syslinux] Rel 5; fix patch and deps
arekm
arekm at pld-linux.org
Tue Sep 8 09:23:28 CEST 2026
commit 19943d731e17d16095cb60f7c8f9d77069ed474b
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Tue Sep 8 09:23:04 2026 +0200
Rel 5; fix patch and deps
gcc14.patch | 34 ++++++++++++++++++++++------------
syslinux.spec | 8 ++++----
2 files changed, 26 insertions(+), 16 deletions(-)
---
diff --git a/syslinux.spec b/syslinux.spec
index 280ff2b..aaf5b77 100644
--- a/syslinux.spec
+++ b/syslinux.spec
@@ -4,7 +4,7 @@
%bcond_without efi64 # EFI64 bootloader (requires x86_64 gnu-efi)
#
%ifnarch %{ix86}
-# %{x8664} also possible, but requires multilib gnu-efi
+# %%{x8664} also possible, but requires multilib gnu-efi
%undefine with_efi32
%endif
%ifnarch %{x8664}
@@ -16,10 +16,10 @@ Summary(pt_BR.UTF-8): Carregador de boot simples
Summary(zh_CN.UTF-8): Linux操作系统的启动管理器
Name: syslinux
Version: 6.04
-Release: 4
+Release: 5
License: GPL v2+
Group: Applications/System
-# Source0: https://www.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{version}.tar.xz
+# Source0: https://www.kernel.org/pub/linux/utils/boot/syslinux/%%{name}-%%{version}.tar.xz
Source0: https://mirrors.edge.kernel.org/pub/linux/utils/boot/syslinux/Testing/6.04/syslinux-6.04-pre1.tar.xz
# Source0-md5: f9c956fde0de29be297402ecbc8ff4d0
# FC:
@@ -87,7 +87,7 @@ Intel PXE (Pre-Execution Environment).
Summary: Header files for syslinux libraries
Summary(pl.UTF-8): Pliki nagłówkowe bibliotek syslinux
Group: Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
%description devel
This package includes the header files needed for compilation of
diff --git a/gcc14.patch b/gcc14.patch
index 07676cd..548e6cc 100644
--- a/gcc14.patch
+++ b/gcc14.patch
@@ -1,18 +1,29 @@
-diff --git a/com32/chain/chain.c b/com32/chain/chain.c
---- a/com32/chain/chain.c
-+++ b/com32/chain/chain.c
-@@ -514,7 +514,7 @@ int main(int argc, char *argv[])
+Build fixes for gcc >= 14: stricter pointer and prototype checks.
+
+loadfile() stores a size_t; struct data_area.size is a 32-bit addr_t, so
+it needs a temporary rather than a cast - on the 64-bit EFI build a cast
+writes 8 bytes into the 4-byte field.
+--- a/com32/chain/chain.c 2016-03-02 06:06:02.000000000 +0100
++++ b/com32/chain/chain.c 2026-09-08 08:32:24.066700076 +0200
+@@ -512,12 +512,15 @@
+
+ /* Load the boot file */
if (opt.file) {
++ size_t fsize;
++
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)) {
++ if (loadfile(opt.file, &fdat.data, &fsize)) {
error("Couldn't read the boot file.");
goto bail;
}
-diff --git a/com32/lib/syslinux/debug.c b/com32/lib/syslinux/debug.c
---- a/com32/lib/syslinux/debug.c
-+++ b/com32/lib/syslinux/debug.c
++ fdat.size = fsize;
+ if (fdat.base + fdat.size > dosmax) {
+ error("The boot file is too big to load at this address.");
+ goto bail;
+--- a/com32/lib/syslinux/debug.c 2016-03-02 06:06:02.000000000 +0100
++++ b/com32/lib/syslinux/debug.c 2026-09-08 08:30:56.986892744 +0200
@@ -1,6 +1,7 @@
#include <linux/list.h>
#include <string.h>
@@ -21,10 +32,9 @@ diff --git a/com32/lib/syslinux/debug.c b/com32/lib/syslinux/debug.c
#ifdef DYNAMIC_DEBUG
-diff --git a/com32/libupload/tftp.h b/com32/libupload/tftp.h
---- a/com32/libupload/tftp.h
-+++ b/com32/libupload/tftp.h
-@@ -19,4 +19,7 @@ TFTP_OK = 11, /* Not in RFC */
+--- a/com32/libupload/tftp.h 2016-03-02 06:06:02.000000000 +0100
++++ b/com32/libupload/tftp.h 2026-09-08 08:30:56.986970864 +0200
+@@ -19,4 +19,7 @@
};
extern const char *tftp_string_error_message[];
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/syslinux.git/commitdiff/19943d731e17d16095cb60f7c8f9d77069ed474b
More information about the pld-cvs-commit
mailing list