Patched LILO

11 files changed, 890 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 77f963baec16..e5003b1894c7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = lilo
 	pkgdesc = A bootloader for Linux
 	pkgver = 24.2
-	pkgrel = 2
+	pkgrel = 3
 	url = https://alioth.debian.org/projects/lilo/
 	install = lilo.install
 	arch = i686
@@ -16,8 +16,24 @@ pkgbase = lilo
 	backup = etc/lilo.conf
 	source = https://alioth-archive.debian.org/releases/lilo/Lilo/24.2/lilo-24.2.tar.gz
 	source = lilo.conf
+	source = 01_makefile-adds.patch
+	source = 03_keytab-lilo.8-debian-based.patch
+	source = 05_readme.disk-change.patch
+	source = 06_notinteractive.patch
+	source = 08_small-typos-in-manpages.patch
+	source = 09_fix-manpage-lilo-conf-5.patch
+	source = 10_fix-manpage-lilo-conf-5.patch
+	source = 11_fix-gcc-10.patch
 	md5sums = fe5e8c9754cee342b958b5fcbbb6eb51
-	md5sums = ca2d8cd9b63f11444861939b42df29c1
+	md5sums = c828942206c191242875d9b5fbeae094
+	md5sums = 3e9380373e16b930c079ad31376468d9
+	md5sums = 684ca1867c5a8ad7f6ba44f0fd92ce52
+	md5sums = 51703dc2a3784974a49d498599f3da04
+	md5sums = 4ef1ffaa647531de21b689591b38d6bd
+	md5sums = 2f0a159a767e118a76f8ffa0c7dce48f
+	md5sums = 96cfca0c181b116de256e990752f5af0
+	md5sums = fd26557bc2d704105369c5ad6e3cc38e
+	md5sums = 112a98527481c4d9ec8e76a0bd30af8e
 
 pkgname = lilo
 
diff --git a/01_makefile-adds.patch b/01_makefile-adds.patch
new file mode 100644
index 000000000000..84164a7bab07
--- /dev/null
+++ b/01_makefile-adds.patch
@@ -0,0 +1,32 @@
+Package:     lilo
+Subject:     add autoauto and diag1.img to makefile
+Author:      Joachim Wiedorn <joodebian at joonet.de>
+Forwarded:   no
+Last-Update: 2011-05-06
+
+---
+
+diff -urN s00/make.vars s01/make.vars
+--- 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 \
+-    -DMDPRAID -DDEVMAPPER
++    -DMDPRAID -DDEVMAPPER -DAUTOAUTO
+    
+ # 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	2011-04-09 16:59:26.000000000 +0200
++++ s01/src/Makefile	2011-05-06 17:25:55.882961287 +0200
+@@ -47,7 +47,7 @@
+ #
+ # everything needed to run, just short of installation
+ #
+-all:	lilo bootsect.b
++all:	lilo bootsect.b diag1.img
+ 
+ #
+ # everything above plus the statically linked version
diff --git a/03_keytab-lilo.8-debian-based.patch b/03_keytab-lilo.8-debian-based.patch
new file mode 100644
index 000000000000..43f860542461
--- /dev/null
+++ b/03_keytab-lilo.8-debian-based.patch
@@ -0,0 +1,19 @@
+Package:     lilo
+Subject:     keytab-lilo.8 for Debian-based systems
+Author:      Joachim Wiedorn <joodebian at joonet.de>
+Forwarded:   no
+Last-Update: 2011-01-28
+
+---
+
+diff -urN v03/man/keytab-lilo.8 v04/man/keytab-lilo.8
+--- v03/man/keytab-lilo.8	2010-06-28 22:41:18.000000000 +0200
++++ v04/man/keytab-lilo.8	2010-07-03 09:21:19.560354947 +0200
+@@ -100,3 +100,7 @@
+ .BR lilo (8),
+ .BR keytables (5),
+ .BR gzip (1)
++
++.B lilo
++comes with extensive documentation which can be found in
++/usr/share/doc/lilo-doc/ on Debian-based systems.
diff --git a/05_readme.disk-change.patch b/05_readme.disk-change.patch
new file mode 100644
index 000000000000..1fb111094b37
--- /dev/null
+++ b/05_readme.disk-change.patch
@@ -0,0 +1,24 @@
+Package:     lilo
+Subject:     readme.disk for Debian based systems
+Author:      Joachim Wiedorn <joodebian at joonet.de>
+Forwarded:   no
+Last-Update: 2010-11-11
+
+---
+
+diff -urN v06/readme/README.disk v07/readme/README.disk
+--- v06/readme/README.disk	2001-01-04 06:04:37.000000000 +0100
++++ v07/readme/README.disk	2010-07-03 09:32:51.596354341 +0200
+@@ -7,9 +7,9 @@
+ 
+ Creating the floppy
+ ===================
+-Change into the LILO source code directory.  Insert a formatted floppy
+-disk into the A: drive (/dev/fd0).  Type the command "make floppy". 
+-After the files have assembled, the bootable floppy disk will be created.
++Change into the /usr/lib/lilo directory.  Insert a formatted floppy
++disk into the A: drive (/dev/fd0).  Type the command "make". A bootable
++floppy disk will be created.
+ 
+ Running the diagnostic
+ ======================
diff --git a/06_notinteractive.patch b/06_notinteractive.patch
new file mode 100644
index 000000000000..2e00c3ef3527
--- /dev/null
+++ b/06_notinteractive.patch
@@ -0,0 +1,22 @@
+Package:     lilo
+Subject:     notinteractive for debian
+Author:      Joachim Wiedorn <joodebian at joonet.de>
+Forwarded:   no
+Last-Update: 2011-05-06
+
+---
+
+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
+@@ -846,7 +846,9 @@
+ "This caution does not apply to Windows 95 or 98, or to NT data disks.\n"
+ 				, vm->name, MAJOR(dev), MINOR(dev), dev);
+ 					
+-					
++    if (test)
++       return 0;
++
+     ret = yesno("\nIs the above disk an NT boot disk? ", 1);
+ 
+     if (ret && fatal) {
diff --git a/08_small-typos-in-manpages.patch b/08_small-typos-in-manpages.patch
new file mode 100644
index 000000000000..b0b3fb5a7dbd
--- /dev/null
+++ b/08_small-typos-in-manpages.patch
@@ -0,0 +1,30 @@
+Package:     lilo
+Subject:     fix small typos in manpages
+Author:      Joachim Wiedorn <joodebian at joonet.de>
+Last-Update: 2016-07-15
+---
+
+diff -urN s07/man/lilo.conf.5 s08/man/lilo.conf.5
+--- s07/man/lilo.conf.5	2013-06-07 21:17:39.000000000 +0200
++++ s08/man/lilo.conf.5	2016-07-15 22:02:52.497917216 +0200
+@@ -736,7 +736,7 @@
+ This is typically used to specify hardware parameters that can't be
+ entirely auto-detected or for which probing may be dangerous. Multiple
+ kernel parameters are separated by a blank space, and the string must be
+-enclosed in double quotes.  A local append= appearing withing an image=
++enclosed in double quotes.  A local append= appearing within an image=
+ section overrides any
+ global append= appearing in the global section of the configuration file.
+ The append option may be used only once per "image="
+diff -urN s07/man/mkrescue.8 s08/man/mkrescue.8
+--- s07/man/mkrescue.8	2011-04-09 11:56:16.000000000 +0200
++++ s08/man/mkrescue.8	2016-07-15 22:03:07.990171776 +0200
+@@ -84,7 +84,7 @@
+ arbitrary kernel file and initial ramdisk file to be used on the created
+ boot floppy.
+ Be sure you know what you are doing before you use these options.
+-If no inital ramdisk is needed with a particular kernel, then you MUST
++If no initial ramdisk is needed with a particular kernel, then you MUST
+ specify \fB--initrd ""\fP, meaning a null pathname.
+ 
+ .TP
diff --git a/09_fix-manpage-lilo-conf-5.patch b/09_fix-manpage-lilo-conf-5.patch
new file mode 100644
index 000000000000..61210de302b8
--- /dev/null
+++ b/09_fix-manpage-lilo-conf-5.patch
@@ -0,0 +1,335 @@
+Package:     lilo
+Subject:     fix for manpage lilo.conf.5
+Author:      Bjarni Ingi Gislason <bjarniig at rhi.hi.is>
+Bug-Debian:  https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=902711
+Forwarded:   yes
+Last-Update: 2018-09-09
+
+Fix the warning: (macro BI): only 1 argument, but more are expected.
+---
+
+diff -urN s08/man/lilo.conf.5 s09/man/lilo.conf.5
+--- s08/man/lilo.conf.5	2016-07-15 22:02:52.000000000 +0200
++++ s09/man/lilo.conf.5	2018-09-09 15:41:31.019967938 +0200
+@@ -141,7 +141,7 @@
+ From a text file with all the information about 'bmp-colors', 'bmp-table' 
+ and 'bmp-timer' options together with the 'bitmap' option are stored in 
+ the special LILO  header of the bitmap image file by the
+-.BI "lilo -E"
++.B lilo \-E
+ command. Another way works without these special header information: All
+ the information about 'bmp-colors', 'bmp-table' and 'bmp-timer' options
+ together with the 'bitmap' option are stored in the configuration file.
+@@ -158,7 +158,7 @@
+ then "none" is assumed.  The list entries are separated by commas, with no
+ spaces.
+ .TP
+-.BI "bmp-retain"
++.B bmp-retain
+ Option applies to all 'image=' and 'other=' sections.
+ (See COMMON OPTIONS, below.)
+ .TP
+@@ -206,7 +206,7 @@
+     boot = /dev/disk/by-id/ata-SAMSUNG_SV1604N_S01FJ10X999999
+ .fi
+ .TP
+-.BI "change-rules"
++.B change-rules
+ Defines boot-time changes to partition type numbers (`hiding').
+ .IP
+ .nf
+@@ -235,7 +235,7 @@
+ See section "Partition type change rules" of html/user_21-5.html inside 
+ the old documentation for more details.
+ .TP
+-.BI "compact"
++.B compact
+ Tries to merge read requests for adjacent sectors into a single 
+ read request. This drastically reduces load time and keeps the map file
+ smaller. Using `compact' is especially recommended when booting
+@@ -299,7 +299,7 @@
+ .sp
+ probably only useful for floppy disks and loopback devices,
+ because for hard disks the
+-.BI lba32
++.B lba32
+ disk addressing option ignores disk geometry.
+ .sp
+ Developers who have implemented a disk driver for a new block storage
+@@ -337,12 +337,12 @@
+ .I /etc/disktab
+ if `disktab' is omitted. The use of disktabs is discouraged.
+ .TP
+-.BI "el-torito-bootable-CD"
++.B el-torito-bootable-CD
+ Flag second stage loader to terminate disk emulation when booting
+ from an El Torito Bootable CD. This option is used by the
+ \fBmkrescue\fP utility when the "\-\-iso" switch is specified.
+ .TP
+-.BI "fix-table"
++.B fix-table
+ This allows lilo to adjust 3D addresses in partition tables. Each 
+ partition entry contains a 3D (cylinder/head/sector) and a linear 
+ address of the first and the last sector of the partition. If a 
+@@ -364,14 +364,14 @@
+ Operation is identical to \fBbackup=\fP above, except an existing backup
+ file is unconditionally overwritten if it exists.
+ .TP
+-.BI "geometric"
++.B geometric
+ Force disk addressing which is compatible with older versions of LILO. 
+ Geometric addressing uses cylinder/head/sector addresses, and is limited to
+ disk cylinders up to 1023.  If inaccessible cylinders are referenced,
+ diagnostics will be issued at boot-install time, rather than boot-time. 
+ With a newer BIOS, use of 'lba32' is recommended.
+ .TP
+-.BI "ignore-table"
++.B ignore-table
+ tells lilo to ignore corrupt partition tables. 
+ .TP
+ .BI "install=" <user-interface>
+@@ -389,7 +389,7 @@
+ (Prior to LILO version 22.3, `install=' specified the user interface as
+ a file in the `/boot' directory.)
+ .TP
+-.BI "large-memory"
++.B large-memory
+ Normally any initial ramdisk (initrd) loaded with a kernel is loaded as
+ high in memory as possible, but never above 15Mb.  This is due to a BIOS
+ limitation on older systems.  On newer systems, this option enables using
+@@ -403,7 +403,7 @@
+ kernel documentation for the kernel command line parameter
+ "mem=" for limiting the memory used by the kernel.)
+ .TP
+-.BI "lba32"
++.B lba32
+ Generate 32-bit Logical Block Addresses instead of cylinder/head/sector 
+ addresses. If the BIOS supports packet addressing, then packet calls will be
+ used to access the disk. This allows booting from any partition on disks
+@@ -415,7 +415,7 @@
+ all post-1998 systems.  Beginning with LILO version 22, 'lba32' is the
+ default disk addressing scheme.
+ .TP
+-.BI "linear"
++.B linear
+ Generate 24-bit linear sector addresses instead of cylinder/head/sector 
+ (geometric) addresses. Linear addresses are translated at run time to
+ geometric addresses, and are limited to cylinders <= 1023. When using
+@@ -426,12 +426,12 @@
+ recent BIOS (post-1998).  The 'linear' option is considered obsolete,
+ and its use is strongly discouraged.
+ .TP
+-.BI "lock"
++.B lock
+ Enables automatic recording of boot command lines as the defaults 
+ for the following boots. This way, lilo "locks" on a choice until it is 
+ manually overridden.
+ .TP
+-.BI "mandatory"
++.B mandatory
+ The per-image password option `mandatory' (see below) applies to all images.
+ .TP
+ .BI "map=" <map-file>
+@@ -497,7 +497,7 @@
+ message file is changed or moved.  'message=' and 'bitmap=' are mutually
+ exclusive.
+ .TP
+-.BI "nodevcache"
++.B nodevcache
+ (22.8)
+ Disables pre-loading of the internal device cache. May be needed for
+ Linux distributions which use non-standard device naming conventions;
+@@ -513,7 +513,7 @@
+ The keyboard detection codes cannot detect the presence or absence of
+ a newer USB keyboard.
+ .TP
+-.BI "noraid"
++.B noraid
+ Disables the automatic marking of disk volumes which are components of
+ RAID arrays as \fBinaccessible\fP.  This allows the user to edit the \fBdisk=\fP
+ / \fBinaccessible\fP declarations into the configuration file himself.  Without
+@@ -521,10 +521,10 @@
+ confusing situations at boot-time, and possible failure to boot.  The use
+ of this keyword is generally not necessary.
+ .TP
+-.BI "nowarn"
++.B nowarn
+ Disables warnings about possible future dangers.
+ .TP
+-.BI "optional"
++.B optional
+ The per-image option `optional' (see below) applies to all images.
+ .TP
+ .BI "password=" <password>
+@@ -533,7 +533,7 @@
+ protected at the default level `mandatory', which is a level higher than
+ `restricted'.
+ .TP
+-.BI "prompt"
++.B prompt
+ Automatic booting (see `delay' above) will not take place unless a locked or
+ pre-stored ("lilo \-R") command line is present. Instead, the boot
+ loader will issue the 
+@@ -568,7 +568,7 @@
+ one way to have it written. Use of \fImbr\fP is the other way to force
+ writing to the MBR of device 0x80.
+ .TP
+-.BI "restricted"
++.B restricted
+ The per-image password option `restricted' (see below) applies to all images.
+ .TP
+ .BI "serial=" <parameters>
+@@ -606,13 +606,13 @@
+ .sp
+ Example: "serial=0,2400n8" initializes COM1 with the default parameters.
+ .TP
+-.BI "single-key"
++.B single-key
+ This option specifies that boot images or 'other's are to be selected and
+ launched with a single keystroke.  Selection is based upon the first
+ character of each name, which must be unique.  This option should not be
+ used with the menu or bitmap user interface ("install=").
+ .TP
+-.BI "static-BIOS-codes"
++.B static-BIOS-codes
+ Causes the operation of the boot installer and boot loader to bypass the
+ use of Volume-ID information, and to revert to a mode of operation of
+ versions of LILO from 22.4 backward.  With Volume-ID booting (22.5 and later),
+@@ -632,7 +632,7 @@
+ In general, this option should
+ never be used, except as a bug workaround.
+ .TP
+-.BI "suppress-boot-time-BIOS-data"
++.B suppress-boot-time-BIOS-data
+ This global option suppresses the boot-time real mode collection of BIOS data
+ on systems which hang on certain BIOS calls.  It is equivalent to using the
+ boot-time switch 'nobd'.
+@@ -649,7 +649,7 @@
+ If no key is pressed for the specified time, the default image is 
+ automatically booted. The default timeout is infinite.
+ .TP
+-.BI "unattended"
++.B unattended
+ (22.6) Alters the operation of the "timeout" parameter in a manner which
+ is useful on
+ noisy serial lines.  Each typed (or noise) character restarts the "timeout"
+@@ -765,13 +765,13 @@
+ zero indicates that no RAM disk should be created. If this variable is 
+ omitted, the RAM disk size configured into the boot image is used.
+ .TP
+-.BI "read-only"
++.B read-only
+ This specifies that the root file system should be mounted read-only.
+ It may be specified as a global option.
+ Typically, the system startup procedure re-mounts the root 
+ file system read-write later (e.g. after fsck'ing it).
+ .TP
+-.BI "read-write"
++.B read-write
+ This specifies that the root file system should be mounted read-write.
+ It may be specified as a global option.
+ .TP
+@@ -868,7 +868,7 @@
+ Note that /sbin/lilo must be re-run if a partition table mapped referenced
+ with `table' is modified.
+ .TP
+-.BI "change"
++.B change
+ This keyword starts a section which describes how primary partition IDs are
+ changed, and how primary partitions are activated and deactivated.  If
+ .B change
+@@ -924,7 +924,7 @@
+ interfere with floppy disk BIOS device codes; "boot-as=" is then used as a
+ local option to override "master-boot" as necessary.
+ .TP
+-.BI "master-boot"
++.B master-boot
+ This flag (LILO version 22.5) indicates a DOS/Windows or other
+ system which will only boot from BIOS device 0x80, the "C:" drive, or BIOS
+ device 0, the A: drive. When this
+@@ -959,7 +959,7 @@
+ This option is largely
+ rendered obsolete by "boot-as=", introduced with LILO version 22.5.
+ .TP
+-.BI "unsafe"
++.B unsafe
+ Do not access the boot sector at map creation time. This disables 
+ some sanity checks, including a partition table check. If the boot 
+ sector is on a fixed-format floppy disk device, using UNSAFE avoids the 
+@@ -975,7 +975,7 @@
+ .BR image= " and " other=
+ cases, the following options apply.
+ .TP
+-.BI "bypass"
++.B bypass
+ No password is required to boot this image. Used to indicate that the global
+ password does not apply to this `image=' or `other='.  See 'password=' below.
+ .TP
+@@ -987,7 +987,7 @@
+ .BI "alias=" <name>
+ A second name for the same entry can be used by specifying an alias.
+ .TP
+-.BI "bmp-retain"
++.B "bmp-retain
+ The bitmap graphic (install=bmp) is retained when control is passed to the
+ loaded kernel image, or other= bootloader; i.e., the screen is not
+ blanked to alphanumeric mode before starting the kernel.  This feature is
+@@ -999,19 +999,19 @@
+ command line if the current image is booted. This is useful when 
+ experimenting with kernels which may crash before allowing interaction 
+ with the system. If using the
+-.BI fallback
++.B fallback
+ option, the next reboot (e.g. 
+ triggered by a manual reset or by a watchdog timer) will load a 
+ different (supposedly stable) kernel. The command line stored by the fallback 
+ mechanism is cleared by removing or changing the default command line 
+ with the
+-.IR "-R"
++.I \-R
+ option, which should be a part of the boot startup scripts.
+ .TP
+-.BI "lock"
++.B lock
+ (See above.)
+ .TP
+-.BI "optional"
++.B optional
+ Omit the image if it is not available at map creation time.
+ It may be specified as a global option.
+ This is useful to specify test kernels that are not always present.
+@@ -1032,11 +1032,11 @@
+ will be issued telling you to re-run \fIlilo \-p\fP to force re-creation of the
+ password cache file.
+ .TP
+-.BI "mandatory"
++.B mandatory
+ A password is required to boot this image. This is the default. May be used
+ on a single `image=' or `other=' to override a different global setting.
+ .TP
+-.BI "nokbdisable"
++.B nokbdisable
+ (22.7.2)
+ The specified descriptor is not bootable if the IBM-PC keyboard is not present.
+ This option is really only useful if the "serial=" boot terminal is in use.
+@@ -1046,17 +1046,17 @@
+ .I nokbdefault
+ above.
+ .TP
+-.BI "restricted"
++.B restricted
+ A password is only required to boot the image if kernel parameters
+ are specified on the command line (e.g. 'single').  May be used
+ on a single `image=' or `other=' to override a different global setting.
+ .TP
+-.BI "vmwarn"
++.B vmwarn
+ If booting under a virtual monitor such as VMware(tm), the image with this
+ label will cause a cautionary warning to be issued at boot time, and user
+ intervention will be required to continue or to abort the boot process.
+ .TP
+-.BI "vmdisable"
++.B vmdisable
+ If booting under a virtual monitor, the image with this label will not be
+ displayed as a boot option.  The image is only bootable in real mode.  See
+ .I vmdefault
diff --git a/10_fix-manpage-lilo-conf-5.patch b/10_fix-manpage-lilo-conf-5.patch
new file mode 100644
index 000000000000..e29747a5ed59
--- /dev/null
+++ b/10_fix-manpage-lilo-conf-5.patch
@@ -0,0 +1,309 @@
+Package:     lilo
+Subject:     fix manpage lilo.conf.5
+Author:      Bjarni Ingi Gislason <bjarniig at rhi.hi.is>
+Bug-Debian:  https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=919741
+Forwarded:   no
+Last-Update: 2019-12-10
+---
+
+diff -urN s09/man/lilo.conf.5 s10/man/lilo.conf.5
+--- s09/man/lilo.conf.5	2018-09-09 16:29:07.000000000 +0200
++++ s10/man/lilo.conf.5	2019-12-10 23:29:54.262691441 +0100
+@@ -74,8 +74,8 @@
+ to use lilo, and the interaction with other operating systems,
+ see html/user_21-5.html inside the old documentation.)
+ .LP
+-When booting, the boot loader will issue its 
+-.I "boot:"
++When booting, the boot loader will issue its
++.B boot:
+ prompt and wait for you to enter the label of the kernel (and any
+ options) which you wish to boot. At any time you may hit [Tab] to
+ see a list of kernel/other labels.
+@@ -140,7 +140,7 @@
+ One way is the use of header information in the bitmap image (*.bmp) file:
+ From a text file with all the information about 'bmp-colors', 'bmp-table' 
+ and 'bmp-timer' options together with the 'bitmap' option are stored in 
+-the special LILO  header of the bitmap image file by the
++the special LILO header of the bitmap image file by the
+ .B lilo \-E
+ command. Another way works without these special header information: All
+ the information about 'bmp-colors', 'bmp-table' and 'bmp-timer' options
+@@ -200,7 +200,7 @@
+ is for the root options.
+ .sp
+ If your boot device is a hard disk you need a special ID, which is supported
+-by udev. You find the right ID in the directory /dev/disks/by-id, i. e.:
++by udev. You find the right ID in the directory /dev/disk/by-id, i.e.:
+ .IP
+ .nf
+     boot = /dev/disk/by-id/ata-SAMSUNG_SV1604N_S01FJ10X999999
+@@ -255,7 +255,7 @@
+ When `delay' is non-zero, the boot loader will wait for an interrupt for the 
+ specified interval. If an interrupt is received, or
+ is already waiting, the \fBboot:\fP
+-prompt will be be issued, and no automatic boot will take place. The setting
++prompt will be issued, and no automatic boot will take place. The setting
+ of CAPS LOCK or SCROLL LOCK, or any of the
+ keys ALT, CTRL, or SHIFT, when held down, are taken as interrupts.
+ 
+@@ -317,16 +317,16 @@
+ .sp
+ In cases where there is no
+ kernel partition information available, such as on loopback devices,
+-the 'disk=' specification may include paritition start information;
++the 'disk=' specification may include partition start information;
+ viz.,
+ .sp
+ .nf
+        disk=/dev/loop0
+             bios=0x80			# use this BIOS code
+             max-partitions=7		# declare partitionable
+-            paritition=/dev/loop1
++            partition=/dev/loop1
+                  start=63		# offset from sector 0
+-            paritition=/dev/loop2
++            partition=/dev/loop2
+                  start=102400		# offset from sector 0
+ .fi
+ .sp
+@@ -376,7 +376,7 @@
+ .TP
+ .BI "install=" <user-interface>
+ Selects the user interface which will be seen at boot time.  One of the
+-following three options may be specified:  \fBtext\fP, \fBmenu\fP, or
++following three options may be specified: \fBtext\fP, \fBmenu\fP, or
+ \fBbmp\fP. The traditional LILO interface is `text'; but `menu' is now the
+ default, unless the configuration file contains the `bitmap='
+ specification.  The \fItext\fP interface is strictly a command-line
+@@ -391,9 +391,9 @@
+ .TP
+ .B large-memory
+ Normally any initial ramdisk (initrd) loaded with a kernel is loaded as
+-high in memory as possible, but never above 15Mb.  This is due to a BIOS
++high in memory as possible, but never above 15\~MB.  This is due to a BIOS
+ limitation on older systems.  On newer systems, this option enables using
+-memory above 15Mb (up to a kernel imposed limit, around 768Mb) for
++memory above 15\~MB (up to a kernel imposed limit, around 768\~MB) for
+ passing the initrd to the kernel.  The presence of this option merely
+ indicates that your system does not have the old BIOS limitation.
+ 
+@@ -452,7 +452,7 @@
+ title replaces the default "LILO Boot Menu" title string. If
+ .I menu
+ is not installed as the boot loader (see
+-.I "install="
++.B install=
+ option), then this line has no effect.
+ .TP
+ .BI "menu-scheme=" <color-scheme>
+@@ -474,7 +474,7 @@
+ \fBB\fPlue, \fBG\fPreen, \fBC\fPyan, \fBR\fPed,
+ \fBM\fPagenta, \fBY\fPellow, and \fBW\fPhite: upper case for
+ intense (fg only), lower case for dim.
+-Legal color-scheme strings would be
++Valid color-scheme strings would be
+ .sp
+ .nf
+     menu-scheme=Wm     intense white on magenta
+@@ -483,7 +483,7 @@
+ .fi
+ .sp
+ If
+-.I "menu"
++.B menu
+ is not installed as the boot loader, then this line has no effect.
+ .TP
+ .BI "message=" <message-file>
+@@ -528,8 +528,8 @@
+ The per-image option `optional' (see below) applies to all images.
+ .TP
+ .BI "password=" <password>
+-The per-image option `password=...' (see below) applies to all images. This
+-option may prevent unattended booting, if the default image is `password='
++The per-image option `password=.\|.\|.\&' (see below) applies to all images.
++This option may prevent unattended booting, if the default image is `password='
+ protected at the default level `mandatory', which is a level higher than
+ `restricted'.
+ .TP
+@@ -585,20 +585,20 @@
+     <port>[,<bps>[<parity>[<bits>]]]
+ .fi
+ .sp
+-<port>:  the number of the serial port, zero-based. 0 corresponds to
++<port>: the number of the serial port, zero-based. Zero (0) corresponds to
+ COM1 alias /dev/ttyS0, etc. All four ports can be used (if present).
+ .sp
+-<bps>:  the baud rate of the serial port. The following baud rates are 
+-supported: 110, 150, 300, 600, 1200, 2400(default), 4800, 9600, plus the 
+-extended rates 19200, 38400, and 57600(56000).  115200 is allowed, but may
+-not work with all COMx port hardware.
+-.sp
+-<parity>:  the parity used on the serial line. The boot loader ignores input 
+-parity and strips the 8th bit. The following (upper or lower case) 
+-characters are used to describe the parity:  "n" for no parity, "e" 
++<bps>: the baud rate of the serial port. The following baud rates are
++supported: 110, 150, 300, 600, 1200, 2400 (default), 4800, 9600, plus the
++extended rates 19200, 38400, and 57600 (56000).
++The rate 115200 is allowed, but may not work with all COMx port hardware.
++.sp
++<parity>: the parity used on the serial line. The boot loader ignores input
++parity and strips the 8th bit. The following (upper or lower case)
++characters are used to describe the parity: "n" for no parity, "e"
+ for even parity and "o" for odd parity.
+ .sp
+-<bits>:  the number of bits in a character. Only 7 and 8 bits are 
++<bits>: the number of bits in a character. Only 7 and 8 bits are
+ supported. Default is 8 if parity is "none", 7 if parity is "even" 
+ or "odd". 
+ .sp
+@@ -658,7 +658,10 @@
+ .TP
+ .BI "verbose=" <number>
+ Turns on lots of progress reporting. Higher numbers give more verbose
+-output. If  \-v  is additionally specified on the lilo command line,
++output.
++If
++.B \-v
++is additionally specified on the lilo command line,
+ the level is increased accordingly. The maximum verbosity level is 5.
+ .TP
+ .BI "vmdefault=" <name>
+@@ -712,19 +715,19 @@
+ .BI "addappend=" <string>
+ The kernel parameters of this string are concatenated to the
+ parameter(s) from an
+-.B "append="
++.B append=
+ option (see below).
+ The string of addappend must be enclosed within double quotes. 
+ Usually, the previous
+-.B "append="
+-will set parameters common to all kernels by appearing in the global 
++.B append=
++will set parameters common to all kernels by appearing in the global
+ section of the configuration file and
+-.B "addappend="
++.B addappend=
+ will be used to add local parameter(s) to an individual image.
+ The addappend option may be used only once per "image=" section.
+ .sp
+-If the string is a very long line, this line can be divided 
+-in more lines using "\\" as last character of a line, e.g.
++If the string is a very long line, this line can be divided
++in more lines using "\e" as last character of a line, e.g.,
+ .sp
+ .nf
+     addappend="noapic acpi=off pci=usepirqmask \\
+@@ -746,13 +749,14 @@
+      append="mem=96M hd=576,64,32 console=ttyS1,9600"
+ .fi
+ .sp
+-If the string is a very long line, this line can be divided in more lines 
+-using "\\" as last character of a line. See example of addappend option.
++If the string is a very long line, this line can be divided in more lines
++using "\e" as last character of a line. See example of addappend option.
+ .TP
+ .BI "initrd=" <name>
+ Specifies the initial ramdisk image to be loaded with the kernel.  The
+ image will contain modules needed at boot time, such as network and scsi
+-drivers. See man pages for \fImkinitrd(8)\fP.
++drivers. See man pages for
++.BR mkinitrd (8).
+ .TP
+ .BI "literal=" <string>
+ Like `append', but removes all other options (e.g. setting of the root
+@@ -761,8 +765,8 @@
+ this option cannot be set in the global options section.
+ .TP
+ .BI "ramdisk=" <size>
+-This specifies the size (e.g., "4096k") of the optional RAM disk. A value of 
+-zero indicates that no RAM disk should be created. If this variable is 
++This specifies the size (e.g. "4096k") of the optional RAM disk. A value of
++zero indicates that no RAM disk should be created. If this variable is
+ omitted, the RAM disk size configured into the boot image is used.
+ .TP
+ .B read-only
+@@ -781,7 +785,8 @@
+ If the special name
+ .B current
+ is used, the root device is set to the device on which the root file
+-system is currently mounted. If the root has been changed with  \-r ,
++system is currently mounted. If the root has been changed with
++.BR \-r ,
+ the respective device is used. If the variable `root' is omitted,
+ the root device setting contained in the running kernel image is used.
+ Warning: This can induce to an unbootable system!
+@@ -800,7 +805,7 @@
+      root="UUID=5472fd8e-9089-4256-bcaa-ceab4f01a439"
+ .fi
+ .sp
+-Note:  The command line
++Note: The command line
+ .I root=
+ parameter passed to the kernel will be: 'root=LABEL=MyDisk'; i.e., without
+ the quotation marks. If the
+@@ -838,7 +843,9 @@
+ If this variable is omitted, the VGA mode setting contained in the 
+ kernel image is used. (And that is set at compile time using the
+ SVGA_MODE variable in the kernel Makefile, and can later be changed with
+-the rdev(8) program.)
++the
++.BR rdev (8)
++program.)
+ 
+ .SH "ALTERNATE SYSTEM (other=)"
+ .LP
+@@ -872,8 +879,8 @@
+ This keyword starts a section which describes how primary partition IDs are
+ changed, and how primary partitions are activated and deactivated.  If
+ .B change
+-is omitted, change rules are generated as though the 
+-.I "automatic"
++is omitted, change rules are generated as though the
++.B automatic
+ keyword were specified. The keyword
+ .B change
+ alone, without any rules following, will suppress automatic change-rules.
+@@ -987,7 +994,7 @@
+ .BI "alias=" <name>
+ A second name for the same entry can be used by specifying an alias.
+ .TP
+-.B "bmp-retain
++.B bmp-retain
+ The bitmap graphic (install=bmp) is retained when control is passed to the
+ loaded kernel image, or other= bootloader; i.e., the screen is not
+ blanked to alphanumeric mode before starting the kernel.  This feature is
+@@ -1005,7 +1012,7 @@
+ different (supposedly stable) kernel. The command line stored by the fallback 
+ mechanism is cleared by removing or changing the default command line 
+ with the
+-.I \-R
++.B \-R
+ option, which should be a part of the boot startup scripts.
+ .TP
+ .B lock
+@@ -1048,7 +1055,7 @@
+ .TP
+ .B restricted
+ A password is only required to boot the image if kernel parameters
+-are specified on the command line (e.g. 'single').  May be used
++are specified on the command line (e.g.\& 'single').  May be used
+ on a single `image=' or `other=' to override a different global setting.
+ .TP
+ .B vmwarn
+@@ -1061,9 +1068,10 @@
+ displayed as a boot option.  The image is only bootable in real mode.  See
+ .I vmdefault
+ above.
+-
+-.LP
+-
+ .SH "SEE ALSO"
+-lilo(8), mkinitrd(8), mknod(1), mkrescue(8), rdev(8).
++.BR lilo (8),
++.BR mkinitrd (8),
++.BR mknod (1),
++.BR mkrescue (8),
++.BR rdev (8).
+ 
diff --git a/11_fix-gcc-10.patch b/11_fix-gcc-10.patch
new file mode 100644
index 000000000000..c46b9eebdea0
--- /dev/null
+++ b/11_fix-gcc-10.patch
@@ -0,0 +1,51 @@
+Description: Fix ftbfs with GCC-10
+
+Author: Ryan Finnie <ryan@finnie.org>
+Bug-Debian: https://bugs.debian.org/957490
+Forwarded: no
+
+---
+
+--- a/src/raid.h
++++ b/src/raid.h
+@@ -8,7 +8,7 @@
+  * in the source directory.
+  */
+ 
+-int do_md_install, ndisk, md_bios;
++extern int ndisk, md_bios;
+ 
+ int raid_setup(void);
+ void raid_final(void);
+--- a/src/bsect.c
++++ b/src/bsect.c
+@@ -54,8 +54,6 @@
+ #endif
+ 
+ 
+-int boot_dev_nr;
+-
+ static BOOT_SECTOR bsect,bsect_orig;
+ static MENUTABLE menuparams;
+ static DESCR_SECTORS descrs;
+--- a/src/identify.c
++++ b/src/identify.c
+@@ -19,7 +19,6 @@
+ #include "common.h"
+ #include "cfg.h"
+ 
+-char *identify;
+ static char *opt;
+ static char *first, *dflt;
+ static int idefault;
+--- a/src/raid.c
++++ b/src/raid.c
+@@ -41,7 +41,7 @@
+ static int raid_bios[MAX_RAID+1];
+ static int device;
+ enum {MD_NULL=0, MD_PARALLEL, MD_MIXED, MD_SKEWED};
+-int do_md_install, ndisk, md_bios;
++int ndisk, md_bios;
+ static char *raid_list[MAX_RAID];
+ static int list_index[MAX_RAID];
+ static int nlist, faulty;
diff --git a/PKGBUILD b/PKGBUILD
index d7ed5c97f2f1..cbd1b33dc15a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,11 @@
-# Maintainer: Connor Behan <connor.behan@gmail.com>
+# Maintainer: Alonso Rodriguez <alonsorodi20 (at) gmail.com>
+# Contributor: Connor Behan <connor.behan@gmail.com>
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=lilo
 pkgver=24.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A bootloader for Linux"
 arch=('i686' 'x86_64')
 url="https://alioth.debian.org/projects/lilo/"
@@ -16,7 +17,41 @@ optdepends=('perl: to use keytab-lilo')
 install=lilo.install
 options=('!makeflags')
 source=("https://alioth-archive.debian.org/releases/lilo/Lilo/${pkgver}/${pkgname}-${pkgver}.tar.gz"
-        'lilo.conf')
+        'lilo.conf'
+        '01_makefile-adds.patch'
+        '03_keytab-lilo.8-debian-based.patch'
+        '05_readme.disk-change.patch'
+        '06_notinteractive.patch'
+        '08_small-typos-in-manpages.patch'
+        '09_fix-manpage-lilo-conf-5.patch'
+        '10_fix-manpage-lilo-conf-5.patch'
+        '11_fix-gcc-10.patch'
+        )
+
+md5sums=('fe5e8c9754cee342b958b5fcbbb6eb51'
+         'c828942206c191242875d9b5fbeae094'
+         '3e9380373e16b930c079ad31376468d9'
+         '684ca1867c5a8ad7f6ba44f0fd92ce52'
+         '51703dc2a3784974a49d498599f3da04'
+         '4ef1ffaa647531de21b689591b38d6bd'
+         '2f0a159a767e118a76f8ffa0c7dce48f'
+         '96cfca0c181b116de256e990752f5af0'
+         'fd26557bc2d704105369c5ad6e3cc38e'
+         '112a98527481c4d9ec8e76a0bd30af8e'
+        )
+
+prepare(){
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  pwd
+  patch -Np1 -i ../01_makefile-adds.patch
+  patch -Np1 -i ../03_keytab-lilo.8-debian-based.patch
+  patch -Np1 -i ../05_readme.disk-change.patch
+  patch -Np1 -i ../06_notinteractive.patch
+  patch -Np1 -i ../08_small-typos-in-manpages.patch
+  patch -Np1 -i ../09_fix-manpage-lilo-conf-5.patch
+  patch -Np1 -i ../10_fix-manpage-lilo-conf-5.patch
+  patch -Np1 -i ../11_fix-gcc-10.patch
+}
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -48,5 +83,3 @@ package() {
   rm -rf "${pkgdir}"/etc/kernel
 }
 
-md5sums=('fe5e8c9754cee342b958b5fcbbb6eb51'
-         'ca2d8cd9b63f11444861939b42df29c1')
diff --git a/lilo.conf b/lilo.conf
index 9d42a23336c0..a19b161afe3f 100644
--- a/lilo.conf
+++ b/lilo.conf
@@ -2,24 +2,32 @@
 # /etc/lilo.conf
 #
 
-boot=/dev/hda
+boot=/dev/sda
 # This line often fixes L40 errors on bootup
-# disk=/dev/hda bios=0x80
+# disk=/dev/sda bios=0x80
 
 default=arch
 timeout=50
 lba32
 prompt
+# Nice colours
+install=menu
+menu-scheme=Wb:Yr:Wb:Wb
 
+# Highly recommended to uncomment line below if it
+#  does not give any error on booting
+# compact
+
+# Remember to change root=/dev/???
 image=/boot/vmlinuz-linux
 	label=arch
-	root=/dev/hda3
+	root=/dev/sda2
 	initrd=/boot/initramfs-linux.img
 	read-only
 
 image=/boot/vmlinuz-linux
 	label=arch-fallback
-	root=/dev/hda3
+	root=/dev/sda2
 	initrd=/boot/initramfs-linux-fallback.img
 	read-only