rpms
/
syslinux
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import syslinux-6.04-0.20.el9

This commit is contained in:
CentOS Sources 2022-11-15 02:05:27 -05:00 committed by Stepan Oksanichenko
parent c16b0db7ce
commit 25105c0bf7
9 changed files with 163 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From ca745cdfc27b83b6bcef9f856d858a68c64429de Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 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 b472945..6606d31 100644
index b472945b..6606d319 100644
--- a/Makefile
+++ b/Makefile
@@ -275,6 +275,16 @@ efi64:
@ -28,5 +28,3 @@ index b472945..6606d31 100644
else # FIRMWARE
all: all-local subdirs
--
2.5.5

9
SOURCES/0002-ext4-64bit-feature.patch → SOURCES/0002-ext4-Fix-64bit-feature.patch
View File

@ -1,4 +1,4 @@
From af7e95c32cea40c1e443ae301e64b27f068b4915 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 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 76bd1d5..4bc0a53 100644
index 76bd1d5a..4bc0a535 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 76bd1d5..4bc0a53 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 803a995..d8d07eb 100644
index 803a9954..d8d07ebd 100644
--- a/core/fs/ext2/ext2_fs.h
+++ b/core/fs/ext2/ext2_fs.h
@@ -278,6 +278,7 @@ struct ext2_sb_info {
@ -96,6 +96,3 @@ index 803a995..d8d07eb 100644
};
static inline struct ext2_sb_info *EXT2_SB(struct fs_info *fs)
--
2.7.4.GIT

7
SOURCES/0003-include-sysmacros-h.patch → SOURCES/0003-extlinux-pull-in-sys-sysmacros.h-for-major-minor-mak.patch
View File

@ -1,4 +1,4 @@
From 1a74985b2a404639b08882c57f3147229605dfd5 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 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 a7ebd49..ebff7ea 100644
index a7ebd49a..ebff7eae 100644
--- a/extlinux/main.c
+++ b/extlinux/main.c
@@ -38,6 +38,7 @@
@ -28,6 +28,3 @@ index a7ebd49..ebff7ea 100644
#include <sys/types.h>
#include <sys/mount.h>
#include <sys/vfs.h>
--
2.10.5.GIT

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

@ -1,4 +1,4 @@
From 5c24d725d5a5f50f0544fbcc544f08a3f9e90e5d Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 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 1721ee54aff..d504e23133e 100644
index 1721ee54..d504e231 100644
--- a/extlinux/Makefile
+++ b/extlinux/Makefile
@@ -18,9 +18,9 @@ include $(MAKEDIR)/syslinux.mk
@ -27,7 +27,7 @@ index 1721ee54aff..d504e23133e 100644
SRCS = main.c \
mountinfo.c \
diff --git a/linux/Makefile b/linux/Makefile
index 5a49d813de1..9fed68d02c6 100644
index 5a49d813..9fed68d0 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -18,8 +18,8 @@ include $(MAKEDIR)/syslinux.mk
@ -42,7 +42,7 @@ index 5a49d813de1..9fed68d02c6 100644
SRCS = syslinux.c \
../libinstaller/syslxopt.c \
diff --git a/mtools/Makefile b/mtools/Makefile
index 632b185ba2f..b6e5ebdba6b 100755
index 632b185b..b6e5ebdb 100755
--- a/mtools/Makefile
+++ b/mtools/Makefile
@@ -2,8 +2,8 @@ include $(MAKEDIR)/syslinux.mk
@ -57,7 +57,7 @@ index 632b185ba2f..b6e5ebdba6b 100755
SRCS = syslinux.c \
../libinstaller/fs.c \
diff --git a/utils/Makefile b/utils/Makefile
index dfe625902ce..b4962353f20 100644
index dfe62590..b4962353 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -17,8 +17,8 @@
@ -71,6 +71,3 @@ index dfe625902ce..b4962353f20 100644
C_TARGETS = isohybrid gethostip memdiskfind
SCRIPT_TARGETS = mkdiskimage
--
2.21.0

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

@ -1,4 +1,4 @@
From 951928f2cad5682c2844e6bd0f7201236c5d9b66 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 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,6 +104,3 @@ index bbf23f24..3dd922d5 100644
# We need to rename the .hash section because the EFI firmware
# linker really doesn't like it.
--
2.25.1

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

@ -1,4 +1,4 @@
From eae06bdce9468d7fde263de1c53f80f2faff0c9e Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 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,6 +35,3 @@ 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

134
SOURCES/0007-Fix-backspace-when-editing-a-multiline-cmdline.patch Normal file
View File

@ -0,0 +1,134 @@
From 0000000000000000000000000000000000000000 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
Once the cmdline had passed the width of the screen, adding additional
characters introduced a spurious newline, and another newline at the
width of input. Furthermore, hitting backspace would not start
redrawing at the end of input, but rather at the beginning of the
current line - resulting in extra duplicate lines scrolling the console.
First, fix the assumption that the length of cmdline is the width - it
needs to include the length of the prompt (i.e., length of input and
space).
Second, fix the behavior of single-line redraw (i.e., redraw == 1) to
move the cursor to the row the line begins at.
Third, don't scroll the cursor down when a line wrap would occur - it's
not necessary since line wrap is enabled, and results in the extra blank
line.
Finally, comment all used escape sequences so that I don't need to look
them up again.
Signed-off-by: Robbie Harwood <rharwood@redhat.com>
---
com32/elflink/ldlinux/cli.c | 33 ++++++++++++++++++---------------
1 file changed, 18 insertions(+), 15 deletions(-)
diff --git a/com32/elflink/ldlinux/cli.c b/com32/elflink/ldlinux/cli.c
index 3119b11f..4913f038 100644
--- a/com32/elflink/ldlinux/cli.c
+++ b/com32/elflink/ldlinux/cli.c
@@ -135,6 +135,7 @@ const char *edit_cmdline(const char *input, int top /*, int width */ ,
struct cli_command *comm_counter = NULL;
clock_t kbd_to = kbdtimeout;
clock_t tto = totaltimeout;
+ int prompt_len = 1 + strlen(input);
if (!width) {
int height;
@@ -144,7 +145,7 @@ const char *edit_cmdline(const char *input, int top /*, int width */ ,
len = cursor = 0;
prev_len = 0;
- x = y = 0;
+ y = 0;
/*
* Before we start messing with the x,y coordinates print 'input'
@@ -152,6 +153,7 @@ const char *edit_cmdline(const char *input, int top /*, int width */ ,
* previously.
*/
printf("%s ", input);
+ x = prompt_len;
while (!done) {
if (redraw > 1) {
@@ -162,8 +164,7 @@ const char *edit_cmdline(const char *input, int top /*, int width */ ,
if (pDraw_Menu)
(*pDraw_Menu) (-1, top, 1);
prev_len = 0;
- printf("\033[2J\033[H");
- // printf("\033[0m\033[2J\033[H");
+ printf("\033[2J\033[H"); /* Clear entire screen; move to 0, 0. */
}
if (redraw > 0) {
@@ -172,10 +173,14 @@ const char *edit_cmdline(const char *input, int top /*, int width */ ,
prev_len = max(len, prev_len);
/* Redraw the command line */
- printf("\033[?25l");
- printf("\033[1G%s ", input);
+ printf("\033[?25l"); /* Hide cursor. */
+ printf("\033[1G"); /* Column 1. */
+ if (y > 0)
+ printf("\033[%dA", y); /* Directly up. */
- x = strlen(input);
+ printf("%s ", input);
+
+ x = prompt_len;
y = 0;
at = 0;
while (at < prev_len) {
@@ -183,23 +188,22 @@ const char *edit_cmdline(const char *input, int top /*, int width */ ,
at++;
x++;
if (x >= width) {
- printf("\r\n");
x = 0;
y++;
}
}
- printf("\033[K\r");
+ printf("\033[K\r"); /* Clear to end of line; go to beginning. */
- dy = y - (cursor + strlen(input) + 1) / width;
- x = (cursor + strlen(input) + 1) % width;
+ dy = y - (cursor + prompt_len) / width;
+ x = (cursor + prompt_len) % width;
if (dy) {
- printf("\033[%dA", dy);
+ printf("\033[%dA", dy); /* Cursor directly up. */
y -= dy;
}
if (x)
- printf("\033[%dC", x);
- printf("\033[?25h");
+ printf("\033[%dC", x); /* Cursor forward. */
+ printf("\033[?25h"); /* Show cursor. */
prev_len = len;
redraw = 0;
}
@@ -439,7 +443,6 @@ const char *edit_cmdline(const char *input, int top /*, int width */ ,
cursor++;
x++;
if (x >= width) {
- printf("\r\n\033[K");
y++;
x = 0;
}
@@ -459,7 +462,7 @@ const char *edit_cmdline(const char *input, int top /*, int width */ ,
}
}
- printf("\033[?7h");
+ printf("\033[?7h"); /* Enable line wrap. */
/* Add the command to the history if its length is larger than 0 */
len = strlen(ret);

7
SOURCES/syslinux.patches Normal file
View File

@ -0,0 +1,7 @@
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

15
SPECS/syslinux.spec
View File

@ -7,16 +7,13 @@ Summary: Simple kernel loader which boots from a FAT filesystem
Name: syslinux
Version: 6.04
%define tarball_version 6.04-pre1
Release: 0.19%{?dist}
Release: 0.20%{?dist}
License: GPLv2+
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
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
Source1: syslinux.patches
%include %{SOURCE1}
# this is to keep rpmbuild from thinking the .c32 / .com / .0 / memdisk files
# in noarch packages are a reason to stop the build.
@ -256,6 +253,10 @@ fi
%endif
%changelog
* Wed Aug 03 2022 Robbie Harwood <rharwood@redhat.com> - 6.04-0.20
- Sync with fedora (same NVR)
- Resolves: #2018260
* 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