Accepting request 1182473 from system:install:head

OBS-URL: https://build.opensuse.org/request/show/1182473 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/syslinux?expand=0&rev=71
2024-06-24 18:50:15 +00:00 · 2024-06-24 18:50:15 +00:00 · 73d6aab270
commit 73d6aab270
parent 2e4a3ae37e 0620ccce49
28 changed files with 271 additions and 231 deletions
--- a/remove-note-gnu-section.patch
+++ b/remove-note-gnu-section.patch
@ -1,8 +1,8 @@
-diff --git a/mbr/Makefile b/mbr/Makefile
-index be2bded7..59e06915 100644
--- a/mbr/Makefile
-+++ b/mbr/Makefile
-@@ -36,7 +36,7 @@
+Index: syslinux-4.04/mbr/Makefile
+===================================================================
+--- syslinux-4.04.orig/mbr/Makefile
+++ syslinux-4.04/mbr/Makefile
+@@ -36,7 +36,7 @@ all:	mbr.bin   altmbr.bin   gptmbr.bin
 	$(LD) $(LDFLAGS) -T mbr.ld -e _start -o $@ $<
 
 %.bin: %.elf checksize.pl
--- a/syslinux-4.04-align.diff
+++ b/syslinux-4.04-align.diff
@ -1,11 +0,0 @@
--- 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;
--- a/syslinux-4.04-align.patch
+++ b/syslinux-4.04-align.patch
@ -0,0 +1,13 @@
+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;
--- a/syslinux-4.04-cache_fix.patch
+++ b/syslinux-4.04-cache_fix.patch
@ -17,11 +17,11 @@ Date:   Thu Jul 19 07:29:55 2012 -0700
    Reported-by: Jan Safrata <jsafrata@centrum.cz>
    Signed-off-by: H. Peter Anvin <hpa@zytor.com>

-diff --git a/core/fs/cache.c b/core/fs/cache.c
-index 0d7891b..3b21fc2 100644
--- a/core/fs/cache.c
-+++ b/core/fs/cache.c
-@@ -37,10 +37,10 @@ void cache_init(struct device *dev, int block_size_shift)
+Index: syslinux-4.04/core/fs/cache.c
+===================================================================
+--- syslinux-4.04.orig/core/fs/cache.c
+++ syslinux-4.04/core/fs/cache.c
+@@ -37,10 +37,10 @@ void cache_init(struct device *dev, int
 
     dev->cache_head = head = (struct cache *)
 	(data + (dev->cache_entries << block_size_shift));
--- a/syslinux-4.04-cwd.patch
+++ b/syslinux-4.04-cwd.patch
@ -1,8 +1,8 @@
-diff --git a/com32/gfxboot/gfxboot.c b/com32/gfxboot/gfxboot.c
-index 9a39e79..35d180a 100644
--- a/com32/gfxboot/gfxboot.c
-+++ b/com32/gfxboot/gfxboot.c
-@@ -102,6 +102,8 @@ typedef struct __attribute__ ((packed)) {
+Index: syslinux-4.04/com32/gfxboot/gfxboot.c
+===================================================================
+--- syslinux-4.04.orig/com32/gfxboot/gfxboot.c
+++ syslinux-4.04/com32/gfxboot/gfxboot.c
+@@ -102,6 +102,8 @@ typedef struct __attribute__ ((packed))
   				//    0: GFX_CB_MENU_INIT accepts 32 bit addresses
   				//    1: knows about xmem_start, xmem_end
   uint16_t reserved_1;		// 62:
--- a/syslinux-4.04-gcc10.patch
+++ b/syslinux-4.04-gcc10.patch
@ -1,5 +1,7 @@
--- com32/MCONFIG	2011-04-18 23:24:17.000000000 +0200
-+++ com32/MCONFIG	2020-03-18 17:05:57.507347671 +0100
+Index: syslinux-4.04/com32/MCONFIG
+===================================================================
+--- syslinux-4.04.orig/com32/MCONFIG
+++ syslinux-4.04/com32/MCONFIG
@@ -18,6 +18,7 @@
 include $(topdir)/MCONFIG
 
@ -8,8 +10,10 @@
 GCCOPT += $(call gcc_ok,-m32,)
 GCCOPT += $(call gcc_ok,-fno-stack-protector,)
 GCCOPT += $(call gcc_ok,-fwrapv,)
--- com32/lib/MCONFIG	2011-04-18 23:24:17.000000000 +0200
-+++ com32/lib/MCONFIG	2020-03-18 17:07:39.960337684 +0100
+Index: syslinux-4.04/com32/lib/MCONFIG
+===================================================================
+--- syslinux-4.04.orig/com32/lib/MCONFIG
+++ syslinux-4.04/com32/lib/MCONFIG
@@ -3,6 +3,7 @@
 include $(topdir)/MCONFIG
 
@ -18,8 +22,10 @@
 GCCOPT += $(call gcc_ok,-m32,)
 GCCOPT += $(call gcc_ok,-fno-stack-protector,)
 GCCOPT += $(call gcc_ok,-fwrapv,)
--- dos/errno.h	2011-04-18 23:24:17.000000000 +0200
-+++ dos/errno.h	2020-03-18 17:12:17.359044057 +0100
+Index: syslinux-4.04/dos/errno.h
+===================================================================
+--- syslinux-4.04.orig/dos/errno.h
+++ syslinux-4.04/dos/errno.h
@@ -36,7 +36,7 @@
 #define	EDOM		33	/* Math argument out of domain of func */
 #define	ERANGE		34	/* Math result not representable */
@ -29,9 +35,11 @@
 void perror(const char *);
 
 #endif /* ERRNO_H */
--- 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
-@@ -38,8 +38,8 @@
+Index: syslinux-4.04/gpxe/src/core/exec.c
+===================================================================
+--- syslinux-4.04.orig/gpxe/src/core/exec.c
+++ 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 */
@ -42,8 +50,10 @@
 
 /**
  * Execute command
--- 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
+Index: syslinux-4.04/gpxe/src/include/compiler.h
+===================================================================
+--- syslinux-4.04.orig/gpxe/src/include/compiler.h
+++ syslinux-4.04/gpxe/src/include/compiler.h
@@ -64,7 +64,7 @@
 	.comm	_sym, 0
 #else /* ASSEMBLY */
@ -53,8 +63,10 @@
 #endif /* ASSEMBLY */
 
 /** Require a symbol within this object file
--- dos/string.h	2020-03-18 17:25:50.019155261 +0100
-+++ dos/string.h	2020-03-19 15:10:36.310787373 +0100
+Index: syslinux-4.04/dos/string.h
+===================================================================
+--- syslinux-4.04.orig/dos/string.h
+++ syslinux-4.04/dos/string.h
@@ -5,12 +5,13 @@
 #ifndef _STRING_H
 #define _STRING_H
@ -70,7 +82,7 @@
 
 /* This only returns true or false */
 static inline int memcmp(const void *__m1, const void *__m2, unsigned int __n)
-@@ -21,6 +22,15 @@
+@@ -21,6 +22,15 @@ static inline int memcmp(const void *__m
     return rv;
 }
 
--- a/syslinux-4.04-gcc47.patch
+++ b/syslinux-4.04-gcc47.patch
@ -1,6 +1,8 @@
--- com32/lib/sys/entry.S
-+++ com32/lib/sys/entry.S
-@@ -92,8 +92,8 @@
+Index: syslinux-4.04/com32/lib/sys/entry.S
+===================================================================
+--- syslinux-4.04.orig/com32/lib/sys/entry.S
+++ syslinux-4.04/com32/lib/sys/entry.S
+@@ -92,8 +92,8 @@ _start:
 		pushl %eax				# Save argc
 
 		/* Look for library initialization functions */
@ -11,9 +13,11 @@
 6:
 		cmpl %edi,%esi
 		jae 7f
--- com32/lib/sys/exit.S
-+++ com32/lib/sys/exit.S
-@@ -17,9 +17,9 @@
+Index: syslinux-4.04/com32/lib/sys/exit.S
+===================================================================
+--- syslinux-4.04.orig/com32/lib/sys/exit.S
+++ syslinux-4.04/com32/lib/sys/exit.S
+@@ -17,9 +17,9 @@ _exit:
 #endif
 
 	/* Run any destructors */
--- a/syslinux-4.04-geometry.patch
+++ b/syslinux-4.04-geometry.patch
@ -12,11 +12,11 @@ Signed-off-by: Gene Cumm <gene.cumm@gmail.com>
 ---
 (limited to 'extlinux/main.c')

-diff --git a/extlinux/main.c b/extlinux/main.c
-index e5212a9..6aa6202 100755
--- a/extlinux/main.c
-+++ b/extlinux/main.c
-@@ -112,7 +112,7 @@ static int sysfs_get_offset(int devfd, unsigned long *start)
+Index: syslinux-4.04/extlinux/main.c
+===================================================================
+--- syslinux-4.04.orig/extlinux/main.c
+++ syslinux-4.04/extlinux/main.c
+@@ -112,7 +112,7 @@ static int sysfs_get_offset(int devfd, u
 
     if ((size_t)snprintf(sysfs_name, sizeof sysfs_name,
 			 "/sys/dev/block/%u:%u/start",
@ -25,7 +25,7 @@ index e5212a9..6aa6202 100755
 	>= sizeof sysfs_name)
 	return -1;
 
-@@ -153,7 +153,7 @@ int get_geometry(int devfd, uint64_t totalbytes, struct hd_geometry *geo)
+@@ -153,7 +153,7 @@ int get_geometry(int devfd, uint64_t tot
 
     memset(geo, 0, sizeof *geo);
 
@ -34,5 +34,3 @@ index e5212a9..6aa6202 100755
 	goto ok;
     } else if (!ioctl(devfd, FDGETPRM, &fd_str)) {
 	geo->heads = fd_str.head;
--
-cgit v0.9.2
--- a/syslinux-4.04-iso9660.patch
+++ b/syslinux-4.04-iso9660.patch
@ -1,8 +1,8 @@
-diff --git a/core/fs/iso9660/iso9660.c b/core/fs/iso9660/iso9660.c
-index 3cd3ac4..9bbc299 100644
--- a/core/fs/iso9660/iso9660.c
-+++ b/core/fs/iso9660/iso9660.c
-@@ -228,14 +228,25 @@ static int iso_readdir(struct file *file, struct dirent *dirent)
+Index: syslinux-4.04/core/fs/iso9660/iso9660.c
+===================================================================
+--- syslinux-4.04.orig/core/fs/iso9660/iso9660.c
+++ syslinux-4.04/core/fs/iso9660/iso9660.c
+@@ -228,14 +228,25 @@ static int iso_readdir(struct file *file
 /* Load the config file, return 1 if failed, or 0 */
 static int iso_load_config(void)
 {
--- a/syslinux-4.04-isohybrid_efi.patch
+++ b/syslinux-4.04-isohybrid_efi.patch
@ -1,6 +1,8 @@
--- mbr/altmbr.S
-+++ mbr/altmbr.S
-@@ -204,7 +204,7 @@
+Index: syslinux-4.04/mbr/altmbr.S
+===================================================================
+--- syslinux-4.04.orig/mbr/altmbr.S
+++ syslinux-4.04/mbr/altmbr.S
+@@ -204,7 +204,7 @@ scan_partition_table:
 5:
 	decb	(partition)
 	jz	boot
@ -9,9 +11,11 @@
 	loopw	5b
 
 	popw	%cx			/* %cx <- 4    */
--- mbr/isohdpfx.S
-+++ mbr/isohdpfx.S
-@@ -66,6 +66,37 @@
+Index: syslinux-4.04/mbr/isohdpfx.S
+===================================================================
+--- syslinux-4.04.orig/mbr/isohdpfx.S
+++ syslinux-4.04/mbr/isohdpfx.S
+@@ -66,6 +66,37 @@ bootsec:
 	.globl	_start
 _start:
 	.byte	0x33, 0xed	/* xorw	%bp, %bp */
@ -49,9 +53,11 @@
 	cli
 	movw	%bp, %ss
 	movw	$stack, %sp
--- mbr/mbr.S
-+++ mbr/mbr.S
-@@ -265,6 +265,19 @@
+Index: syslinux-4.04/mbr/mbr.S
+===================================================================
+--- syslinux-4.04.orig/mbr/mbr.S
+++ syslinux-4.04/mbr/mbr.S
+@@ -265,6 +265,19 @@ boot:
 	movl	%eax, 8(%si)	/* Adjust in-memory partition table entry */
 	call	read_sector
 	jc	disk_error
@ -71,9 +77,11 @@
 	cmpw	$0xaa55, (bootsec+510)
 	jne	missing_os		/* Not a valid boot sector */
 	movw	$driveno, %sp	/* driveno == bootsec-6 */
--- utils/Makefile
-+++ utils/Makefile
-@@ -47,7 +47,7 @@
+Index: syslinux-4.04/utils/Makefile
+===================================================================
+--- syslinux-4.04.orig/utils/Makefile
+++ syslinux-4.04/utils/Makefile
+@@ -47,7 +47,7 @@ isohdpfx.c: $(ISOHDPFX) isohdpfxarray.pl
 	$(PERL) isohdpfxarray.pl $(ISOHDPFX) > $@
 
 isohybrid: isohybrid.o isohdpfx.o
@ -82,8 +90,10 @@
 
 gethostip: gethostip.o
 	$(CC) $(LDFLAGS) -o $@ $^
--- utils/isohybrid.c
-+++ utils/isohybrid.c
+Index: syslinux-4.04/utils/isohybrid.c
+===================================================================
+--- syslinux-4.04.orig/utils/isohybrid.c
+++ syslinux-4.04/utils/isohybrid.c
@@ -36,21 +36,29 @@
 #include <unistd.h>
 #include <sys/stat.h>
@ -117,7 +127,7 @@
 uint16_t type = 0x17;           /* partition type: 0 <= type <= 255 */
 uint32_t id = 0;                /* MBR: 0 <= id <= 0xFFFFFFFF(4294967296) */
 
-@@ -59,12 +67,153 @@
+@@ -59,12 +67,153 @@ uint8_t partok = 0;             /* 0 <=
 
 uint16_t ve[16];
 uint32_t catoffset = 0;
@ -272,7 +282,7 @@
 
 
 void
-@@ -86,9 +235,13 @@
+@@ -86,9 +235,13 @@ printh(void)
     printf(FMT, "   -h <X>", "Number of default geometry heads");
     printf(FMT, "   -s <X>", "Number of default geometry sectors");
     printf(FMT, "   -e --entry", "Specify partition entry number (1-4)");
@ -287,7 +297,7 @@
 
     printf("\n");
     printf(FMT, "   --forcehd0", "Assume we are loaded as disk ID 0");
-@@ -108,6 +261,7 @@
+@@ -108,6 +261,7 @@ printh(void)
 int
 check_option(int argc, char *argv[])
 {
@ -295,7 +305,7 @@
     int n = 0, ind = 0;
 
     const char optstr[] = ":h:s:e:o:t:i:fcp?vV";
-@@ -117,10 +271,14 @@
+@@ -117,10 +271,14 @@ check_option(int argc, char *argv[])
         { "offset", required_argument, NULL, 'o' },
         { "type", required_argument, NULL, 't' },
         { "id", required_argument, NULL, 'i' },
@ -310,7 +320,7 @@
 
         { "help", no_argument, NULL, '?' },
         { "verbose", no_argument, NULL, 'v' },
-@@ -135,32 +293,38 @@
+@@ -135,32 +293,38 @@ check_option(int argc, char *argv[])
         switch (n)
         {
         case 'h':
@ -356,7 +366,7 @@
                 errx(1, "invalid id: `%s'", optarg);
             break;
 
-@@ -176,10 +340,26 @@
+@@ -176,10 +340,26 @@ check_option(int argc, char *argv[])
             partok = 1;
             break;
 
@ -383,7 +393,7 @@
         case 'V':
             printf("%s version %s\n", prog, VERSION);
             exit(0);
-@@ -200,6 +380,33 @@
+@@ -200,6 +380,33 @@ check_option(int argc, char *argv[])
     return optind;
 }
 
@ -417,7 +427,7 @@
 
 uint16_t
 lendian_short(const uint16_t s)
-@@ -229,6 +436,22 @@
+@@ -229,6 +436,22 @@ lendian_int(const uint32_t s)
     return r;
 }
 
@ -440,7 +450,7 @@
 
 int
 check_banner(const uint8_t *buf)
-@@ -252,7 +475,7 @@
+@@ -252,7 +475,7 @@ check_banner(const uint8_t *buf)
 int
 check_catalogue(const uint8_t *buf)
 {
@ -449,7 +459,7 @@
 
     for (i = 0, cs = 0; i < 16; i++)
     {
-@@ -307,6 +530,43 @@
+@@ -307,6 +530,43 @@ read_catalogue(const uint8_t *buf)
 }
 
 
@ -493,7 +503,7 @@
 void
 display_catalogue(void)
 {
-@@ -321,18 +581,33 @@
+@@ -321,18 +581,33 @@ display_catalogue(void)
 }
 
 
@ -531,7 +541,7 @@
     mbr += MBRSIZE;                                 /* offset 432 */
 
     tmp = lendian_int(de_lba * 4);
-@@ -351,42 +626,92 @@
+@@ -351,42 +626,92 @@ initialise_mbr(uint8_t *mbr)
     mbr[1] = '\0';
     mbr += 2;                                       /* offset 446 */
 
@ -648,7 +658,7 @@
     mbr[0] = 0x55;
     mbr[1] = 0xAA;
     mbr += 2;
-@@ -394,7 +719,6 @@
+@@ -394,7 +719,6 @@ initialise_mbr(uint8_t *mbr)
     return mbr - rbm;
 }
 
@ -656,7 +666,7 @@
 void
 display_mbr(const uint8_t *mbr, size_t len)
 {
-@@ -424,14 +748,190 @@
+@@ -424,14 +748,190 @@ display_mbr(const uint8_t *mbr, size_t l
 }
 
 
@ -849,7 +859,7 @@
 
     prog = strcpy(alloca(strlen(argv[0]) + 1), argv[0]);
     i = check_option(argc, argv);
-@@ -443,10 +943,32 @@
+@@ -443,10 +943,32 @@ main(int argc, char *argv[])
         usage();
         return 1;
     }
@ -883,7 +893,7 @@
     if (fseek(fp, 17 * 2048, SEEK_SET))
         err(1, "%s: seek error - 1", argv[0]);
 
-@@ -478,6 +1000,53 @@
+@@ -478,6 +1000,53 @@ main(int argc, char *argv[])
     if (mode & VERBOSE)
         display_catalogue();
 
@ -937,7 +947,7 @@
     if (fseek(fp, (de_lba * 2048 + 0x40), SEEK_SET))
         err(1, "%s: seek error - 3", argv[0]);
 
-@@ -491,24 +1060,55 @@
+@@ -491,24 +1060,55 @@ main(int argc, char *argv[])
                  "signature. Note that isolinux-debug.bin does not support " \
                  "hybrid booting", argv[0]);
 
@ -996,7 +1006,7 @@
     if (!id)
     {
         if (fseek(fp, 440, SEEK_SET))
-@@ -530,6 +1130,16 @@
+@@ -530,6 +1130,16 @@ main(int argc, char *argv[])
 
     buf = bufz;
     memset(buf, 0, BUFSIZE);
@ -1013,7 +1023,7 @@
     i = initialise_mbr(buf);
 
     if (mode & VERBOSE)
-@@ -541,15 +1151,74 @@
+@@ -541,15 +1151,74 @@ main(int argc, char *argv[])
     if (fwrite(buf, sizeof(char), i, fp) != (size_t)i)
         err(1, "%s: write error - 1", argv[0]);
 
@ -1089,8 +1099,10 @@
     free(buf);
     fclose(fp);
 
--- utils/isohybrid.h
-+++ utils/isohybrid.h
+Index: syslinux-4.04/utils/isohybrid.h
+===================================================================
+--- syslinux-4.04.orig/utils/isohybrid.h
+++ syslinux-4.04/utils/isohybrid.h
@@ -20,7 +20,7 @@
  *
  */
--- a/syslinux-4.04-isohybrid_efi_optional.patch
+++ b/syslinux-4.04-isohybrid_efi_optional.patch
@ -1,7 +1,7 @@
-diff --git a/utils/isohybrid.c b/utils/isohybrid.c
-index 7638bc0..09f4520 100644
--- a/utils/isohybrid.c
-+++ b/utils/isohybrid.c
+Index: syslinux-4.04/utils/isohybrid.c
+===================================================================
+--- syslinux-4.04.orig/utils/isohybrid.c
+++ syslinux-4.04/utils/isohybrid.c
@@ -1028,7 +1028,9 @@ main(int argc, char *argv[])
 		errx(1, "%s: invalid efi catalogue", argv[0]);
 	    }
--- a/syslinux-4.04-isohybrid_mbr.patch
+++ b/syslinux-4.04-isohybrid_mbr.patch
@ -1,7 +1,7 @@
-diff --git a/utils/isohybrid.c b/utils/isohybrid.c
-index 09f4520..954b5ed 100644
--- a/utils/isohybrid.c
-+++ b/utils/isohybrid.c
+Index: syslinux-4.04/utils/isohybrid.c
+===================================================================
+--- syslinux-4.04.orig/utils/isohybrid.c
+++ syslinux-4.04/utils/isohybrid.c
@@ -653,12 +653,10 @@ initialise_mbr(uint8_t *mbr)
           continue;
         }
--- a/syslinux-4.04-libext2fs.patch
+++ b/syslinux-4.04-libext2fs.patch
@ -1,5 +1,7 @@
--- libinstaller/linuxioctl.h
-+++ libinstaller/linuxioctl.h
+Index: syslinux-4.04/libinstaller/linuxioctl.h
+===================================================================
+--- syslinux-4.04.orig/libinstaller/linuxioctl.h
+++ syslinux-4.04/libinstaller/linuxioctl.h
@@ -19,7 +19,7 @@
 
 #undef SECTOR_SIZE		/* Defined in msdos_fs.h for no good reason */
--- a/syslinux-4.04-localboot.patch
+++ b/syslinux-4.04-localboot.patch
@ -1,7 +1,7 @@
-diff --git a/core/localboot.inc b/core/localboot.inc
-index 1fe3102..30f34fc 100644
--- a/core/localboot.inc
-+++ b/core/localboot.inc
+Index: syslinux-4.04/core/localboot.inc
+===================================================================
+--- syslinux-4.04.orig/core/localboot.inc
+++ syslinux-4.04/core/localboot.inc
@@ -33,6 +33,15 @@ local_boot:
 		cmp ax,-1
 		je .int18
--- a/syslinux-4.04-lzo.diff
+++ b/syslinux-4.04-lzo.diff
@ -1,11 +0,0 @@
--- lzo/Makefile
-+++ lzo/Makefile
-@@ -19,6 +19,8 @@
- LIB     = lzo.a
- BINS    = prepcore
- 
-+OPTFLAGS += -fno-strict-aliasing
-+
- all : $(BINS)
- 
- $(LIB) : $(LIBOBJS)
--- a/syslinux-4.04-lzo.patch
+++ b/syslinux-4.04-lzo.patch
@ -0,0 +1,13 @@
+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)
--- a/syslinux-4.04-mboot_bootif.patch
+++ b/syslinux-4.04-mboot_bootif.patch
@ -1,8 +1,8 @@
-diff --git a/com32/mboot/mboot.c b/com32/mboot/mboot.c
-index 35450e0..a124a21 100644
--- a/com32/mboot/mboot.c
-+++ b/com32/mboot/mboot.c
-@@ -97,9 +97,14 @@ static int get_modules(char **argv, struct module_data **mdp)
+Index: syslinux-4.04/com32/mboot/mboot.c
+===================================================================
+--- syslinux-4.04.orig/com32/mboot/mboot.c
+++ syslinux-4.04/com32/mboot/mboot.c
+@@ -97,9 +97,14 @@ static int get_modules(char **argv, stru
     int arglen;
     const char module_separator[] = "---";
 
@ -17,7 +17,7 @@ index 35450e0..a124a21 100644
     }
 
     *mdp = mp = malloc(module_count * sizeof(struct module_data));
-@@ -133,11 +138,19 @@ static int get_modules(char **argv, struct module_data **mdp)
+@@ -133,11 +138,19 @@ static int get_modules(char **argv, stru
 	    mp->cmdline = strdup("");
 	} else {
 	    char *p;
--- a/syslinux-4.04-md5pass.patch
+++ b/syslinux-4.04-md5pass.patch
@ -1,5 +1,7 @@
--- a/utils/md5pass
-+++ b/utils/md5pass
+Index: syslinux-4.04/utils/md5pass
+===================================================================
+--- syslinux-4.04.orig/utils/md5pass
+++ syslinux-4.04/utils/md5pass
@@ -1,7 +1,6 @@
 #!/usr/bin/perl
 
--- a/syslinux-4.04-miniacc.patch
+++ b/syslinux-4.04-miniacc.patch
@ -1,7 +1,7 @@
-Index: lzo/src/miniacc.h
+Index: syslinux-4.04/lzo/src/miniacc.h
 ===================================================================
--- lzo/src/miniacc.h.orig	2016-02-11 14:37:17.029802775 +0100
-+++ lzo/src/miniacc.h	2016-02-11 14:38:38.086742103 +0100
+--- syslinux-4.04.orig/lzo/src/miniacc.h
+++ syslinux-4.04/lzo/src/miniacc.h
@@ -4412,12 +4412,12 @@ ACCLIB_EXTERN(int, acc_spawnve) (int mod
 #if defined(__MSDOS__) && defined(__TURBOC__) && (__TURBOC__ < 0x0150)
 #elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC)
--- a/syslinux-4.04-mtime.patch
+++ b/syslinux-4.04-mtime.patch
@ -1,7 +1,7 @@
-diff --git a/core/Makefile b/core/Makefile
-index 33ad7e9..49ba474 100644
--- a/core/Makefile
-+++ b/core/Makefile
+Index: syslinux-4.04/core/Makefile
+===================================================================
+--- syslinux-4.04.orig/core/Makefile
+++ syslinux-4.04/core/Makefile
@@ -63,7 +63,7 @@ PREPCORE = ../lzo/prepcore
 # official release.  Otherwise, substitute a hex string that is pretty much
 # guaranteed to be unique to be unique from build to build.
@ -11,10 +11,10 @@ index 33ad7e9..49ba474 100644
 endif
 ifndef DATE
 DATE    := $(shell sh ../gen-id.sh $(VERSION) $(HEXDATE))
-diff --git a/libinstaller/bin2c.pl b/libinstaller/bin2c.pl
-index 07c11dd..2864488 100755
--- a/libinstaller/bin2c.pl
-+++ b/libinstaller/bin2c.pl
+Index: syslinux-4.04/libinstaller/bin2c.pl
+===================================================================
+--- syslinux-4.04.orig/libinstaller/bin2c.pl
+++ syslinux-4.04/libinstaller/bin2c.pl
@@ -71,8 +71,4 @@ if ($align != 0) {
 
 printf "\n};\n\nconst unsigned int %s_len = %u;\n", $table_name, $total_len;
@ -24,10 +24,10 @@ index 07c11dd..2864488 100755
 -printf "\nconst int %s_mtime = %d;\n", $table_name, $st[9];
 -
 exit 0;
-diff --git a/libinstaller/syslinux.h b/libinstaller/syslinux.h
-index 710d30e..963cafe 100644
--- a/libinstaller/syslinux.h
-+++ b/libinstaller/syslinux.h
+Index: syslinux-4.04/libinstaller/syslinux.h
+===================================================================
+--- syslinux-4.04.orig/libinstaller/syslinux.h
+++ syslinux-4.04/libinstaller/syslinux.h
@@ -20,11 +20,9 @@
 /* The standard boot sector and ldlinux image */
 extern unsigned char syslinux_bootsect[];
@ -48,12 +48,10 @@ index 710d30e..963cafe 100644
 
 /* Sector size assumptions... */
 #define SECTOR_SHIFT	9
-diff --git a/now.pl b/now.pl
-old mode 100644
-new mode 100755
-index a3b5a79..60c4fe0
--- a/now.pl
-+++ b/now.pl
+Index: syslinux-4.04/now.pl
+===================================================================
+--- syslinux-4.04.orig/now.pl
+++ syslinux-4.04/now.pl
@@ -1,21 +1,22 @@
 -#!/usr/bin/perl
 -#
--- a/syslinux-4.04-noinitrd.patch
+++ b/syslinux-4.04-noinitrd.patch
@ -1,8 +1,8 @@
-diff --git a/com32/gfxboot/gfxboot.c b/com32/gfxboot/gfxboot.c
-index 3749920..9a39e79 100644
--- a/com32/gfxboot/gfxboot.c
-+++ b/com32/gfxboot/gfxboot.c
-@@ -922,11 +922,15 @@ void boot_entry(menu_t *menu_ptr, char *arg)
+Index: syslinux-4.04/com32/gfxboot/gfxboot.c
+===================================================================
+--- syslinux-4.04.orig/com32/gfxboot/gfxboot.c
+++ syslinux-4.04/com32/gfxboot/gfxboot.c
+@@ -935,11 +935,15 @@ void boot_entry(menu_t *menu_ptr, char *
     *skip_nonspaces(s) = 0;
     initrd_arg = s;
   }
--- a/syslinux-4.04-nostrip.patch
+++ b/syslinux-4.04-nostrip.patch
@ -1,6 +1,8 @@
--- utils/Makefile
-+++ utils/Makefile
-@@ -18,7 +18,7 @@
+Index: syslinux-4.04/utils/Makefile
+===================================================================
+--- syslinux-4.04.orig/utils/Makefile
+++ syslinux-4.04/utils/Makefile
+@@ -18,7 +18,7 @@ topdir = ..
 include $(topdir)/MCONFIG
 
 CFLAGS   = $(GCCWARN) -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64
--- a/syslinux-4.04-pie.patch
+++ b/syslinux-4.04-pie.patch
--- a/syslinux-4.04-python3.patch
+++ b/syslinux-4.04-python3.patch
@ -1,6 +1,8 @@
--- com32/cmenu/Makefile
-+++ com32/cmenu/Makefile
-@@ -37,7 +37,7 @@
+Index: syslinux-4.04/com32/cmenu/Makefile
+===================================================================
+--- syslinux-4.04.orig/com32/cmenu/Makefile
+++ syslinux-4.04/com32/cmenu/Makefile
+@@ -37,7 +37,7 @@ MENUS = $(CMENUS) $(IMENUS)
 
 .PRECIOUS: %.c
 %.c: %.menu adv_menu.tpl
@ -9,15 +11,17 @@
 
 all: menus
 
--- com32/cmenu/menugen.py
-+++ com32/cmenu/menugen.py
+Index: syslinux-4.04/com32/cmenu/menugen.py
+===================================================================
+--- syslinux-4.04.orig/com32/cmenu/menugen.py
+++ syslinux-4.04/com32/cmenu/menugen.py
@@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
 
 import sys, re, getopt
 
-@@ -100,27 +100,27 @@
+@@ -100,27 +100,27 @@ class Menusystem:
           if not self.entry["info"]:
              self.entry["info"] = self.entry["data"]
           if not self.menus:
@ -51,7 +55,7 @@
        elif name in ["state","helpid","ipappend"]:
           try:
               value = int(value)
-@@ -131,14 +131,14 @@
+@@ -131,14 +131,14 @@ class Menusystem:
        return ""
 
    def set_menu(self,name,value):
@ -68,7 +72,7 @@
           return "Error: Unknown keyword %s" % name
        if name == "skipcondn":
           try: # is skipcondn a number?
-@@ -169,7 +169,7 @@
+@@ -169,7 +169,7 @@ class Menusystem:
        if not err: return
 
        # all errors so return item's error message
@ -77,7 +81,7 @@
        sys.exit(1)
 
    def print_entry(self,entry,fd):
-@@ -211,9 +211,9 @@
+@@ -211,9 +211,9 @@ class Menusystem:
 
        missing = None
        for x in self.reqd_templates:
@ -89,7 +93,7 @@
 
        if filename == "-":
           fd = sys.stdout
-@@ -227,8 +227,8 @@
+@@ -227,8 +227,8 @@ class Menusystem:
        fd.write(self.templates["footer"])
        fd.close()
        if not self.foundmain:
@ -100,7 +104,7 @@
           sys.exit(1)
 
    def input(self,filename):
-@@ -259,26 +259,26 @@
+@@ -259,26 +259,26 @@ class Menusystem:
            # add property of current entry
            pos = line.find("=") # find the first = in string
            if pos < 0:
@ -137,7 +141,7 @@
     sys.exit(1)
 
 def main():
-@@ -287,7 +287,7 @@
+@@ -287,7 +287,7 @@ def main():
     ofile = "-"
     opts,args = getopt.getopt(sys.argv[1:], "hi:o:t:",["input=","output=","template=","help"])
     if args:
--- a/syslinux-4.04-timeout.patch
+++ b/syslinux-4.04-timeout.patch
@ -1,7 +1,7 @@
-diff --git a/core/ui.inc b/core/ui.inc
-index 0a4bb56..97945c9 100644
--- a/core/ui.inc
-+++ b/core/ui.inc
+Index: syslinux-4.04/core/ui.inc
+===================================================================
+--- syslinux-4.04.orig/core/ui.inc
+++ syslinux-4.04/core/ui.inc
@@ -529,30 +529,36 @@ kernel_corrupt: mov si,err_notkernel
 ; which can be adjusted by the caller based on the corresponding
 ; master variables; on return they're updated.
--- a/syslinux.changes
+++ b/syslinux.changes
@ -1,3 +1,35 @@
+-------------------------------------------------------------------
+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>

--- a/syslinux.spec
+++ b/syslinux.spec
@ -1,7 +1,7 @@
 #
 # spec file for package syslinux
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -38,34 +38,33 @@ Source:         https://www.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{v
 Source1:        isolinux-config
 Source2:        README.gfxboot
 Source3:        baselibs.conf
-Patch0:         %{name}-%{version}-iso9660.diff
-Patch1:         %{name}-%{version}-cwd.diff
-Patch2:         %{name}-%{version}-noinitrd.diff
-Patch3:         %{name}-%{version}-mboot_bootif.diff
-Patch5:         %{name}-%{version}-md5pass.diff
-Patch6:         %{name}-%{version}-libext2fs.diff
-Patch7:         %{name}-%{version}-gcc47.diff
-Patch8:         %{name}-%{version}-isohybrid_efi.diff
-Patch9:         %{name}-%{version}-isohybrid_efi_optional.diff
-Patch10:        %{name}-%{version}-isohybrid_mbr.diff
-Patch11:        %{name}-%{version}-localboot.diff
-Patch12:        %{name}-%{version}-geometry.diff
-Patch13:        %{name}-%{version}-nostrip.diff
-Patch14:        %{name}-%{version}-timeout.diff
-Patch15:        %{name}-%{version}-cache_fix.diff
-Patch16:        %{name}-%{version}-mtime.diff
-Patch17:        %{name}-%{version}-miniacc.diff
-Patch18:        %{name}-%{version}-align.diff
+Patch0:         %{name}-%{version}-iso9660.patch
+Patch1:         %{name}-%{version}-cwd.patch
+Patch2:         %{name}-%{version}-noinitrd.patch
+Patch3:         %{name}-%{version}-mboot_bootif.patch
+Patch5:         %{name}-%{version}-md5pass.patch
+Patch6:         %{name}-%{version}-libext2fs.patch
+Patch7:         %{name}-%{version}-gcc47.patch
+Patch8:         %{name}-%{version}-isohybrid_efi.patch
+Patch9:         %{name}-%{version}-isohybrid_efi_optional.patch
+Patch10:        %{name}-%{version}-isohybrid_mbr.patch
+Patch11:        %{name}-%{version}-localboot.patch
+Patch12:        %{name}-%{version}-geometry.patch
+Patch13:        %{name}-%{version}-nostrip.patch
+Patch14:        %{name}-%{version}-timeout.patch
+Patch15:        %{name}-%{version}-cache_fix.patch
+Patch16:        %{name}-%{version}-mtime.patch
+Patch17:        %{name}-%{version}-miniacc.patch
+Patch18:        %{name}-%{version}-align.patch
 # PATCH-FIX-UPSTREAM -- make package build reproducible
 Patch19:        syslinux-4.04-reproducible.patch
-Patch20:        %{name}-%{version}-python3.diff
+Patch20:        %{name}-%{version}-python3.patch
 Patch21:        sysmacros.patch
 Patch22:        remove-note-gnu-section.patch
-Patch23:        %{name}-%{version}-lzo.diff
-Patch24:        %{name}-%{version}-gcc10.diff
+Patch23:        %{name}-%{version}-lzo.patch
+Patch24:        %{name}-%{version}-gcc10.patch
 Patch25:        syslinux-4.04-reproducible-isohybrid.patch
-Patch26:        %{name}-%{version}-pie.diff
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Patch26:        %{name}-%{version}-pie.patch

 %description
 SYSLINUX is a boot loader for the Linux operating system which operates
@ -80,33 +79,7 @@ Authors:
    H. Peter Anvin <hpa@zytor.com>

 %prep
-%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
+%autosetup -p1

 %build
 cp %{SOURCE2} .
--- a/sysmacros.patch
+++ b/sysmacros.patch
@ -16,11 +16,11 @@ Signed-off-by: Gene Cumm <gene.cumm@gmail.com>
 extlinux/main.c | 1 +
 1 file changed, 1 insertion(+)

-diff --git a/extlinux/main.c b/extlinux/main.c
-index a7ebd49a94..ebff7eae0e 100644
--- a/extlinux/main.c
-+++ b/extlinux/main.c
-@@ -38,6 +38,7 @@
+Index: syslinux-4.04/extlinux/main.c
+===================================================================
+--- syslinux-4.04.orig/extlinux/main.c
+++ syslinux-4.04/extlinux/main.c
+@@ -37,6 +37,7 @@ typedef uint64_t u64;
 #include <sysexits.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
@ -28,6 +28,3 @@ index a7ebd49a94..ebff7eae0e 100644
 #include <sys/types.h>
 #include <sys/mount.h>
 #include <sys/vfs.h>
-- 
-2.19.0
-