From: Joachim Wiedorn Date: Sat, 7 May 2011 12:40:30 +0000 (+0200) Subject: Update of some patches; remove of some patches X-Git-Tag: debian/23.2-1~8 X-Git-Url: https://git.rrq.au/?a=commitdiff_plain;h=489dc8dc47cfa2a0bc9dc33ea0104f3996f01d83;p=rrq%2Fmaintain_lilo.git Update of some patches; remove of some patches --- diff --git a/debian/changelog b/debian/changelog index b503a09..f162ad4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ lilo (1:23.2-1) unstable; urgency=low - Fix for larger kernel setup code. (Closes: #625266) - Update of manpages (mkrescue.8, lilo.conf.5). - Add new scripts 'liloconfig' and 'lilo-uuid-diskid'. + * Update of some patches; remove of some patches (now in upstream). -- Joachim Wiedorn Fri, 06 May 2011 18:07:43 +0200 diff --git a/debian/patches/01_makefile-adds.patch b/debian/patches/01_makefile-adds.patch index eb45576..e5648df 100644 --- a/debian/patches/01_makefile-adds.patch +++ b/debian/patches/01_makefile-adds.patch @@ -2,14 +2,14 @@ Package: lilo Subject: add autoauto and diag1.img to makefile Author: Joachim Wiedorn Forwarded: no -Last-Update: 2010-11-11 +Last-Update: 2011-05-06 --- diff -urN s00/make.vars s01/make.vars ---- s00/make.vars 2010-06-28 22:47:31.000000000 +0200 -+++ s01/make.vars 2010-11-04 23:15:56.367070520 +0100 -@@ -65,7 +65,7 @@ +--- s00/make.vars 2011-04-09 16:59:26.000000000 +0200 ++++ s01/make.vars 2011-05-06 17:25:55.864706382 +0200 +@@ -71,7 +71,7 @@ CONFIG=-DBDATA -DDSECS=3 -DEVMS -DIGNORECASE -DLVM -DNOKEYBOARD -DONE_SHOT \ -DPASS160 -DREISERFS -DREWRITE_TABLE -DSOLO_CHAIN -DVERSION -DVIRTUAL \ @@ -19,9 +19,9 @@ diff -urN s00/make.vars s01/make.vars # set the following if you wish LILO.COM to be installed DOS_DIR=/dosC/boot diff -urN s00/src/Makefile s01/src/Makefile ---- s00/src/Makefile 2010-11-04 16:35:52.000000000 +0100 -+++ s01/src/Makefile 2010-11-04 23:15:50.831064767 +0100 -@@ -41,7 +41,7 @@ +--- s00/src/Makefile 2011-04-09 16:59:26.000000000 +0200 ++++ s01/src/Makefile 2011-05-06 17:25:55.882961287 +0200 +@@ -48,7 +48,7 @@ # # everything needed to run, just short of installation # diff --git a/debian/patches/02_lilo-version-debian.patch b/debian/patches/02_lilo-version-debian.patch index 0048a37..437abef 100644 --- a/debian/patches/02_lilo-version-debian.patch +++ b/debian/patches/02_lilo-version-debian.patch @@ -2,13 +2,13 @@ Package: lilo Subject: add lilo version for Debian Author: Joachim Wiedorn Forwarded: no -Last-Update: 2011-01-28 +Last-Update: 2011-05-06 --- diff -urN s01/src/crt.S s02/src/crt.S --- s01/src/crt.S 2010-11-01 16:32:09.000000000 +0100 -+++ s02/src/crt.S 2010-11-05 00:30:35.183058179 +0100 ++++ s02/src/crt.S 2011-05-06 17:26:25.856704412 +0200 @@ -694,7 +694,7 @@ @@ -19,21 +19,23 @@ diff -urN s01/src/crt.S s02/src/crt.S #ifdef LCF_VERSION .ascii SA(VERSION_MAJOR) diff -urN s01/src/lilo.c s02/src/lilo.c ---- s01/src/lilo.c 2010-06-28 23:29:23.000000000 +0200 -+++ s02/src/lilo.c 2010-11-05 00:29:44.219065803 +0100 -@@ -819,6 +819,7 @@ - printf("LILO version %d.%d%s%s", VERSION_MAJOR, VERSION_MINOR, - VERSION_EDIT, test ? " (test mode)" : ""); - if (version && verbose<=0) { -+ printf (" (Debian GNU/Linux)"); - printf("\n"); - return 0; - } -@@ -843,6 +844,7 @@ - } +--- s01/src/lilo.c 2011-04-09 18:40:33.000000000 +0200 ++++ s02/src/lilo.c 2011-05-06 17:28:53.484698617 +0200 +@@ -824,7 +824,8 @@ + else + printf(" (released %s)\n", VERSION_DATE); + if (version && verbose<=0) { +- /* exit if user asks for version and no verbose */ ++ /* user asks for version without verbose */ ++ printf ("(Debian GNU/Linux)\n"); + return 0; + } + printf(" * Copyright (C) 1992-1998 Werner Almesberger (until v20)\n" +@@ -847,6 +848,7 @@ + } #endif - } -+ printf ("Debian GNU/Linux\n"); + } ++ printf("Debian GNU/Linux\n"); printf("\n"); if (version) { if (verbose>=2) configuration(); diff --git a/debian/patches/02_lilo-version-ubuntu.patch b/debian/patches/02_lilo-version-ubuntu.patch index a8dce93..197984a 100644 --- a/debian/patches/02_lilo-version-ubuntu.patch +++ b/debian/patches/02_lilo-version-ubuntu.patch @@ -2,13 +2,13 @@ Package: lilo Subject: add lilo version for Ubuntu Author: Joachim Wiedorn Forwarded: no -Last-Update: 2011-01-28 +Last-Update: 2011-05-06 --- diff -urN s01/src/crt.S s02/src/crt.S --- s01/src/crt.S 2010-11-01 16:32:09.000000000 +0100 -+++ s02/src/crt.S 2010-11-05 00:30:35.183058179 +0100 ++++ s02/src/crt.S 2011-05-06 17:26:25.856704412 +0200 @@ -694,7 +694,7 @@ @@ -19,21 +19,23 @@ diff -urN s01/src/crt.S s02/src/crt.S #ifdef LCF_VERSION .ascii SA(VERSION_MAJOR) diff -urN s01/src/lilo.c s02/src/lilo.c ---- s01/src/lilo.c 2010-06-28 23:29:23.000000000 +0200 -+++ s02/src/lilo.c 2010-11-05 00:29:44.219065803 +0100 -@@ -819,6 +819,7 @@ - printf("LILO version %d.%d%s%s", VERSION_MAJOR, VERSION_MINOR, - VERSION_EDIT, test ? " (test mode)" : ""); - if (version && verbose<=0) { -+ printf (" (Ubuntu GNU/Linux)"); - printf("\n"); - return 0; - } -@@ -843,6 +844,7 @@ - } +--- s01/src/lilo.c 2011-04-09 18:40:33.000000000 +0200 ++++ s02/src/lilo.c 2011-05-06 17:28:53.484698617 +0200 +@@ -824,7 +824,8 @@ + else + printf(" (released %s)\n", VERSION_DATE); + if (version && verbose<=0) { +- /* exit if user asks for version and no verbose */ ++ /* user asks for version without verbose */ ++ printf ("(Ubuntu GNU/Linux)\n"); + return 0; + } + printf(" * Copyright (C) 1992-1998 Werner Almesberger (until v20)\n" +@@ -847,6 +848,7 @@ + } #endif - } -+ printf ("Ubuntu GNU/Linux\n"); + } ++ printf("Ubuntu GNU/Linux\n"); printf("\n"); if (version) { if (verbose>=2) configuration(); diff --git a/debian/patches/06_notinteractive.patch b/debian/patches/06_notinteractive.patch index d10d095..9c14375 100644 --- a/debian/patches/06_notinteractive.patch +++ b/debian/patches/06_notinteractive.patch @@ -2,14 +2,14 @@ Package: lilo Subject: notinteractive for debian Author: Joachim Wiedorn Forwarded: no -Last-Update: 2010-11-11 +Last-Update: 2011-05-06 --- -diff -urN v08/src/device.c v09/src/device.c ---- v08/src/device.c 2010-07-03 09:36:00.637903317 +0200 -+++ v09/src/device.c 2010-07-03 09:37:44.660354270 +0200 -@@ -847,7 +847,9 @@ +diff -urN s05/src/device.c s06/src/device.c +--- s05/src/device.c 2011-04-09 17:03:29.000000000 +0200 ++++ s06/src/device.c 2011-05-06 17:37:44.716712084 +0200 +@@ -849,7 +849,9 @@ "This caution does not apply to Windows 95 or 98, or to NT data disks.\n" , vm->name, MAJOR(dev), MINOR(dev), dev); diff --git a/debian/patches/09_use-of-newer-debhelper.patch b/debian/patches/09_use-of-newer-debhelper.patch index ff044ea..d95ebb9 100644 --- a/debian/patches/09_use-of-newer-debhelper.patch +++ b/debian/patches/09_use-of-newer-debhelper.patch @@ -2,7 +2,7 @@ Package: lilo Subject: use of newer debhelper 7.0.50 and above Author: Joachim Wiedorn Forwarded: no -Last-Update: 2010-11-13 +Last-Update: 2011-05-06 With the possibilities of debhelper of 7.0.50 and above and some direct patches in the sources the rules can be reduced to few @@ -10,8 +10,8 @@ lines. --- diff -urN s08/images/Makefile s09/images/Makefile ---- s08/images/Makefile 2010-11-13 18:39:14.558043894 +0100 -+++ s09/images/Makefile 2010-11-13 20:23:08.510034528 +0100 +--- s08/images/Makefile 2011-05-06 17:40:18.924705158 +0200 ++++ s09/images/Makefile 2011-05-06 17:45:57.304713832 +0200 @@ -23,11 +23,11 @@ install: all mkdir -p $$DESTDIR$(BOOT_DIR) @@ -37,10 +37,10 @@ diff -urN s08/images/Makefile s09/images/Makefile + done diff -urN s08/Makefile s09/Makefile ---- s08/Makefile 2010-11-04 16:35:15.000000000 +0100 -+++ s09/Makefile 2010-11-13 20:23:08.498047887 +0100 -@@ -1,6 +1,14 @@ - # -*- makefile -*- +--- s08/Makefile 2011-04-09 17:14:05.000000000 +0200 ++++ s09/Makefile 2011-05-06 17:45:57.304713832 +0200 +@@ -8,6 +8,14 @@ + # # +# everything needed to run, just short of installation @@ -54,15 +54,15 @@ diff -urN s08/Makefile s09/Makefile # make help # help: -@@ -27,13 +35,6 @@ +@@ -34,13 +42,6 @@ @echo "" # -# everything needed to run, just short of installation -# -all: test -- make -C src all -- make -C images all +- $(MAKE) -C src all +- $(MAKE) -C images all - -# # everything above plus the statically linked version diff --git a/debian/patches/10_add-info-about-h-option.patch b/debian/patches/10_add-info-about-h-option.patch deleted file mode 100644 index 179d2c5..0000000 --- a/debian/patches/10_add-info-about-h-option.patch +++ /dev/null @@ -1,21 +0,0 @@ -Package: lilo -Subject: add usage hints about -H option -Author: Joachim Wiedorn -Forwarded: yes -Last-Update: 2010-11-20 - -The already existing option '-H' isn't listed in the usage, -if you run 'lilo --help'. Now one line is added. ---- - -diff -urN s09/src/lilo.c s10/src/lilo.c ---- s09/src/lilo.c 2010-11-04 23:18:47.000000000 +0100 -+++ s10/src/lilo.c 2010-11-20 15:51:32.270152972 +0100 -@@ -542,6 +542,7 @@ - fprintf(errstd,"%7s%s [ -C config_file ] -I name [ options ]\n","",name); - fprintf(errstd,"%7s%s [ -C config_file ] [ -s save_file ] " - "-u | -U [ boot_device ]\n","",name); -+ fprintf(errstd,"%7s%s -H\t\t\t\tinstall only to active discs (RAID-1)\n", "", name); - fprintf(errstd,"%7s%s -A /dev/XXX [ N ]\t\tinquire/activate a partition\n","",name); - fprintf(errstd,"%7s%s -M /dev/XXX [ mbr | ext ]\tinstall master boot record\n","",name); - fprintf(errstd,"%7s%s -T help \t\t\tlist additional options\n", "", name); diff --git a/debian/patches/11_remove-obsolete-bios-workaround.patch b/debian/patches/11_remove-obsolete-bios-workaround.patch deleted file mode 100644 index 7d2a759..0000000 --- a/debian/patches/11_remove-obsolete-bios-workaround.patch +++ /dev/null @@ -1,38 +0,0 @@ -Package: lilo -Subject: remove obsolete bios workaround -Author: Joachim Wiedorn -Forwarded: yes -Last-Update: 2011-01-18 - -In the changelog of Debian lilo 22.2-3.1 (from 2002-05-10) was noted: - - * This upstream version uses int15,0xe820 to fetch the memory map. - However, sufficiently many systems don't implement this interrupt - correctly. We avoid the errant code for now. The next upstream - release fixes this problem for real. Note to Russell: this patch - must be removed for the next upstream release. - -Unfortunately nobody had remembered to this note and removed this -workaround with the new upstream release. But the upstream release -22.3 (from 2002-10-19) of have the following note in its CHANGES: - - - Compensate for buggy BIOS in int 15h, fn E820h call to avoid - overlapping memory areas - -Now I remove this very old workaround because it is obsolete since -May 2002! ---- - -diff -urN s10/src/second.S s11/src/second.S ---- s10/src/second.S 2010-06-20 00:20:26.000000000 +0200 -+++ s11/src/second.S 2011-01-18 20:18:55.903147359 +0100 -@@ -2927,8 +2927,7 @@ - xor edx,edx ; flag nothing found - xor esi,esi ; flag size==0 - xor ebx,ebx -- ;jmp e8go ; circumvented due to BIOS problems -- br no_e801 ; skip to backup plan -+ jmp e8go - e8go2: or ebx,ebx ; test for end - jz e8go5 - e8go: push edx ; save best prospect diff --git a/debian/patches/12_save-errno-for-second-command.patch b/debian/patches/12_save-errno-for-second-command.patch deleted file mode 100644 index f21597d..0000000 --- a/debian/patches/12_save-errno-for-second-command.patch +++ /dev/null @@ -1,51 +0,0 @@ -Package: lilo -Subject: save errno for second command -Author: Joachim Wiedorn -Forwarded: yes -Last-Update: 2011-02-17 - -The problem is that fprintf can alter the value of errno -(see man perror). In a weired case the user get a bogus error -because the real error was hidden by fprintf. ---- - -diff -urN s11/src/device.c s12/src/device.c ---- s11/src/device.c 2011-02-17 22:07:17.167142581 +0100 -+++ s12/src/device.c 2011-02-17 22:20:03.047152869 +0100 -@@ -197,6 +197,7 @@ - char name[PATH_MAX]; - ST_BUF st; - int count; -+ int err; - - if (lookup_dev(name,dev,number)) dev->delete = 0; - else { -@@ -235,11 +236,12 @@ - #endif - if (flags == O_BYPASS) dev->fd = -1; - else if ((dev->fd = open(name,flags)) < 0) { -- fprintf (errstd, "Cannot proceed. Maybe you need to add " -+ err = errno; -+ fprintf (errstd, "Cannot proceed. Maybe you need to add " - "this to your lilo.conf:\n" - "\tdisk=%s inaccessible\n" - "(real error shown below)\n", name); -- die("open %s: %s",name,strerror(errno)); -+ die("open %s: %s",name,strerror(err)); - } - dev->name = stralloc(name); - return dev->fd; -@@ -714,11 +716,11 @@ - - fd = dev_open(&dev, device, option ? O_RDWR : O_RDONLY); - if (read(fd, &buf, sizeof(buf)) != sizeof(buf)) { -- fprintf (errstd, "Cannot proceed. Maybe you need to add " -+ fprintf (errstd, "Cannot proceed. Maybe you need to add " - "this to your lilo.conf:\n" - "\tdisk=%s inaccessible\n" - "(real error shown below)\n", dev.name); -- die("VolumeID read error: sector 0 of %s not readable", dev.name); -+ die("VolumeID read error: sector 0 of %s not readable", dev.name); - } - if (option==ID_SET) { - make_backup(NULL, 0, &buf, device, diff --git a/debian/patches/13_reformatted-mkrescue-manpage.patch b/debian/patches/13_reformatted-mkrescue-manpage.patch deleted file mode 100644 index 359dae8..0000000 --- a/debian/patches/13_reformatted-mkrescue-manpage.patch +++ /dev/null @@ -1,268 +0,0 @@ -Package: lilo -Subject: reformatted mkrescue manpage -Author: Martin Eberhard Schauer -Forwarded: yes -Last-Update: 2011-03-07 - -The formatting did not obey the recommendations of man (7) and -man-pages (7). ---- - -diff -urN s12/man/mkrescue.8 s13/man/mkrescue.8 ---- s12/man/mkrescue.8 2010-11-01 17:13:41.000000000 +0100 -+++ s13/man/mkrescue.8 2011-03-07 21:25:53.000000000 +0100 -@@ -2,130 +2,155 @@ - .\" @(#)mkrescue.8 1.0 20011031 jrc - .\" This page is part of the LILO package, which is released by - .\" the author(s) under a BSD license. See the file COPYING --.\" in the LILO source directory for the License and Disclaimer. -+.\" in the LILO source directory for the license and disclaimer. - .\" - .\" Original version, John Coffman 2001-10-31 - .\" Updated to version 2.0 & lilo 22.5.4, John Coffman 2003-05-24 --.\" - .\" Updated to version 3.0 & lilo 22.6.1, John Coffman 2004-11-16 --.\" --.TH MKRESCUE 8 "16 Nov 2004" -+.\" Reformatted to better match Linux man-pages conventions -+.\" Martin Eberhard Schauer 2011-03-06 -+ -+.TH MKRESCUE 8 "6 Mar 2011" -+ - .SH NAME --mkrescue \- make rescue floppy -+mkrescue \- make rescue floppy or CD -+ - .SH SYNOPSIS --.LP --.B "/usr/sbin/mkrescue" --\- make a bootable rescue floppy or CD using the default kernel specified --in \fIlilo.conf\fP. -+.B /sbin/mkrescue -+makes a bootable rescue floppy or CD using the default kernel specified in -+.IR lilo.conf . -+ - .SH DESCRIPTION --.LP --.B mkrescue --takes its specification for the kernel from the default image specified in --\fB/etc/lilo.conf\fP. If the actual default is an \fIother=\fP specification, --then use the first \fIimage=\fP specification. --Any associated initial ramdisk (initrd=), and \fIappend=\fP --options will also be used. The root directory will be taken to be the --\fIcurrent\fP root. A bootable floppy or CD-image will be created using LILO version -+\fBmkrescue\fP takes its specifation for the kernel from the default image -+specified in \fI/etc/lilo.conf\fP. -+If the actual default is an \fIother=\fP specification, then use the first -+\fIimage=\fP specification. -+Any associated initial ramdisk (\fIinitrd=\fP), and \fIappend=\fP options -+will also be used. -+The root directory will be taken to be the \fIcurrent\fP root. -+A bootable floppy or CD-image will be created using LILO version - 22.5.5 or later. --.B mkrescue --normally requires no options, unless a CD-image is desired (\fI--iso\fP). -+\fBmkrescue\fP normally requires no options, unless a CD-image is desired -+(\fB--iso\fP). -+ - .SH OPTIONS --.LP -+ - .TP --.BI "--append " --Override any \fIappend=\fP options taken from the default image. If there is --any doubt about whether the \fIlilo.conf\fP options are correct, then specify --no kernel parameters with: \fB--append ""\fP, the null string. --.TP --.BI "--debug" --Provide verbose output of the operation of "mkrescue", pausing to allow --the setting of internal operating parameters to be viewed. "" must --be hit to proceed from these pauses. --.TP --.BI "--device " --Make the floppy on a device other than /dev/fd0. The floppy disk will --always be made to boot on BIOS device code 0x00 (A: drive), without --regard to the drive on which it is created. --.TP --.BI "--fast" --Use a faster method of creating the boot floppy. This involves first --creating a file of "\-\-size" 1k blocks (default is 1440) --mounted using a loopback device, creating the bootable floppy, -+\fB--append\fP -+Override any \fIappend=\fP options taken from the default image. -+If there is any doubt about whether the \fIlilo.conf\fP -+options are correct, then specify no kernel parameters by providing the -+null string (\fB--append ""\fP). -+ -+.TP -+.B --debug -+Provide verbose output of the operation of -+.BR mkrescue , -+pausing to allow the setting of internal operating parameters to be viewed. -+ must be hit to proceed from these pauses. -+ -+.TP -+\fB--device\fP -+Make the floppy on a device other than \fI/dev/fd0\fP. -+The floppy disk will always be made to boot on BIOS device code 0x00 (A: -+drive), without regard to the drive on which it is created. -+ -+.TP -+.B --fast -+Use a faster method of creating the boot floppy. -+This involves first creating a file of \fB--size\fP 1k blocks (default -+is 1440) mounted using a loopback device, creating the bootable floppy, - then copying the entire file to the disk. -+ - .TP --.BI "--fs [ ext2 | msdos | minix ]" -+\fB--fs\fP [ \fIext2\fP | \fImsdos\fP | \fIminix\fP ] - Specify the type of filesystem to create on the drive. --.B ext2 --is the default, but "msdos" and "minix" allow slightly more disk sectors --for really big kernels. -+\fIext2\fP is the default, but \fImsdos\fP and \fIminix\fP allow -+slightly more disk sectors for really big kernels. -+ - .TP --.BI "--help" -+.B --help - Print a short usage synopsis, including a list of command options. -+ - .TP --.BI "--image