[packages/lilo] Rediff

[arekm]

commit 7d50b855d937d0751d9d81b36e41aed50ef85fda
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Tue Mar 3 00:23:45 2026 +0100

    Rediff

 lilo-cc.patch       | 15 ++++++++-------
 lilo-nobash.patch   | 11 ++++++-----
 lilo-pagesize.patch | 13 +++++++------
 lilo.spec           |  2 +-
 4 files changed, 22 insertions(+), 19 deletions(-)
---
diff --git a/lilo.spec b/lilo.spec
index 0427d85..60b5cf0 100644
--- a/lilo.spec
+++ b/lilo.spec
@@ -117,7 +117,7 @@ Wsparcie lilo dla rc-boot.
 sed -i -e 's#/bin/bcc#/nonexistant/file#g' Makefile*
 %{__make} all \
 	CC="%{__cc}" \
-	OPT="%{rpmcflags} %{rpmcppflags} -DLCF_DEVMAPPER" \
+	OPT="%{rpmcflags} %{rpmcppflags} -DLCF_DEVMAPPER -std=gnu17" \
 	LDFLAGS="%{rpmldflags}"
 
 %install
diff --git a/lilo-cc.patch b/lilo-cc.patch
index 09372aa..76e150f 100644
--- a/lilo-cc.patch
+++ b/lilo-cc.patch
@@ -1,8 +1,9 @@
---- lilo-22.7.2/diagnose/Makefile.orig	2005-09-23 19:24:33.000000000 +0200
-+++ lilo-22.7.2/diagnose/Makefile	2006-07-18 14:07:54.594440000 +0200
-@@ -1,11 +1,11 @@
- # Makefile for BCC tests
- #
+diff -urNp -x '*.orig' lilo-24.2.org/diagnose/Makefile lilo-24.2/diagnose/Makefile
+--- lilo-24.2.org/diagnose/Makefile	2010-06-18 19:06:27.000000000 +0200
++++ lilo-24.2/diagnose/Makefile	2026-03-03 00:21:59.225285457 +0100
+@@ -5,11 +5,11 @@
+ include ../make.vars
+ 
  MODEL=s
 -CC = bcc -M$(MODEL)
 +BCC = bcc -M$(MODEL)
@@ -14,8 +15,8 @@
  COPT = -ansi -I$(CINCL) -c -O -DDEBUG=0
  LOPT = -m >$*.map -M -d
  AOPT = -0 -a -w
-@@ -17,7 +17,7 @@
- .SUFFIXES:	.com .S
+@@ -21,7 +21,7 @@ LOOP=/dev/loop5
+ .SUFFIXES:  .com .S
  
  .c.o:
 -	$(CC) $(COPT) -o $@ $< -A-l -A$*.lis
diff --git a/lilo-nobash.patch b/lilo-nobash.patch
index e92a9c0..982cc1c 100644
--- a/lilo-nobash.patch
+++ b/lilo-nobash.patch
@@ -1,12 +1,13 @@
---- lilo-22.6.1/mkrescue	2004-11-16 08:50:08.000000000 +0000
-+++ lilo-22.6.1.new/mkrescue	2005-01-04 22:41:53.456867448 +0000
+diff -urNp -x '*.orig' lilo-24.2.org/mkrescue lilo-24.2/mkrescue
+--- lilo-24.2.org/mkrescue	2011-06-21 01:22:16.000000000 +0200
++++ lilo-24.2/mkrescue	2026-03-03 00:21:42.477374881 +0100
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh
  #
- # mkrescue
+ #       mkrescue - create a boot floppy or cd image with the current kernel
  #
-@@ -612,7 +612,7 @@
+@@ -624,7 +624,7 @@ echo ""
  
  
  
@@ -15,7 +16,7 @@
  if [ "$fast" = fast ]; then
  	bootcmd="-b /dev/$loopback"
  fi
-@@ -629,7 +629,7 @@
+@@ -644,7 +644,7 @@ fi
  else
  	$lilo -C $mountconfig $compact $bootcmd || fast=error
  fi
diff --git a/lilo-pagesize.patch b/lilo-pagesize.patch
index a7f337b..0d4a529 100644
--- a/lilo-pagesize.patch
+++ b/lilo-pagesize.patch
@@ -1,11 +1,12 @@
---- lilo-21.4.4/src/lilo.h.pagesize	2003-08-20 18:55:00.000000000 -0400
-+++ lilo-21.4.4/src/lilo.h	2003-08-20 18:55:22.000000000 -0400
-@@ -142,6 +142,8 @@
- #define PRTMAP_SIZE	32	/* number of partition type mappings */
- #define DRVMAP_SIZE	8	/* number of drive mappings */
+diff -urNp -x '*.orig' lilo-24.2.org/src/lilo.h lilo-24.2/src/lilo.h
+--- lilo-24.2.org/src/lilo.h	2015-11-22 00:50:20.000000000 +0100
++++ lilo-24.2/src/lilo.h	2026-03-03 00:22:13.525819676 +0100
+@@ -470,6 +470,8 @@
+ 
+ 
  
 +#define PAGE_SIZE sysconf(_SC_PAGESIZE)
 +
  #ifdef LILO_ASM
- 
  BOOTSEG   = 0x07C0			! original address of boot-sector
+ PARTS_LOAD= 0x0600			! partition sector load address
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/lilo.git/commitdiff/7d50b855d937d0751d9d81b36e41aed50ef85fda