Compare commits
No commits in common. "c8" and "c10s" have entirely different histories.
4
.gitignore
vendored
4
.gitignore
vendored
@ -1 +1,3 @@
|
|||||||
SOURCES/syslinux-6.04-pre1.tar.xz
|
clog
|
||||||
|
syslinux-*.tar.*
|
||||||
|
*.rpm
|
||||||
|
@ -1 +0,0 @@
|
|||||||
599b7a85d522b1b6658a1fe290e4d23dc64b1470 SOURCES/syslinux-6.04-pre1.tar.xz
|
|
@ -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>
|
From: Peter Jones <pjones@redhat.com>
|
||||||
Date: Tue, 8 Apr 2014 15:28:12 -0400
|
Date: Tue, 8 Apr 2014 15:28:12 -0400
|
||||||
Subject: [PATCH] Add "install-all target" to top side of HAVE_FIRMWARE.
|
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(+)
|
1 file changed, 10 insertions(+)
|
||||||
|
|
||||||
diff --git a/Makefile b/Makefile
|
diff --git a/Makefile b/Makefile
|
||||||
index b472945b..6606d319 100644
|
index b472945..6606d31 100644
|
||||||
--- a/Makefile
|
--- a/Makefile
|
||||||
+++ b/Makefile
|
+++ b/Makefile
|
||||||
@@ -275,6 +275,16 @@ efi64:
|
@@ -275,6 +275,16 @@ efi64:
|
||||||
@ -28,3 +28,5 @@ index b472945b..6606d319 100644
|
|||||||
else # FIRMWARE
|
else # FIRMWARE
|
||||||
|
|
||||||
all: all-local subdirs
|
all: all-local subdirs
|
||||||
|
--
|
||||||
|
2.5.5
|
@ -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>
|
From: Paulo Alcantara <pcacjr@zytor.com>
|
||||||
Date: Wed, 11 Oct 2017 07:00:31 -0400
|
Date: Wed, 11 Oct 2017 07:00:31 -0400
|
||||||
Subject: [PATCH] ext4: Fix 64bit feature
|
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(-)
|
2 files changed, 15 insertions(+), 9 deletions(-)
|
||||||
|
|
||||||
diff --git a/core/fs/ext2/ext2.c b/core/fs/ext2/ext2.c
|
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
|
--- a/core/fs/ext2/ext2.c
|
||||||
+++ b/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)
|
@@ -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) - 1)
|
||||||
/ EXT2_BLOCKS_PER_GROUP(fs);
|
/ EXT2_BLOCKS_PER_GROUP(fs);
|
||||||
diff --git a/core/fs/ext2/ext2_fs.h b/core/fs/ext2/ext2_fs.h
|
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
|
--- a/core/fs/ext2/ext2_fs.h
|
||||||
+++ b/core/fs/ext2/ext2_fs.h
|
+++ b/core/fs/ext2/ext2_fs.h
|
||||||
@@ -278,6 +278,7 @@ struct ext2_sb_info {
|
@@ -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)
|
static inline struct ext2_sb_info *EXT2_SB(struct fs_info *fs)
|
||||||
|
--
|
||||||
|
2.7.4.GIT
|
||||||
|
|
@ -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>
|
From: Mike Frysinger <vapier@gentoo.org>
|
||||||
Date: Tue, 19 Apr 2016 06:50:31 -0400
|
Date: Tue, 19 Apr 2016 06:50:31 -0400
|
||||||
Subject: [PATCH] extlinux: pull in sys/sysmacros.h for major/minor/makedev
|
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(+)
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
diff --git a/extlinux/main.c b/extlinux/main.c
|
diff --git a/extlinux/main.c b/extlinux/main.c
|
||||||
index a7ebd49a..ebff7eae 100644
|
index a7ebd49..ebff7ea 100644
|
||||||
--- a/extlinux/main.c
|
--- a/extlinux/main.c
|
||||||
+++ b/extlinux/main.c
|
+++ b/extlinux/main.c
|
||||||
@@ -38,6 +38,7 @@
|
@@ -38,6 +38,7 @@
|
||||||
@ -28,3 +28,6 @@ index a7ebd49a..ebff7eae 100644
|
|||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/mount.h>
|
#include <sys/mount.h>
|
||||||
#include <sys/vfs.h>
|
#include <sys/vfs.h>
|
||||||
|
--
|
||||||
|
2.10.5.GIT
|
||||||
|
|
@ -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>
|
From: Peter Jones <pjones@redhat.com>
|
||||||
Date: Thu, 8 Aug 2019 05:41:36 -0400
|
Date: Thu, 8 Aug 2019 05:41:36 -0400
|
||||||
Subject: [PATCH] Add 'RPMOPTFLAGS' to CFLAGS for some stuff.
|
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(-)
|
4 files changed, 8 insertions(+), 8 deletions(-)
|
||||||
|
|
||||||
diff --git a/extlinux/Makefile b/extlinux/Makefile
|
diff --git a/extlinux/Makefile b/extlinux/Makefile
|
||||||
index 1721ee54..d504e231 100644
|
index 1721ee54aff..d504e23133e 100644
|
||||||
--- a/extlinux/Makefile
|
--- a/extlinux/Makefile
|
||||||
+++ b/extlinux/Makefile
|
+++ b/extlinux/Makefile
|
||||||
@@ -18,9 +18,9 @@ include $(MAKEDIR)/syslinux.mk
|
@@ -18,9 +18,9 @@ include $(MAKEDIR)/syslinux.mk
|
||||||
@ -27,7 +27,7 @@ index 1721ee54..d504e231 100644
|
|||||||
SRCS = main.c \
|
SRCS = main.c \
|
||||||
mountinfo.c \
|
mountinfo.c \
|
||||||
diff --git a/linux/Makefile b/linux/Makefile
|
diff --git a/linux/Makefile b/linux/Makefile
|
||||||
index 5a49d813..9fed68d0 100644
|
index 5a49d813de1..9fed68d02c6 100644
|
||||||
--- a/linux/Makefile
|
--- a/linux/Makefile
|
||||||
+++ b/linux/Makefile
|
+++ b/linux/Makefile
|
||||||
@@ -18,8 +18,8 @@ include $(MAKEDIR)/syslinux.mk
|
@@ -18,8 +18,8 @@ include $(MAKEDIR)/syslinux.mk
|
||||||
@ -42,7 +42,7 @@ index 5a49d813..9fed68d0 100644
|
|||||||
SRCS = syslinux.c \
|
SRCS = syslinux.c \
|
||||||
../libinstaller/syslxopt.c \
|
../libinstaller/syslxopt.c \
|
||||||
diff --git a/mtools/Makefile b/mtools/Makefile
|
diff --git a/mtools/Makefile b/mtools/Makefile
|
||||||
index 632b185b..b6e5ebdb 100755
|
index 632b185ba2f..b6e5ebdba6b 100755
|
||||||
--- a/mtools/Makefile
|
--- a/mtools/Makefile
|
||||||
+++ b/mtools/Makefile
|
+++ b/mtools/Makefile
|
||||||
@@ -2,8 +2,8 @@ include $(MAKEDIR)/syslinux.mk
|
@@ -2,8 +2,8 @@ include $(MAKEDIR)/syslinux.mk
|
||||||
@ -57,7 +57,7 @@ index 632b185b..b6e5ebdb 100755
|
|||||||
SRCS = syslinux.c \
|
SRCS = syslinux.c \
|
||||||
../libinstaller/fs.c \
|
../libinstaller/fs.c \
|
||||||
diff --git a/utils/Makefile b/utils/Makefile
|
diff --git a/utils/Makefile b/utils/Makefile
|
||||||
index dfe62590..b4962353 100644
|
index dfe625902ce..b4962353f20 100644
|
||||||
--- a/utils/Makefile
|
--- a/utils/Makefile
|
||||||
+++ b/utils/Makefile
|
+++ b/utils/Makefile
|
||||||
@@ -17,8 +17,8 @@
|
@@ -17,8 +17,8 @@
|
||||||
@ -71,3 +71,6 @@ index dfe62590..b4962353 100644
|
|||||||
|
|
||||||
C_TARGETS = isohybrid gethostip memdiskfind
|
C_TARGETS = isohybrid gethostip memdiskfind
|
||||||
SCRIPT_TARGETS = mkdiskimage
|
SCRIPT_TARGETS = mkdiskimage
|
||||||
|
--
|
||||||
|
2.21.0
|
||||||
|
|
@ -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>
|
From: Merlin Mathesius <mmathesi@redhat.com>
|
||||||
Date: Wed, 13 May 2020 08:02:27 -0500
|
Date: Wed, 13 May 2020 08:02:27 -0500
|
||||||
Subject: [PATCH] Workaround multiple definition of symbol errors
|
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
|
# We need to rename the .hash section because the EFI firmware
|
||||||
# linker really doesn't like it.
|
# linker really doesn't like it.
|
||||||
|
--
|
||||||
|
2.25.1
|
||||||
|
|
@ -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>
|
From: Merlin Mathesius <mmathesi@redhat.com>
|
||||||
Date: Wed, 13 May 2020 11:58:37 -0500
|
Date: Wed, 13 May 2020 11:58:37 -0500
|
||||||
Subject: [PATCH] Replace builtin strlen that appears to get optimized away
|
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 */
|
/* This only returns true or false */
|
||||||
static inline int memcmp(const void *__m1, const void *__m2, unsigned int __n)
|
static inline int memcmp(const void *__m1, const void *__m2, unsigned int __n)
|
||||||
|
--
|
||||||
|
2.25.1
|
||||||
|
|
@ -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>
|
From: Robbie Harwood <rharwood@redhat.com>
|
||||||
Date: Thu, 21 Oct 2021 15:15:33 -0400
|
Date: Thu, 21 Oct 2021 15:15:33 -0400
|
||||||
Subject: [PATCH] Fix backspace when editing a multiline cmdline
|
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 */
|
/* Add the command to the history if its length is larger than 0 */
|
||||||
len = strlen(ret);
|
len = strlen(ret);
|
||||||
|
--
|
||||||
|
2.33.0
|
||||||
|
|
61
0008-Fix-build-with-GCC-14.patch
Normal file
61
0008-Fix-build-with-GCC-14.patch
Normal file
@ -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
|
||||||
|
|
33
0009-Rewrite_Digest_SHA1_to_SHA.patch
Normal file
33
0009-Rewrite_Digest_SHA1_to_SHA.patch
Normal file
@ -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
|
||||||
|
|
@ -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
|
|
6
gating.yaml
Normal file
6
gating.yaml
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
--- !Policy
|
||||||
|
product_versions:
|
||||||
|
- rhel-10
|
||||||
|
decision_context: osci_compose_gate
|
||||||
|
rules:
|
||||||
|
- !PassingTestCaseRule {test_case_name: manual.sst_desktop.syslinux.functional}
|
25
rpminspect.yaml
Normal file
25
rpminspect.yaml
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
---
|
||||||
|
inspections:
|
||||||
|
# Not a Java package
|
||||||
|
javabytecode: off
|
||||||
|
|
||||||
|
# These just flag when things change "too much"
|
||||||
|
changedfiles: off
|
||||||
|
filesize: off
|
||||||
|
patches: off
|
||||||
|
upstream: off
|
||||||
|
|
||||||
|
# bootloader - can't do anything about executable stack
|
||||||
|
elf: off
|
||||||
|
|
||||||
|
# These are v4-only network functions. Upstream is dead, and this tool is
|
||||||
|
# legacy, so we can consider it v4-only.
|
||||||
|
badfuncs: off
|
||||||
|
|
||||||
|
# https://bugzilla.redhat.com/show_bug.cgi?id=2029601
|
||||||
|
annocheck: off
|
||||||
|
|
||||||
|
# So here's the thing: I don't care, especially because it's a symlink to
|
||||||
|
# the same place. Not only was usrmerge a waste of time, but it's the wrong
|
||||||
|
# direction: stuff in /usr should point to /.
|
||||||
|
pathmigration: off
|
1
sources
Normal file
1
sources
Normal file
@ -0,0 +1 @@
|
|||||||
|
f9c956fde0de29be297402ecbc8ff4d0 syslinux-6.04-pre1.tar.xz
|
@ -1,3 +1,6 @@
|
|||||||
|
# No, please don't break the build. Thanks.
|
||||||
|
%undefine _auto_set_build_flags
|
||||||
|
|
||||||
%global buildarches %{ix86} x86_64
|
%global buildarches %{ix86} x86_64
|
||||||
%ifnarch %{buildarches}
|
%ifnarch %{buildarches}
|
||||||
%global debug_package %{nil}
|
%global debug_package %{nil}
|
||||||
@ -7,24 +10,31 @@ Summary: Simple kernel loader which boots from a FAT filesystem
|
|||||||
Name: syslinux
|
Name: syslinux
|
||||||
Version: 6.04
|
Version: 6.04
|
||||||
%define tarball_version 6.04-pre1
|
%define tarball_version 6.04-pre1
|
||||||
Release: 6%{?dist}
|
Release: 0.30%{?dist}
|
||||||
License: GPLv2+
|
License: GPL-2.0-or-later
|
||||||
Group: Applications/System
|
|
||||||
URL: http://syslinux.zytor.com/wiki/index.php/The_Syslinux_Project
|
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
|
Source0: http://www.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{tarball_version}.tar.xz
|
||||||
Source1: syslinux.patches
|
Patch0001: 0001-Add-install-all-target-to-top-side-of-HAVE_FIRMWARE.patch
|
||||||
|
Patch0002: 0002-ext4-64bit-feature.patch
|
||||||
%include %{SOURCE1}
|
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
|
# this is to keep rpmbuild from thinking the .c32 / .com / .0 / memdisk files
|
||||||
# in noarch packages are a reason to stop the build.
|
# in noarch packages are a reason to stop the build.
|
||||||
%define _binaries_in_noarch_packages_terminate_build 0
|
%define _binaries_in_noarch_packages_terminate_build 0
|
||||||
|
|
||||||
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRequires: make
|
||||||
BuildRequires: git
|
BuildRequires: git
|
||||||
%ifarch %{buildarches}
|
%ifarch %{buildarches}
|
||||||
|
BuildRequires: gcc
|
||||||
BuildRequires: nasm >= 0.98.38-1, perl-interpreter, perl-generators, netpbm-progs
|
BuildRequires: nasm >= 0.98.38-1, perl-interpreter, perl-generators, netpbm-progs
|
||||||
BuildRequires: /usr/include/gnu/stubs-32.h
|
BuildRequires: perl(FileHandle)
|
||||||
|
BuildRequires: (glibc-devel(x86-32) or glibc32)
|
||||||
BuildRequires: libuuid-devel
|
BuildRequires: libuuid-devel
|
||||||
Requires: syslinux-nonlinux = %{version}-%{release}
|
Requires: syslinux-nonlinux = %{version}-%{release}
|
||||||
%endif
|
%endif
|
||||||
@ -34,7 +44,7 @@ BuildRequires: mingw32-gcc
|
|||||||
%endif
|
%endif
|
||||||
%ifarch x86_64
|
%ifarch x86_64
|
||||||
Requires: mtools, libc.so.6()(64bit)
|
Requires: mtools, libc.so.6()(64bit)
|
||||||
BuildRequires: mingw64-gcc
|
BuildRequires: mingw32-gcc mingw64-gcc
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# NOTE: extlinux belongs in /sbin, not in /usr/sbin, since it is typically
|
# NOTE: extlinux belongs in /sbin, not in /usr/sbin, since it is typically
|
||||||
@ -49,14 +59,12 @@ MEMDISK, which loads legacy operating systems from these media.
|
|||||||
|
|
||||||
%package perl
|
%package perl
|
||||||
Summary: Syslinux tools written in perl
|
Summary: Syslinux tools written in perl
|
||||||
Group: Applications/System
|
|
||||||
|
|
||||||
%description perl
|
%description perl
|
||||||
Syslinux tools written in perl
|
Syslinux tools written in perl
|
||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
Summary: Headers and libraries for syslinux development.
|
Summary: Headers and libraries for syslinux development.
|
||||||
Group: Development/Libraries
|
|
||||||
Provides: %{name}-static = %{version}-%{release}
|
Provides: %{name}-static = %{version}-%{release}
|
||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
@ -64,7 +72,6 @@ Headers and libraries for syslinux development.
|
|||||||
|
|
||||||
%package extlinux
|
%package extlinux
|
||||||
Summary: The EXTLINUX bootloader, for booting the local system.
|
Summary: The EXTLINUX bootloader, for booting the local system.
|
||||||
Group: System/Boot
|
|
||||||
Requires: syslinux
|
Requires: syslinux
|
||||||
Requires: syslinux-extlinux-nonlinux = %{version}-%{release}
|
Requires: syslinux-extlinux-nonlinux = %{version}-%{release}
|
||||||
|
|
||||||
@ -72,10 +79,9 @@ Requires: syslinux-extlinux-nonlinux = %{version}-%{release}
|
|||||||
The EXTLINUX bootloader, for booting the local system, as well as all
|
The EXTLINUX bootloader, for booting the local system, as well as all
|
||||||
the SYSLINUX/PXELINUX modules in /boot.
|
the SYSLINUX/PXELINUX modules in /boot.
|
||||||
|
|
||||||
%ifarch %{ix86}
|
%ifarch x86_64
|
||||||
%package tftpboot
|
%package tftpboot
|
||||||
Summary: SYSLINUX modules in /tftpboot, available for network booting
|
Summary: SYSLINUX modules in /tftpboot, available for network booting
|
||||||
Group: Applications/Internet
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
%description tftpboot
|
%description tftpboot
|
||||||
@ -84,7 +90,6 @@ booting in the /tftpboot directory.
|
|||||||
|
|
||||||
%package extlinux-nonlinux
|
%package extlinux-nonlinux
|
||||||
Summary: The parts of the EXTLINUX bootloader which aren't run from linux.
|
Summary: The parts of the EXTLINUX bootloader which aren't run from linux.
|
||||||
Group: System/Boot
|
|
||||||
Requires: syslinux
|
Requires: syslinux
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
ExclusiveArch: %{ix86} x86_64
|
ExclusiveArch: %{ix86} x86_64
|
||||||
@ -95,7 +100,6 @@ from a linux host.
|
|||||||
|
|
||||||
%package nonlinux
|
%package nonlinux
|
||||||
Summary: SYSLINUX modules which aren't run from linux.
|
Summary: SYSLINUX modules which aren't run from linux.
|
||||||
Group: System/Boot
|
|
||||||
Requires: syslinux
|
Requires: syslinux
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
ExclusiveArch: %{ix86} x86_64
|
ExclusiveArch: %{ix86} x86_64
|
||||||
@ -109,7 +113,6 @@ systems from media.
|
|||||||
%ifarch x86_64
|
%ifarch x86_64
|
||||||
%package efi64
|
%package efi64
|
||||||
Summary: SYSLINUX binaries and modules for 64-bit UEFI systems
|
Summary: SYSLINUX binaries and modules for 64-bit UEFI systems
|
||||||
Group: System/Boot
|
|
||||||
|
|
||||||
%description efi64
|
%description efi64
|
||||||
SYSLINUX binaries and modules for 64-bit UEFI systems
|
SYSLINUX binaries and modules for 64-bit UEFI systems
|
||||||
@ -159,12 +162,8 @@ rm -f %{buildroot}%{_prefix}/lib/libsyslinux*
|
|||||||
rm -f %{buildroot}%{_includedir}/syslinux.h
|
rm -f %{buildroot}%{_includedir}/syslinux.h
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%clean
|
|
||||||
rm -rf %{buildroot}
|
|
||||||
|
|
||||||
%ifarch %{buildarches}
|
%ifarch %{buildarches}
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root)
|
|
||||||
%{!?_licensedir:%global license %%doc}
|
%{!?_licensedir:%global license %%doc}
|
||||||
%license COPYING
|
%license COPYING
|
||||||
%doc NEWS README*
|
%doc NEWS README*
|
||||||
@ -172,7 +171,6 @@ rm -rf %{buildroot}
|
|||||||
%doc sample
|
%doc sample
|
||||||
%{_mandir}/man1/gethostip*
|
%{_mandir}/man1/gethostip*
|
||||||
%{_mandir}/man1/syslinux*
|
%{_mandir}/man1/syslinux*
|
||||||
%{_mandir}/man1/extlinux*
|
|
||||||
%{_mandir}/man1/isohybrid*
|
%{_mandir}/man1/isohybrid*
|
||||||
%{_mandir}/man1/memdiskfind*
|
%{_mandir}/man1/memdiskfind*
|
||||||
%{_bindir}/gethostip
|
%{_bindir}/gethostip
|
||||||
@ -191,7 +189,6 @@ rm -rf %{buildroot}
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%files perl
|
%files perl
|
||||||
%defattr(-,root,root)
|
|
||||||
%{!?_licensedir:%global license %%doc}
|
%{!?_licensedir:%global license %%doc}
|
||||||
%license COPYING
|
%license COPYING
|
||||||
%{_mandir}/man1/lss16toppm*
|
%{_mandir}/man1/lss16toppm*
|
||||||
@ -208,7 +205,6 @@ rm -rf %{buildroot}
|
|||||||
%{_bindir}/isohybrid.pl
|
%{_bindir}/isohybrid.pl
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%defattr(-,root,root)
|
|
||||||
%{!?_licensedir:%global license %%doc}
|
%{!?_licensedir:%global license %%doc}
|
||||||
%license COPYING
|
%license COPYING
|
||||||
%dir %{_datadir}/syslinux/com32
|
%dir %{_datadir}/syslinux/com32
|
||||||
@ -216,9 +212,10 @@ rm -rf %{buildroot}
|
|||||||
|
|
||||||
%files extlinux
|
%files extlinux
|
||||||
%{_sbindir}/extlinux
|
%{_sbindir}/extlinux
|
||||||
|
%{_mandir}/man1/extlinux*
|
||||||
%config /etc/extlinux.conf
|
%config /etc/extlinux.conf
|
||||||
|
|
||||||
%ifarch %{ix86}
|
%ifarch x86_64
|
||||||
%files tftpboot
|
%files tftpboot
|
||||||
/tftpboot
|
/tftpboot
|
||||||
|
|
||||||
@ -265,29 +262,80 @@ fi
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Wed Aug 03 2022 Robbie Harwood <rharwood@redhat.com> - 6.04-6
|
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 6.04-0.30
|
||||||
- Sync with RHEL 9 / Fedora at their 6.04-0.20
|
- Bump release for October 2024 mass rebuild:
|
||||||
- Resolves: #1748014
|
Resolves: RHEL-64018
|
||||||
|
|
||||||
* Fri Nov 13 2020 Javier Martinez Canillas <javierm@redhat.com> - 6.04-5
|
* Tue Jul 23 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 6.04-0.29
|
||||||
- Bump release to ship the syslinux-tftpboot subpackage on aarch64
|
- Build tftpboot and nonlinux on x86_64
|
||||||
Resolves: rhbz#1870276
|
|
||||||
|
|
||||||
* Tue Sep 24 2019 Yaakov Selkowitz <yselkowi@redhat.com> - 6.04-4
|
* Thu Jul 11 2024 Michal Josef Špaček <mspacek@redhat.com> - 6.04-0.28
|
||||||
- Make tftpboot subpackage completely noarch
|
- Rewrite Digest::SHA1 to SHA
|
||||||
Resolves: rhbz#1745205
|
|
||||||
|
|
||||||
* Tue Aug 27 2019 Javier Martinez Canillas <javierm@redhat.com> 6.04-3
|
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 6.04-0.27
|
||||||
Drop x86_64 ExclusiveArch for tftpboot subpackage
|
- Bump release for June 2024 mass rebuild
|
||||||
Resolves: rhbz#1745205
|
|
||||||
|
|
||||||
* Thu Aug 08 2019 Peter Jones <pjones@redhat.com> - 6.04-2
|
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6.04-0.26
|
||||||
- Fix a bunch of annocheck problems
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||||
Resolves: rhbz#1624176
|
|
||||||
|
|
||||||
* Fri Aug 10 2018 Peter Jones <pjones@redhat.com> - 6.04-1
|
* Wed Dec 13 2023 Nicolas Frayer <nfrayer@redhat.com>
|
||||||
- extlinux: fix missing include for major()/minor()
|
- Migrate to SPDX license
|
||||||
Resolves: rhbz#1611751
|
- 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
|
||||||
|
|
||||||
|
* Wed Sep 01 2021 Robbie Harwood <rharwood@redhat.com> - 6.04-0.19
|
||||||
|
- Place extlinux(1) in the extlinux subpackage
|
||||||
|
- Resolves: #977004
|
||||||
|
|
||||||
|
* 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
|
||||||
|
|
||||||
|
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.04-0.16
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed May 13 2020 Merlin Mathesius <mmathesi@redhat.com> - 6.04-0.15
|
||||||
|
- Patches to fix FTBFS in F32/F33/ELN (RHBZ#1800180)
|
||||||
|
|
||||||
|
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.04-0.14
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Sep 27 2019 Javier Martinez Canillas <javierm@redhat.com> - 6.04-0.13
|
||||||
|
- Fix a bunch of annocheck problems (pjones)
|
||||||
|
- Drop x86_64 ExclusiveArch for tftpboot subpackage
|
||||||
|
- Make tftpboot subpackage completely noarch (yselkowi)
|
||||||
|
|
||||||
|
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6.04-0.12
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri May 10 2019 Scott Talbert <swt@techie.net> - 6.04-0.11
|
||||||
|
- Add upstream patch to include sysmacros.h to fix FTBFS (#1676107)
|
||||||
|
|
||||||
|
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6.04-0.10
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.04-0.9
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.04-0.8
|
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.04-0.8
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
Loading…
Reference in New Issue
Block a user