SLFO-pool/syslinux
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: SLFO-pool:main
Branches Tags
SLFO-pool:main SLFO-pool:1.1
..
compare: SLFO-pool:1.1
Branches Tags
SLFO-pool:1.1 SLFO-pool:main

1 Commits
main ... 1.1

Author SHA256 Message Date
Adrian Schröter
d7b316a344 Sync from SUSE:SLFO:1.1 syslinux revision e783fb092298de1c0a4d005229872b58 2025-04-16 04:07:16 +02:00
28 changed files with 231 additions and 285 deletions
Expand all files Collapse all files

10
remove-note-gnu-section.patch
View File

@@ -1,8 +1,8 @@
Index: syslinux-4.04/mbr/Makefile diff --git a/mbr/Makefile b/mbr/Makefile
=================================================================== index be2bded7..59e06915 100644
--- syslinux-4.04.orig/mbr/Makefile --- a/mbr/Makefile
+++ syslinux-4.04/mbr/Makefile +++ b/mbr/Makefile
@@ -36,7 +36,7 @@ all: mbr.bin altmbr.bin gptmbr.bin @@ -36,7 +36,7 @@
$(LD) $(LDFLAGS) -T mbr.ld -e _start -o $@ $< $(LD) $(LDFLAGS) -T mbr.ld -e _start -o $@ $<
%.bin: %.elf checksize.pl %.bin: %.elf checksize.pl

11
syslinux-4.04-align.diff Normal file
View File

@@ -0,0 +1,11 @@
--- core/syslinux.ld
+++ core/syslinux.ld
@@ -263,7 +263,7 @@
__text_end = .;
}
- . = ALIGN(16);
+ . = ALIGN(32);
__rodata_vma = .;
__rodata_lma = __rodata_vma + __text_lma - __text_vma;

13
syslinux-4.04-align.patch
View File

@@ -1,13 +0,0 @@
Index: syslinux-4.04/core/syslinux.ld
===================================================================
--- syslinux-4.04.orig/core/syslinux.ld
+++ syslinux-4.04/core/syslinux.ld
@@ -263,7 +263,7 @@ SECTIONS
__text_end = .;
}
- . = ALIGN(16);
+ . = ALIGN(32);
__rodata_vma = .;
__rodata_lma = __rodata_vma + __text_lma - __text_vma;

10
syslinux-4.04-cache_fix.patch → syslinux-4.04-cache_fix.diff
View File

@@ -17,11 +17,11 @@ Date: Thu Jul 19 07:29:55 2012 -0700
Reported-by: Jan Safrata <jsafrata@centrum.cz> Reported-by: Jan Safrata <jsafrata@centrum.cz>
Signed-off-by: H. Peter Anvin <hpa@zytor.com> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Index: syslinux-4.04/core/fs/cache.c diff --git a/core/fs/cache.c b/core/fs/cache.c
=================================================================== index 0d7891b..3b21fc2 100644
--- syslinux-4.04.orig/core/fs/cache.c --- a/core/fs/cache.c
+++ syslinux-4.04/core/fs/cache.c +++ b/core/fs/cache.c
@@ -37,10 +37,10 @@ void cache_init(struct device *dev, int @@ -37,10 +37,10 @@ void cache_init(struct device *dev, int block_size_shift)
dev->cache_head = head = (struct cache *) dev->cache_head = head = (struct cache *)
(data + (dev->cache_entries << block_size_shift)); (data + (dev->cache_entries << block_size_shift));

10
syslinux-4.04-cwd.patch → syslinux-4.04-cwd.diff
View File

@@ -1,8 +1,8 @@
Index: syslinux-4.04/com32/gfxboot/gfxboot.c diff --git a/com32/gfxboot/gfxboot.c b/com32/gfxboot/gfxboot.c
=================================================================== index 9a39e79..35d180a 100644
--- syslinux-4.04.orig/com32/gfxboot/gfxboot.c --- a/com32/gfxboot/gfxboot.c
+++ syslinux-4.04/com32/gfxboot/gfxboot.c +++ b/com32/gfxboot/gfxboot.c
@@ -102,6 +102,8 @@ typedef struct __attribute__ ((packed)) @@ -102,6 +102,8 @@ typedef struct __attribute__ ((packed)) {
// 0: GFX_CB_MENU_INIT accepts 32 bit addresses // 0: GFX_CB_MENU_INIT accepts 32 bit addresses
// 1: knows about xmem_start, xmem_end // 1: knows about xmem_start, xmem_end
uint16_t reserved_1; // 62: uint16_t reserved_1; // 62:

40
syslinux-4.04-gcc10.patch → syslinux-4.04-gcc10.diff
View File

@@ -1,7 +1,5 @@
Index: syslinux-4.04/com32/MCONFIG --- com32/MCONFIG 2011-04-18 23:24:17.000000000 +0200
=================================================================== +++ com32/MCONFIG 2020-03-18 17:05:57.507347671 +0100
--- syslinux-4.04.orig/com32/MCONFIG
+++ syslinux-4.04/com32/MCONFIG
@@ -18,6 +18,7 @@ @@ -18,6 +18,7 @@
include $(topdir)/MCONFIG include $(topdir)/MCONFIG
@@ -10,10 +8,8 @@ Index: syslinux-4.04/com32/MCONFIG
GCCOPT += $(call gcc_ok,-m32,) GCCOPT += $(call gcc_ok,-m32,)
GCCOPT += $(call gcc_ok,-fno-stack-protector,) GCCOPT += $(call gcc_ok,-fno-stack-protector,)
GCCOPT += $(call gcc_ok,-fwrapv,) GCCOPT += $(call gcc_ok,-fwrapv,)
Index: syslinux-4.04/com32/lib/MCONFIG --- com32/lib/MCONFIG 2011-04-18 23:24:17.000000000 +0200
=================================================================== +++ com32/lib/MCONFIG 2020-03-18 17:07:39.960337684 +0100
--- syslinux-4.04.orig/com32/lib/MCONFIG
+++ syslinux-4.04/com32/lib/MCONFIG
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
include $(topdir)/MCONFIG include $(topdir)/MCONFIG
@@ -22,10 +18,8 @@ Index: syslinux-4.04/com32/lib/MCONFIG
GCCOPT += $(call gcc_ok,-m32,) GCCOPT += $(call gcc_ok,-m32,)
GCCOPT += $(call gcc_ok,-fno-stack-protector,) GCCOPT += $(call gcc_ok,-fno-stack-protector,)
GCCOPT += $(call gcc_ok,-fwrapv,) GCCOPT += $(call gcc_ok,-fwrapv,)
Index: syslinux-4.04/dos/errno.h --- dos/errno.h 2011-04-18 23:24:17.000000000 +0200
=================================================================== +++ dos/errno.h 2020-03-18 17:12:17.359044057 +0100
--- syslinux-4.04.orig/dos/errno.h
+++ syslinux-4.04/dos/errno.h
@@ -36,7 +36,7 @@ @@ -36,7 +36,7 @@
#define EDOM 33 /* Math argument out of domain of func */ #define EDOM 33 /* Math argument out of domain of func */
#define ERANGE 34 /* Math result not representable */ #define ERANGE 34 /* Math result not representable */
@@ -35,11 +29,9 @@ Index: syslinux-4.04/dos/errno.h
void perror(const char *); void perror(const char *);
#endif /* ERRNO_H */ #endif /* ERRNO_H */
Index: syslinux-4.04/gpxe/src/core/exec.c --- gpxe/src/core/exec.c 2011-04-18 23:24:17.000000000 +0200
=================================================================== +++ gpxe/src/core/exec.c 2020-03-18 16:56:52.257888015 +0100
--- syslinux-4.04.orig/gpxe/src/core/exec.c @@ -38,8 +38,8 @@
+++ syslinux-4.04/gpxe/src/core/exec.c
@@ -38,8 +38,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
*/ */
/* Avoid dragging in getopt.o unless a command really uses it */ /* Avoid dragging in getopt.o unless a command really uses it */
@@ -50,10 +42,8 @@ Index: syslinux-4.04/gpxe/src/core/exec.c
/** /**
* Execute command * Execute command
Index: syslinux-4.04/gpxe/src/include/compiler.h --- gpxe/src/include/compiler.h 2011-04-18 23:24:17.000000000 +0200
=================================================================== +++ gpxe/src/include/compiler.h 2020-03-18 16:48:56.193236495 +0100
--- syslinux-4.04.orig/gpxe/src/include/compiler.h
+++ syslinux-4.04/gpxe/src/include/compiler.h
@@ -64,7 +64,7 @@ @@ -64,7 +64,7 @@
.comm _sym, 0 .comm _sym, 0
#else /* ASSEMBLY */ #else /* ASSEMBLY */
@@ -63,10 +53,8 @@ Index: syslinux-4.04/gpxe/src/include/compiler.h
#endif /* ASSEMBLY */ #endif /* ASSEMBLY */
/** Require a symbol within this object file /** Require a symbol within this object file
Index: syslinux-4.04/dos/string.h --- dos/string.h 2020-03-18 17:25:50.019155261 +0100
=================================================================== +++ dos/string.h 2020-03-19 15:10:36.310787373 +0100
--- syslinux-4.04.orig/dos/string.h
+++ syslinux-4.04/dos/string.h
@@ -5,12 +5,13 @@ @@ -5,12 +5,13 @@
#ifndef _STRING_H #ifndef _STRING_H
#define _STRING_H #define _STRING_H
@@ -82,7 +70,7 @@ Index: syslinux-4.04/dos/string.h
/* 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)
@@ -21,6 +22,15 @@ static inline int memcmp(const void *__m @@ -21,6 +22,15 @@
return rv; return rv;
} }

16
syslinux-4.04-gcc47.patch → syslinux-4.04-gcc47.diff
View File

@@ -1,8 +1,6 @@
Index: syslinux-4.04/com32/lib/sys/entry.S --- com32/lib/sys/entry.S
=================================================================== +++ com32/lib/sys/entry.S
--- syslinux-4.04.orig/com32/lib/sys/entry.S @@ -92,8 +92,8 @@
+++ syslinux-4.04/com32/lib/sys/entry.S
@@ -92,8 +92,8 @@ _start:
pushl %eax # Save argc pushl %eax # Save argc
/* Look for library initialization functions */ /* Look for library initialization functions */
@@ -13,11 +11,9 @@ Index: syslinux-4.04/com32/lib/sys/entry.S
6: 6:
cmpl %edi,%esi cmpl %edi,%esi
jae 7f jae 7f
Index: syslinux-4.04/com32/lib/sys/exit.S --- com32/lib/sys/exit.S
=================================================================== +++ com32/lib/sys/exit.S
--- syslinux-4.04.orig/com32/lib/sys/exit.S @@ -17,9 +17,9 @@
+++ syslinux-4.04/com32/lib/sys/exit.S
@@ -17,9 +17,9 @@ _exit:
#endif #endif
/* Run any destructors */ /* Run any destructors */

14
syslinux-4.04-geometry.patch → syslinux-4.04-geometry.diff
View File

@@ -12,11 +12,11 @@ Signed-off-by: Gene Cumm <gene.cumm@gmail.com>
--- ---
(limited to 'extlinux/main.c') (limited to 'extlinux/main.c')
Index: syslinux-4.04/extlinux/main.c diff --git a/extlinux/main.c b/extlinux/main.c
=================================================================== index e5212a9..6aa6202 100755
--- syslinux-4.04.orig/extlinux/main.c --- a/extlinux/main.c
+++ syslinux-4.04/extlinux/main.c +++ b/extlinux/main.c
@@ -112,7 +112,7 @@ static int sysfs_get_offset(int devfd, u @@ -112,7 +112,7 @@ static int sysfs_get_offset(int devfd, unsigned long *start)
if ((size_t)snprintf(sysfs_name, sizeof sysfs_name, if ((size_t)snprintf(sysfs_name, sizeof sysfs_name,
"/sys/dev/block/%u:%u/start", "/sys/dev/block/%u:%u/start",
@@ -25,7 +25,7 @@ Index: syslinux-4.04/extlinux/main.c
>= sizeof sysfs_name) >= sizeof sysfs_name)
return -1; return -1;
@@ -153,7 +153,7 @@ int get_geometry(int devfd, uint64_t tot @@ -153,7 +153,7 @@ int get_geometry(int devfd, uint64_t totalbytes, struct hd_geometry *geo)
memset(geo, 0, sizeof *geo); memset(geo, 0, sizeof *geo);
@@ -34,3 +34,5 @@ Index: syslinux-4.04/extlinux/main.c
goto ok; goto ok;
} else if (!ioctl(devfd, FDGETPRM, &fd_str)) { } else if (!ioctl(devfd, FDGETPRM, &fd_str)) {
geo->heads = fd_str.head; geo->heads = fd_str.head;
--
cgit v0.9.2

10
syslinux-4.04-iso9660.patch → syslinux-4.04-iso9660.diff
View File

@@ -1,8 +1,8 @@
Index: syslinux-4.04/core/fs/iso9660/iso9660.c diff --git a/core/fs/iso9660/iso9660.c b/core/fs/iso9660/iso9660.c
=================================================================== index 3cd3ac4..9bbc299 100644
--- syslinux-4.04.orig/core/fs/iso9660/iso9660.c --- a/core/fs/iso9660/iso9660.c
+++ syslinux-4.04/core/fs/iso9660/iso9660.c +++ b/core/fs/iso9660/iso9660.c
@@ -228,14 +228,25 @@ static int iso_readdir(struct file *file @@ -228,14 +228,25 @@ static int iso_readdir(struct file *file, struct dirent *dirent)
/* Load the config file, return 1 if failed, or 0 */ /* Load the config file, return 1 if failed, or 0 */
static int iso_load_config(void) static int iso_load_config(void)
{ {

82
syslinux-4.04-isohybrid_efi.patch → syslinux-4.04-isohybrid_efi.diff
View File

@@ -1,8 +1,6 @@
Index: syslinux-4.04/mbr/altmbr.S --- mbr/altmbr.S
=================================================================== +++ mbr/altmbr.S
--- syslinux-4.04.orig/mbr/altmbr.S @@ -204,7 +204,7 @@
+++ syslinux-4.04/mbr/altmbr.S
@@ -204,7 +204,7 @@ scan_partition_table:
5: 5:
decb (partition) decb (partition)
jz boot jz boot
@@ -11,11 +9,9 @@ Index: syslinux-4.04/mbr/altmbr.S
loopw 5b loopw 5b
popw %cx /* %cx <- 4 */ popw %cx /* %cx <- 4 */
Index: syslinux-4.04/mbr/isohdpfx.S --- mbr/isohdpfx.S
=================================================================== +++ mbr/isohdpfx.S
--- syslinux-4.04.orig/mbr/isohdpfx.S @@ -66,6 +66,37 @@
+++ syslinux-4.04/mbr/isohdpfx.S
@@ -66,6 +66,37 @@ bootsec:
.globl _start .globl _start
_start: _start:
.byte 0x33, 0xed /* xorw %bp, %bp */ .byte 0x33, 0xed /* xorw %bp, %bp */
@@ -53,11 +49,9 @@ Index: syslinux-4.04/mbr/isohdpfx.S
cli cli
movw %bp, %ss movw %bp, %ss
movw $stack, %sp movw $stack, %sp
Index: syslinux-4.04/mbr/mbr.S --- mbr/mbr.S
=================================================================== +++ mbr/mbr.S
--- syslinux-4.04.orig/mbr/mbr.S @@ -265,6 +265,19 @@
+++ syslinux-4.04/mbr/mbr.S
@@ -265,6 +265,19 @@ boot:
movl %eax, 8(%si) /* Adjust in-memory partition table entry */ movl %eax, 8(%si) /* Adjust in-memory partition table entry */
call read_sector call read_sector
jc disk_error jc disk_error
@@ -77,11 +71,9 @@ Index: syslinux-4.04/mbr/mbr.S
cmpw $0xaa55, (bootsec+510) cmpw $0xaa55, (bootsec+510)
jne missing_os /* Not a valid boot sector */ jne missing_os /* Not a valid boot sector */
movw $driveno, %sp /* driveno == bootsec-6 */ movw $driveno, %sp /* driveno == bootsec-6 */
Index: syslinux-4.04/utils/Makefile --- utils/Makefile
=================================================================== +++ utils/Makefile
--- syslinux-4.04.orig/utils/Makefile @@ -47,7 +47,7 @@
+++ syslinux-4.04/utils/Makefile
@@ -47,7 +47,7 @@ isohdpfx.c: $(ISOHDPFX) isohdpfxarray.pl
$(PERL) isohdpfxarray.pl $(ISOHDPFX) > $@ $(PERL) isohdpfxarray.pl $(ISOHDPFX) > $@
isohybrid: isohybrid.o isohdpfx.o isohybrid: isohybrid.o isohdpfx.o
@@ -90,10 +82,8 @@ Index: syslinux-4.04/utils/Makefile
gethostip: gethostip.o gethostip: gethostip.o
$(CC) $(LDFLAGS) -o $@ $^ $(CC) $(LDFLAGS) -o $@ $^
Index: syslinux-4.04/utils/isohybrid.c --- utils/isohybrid.c
=================================================================== +++ utils/isohybrid.c
--- syslinux-4.04.orig/utils/isohybrid.c
+++ syslinux-4.04/utils/isohybrid.c
@@ -36,21 +36,29 @@ @@ -36,21 +36,29 @@
#include <unistd.h> #include <unistd.h>
#include <sys/stat.h> #include <sys/stat.h>
@@ -127,7 +117,7 @@ Index: syslinux-4.04/utils/isohybrid.c
uint16_t type = 0x17; /* partition type: 0 <= type <= 255 */ uint16_t type = 0x17; /* partition type: 0 <= type <= 255 */
uint32_t id = 0; /* MBR: 0 <= id <= 0xFFFFFFFF(4294967296) */ uint32_t id = 0; /* MBR: 0 <= id <= 0xFFFFFFFF(4294967296) */
@@ -59,12 +67,153 @@ uint8_t partok = 0; /* 0 <= @@ -59,12 +67,153 @@
uint16_t ve[16]; uint16_t ve[16];
uint32_t catoffset = 0; uint32_t catoffset = 0;
@@ -282,7 +272,7 @@ Index: syslinux-4.04/utils/isohybrid.c
void void
@@ -86,9 +235,13 @@ printh(void) @@ -86,9 +235,13 @@
printf(FMT, " -h <X>", "Number of default geometry heads"); printf(FMT, " -h <X>", "Number of default geometry heads");
printf(FMT, " -s <X>", "Number of default geometry sectors"); printf(FMT, " -s <X>", "Number of default geometry sectors");
printf(FMT, " -e --entry", "Specify partition entry number (1-4)"); printf(FMT, " -e --entry", "Specify partition entry number (1-4)");
@@ -297,7 +287,7 @@ Index: syslinux-4.04/utils/isohybrid.c
printf("\n"); printf("\n");
printf(FMT, " --forcehd0", "Assume we are loaded as disk ID 0"); printf(FMT, " --forcehd0", "Assume we are loaded as disk ID 0");
@@ -108,6 +261,7 @@ printh(void) @@ -108,6 +261,7 @@
int int
check_option(int argc, char *argv[]) check_option(int argc, char *argv[])
{ {
@@ -305,7 +295,7 @@ Index: syslinux-4.04/utils/isohybrid.c
int n = 0, ind = 0; int n = 0, ind = 0;
const char optstr[] = ":h:s:e:o:t:i:fcp?vV"; const char optstr[] = ":h:s:e:o:t:i:fcp?vV";
@@ -117,10 +271,14 @@ check_option(int argc, char *argv[]) @@ -117,10 +271,14 @@
{ "offset", required_argument, NULL, 'o' }, { "offset", required_argument, NULL, 'o' },
{ "type", required_argument, NULL, 't' }, { "type", required_argument, NULL, 't' },
{ "id", required_argument, NULL, 'i' }, { "id", required_argument, NULL, 'i' },
@@ -320,7 +310,7 @@ Index: syslinux-4.04/utils/isohybrid.c
{ "help", no_argument, NULL, '?' }, { "help", no_argument, NULL, '?' },
{ "verbose", no_argument, NULL, 'v' }, { "verbose", no_argument, NULL, 'v' },
@@ -135,32 +293,38 @@ check_option(int argc, char *argv[]) @@ -135,32 +293,38 @@
switch (n) switch (n)
{ {
case 'h': case 'h':
@@ -366,7 +356,7 @@ Index: syslinux-4.04/utils/isohybrid.c
errx(1, "invalid id: `%s'", optarg); errx(1, "invalid id: `%s'", optarg);
break; break;
@@ -176,10 +340,26 @@ check_option(int argc, char *argv[]) @@ -176,10 +340,26 @@
partok = 1; partok = 1;
break; break;
@@ -393,7 +383,7 @@ Index: syslinux-4.04/utils/isohybrid.c
case 'V': case 'V':
printf("%s version %s\n", prog, VERSION); printf("%s version %s\n", prog, VERSION);
exit(0); exit(0);
@@ -200,6 +380,33 @@ check_option(int argc, char *argv[]) @@ -200,6 +380,33 @@
return optind; return optind;
} }
@@ -427,7 +417,7 @@ Index: syslinux-4.04/utils/isohybrid.c
uint16_t uint16_t
lendian_short(const uint16_t s) lendian_short(const uint16_t s)
@@ -229,6 +436,22 @@ lendian_int(const uint32_t s) @@ -229,6 +436,22 @@
return r; return r;
} }
@@ -450,7 +440,7 @@ Index: syslinux-4.04/utils/isohybrid.c
int int
check_banner(const uint8_t *buf) check_banner(const uint8_t *buf)
@@ -252,7 +475,7 @@ check_banner(const uint8_t *buf) @@ -252,7 +475,7 @@
int int
check_catalogue(const uint8_t *buf) check_catalogue(const uint8_t *buf)
{ {
@@ -459,7 +449,7 @@ Index: syslinux-4.04/utils/isohybrid.c
for (i = 0, cs = 0; i < 16; i++) for (i = 0, cs = 0; i < 16; i++)
{ {
@@ -307,6 +530,43 @@ read_catalogue(const uint8_t *buf) @@ -307,6 +530,43 @@
} }
@@ -503,7 +493,7 @@ Index: syslinux-4.04/utils/isohybrid.c
void void
display_catalogue(void) display_catalogue(void)
{ {
@@ -321,18 +581,33 @@ display_catalogue(void) @@ -321,18 +581,33 @@
} }
@@ -541,7 +531,7 @@ Index: syslinux-4.04/utils/isohybrid.c
mbr += MBRSIZE; /* offset 432 */ mbr += MBRSIZE; /* offset 432 */
tmp = lendian_int(de_lba * 4); tmp = lendian_int(de_lba * 4);
@@ -351,42 +626,92 @@ initialise_mbr(uint8_t *mbr) @@ -351,42 +626,92 @@
mbr[1] = '\0'; mbr[1] = '\0';
mbr += 2; /* offset 446 */ mbr += 2; /* offset 446 */
@@ -658,7 +648,7 @@ Index: syslinux-4.04/utils/isohybrid.c
mbr[0] = 0x55; mbr[0] = 0x55;
mbr[1] = 0xAA; mbr[1] = 0xAA;
mbr += 2; mbr += 2;
@@ -394,7 +719,6 @@ initialise_mbr(uint8_t *mbr) @@ -394,7 +719,6 @@
return mbr - rbm; return mbr - rbm;
} }
@@ -666,7 +656,7 @@ Index: syslinux-4.04/utils/isohybrid.c
void void
display_mbr(const uint8_t *mbr, size_t len) display_mbr(const uint8_t *mbr, size_t len)
{ {
@@ -424,14 +748,190 @@ display_mbr(const uint8_t *mbr, size_t l @@ -424,14 +748,190 @@
} }
@@ -859,7 +849,7 @@ Index: syslinux-4.04/utils/isohybrid.c
prog = strcpy(alloca(strlen(argv[0]) + 1), argv[0]); prog = strcpy(alloca(strlen(argv[0]) + 1), argv[0]);
i = check_option(argc, argv); i = check_option(argc, argv);
@@ -443,10 +943,32 @@ main(int argc, char *argv[]) @@ -443,10 +943,32 @@
usage(); usage();
return 1; return 1;
} }
@@ -893,7 +883,7 @@ Index: syslinux-4.04/utils/isohybrid.c
if (fseek(fp, 17 * 2048, SEEK_SET)) if (fseek(fp, 17 * 2048, SEEK_SET))
err(1, "%s: seek error - 1", argv[0]); err(1, "%s: seek error - 1", argv[0]);
@@ -478,6 +1000,53 @@ main(int argc, char *argv[]) @@ -478,6 +1000,53 @@
if (mode & VERBOSE) if (mode & VERBOSE)
display_catalogue(); display_catalogue();
@@ -947,7 +937,7 @@ Index: syslinux-4.04/utils/isohybrid.c
if (fseek(fp, (de_lba * 2048 + 0x40), SEEK_SET)) if (fseek(fp, (de_lba * 2048 + 0x40), SEEK_SET))
err(1, "%s: seek error - 3", argv[0]); err(1, "%s: seek error - 3", argv[0]);
@@ -491,24 +1060,55 @@ main(int argc, char *argv[]) @@ -491,24 +1060,55 @@
"signature. Note that isolinux-debug.bin does not support " \ "signature. Note that isolinux-debug.bin does not support " \
"hybrid booting", argv[0]); "hybrid booting", argv[0]);
@@ -1006,7 +996,7 @@ Index: syslinux-4.04/utils/isohybrid.c
if (!id) if (!id)
{ {
if (fseek(fp, 440, SEEK_SET)) if (fseek(fp, 440, SEEK_SET))
@@ -530,6 +1130,16 @@ main(int argc, char *argv[]) @@ -530,6 +1130,16 @@
buf = bufz; buf = bufz;
memset(buf, 0, BUFSIZE); memset(buf, 0, BUFSIZE);
@@ -1023,7 +1013,7 @@ Index: syslinux-4.04/utils/isohybrid.c
i = initialise_mbr(buf); i = initialise_mbr(buf);
if (mode & VERBOSE) if (mode & VERBOSE)
@@ -541,15 +1151,74 @@ main(int argc, char *argv[]) @@ -541,15 +1151,74 @@
if (fwrite(buf, sizeof(char), i, fp) != (size_t)i) if (fwrite(buf, sizeof(char), i, fp) != (size_t)i)
err(1, "%s: write error - 1", argv[0]); err(1, "%s: write error - 1", argv[0]);
@@ -1099,10 +1089,8 @@ Index: syslinux-4.04/utils/isohybrid.c
free(buf); free(buf);
fclose(fp); fclose(fp);
Index: syslinux-4.04/utils/isohybrid.h --- utils/isohybrid.h
=================================================================== +++ utils/isohybrid.h
--- syslinux-4.04.orig/utils/isohybrid.h
+++ syslinux-4.04/utils/isohybrid.h
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
* *
*/ */

8
syslinux-4.04-isohybrid_efi_optional.patch → syslinux-4.04-isohybrid_efi_optional.diff
View File

@@ -1,7 +1,7 @@
Index: syslinux-4.04/utils/isohybrid.c diff --git a/utils/isohybrid.c b/utils/isohybrid.c
=================================================================== index 7638bc0..09f4520 100644
--- syslinux-4.04.orig/utils/isohybrid.c --- a/utils/isohybrid.c
+++ syslinux-4.04/utils/isohybrid.c +++ b/utils/isohybrid.c
@@ -1028,7 +1028,9 @@ main(int argc, char *argv[]) @@ -1028,7 +1028,9 @@ main(int argc, char *argv[])
errx(1, "%s: invalid efi catalogue", argv[0]); errx(1, "%s: invalid efi catalogue", argv[0]);
} }

8
syslinux-4.04-isohybrid_mbr.patch → syslinux-4.04-isohybrid_mbr.diff
View File

@@ -1,7 +1,7 @@
Index: syslinux-4.04/utils/isohybrid.c diff --git a/utils/isohybrid.c b/utils/isohybrid.c
=================================================================== index 09f4520..954b5ed 100644
--- syslinux-4.04.orig/utils/isohybrid.c --- a/utils/isohybrid.c
+++ syslinux-4.04/utils/isohybrid.c +++ b/utils/isohybrid.c
@@ -653,12 +653,10 @@ initialise_mbr(uint8_t *mbr) @@ -653,12 +653,10 @@ initialise_mbr(uint8_t *mbr)
continue; continue;
} }

6
syslinux-4.04-libext2fs.patch → syslinux-4.04-libext2fs.diff
View File

@@ -1,7 +1,5 @@
Index: syslinux-4.04/libinstaller/linuxioctl.h --- libinstaller/linuxioctl.h
=================================================================== +++ libinstaller/linuxioctl.h
--- syslinux-4.04.orig/libinstaller/linuxioctl.h
+++ syslinux-4.04/libinstaller/linuxioctl.h
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
#undef SECTOR_SIZE /* Defined in msdos_fs.h for no good reason */ #undef SECTOR_SIZE /* Defined in msdos_fs.h for no good reason */

8
syslinux-4.04-localboot.patch → syslinux-4.04-localboot.diff
View File

@@ -1,7 +1,7 @@
Index: syslinux-4.04/core/localboot.inc diff --git a/core/localboot.inc b/core/localboot.inc
=================================================================== index 1fe3102..30f34fc 100644
--- syslinux-4.04.orig/core/localboot.inc --- a/core/localboot.inc
+++ syslinux-4.04/core/localboot.inc +++ b/core/localboot.inc
@@ -33,6 +33,15 @@ local_boot: @@ -33,6 +33,15 @@ local_boot:
cmp ax,-1 cmp ax,-1
je .int18 je .int18

11
syslinux-4.04-lzo.diff Normal file
View File

@@ -0,0 +1,11 @@
--- lzo/Makefile
+++ lzo/Makefile
@@ -19,6 +19,8 @@
LIB = lzo.a
BINS = prepcore
+OPTFLAGS += -fno-strict-aliasing
+
all : $(BINS)
$(LIB) : $(LIBOBJS)

13
syslinux-4.04-lzo.patch
View File

@@ -1,13 +0,0 @@
Index: syslinux-4.04/lzo/Makefile
===================================================================
--- syslinux-4.04.orig/lzo/Makefile
+++ syslinux-4.04/lzo/Makefile
@@ -19,6 +19,8 @@ LIBOBJS = $(sort $(patsubst %.c,%.o,$(wi
LIB = lzo.a
BINS = prepcore
+OPTFLAGS += -fno-strict-aliasing
+
all : $(BINS)
$(LIB) : $(LIBOBJS)

12
syslinux-4.04-mboot_bootif.patch → syslinux-4.04-mboot_bootif.diff
View File

@@ -1,8 +1,8 @@
Index: syslinux-4.04/com32/mboot/mboot.c diff --git a/com32/mboot/mboot.c b/com32/mboot/mboot.c
=================================================================== index 35450e0..a124a21 100644
--- syslinux-4.04.orig/com32/mboot/mboot.c --- a/com32/mboot/mboot.c
+++ syslinux-4.04/com32/mboot/mboot.c +++ b/com32/mboot/mboot.c
@@ -97,9 +97,14 @@ static int get_modules(char **argv, stru @@ -97,9 +97,14 @@ static int get_modules(char **argv, struct module_data **mdp)
int arglen; int arglen;
const char module_separator[] = "---"; const char module_separator[] = "---";
@@ -17,7 +17,7 @@ Index: syslinux-4.04/com32/mboot/mboot.c
} }
*mdp = mp = malloc(module_count * sizeof(struct module_data)); *mdp = mp = malloc(module_count * sizeof(struct module_data));
@@ -133,11 +138,19 @@ static int get_modules(char **argv, stru @@ -133,11 +138,19 @@ static int get_modules(char **argv, struct module_data **mdp)
mp->cmdline = strdup(""); mp->cmdline = strdup("");
} else { } else {
char *p; char *p;

6
syslinux-4.04-md5pass.patch → syslinux-4.04-md5pass.diff
View File

@@ -1,7 +1,5 @@
Index: syslinux-4.04/utils/md5pass --- a/utils/md5pass
=================================================================== +++ b/utils/md5pass
--- syslinux-4.04.orig/utils/md5pass
+++ syslinux-4.04/utils/md5pass
@@ -1,7 +1,6 @@ @@ -1,7 +1,6 @@
#!/usr/bin/perl #!/usr/bin/perl

6
syslinux-4.04-miniacc.patch → syslinux-4.04-miniacc.diff
View File

@@ -1,7 +1,7 @@
Index: syslinux-4.04/lzo/src/miniacc.h Index: lzo/src/miniacc.h
=================================================================== ===================================================================
--- syslinux-4.04.orig/lzo/src/miniacc.h --- lzo/src/miniacc.h.orig 2016-02-11 14:37:17.029802775 +0100
+++ syslinux-4.04/lzo/src/miniacc.h +++ lzo/src/miniacc.h 2016-02-11 14:38:38.086742103 +0100
@@ -4412,12 +4412,12 @@ ACCLIB_EXTERN(int, acc_spawnve) (int mod @@ -4412,12 +4412,12 @@ ACCLIB_EXTERN(int, acc_spawnve) (int mod
#if defined(__MSDOS__) && defined(__TURBOC__) && (__TURBOC__ < 0x0150) #if defined(__MSDOS__) && defined(__TURBOC__) && (__TURBOC__ < 0x0150)
#elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC) #elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC)

34
syslinux-4.04-mtime.patch → syslinux-4.04-mtime.diff
View File

@@ -1,7 +1,7 @@
Index: syslinux-4.04/core/Makefile diff --git a/core/Makefile b/core/Makefile
=================================================================== index 33ad7e9..49ba474 100644
--- syslinux-4.04.orig/core/Makefile --- a/core/Makefile
+++ syslinux-4.04/core/Makefile +++ b/core/Makefile
@@ -63,7 +63,7 @@ PREPCORE = ../lzo/prepcore @@ -63,7 +63,7 @@ PREPCORE = ../lzo/prepcore
# official release. Otherwise, substitute a hex string that is pretty much # official release. Otherwise, substitute a hex string that is pretty much
# guaranteed to be unique to be unique from build to build. # guaranteed to be unique to be unique from build to build.
@@ -11,10 +11,10 @@ Index: syslinux-4.04/core/Makefile
endif endif
ifndef DATE ifndef DATE
DATE := $(shell sh ../gen-id.sh $(VERSION) $(HEXDATE)) DATE := $(shell sh ../gen-id.sh $(VERSION) $(HEXDATE))
Index: syslinux-4.04/libinstaller/bin2c.pl diff --git a/libinstaller/bin2c.pl b/libinstaller/bin2c.pl
=================================================================== index 07c11dd..2864488 100755
--- syslinux-4.04.orig/libinstaller/bin2c.pl --- a/libinstaller/bin2c.pl
+++ syslinux-4.04/libinstaller/bin2c.pl +++ b/libinstaller/bin2c.pl
@@ -71,8 +71,4 @@ if ($align != 0) { @@ -71,8 +71,4 @@ if ($align != 0) {
printf "\n};\n\nconst unsigned int %s_len = %u;\n", $table_name, $total_len; printf "\n};\n\nconst unsigned int %s_len = %u;\n", $table_name, $total_len;
@@ -24,10 +24,10 @@ Index: syslinux-4.04/libinstaller/bin2c.pl
-printf "\nconst int %s_mtime = %d;\n", $table_name, $st[9]; -printf "\nconst int %s_mtime = %d;\n", $table_name, $st[9];
- -
exit 0; exit 0;
Index: syslinux-4.04/libinstaller/syslinux.h diff --git a/libinstaller/syslinux.h b/libinstaller/syslinux.h
=================================================================== index 710d30e..963cafe 100644
--- syslinux-4.04.orig/libinstaller/syslinux.h --- a/libinstaller/syslinux.h
+++ syslinux-4.04/libinstaller/syslinux.h +++ b/libinstaller/syslinux.h
@@ -20,11 +20,9 @@ @@ -20,11 +20,9 @@
/* The standard boot sector and ldlinux image */ /* The standard boot sector and ldlinux image */
extern unsigned char syslinux_bootsect[]; extern unsigned char syslinux_bootsect[];
@@ -48,10 +48,12 @@ Index: syslinux-4.04/libinstaller/syslinux.h
/* Sector size assumptions... */ /* Sector size assumptions... */
#define SECTOR_SHIFT 9 #define SECTOR_SHIFT 9
Index: syslinux-4.04/now.pl diff --git a/now.pl b/now.pl
=================================================================== old mode 100644
--- syslinux-4.04.orig/now.pl new mode 100755
+++ syslinux-4.04/now.pl index a3b5a79..60c4fe0
--- a/now.pl
+++ b/now.pl
@@ -1,21 +1,22 @@ @@ -1,21 +1,22 @@
-#!/usr/bin/perl -#!/usr/bin/perl
-# -#

10
syslinux-4.04-noinitrd.patch → syslinux-4.04-noinitrd.diff
View File

@@ -1,8 +1,8 @@
Index: syslinux-4.04/com32/gfxboot/gfxboot.c diff --git a/com32/gfxboot/gfxboot.c b/com32/gfxboot/gfxboot.c
=================================================================== index 3749920..9a39e79 100644
--- syslinux-4.04.orig/com32/gfxboot/gfxboot.c --- a/com32/gfxboot/gfxboot.c
+++ syslinux-4.04/com32/gfxboot/gfxboot.c +++ b/com32/gfxboot/gfxboot.c
@@ -935,11 +935,15 @@ void boot_entry(menu_t *menu_ptr, char * @@ -922,11 +922,15 @@ void boot_entry(menu_t *menu_ptr, char *arg)
*skip_nonspaces(s) = 0; *skip_nonspaces(s) = 0;
initrd_arg = s; initrd_arg = s;
} }

8
syslinux-4.04-nostrip.patch → syslinux-4.04-nostrip.diff
View File

@@ -1,8 +1,6 @@
Index: syslinux-4.04/utils/Makefile --- utils/Makefile
=================================================================== +++ utils/Makefile
--- syslinux-4.04.orig/utils/Makefile @@ -18,7 +18,7 @@
+++ syslinux-4.04/utils/Makefile
@@ -18,7 +18,7 @@ topdir = ..
include $(topdir)/MCONFIG include $(topdir)/MCONFIG
CFLAGS = $(GCCWARN) -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 CFLAGS = $(GCCWARN) -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64

0
syslinux-4.04-pie.patch → syslinux-4.04-pie.diff
View File

28
syslinux-4.04-python3.patch → syslinux-4.04-python3.diff
View File

@@ -1,8 +1,6 @@
Index: syslinux-4.04/com32/cmenu/Makefile --- com32/cmenu/Makefile
=================================================================== +++ com32/cmenu/Makefile
--- syslinux-4.04.orig/com32/cmenu/Makefile @@ -37,7 +37,7 @@
+++ syslinux-4.04/com32/cmenu/Makefile
@@ -37,7 +37,7 @@ MENUS = $(CMENUS) $(IMENUS)
.PRECIOUS: %.c .PRECIOUS: %.c
%.c: %.menu adv_menu.tpl %.c: %.menu adv_menu.tpl
@@ -11,17 +9,15 @@ Index: syslinux-4.04/com32/cmenu/Makefile
all: menus all: menus
Index: syslinux-4.04/com32/cmenu/menugen.py --- com32/cmenu/menugen.py
=================================================================== +++ com32/cmenu/menugen.py
--- syslinux-4.04.orig/com32/cmenu/menugen.py
+++ syslinux-4.04/com32/cmenu/menugen.py
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-#!/usr/bin/env python -#!/usr/bin/env python
+#!/usr/bin/env python3 +#!/usr/bin/env python3
import sys, re, getopt import sys, re, getopt
@@ -100,27 +100,27 @@ class Menusystem: @@ -100,27 +100,27 @@
if not self.entry["info"]: if not self.entry["info"]:
self.entry["info"] = self.entry["data"] self.entry["info"] = self.entry["data"]
if not self.menus: if not self.menus:
@@ -55,7 +51,7 @@ Index: syslinux-4.04/com32/cmenu/menugen.py
elif name in ["state","helpid","ipappend"]: elif name in ["state","helpid","ipappend"]:
try: try:
value = int(value) value = int(value)
@@ -131,14 +131,14 @@ class Menusystem: @@ -131,14 +131,14 @@
return "" return ""
def set_menu(self,name,value): def set_menu(self,name,value):
@@ -72,7 +68,7 @@ Index: syslinux-4.04/com32/cmenu/menugen.py
return "Error: Unknown keyword %s" % name return "Error: Unknown keyword %s" % name
if name == "skipcondn": if name == "skipcondn":
try: # is skipcondn a number? try: # is skipcondn a number?
@@ -169,7 +169,7 @@ class Menusystem: @@ -169,7 +169,7 @@
if not err: return if not err: return
# all errors so return item's error message # all errors so return item's error message
@@ -81,7 +77,7 @@ Index: syslinux-4.04/com32/cmenu/menugen.py
sys.exit(1) sys.exit(1)
def print_entry(self,entry,fd): def print_entry(self,entry,fd):
@@ -211,9 +211,9 @@ class Menusystem: @@ -211,9 +211,9 @@
missing = None missing = None
for x in self.reqd_templates: for x in self.reqd_templates:
@@ -93,7 +89,7 @@ Index: syslinux-4.04/com32/cmenu/menugen.py
if filename == "-": if filename == "-":
fd = sys.stdout fd = sys.stdout
@@ -227,8 +227,8 @@ class Menusystem: @@ -227,8 +227,8 @@
fd.write(self.templates["footer"]) fd.write(self.templates["footer"])
fd.close() fd.close()
if not self.foundmain: if not self.foundmain:
@@ -104,7 +100,7 @@ Index: syslinux-4.04/com32/cmenu/menugen.py
sys.exit(1) sys.exit(1)
def input(self,filename): def input(self,filename):
@@ -259,26 +259,26 @@ class Menusystem: @@ -259,26 +259,26 @@
# add property of current entry # add property of current entry
pos = line.find("=") # find the first = in string pos = line.find("=") # find the first = in string
if pos < 0: if pos < 0:
@@ -141,7 +137,7 @@ Index: syslinux-4.04/com32/cmenu/menugen.py
sys.exit(1) sys.exit(1)
def main(): def main():
@@ -287,7 +287,7 @@ def main(): @@ -287,7 +287,7 @@
ofile = "-" ofile = "-"
opts,args = getopt.getopt(sys.argv[1:], "hi:o:t:",["input=","output=","template=","help"]) opts,args = getopt.getopt(sys.argv[1:], "hi:o:t:",["input=","output=","template=","help"])
if args: if args:

8
syslinux-4.04-timeout.patch → syslinux-4.04-timeout.diff
View File

@@ -1,7 +1,7 @@
Index: syslinux-4.04/core/ui.inc diff --git a/core/ui.inc b/core/ui.inc
=================================================================== index 0a4bb56..97945c9 100644
--- syslinux-4.04.orig/core/ui.inc --- a/core/ui.inc
+++ syslinux-4.04/core/ui.inc +++ b/core/ui.inc
@@ -529,30 +529,36 @@ kernel_corrupt: mov si,err_notkernel @@ -529,30 +529,36 @@ kernel_corrupt: mov si,err_notkernel
; which can be adjusted by the caller based on the corresponding ; which can be adjusted by the caller based on the corresponding
; master variables; on return they're updated. ; master variables; on return they're updated.

38
syslinux.changes
View File

@@ -1,41 +1,3 @@
-------------------------------------------------------------------
Mon Feb 26 13:28:56 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
- Use %autosetup macro: allows us to eliminate usage of deprecated
%patchN syntax.
- Normalize all patches to apply as -p1
+ Rebased remove-note-gnu-section.patch
+ Rebased sysmacros.patch
- Rename all *.diff files to *.patch, aligning one a common suffix:
+ syslinux-4.04-align.diff -> syslinux-4.04-align.patch
+ syslinux-4.04-cache_fix.diff -> syslinux-4.04-cache_fix.patch
+ syslinux-4.04-cwd.diff -> syslinux-4.04-cwd.patch
+ syslinux-4.04-gcc10.diff -> syslinux-4.04-gcc10.patch
+ syslinux-4.04-gcc47.diff -> syslinux-4.04-gcc47.patch
+ syslinux-4.04-geometry.diff -> syslinux-4.04-geometry.patch
+ syslinux-4.04-iso9660.diff -> syslinux-4.04-iso9660.patch
+ syslinux-4.04-isohybrid_efi.diff -> syslinux-4.04-isohybrid_efi.patch
+ syslinux-4.04-isohybrid_efi_optional.diff -> syslinux-4.04-isohybrid_efi_optional.patch
+ syslinux-4.04-isohybrid_mbr.diff -> syslinux-4.04-isohybrid_mbr.patch
+ syslinux-4.04-libext2fs.diff -> syslinux-4.04-libext2fs.patch
+ syslinux-4.04-localboot.diff -> syslinux-4.04-localboot.patch
+ syslinux-4.04-lzo.diff -> syslinux-4.04-lzo.patch
+ syslinux-4.04-mboot_bootif.diff -> syslinux-4.04-mboot_bootif.patch
+ syslinux-4.04-md5pass.diff -> syslinux-4.04-md5pass.patch
+ syslinux-4.04-miniacc.diff -> syslinux-4.04-miniacc.patch
+ syslinux-4.04-mtime.diff -> syslinux-4.04-mtime.patch
+ syslinux-4.04-noinitrd.diff -> syslinux-4.04-noinitrd.patch
+ syslinux-4.04-nostrip.diff -> syslinux-4.04-nostrip.patch
+ syslinux-4.04-pie.diff -> syslinux-4.04-pie.patch
+ syslinux-4.04-python3.diff -> syslinux-4.04-python3.patch
+ syslinux-4.04-timeout.diff -> syslinux-4.04-timeout.patch
-------------------------------------------------------------------
Fri May 26 08:42:21 UTC 2023 - Marcus Meissner <meissner@suse.com>
- Build the system installable binaries with RPM_OPT_FLAGS, to allow
utilization of stack-protector and FORTIFY_SOURCE. (bsc#1211640)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 9 10:45:24 UTC 2021 - Wolfgang Frisch <wolfgang.frisch@suse.com> Wed Jun 9 10:45:24 UTC 2021 - Wolfgang Frisch <wolfgang.frisch@suse.com>

83
syslinux.spec
View File

@@ -1,7 +1,7 @@
# #
# spec file for package syslinux # spec file for package syslinux
# #
# Copyright (c) 2024 SUSE LLC # Copyright (c) 2021 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@@ -38,33 +38,34 @@ Source: https://www.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{v
Source1: isolinux-config Source1: isolinux-config
Source2: README.gfxboot Source2: README.gfxboot
Source3: baselibs.conf Source3: baselibs.conf
Patch0: %{name}-%{version}-iso9660.patch Patch0: %{name}-%{version}-iso9660.diff
Patch1: %{name}-%{version}-cwd.patch Patch1: %{name}-%{version}-cwd.diff
Patch2: %{name}-%{version}-noinitrd.patch Patch2: %{name}-%{version}-noinitrd.diff
Patch3: %{name}-%{version}-mboot_bootif.patch Patch3: %{name}-%{version}-mboot_bootif.diff
Patch5: %{name}-%{version}-md5pass.patch Patch5: %{name}-%{version}-md5pass.diff
Patch6: %{name}-%{version}-libext2fs.patch Patch6: %{name}-%{version}-libext2fs.diff
Patch7: %{name}-%{version}-gcc47.patch Patch7: %{name}-%{version}-gcc47.diff
Patch8: %{name}-%{version}-isohybrid_efi.patch Patch8: %{name}-%{version}-isohybrid_efi.diff
Patch9: %{name}-%{version}-isohybrid_efi_optional.patch Patch9: %{name}-%{version}-isohybrid_efi_optional.diff
Patch10: %{name}-%{version}-isohybrid_mbr.patch Patch10: %{name}-%{version}-isohybrid_mbr.diff
Patch11: %{name}-%{version}-localboot.patch Patch11: %{name}-%{version}-localboot.diff
Patch12: %{name}-%{version}-geometry.patch Patch12: %{name}-%{version}-geometry.diff
Patch13: %{name}-%{version}-nostrip.patch Patch13: %{name}-%{version}-nostrip.diff
Patch14: %{name}-%{version}-timeout.patch Patch14: %{name}-%{version}-timeout.diff
Patch15: %{name}-%{version}-cache_fix.patch Patch15: %{name}-%{version}-cache_fix.diff
Patch16: %{name}-%{version}-mtime.patch Patch16: %{name}-%{version}-mtime.diff
Patch17: %{name}-%{version}-miniacc.patch Patch17: %{name}-%{version}-miniacc.diff
Patch18: %{name}-%{version}-align.patch Patch18: %{name}-%{version}-align.diff
# PATCH-FIX-UPSTREAM -- make package build reproducible # PATCH-FIX-UPSTREAM -- make package build reproducible
Patch19: syslinux-4.04-reproducible.patch Patch19: syslinux-4.04-reproducible.patch
Patch20: %{name}-%{version}-python3.patch Patch20: %{name}-%{version}-python3.diff
Patch21: sysmacros.patch Patch21: sysmacros.patch
Patch22: remove-note-gnu-section.patch Patch22: remove-note-gnu-section.patch
Patch23: %{name}-%{version}-lzo.patch Patch23: %{name}-%{version}-lzo.diff
Patch24: %{name}-%{version}-gcc10.patch Patch24: %{name}-%{version}-gcc10.diff
Patch25: syslinux-4.04-reproducible-isohybrid.patch Patch25: syslinux-4.04-reproducible-isohybrid.patch
Patch26: %{name}-%{version}-pie.patch Patch26: %{name}-%{version}-pie.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
SYSLINUX is a boot loader for the Linux operating system which operates SYSLINUX is a boot loader for the Linux operating system which operates
@@ -79,20 +80,38 @@ Authors:
H. Peter Anvin <hpa@zytor.com> H. Peter Anvin <hpa@zytor.com>
%prep %prep
%autosetup -p1 %setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch5 -p1
%patch6 -p0
%patch7 -p0
%patch8 -p0
%patch9 -p1
%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch13 -p0
%patch14 -p1
%patch15 -p1
%patch16 -p1
%patch17
%patch18
%patch19 -p1
%patch20 -p0
%patch21 -p1
%patch22 -p1
%patch23 -p0
%patch24 -p0
%patch25 -p1
%patch26 -p1
%build %build
cp %{SOURCE2} . cp %{SOURCE2} .
make spotless make spotless
make make
# rebuild the on-system binaries with distribution optflags for stack protector etc.
for dir in extlinux utils linux mtools
do
cd $dir
make clean
make OPTFLAGS="%optflags"
cd ..
done
%install %install
make install-all \ make install-all \

13
sysmacros.patch
View File

@@ -16,11 +16,11 @@ Signed-off-by: Gene Cumm <gene.cumm@gmail.com>
extlinux/main.c | 1 + extlinux/main.c | 1 +
1 file changed, 1 insertion(+) 1 file changed, 1 insertion(+)
Index: syslinux-4.04/extlinux/main.c diff --git a/extlinux/main.c b/extlinux/main.c
=================================================================== index a7ebd49a94..ebff7eae0e 100644
--- syslinux-4.04.orig/extlinux/main.c --- a/extlinux/main.c
+++ syslinux-4.04/extlinux/main.c +++ b/extlinux/main.c
@@ -37,6 +37,7 @@ typedef uint64_t u64; @@ -38,6 +38,7 @@
#include <sysexits.h> #include <sysexits.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/stat.h> #include <sys/stat.h>
@@ -28,3 +28,6 @@ Index: syslinux-4.04/extlinux/main.c
#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.19.0