tags 957490 + patch
thanks

Please see attached debdiff for a NMU ftbfs fix.  Sponsorship is
requested, thank you.
diff -Nru lilo-24.2/debian/changelog lilo-24.2/debian/changelog
--- lilo-24.2/debian/changelog  2019-12-10 14:41:00.000000000 -0800
+++ lilo-24.2/debian/changelog  2020-10-28 11:18:45.000000000 -0700
@@ -1,3 +1,10 @@
+lilo (1:24.2-5.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix ftbfs with GCC-10. (Closes: #957490)
+
+ -- Ryan Finnie <r...@finnie.org>  Wed, 28 Oct 2020 11:18:45 -0700
+
 lilo (1:24.2-5) unstable; urgency=medium
 
   * Add file debian/NEWS to point out that lilo package is deprecated
diff -Nru lilo-24.2/debian/patches/11_fix-gcc-10.patch 
lilo-24.2/debian/patches/11_fix-gcc-10.patch
--- lilo-24.2/debian/patches/11_fix-gcc-10.patch        1969-12-31 
16:00:00.000000000 -0800
+++ lilo-24.2/debian/patches/11_fix-gcc-10.patch        2020-10-28 
11:15:28.000000000 -0700
@@ -0,0 +1,51 @@
+Description: Fix ftbfs with GCC-10
+
+Author: Ryan Finnie <r...@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 -Nru lilo-24.2/debian/patches/series lilo-24.2/debian/patches/series
--- lilo-24.2/debian/patches/series     2019-12-10 14:32:55.000000000 -0800
+++ lilo-24.2/debian/patches/series     2020-10-28 11:17:12.000000000 -0700
@@ -6,3 +6,4 @@
 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

Attachment: signature.asc
Description: OpenPGP digital signature



Reply via email to