From: Joachim Wiedorn Date: Fri, 17 Oct 2014 19:50:00 +0000 (+0200) Subject: Update or remove patches X-Git-Tag: debian/24.1-1~4 X-Git-Url: https://git.rrq.au/?a=commitdiff_plain;h=721896e2e9b1d533ce09ae60b1de52190e75a2b3;p=rrq%2Fmaintain_lilo.git Update or remove patches --- diff --git a/debian/changelog b/debian/changelog index 1f47c53..b3cc886 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ lilo (1:24.1-1) UNRELEASED; urgency=medium Closes: #459713, #728622 - More documentation about -R option. Closes: #720129 - Optional: Set no-defragment bit on XFS filesystems. See: #566035 + - Update some patches, remove all other patches. * Use better link to upstream packages in debian/watch. * Bump Standards Version to 3.9.6 (no changes). diff --git a/debian/patches/01_makefile-adds.patch b/debian/patches/01_makefile-adds.patch index e5648df..ea5adf1 100644 --- a/debian/patches/01_makefile-adds.patch +++ b/debian/patches/01_makefile-adds.patch @@ -21,7 +21,7 @@ diff -urN s00/make.vars s01/make.vars 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 -@@ -48,7 +48,7 @@ +@@ -47,7 +47,7 @@ # # everything needed to run, just short of installation # diff --git a/debian/patches/06_notinteractive.patch b/debian/patches/06_notinteractive.patch index 9c14375..095cbc8 100644 --- a/debian/patches/06_notinteractive.patch +++ b/debian/patches/06_notinteractive.patch @@ -9,7 +9,7 @@ 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 -@@ -849,7 +849,9 @@ +@@ -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); diff --git a/debian/patches/07_bad-partition-warn.patch b/debian/patches/07_bad-partition-warn.patch deleted file mode 100644 index 975bab8..0000000 --- a/debian/patches/07_bad-partition-warn.patch +++ /dev/null @@ -1,24 +0,0 @@ -Package: lilo -Subject: only warning about bad partition -Author: Joachim Wiedorn -Forwarded: no -Last-Update: 2013-06-07 - ---- - -diff -urN v09/src/partition.c v10/src/partition.c ---- v09/src/partition.c 2010-06-19 23:52:05.000000000 +0200 -+++ v10/src/partition.c 2010-07-03 09:41:28.687586169 +0200 -@@ -226,11 +226,10 @@ - dos ? " A DOS/Windows system may be rendered unbootable." - "\n The backup copy of this boot sector should be retained." - : "" ); -+ fprintf (errstd, "I will assume that you know what you're doing and I will proceed.\n"); - #if 0 - if (!dos && !cfg_get_flag(cf_options,"ignore-table")) - die("You may proceed by using either '-P ignore' or 'ignore-table'"); --#else -- if (!yesno("\nProceed? ", 0)) exit(0); - #endif - } - cyl = part_table[part].cyl+((part_table[part].sector >> 6) << 8); diff --git a/debian/patches/08_install-also-dat-files.patch b/debian/patches/08_install-also-dat-files.patch deleted file mode 100644 index 5afffaa..0000000 --- a/debian/patches/08_install-also-dat-files.patch +++ /dev/null @@ -1,35 +0,0 @@ -Package: lilo -Subject: install also dat files of menu backgrounds -Author: Joachim Wiedorn -Forwarded: no -Last-Update: 2010-11-13 - -In some situations it is fine to have the original config files -for the menu background images. So let us install these dat files. ---- - -diff -urN s07/images/Makefile s08/images/Makefile ---- s07/images/Makefile 2010-11-04 13:26:28.000000000 +0100 -+++ s08/images/Makefile 2010-11-13 18:39:14.558043894 +0100 -@@ -6,6 +6,8 @@ - BINLILO := ../src/lilo - BMPS8 := coffee.bmp - BMPS4 := debian.bmp debian-de.bmp debianlilo.bmp inside.bmp onlyblue.bmp tuxlogo.bmp -+NAME8 := coffee -+NAME4 := debian debian-de debianlilo inside onlyblue tuxlogo - - - all: $(BMPS4) $(BMPS8) -@@ -21,6 +23,12 @@ - install: all - mkdir -p $$DESTDIR$(BOOT_DIR) - install -m 0644 $(BMPS4) $(BMPS8) $$DESTDIR$(BOOT_DIR) -+ for i in $(NAME8); do -+ cp $(NAME8)_256c.dat $$DESTDIR$(BOOT_DIR) -+ done -+ for i in $(NAME4); do -+ cp $(NAME4)_16c.dat $$DESTDIR$(BOOT_DIR) -+ done - - clean: - rm -f $(BMPS4) $(BMPS8) diff --git a/debian/patches/09_use-of-newer-debhelper.patch b/debian/patches/09_use-of-newer-debhelper.patch deleted file mode 100644 index 3e78fa9..0000000 --- a/debian/patches/09_use-of-newer-debhelper.patch +++ /dev/null @@ -1,69 +0,0 @@ -Package: lilo -Subject: use of newer debhelper 7.0.50 and above -Author: Joachim Wiedorn -Forwarded: no -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 -lines. ---- - -diff -urN s08/images/Makefile s09/images/Makefile ---- 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) - install -m 0644 $(BMPS4) $(BMPS8) $$DESTDIR$(BOOT_DIR) -- for i in $(NAME8); do -- cp $(NAME8)_256c.dat $$DESTDIR$(BOOT_DIR) -+ for i in $(NAME8); do \ -+ cp $${i}_256c.dat $$DESTDIR$(BOOT_DIR)/$${i}.dat; \ - done -- for i in $(NAME4); do -- cp $(NAME4)_16c.dat $$DESTDIR$(BOOT_DIR) -+ for i in $(NAME4); do \ -+ cp $${i}_16c.dat $$DESTDIR$(BOOT_DIR)/$${i}.dat; \ - done - - clean: -@@ -37,4 +37,7 @@ - - uninstall: - (cd $$DESTDIR$(BOOT_DIR); rm -f $(BMPS4) $(BMPS8)) -+ for i in $(NAME4) $(NAME8); do \ -+ rm -f $$DESTDIR$(BOOT_DIR)/$${i}.dat; \ -+ done - -diff -urN s08/Makefile s09/Makefile ---- s08/Makefile 2011-04-09 17:14:05.000000000 +0200 -+++ s09/Makefile 2011-05-06 17:45:57.304713832 +0200 -@@ -8,6 +8,13 @@ - # - - # -+# everything needed to run, just short of installation -+# -+all: test -+ make -C src all -+ make -C images all -+ -+# - # make help - # - help: -@@ -34,13 +42,6 @@ - @echo "" - - # --# everything needed to run, just short of installation --# --all: test -- $(MAKE) -C src all -- $(MAKE) -C images all -- --# - # everything above plus the statically linked version - # - alles: test diff --git a/debian/patches/10_fix-src-makefile.patch b/debian/patches/10_fix-src-makefile.patch deleted file mode 100644 index b7c87a1..0000000 --- a/debian/patches/10_fix-src-makefile.patch +++ /dev/null @@ -1,26 +0,0 @@ -Package: lilo -Subject: 10 fix src makefile -Author: Joachim Wiedorn -Forwarded: no -Last-Update: 2013-06-07 - -The newer dash shell do not want "-x" inside an makefile. -In the long version it is running without errors. Now -lilo.static will stored to /sbin/ too. ---- - -diff -urN s09/src/Makefile s10/src/Makefile ---- s09/src/Makefile 2013-06-07 22:46:42.315254388 +0200 -+++ s10/src/Makefile 2013-06-07 22:44:13.000000000 +0200 -@@ -245,7 +245,10 @@ - - strip lilo - cp lilo $$DESTDIR$(SBIN_DIR)/lilo -- [ -x lilo.static ] && strip lilo.static -+ if [ -x lilo.static ]; then \ -+ strip lilo.static; \ -+ cp lilo.static $$DESTDIR$(SBIN_DIR)/lilo.static; \ -+ fi - cp ../mkrescue $$DESTDIR$(USRSBIN_DIR)/mkrescue - cp ../keytab-lilo.pl $$DESTDIR$(USRSBIN_DIR)/keytab-lilo - diff --git a/debian/patches/11_add-compile-flags.patch b/debian/patches/11_add-compile-flags.patch deleted file mode 100644 index ca518e7..0000000 --- a/debian/patches/11_add-compile-flags.patch +++ /dev/null @@ -1,160 +0,0 @@ -Package: lio -Subject: add compile flags for hardening -Author: Joachim Wiedorn -Forwarded: no -Last-Update: 2013-07-02 - -To support hardening CFLAGS and LDFLAGS must be usable -for all compiler commands. ---- - -diff -urNa s10/src/Makefile s11/src/Makefile ---- s10/src/Makefile 2013-06-07 22:44:13.000000000 +0200 -+++ s11/src/Makefile 2013-07-02 21:08:53.456876190 +0200 -@@ -23,7 +23,6 @@ - G=`cat foo1 foo2 | grep version | cut -d " " -f 3` - - CFLAGS=$(OPT) -Wall $(PCONFIG) --LDFLAGS=#-Xlinker -qmagic - LIBS=$(DEVMAPPER) - - OBJS=lilo.o raid.o map.o geometry.o boot.o device.o common.o bsect.o cfg.o \ -@@ -79,7 +78,7 @@ - echo $(MAN_DIR) - - .c.o: -- $(CC) -c $(CFLAGS) $*.c -+ $(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c - - .s.o: - $(AS86) -w -l $*.lis -o $*.o $*.s -@@ -91,7 +90,7 @@ - dd if=$*.img of=$*.b bs=32 skip=1 - - edit: $(EDIT) -- $(CC) $(CFLAGS) -DSTANDALONE -o edit $(EDIT) $(LDFLAGS) -+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -DSTANDALONE -o edit $(EDIT) - - loader.i: mkloader first.b second.b third.b bitmap.b mbr.b chain.b mbr2.b - ./mkloader >loader.i -@@ -100,30 +99,30 @@ - cp disk.b disk.com - - disk.s: disk.S read.S bdata.h biosdata.S lilo.h Makefile -- $(CPP) -traditional $(PCONFIG) -o disk.s disk.S -+ $(CPP) $(CPPFLAGS) -traditional $(PCONFIG) -o disk.s disk.S - - mbr.s: mbr.S lilo.h Makefile -- $(CPP) -traditional $(PCONFIG) -DMBR=0xafbbe760 \ -+ $(CPP) $(CPPFLAGS) -traditional $(PCONFIG) -DMBR=0xafbbe760 \ - -o mbr.s mbr.S - - mbr.b: mbr.img - dd if=$*.img of=$*.b bs=32 skip=49 - - mbr2.s: mbr.S lilo.h Makefile -- $(CPP) -traditional $(PCONFIG) -DMBX=0x93c00848 \ -+ $(CPP) $(CPPFLAGS) -traditional $(PCONFIG) -DMBX=0x93c00848 \ - -o mbr2.s mbr.S - - mbr2.b: mbr2.img - dd if=$*.img of=$*.b bs=32 skip=49 - - bootsect.s: bootsect.S disk.b -- $(CPP) -traditional $(PCONFIG) \ -+ $(CPP) $(CPPFLAGS) -traditional $(PCONFIG) \ - -DSIZEDISKB=`wc -c $(TMP).S -- $(CPP) -traditional $(PCONFIG) \ -+ $(CPP) $(CPPFLAGS) -traditional $(PCONFIG) \ - -DSIZEKRNL=`wc -c $(TMP).S -- $(CPP) -traditional $(PCONFIG) \ -+ $(CPP) $(CPPFLAGS) -traditional $(PCONFIG) \ - -DSIZEKRNL=`wc -c <../diagnose/test4.com | sed "s/ //g"` \ - -DSIZEDISKB=512 -o pseudo2.s $(TMP).S - rm -f $(TMP).S -@@ -139,7 +138,7 @@ - pseudo3.s: bootsect.S pseudo.S - $(MAKE) -C ../diagnose all - cat bootsect.S pseudo.S >$(TMP).S -- $(CPP) -traditional $(PCONFIG) \ -+ $(CPP) $(CPPFLAGS) -traditional $(PCONFIG) \ - -DSIZEKRNL=`wc -c <../diagnose/test5.com | sed "s/ //g"` \ - -DSIZEDISKB=512 -o pseudo3.s $(TMP).S - rm -f $(TMP).S -@@ -176,13 +175,13 @@ - cp -p dparam.S dparam.s - - lilo: $(OBJS) -- $(CC) -o lilo $(LDFLAGS) $(OBJS) $(LIBS) -+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o lilo $(OBJS) $(LIBS) - - lilo.static: $(OBJS) -- $(CC) -o lilo.static -static $(LDFLAGS) $(OBJS) $(LIBS) -+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o lilo.static -static $(OBJS) $(LIBS) - - common.s: common.h -- $(CPP) -C -traditional -DLILO_ASM -o common.s common.h -+ $(CPP) $(CPPFLAGS) -C -traditional -DLILO_ASM -o common.s common.h - - bitmap.o: bitmap.s common.s - third.o: third.s common.s -@@ -191,25 +190,25 @@ - chain.o: chain.s common.s - - first.s: first.S lilo.h version.h Makefile -- $(CPP) $(PCONFIG) -DFIRST=0x62177489 -o first.s first.S -+ $(CPP) $(CPPFLAGS) $(PCONFIG) -DFIRST=0x62177489 -o first.s first.S - - second.s: second.S read.S volume.S mapper.S biosdata.S shs3.S bdata.h lilo.h version.h \ - graph.S menu.S strlen.S bitmap.S crt.S display4.S Makefile -- $(CPP) $(PCONFIG) -DTEXT=0x9dd476ec second.S -o second.s -+ $(CPP) $(CPPFLAGS) $(PCONFIG) -DTEXT=0x9dd476ec second.S -o second.s - - third.s: second.S read.S volume.S mapper.S biosdata.S shs3.S bdata.h lilo.h version.h \ - graph.S menu.S strlen.S bitmap.S crt.S display4.S Makefile -- $(CPP) $(PCONFIG) -DMENU=0x2012a4a7 second.S -o third.s -+ $(CPP) $(CPPFLAGS) $(PCONFIG) -DMENU=0x2012a4a7 second.S -o third.s - - bitmap.s: second.S read.S volume.S mapper.S biosdata.S shs3.S bdata.h lilo.h version.h \ - graph.S menu.S strlen.S bitmap.S crt.S display4.S Makefile -- $(CPP) $(PCONFIG) -DBITMAP=0x2ece2fbe second.S -o bitmap.s -+ $(CPP) $(CPPFLAGS) $(PCONFIG) -DBITMAP=0x2ece2fbe second.S -o bitmap.s - - chain.s: chain.S lilo.h version.h first.b Makefile -- $(CPP) $(PCONFIG) -DCHAIN=0x536a7646 chain.S -o chain.s -+ $(CPP) $(CPPFLAGS) $(PCONFIG) -DCHAIN=0x536a7646 chain.S -o chain.s - - xxx.s: chain.S lilo.h Makefile -- $(CPP) chain.S -DXXX -o xxx.s -+ $(CPP) $(CPPFLAGS) chain.S -DXXX -o xxx.s - - $(OBJS): Makefile - -@@ -254,14 +253,14 @@ - - dep: - sed '/\#\#\# Dependencies/q' tmp_make -- $(CPP) $(CFLAGS) -MM *.c >>tmp_make -+ $(CPP) $(CFLAGS) $(CPPFLAGS) -MM *.c >>tmp_make - mv tmp_make Makefile - - version: common.c lilo.h common.h -- $(CC) $(CFLAGS) -DSHS_MAIN -o version common.c -+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -DSHS_MAIN -o version common.c - - mkloader: temp.c -- $(CC) $(CFLAGS) -DLILO_BINARY -o mkloader temp.c -+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -DLILO_BINARY -o mkloader temp.c - - - tidy: diff --git a/debian/patches/series b/debian/patches/series index d5b7580..a7b98cc 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,8 +3,3 @@ 03_keytab-lilo.8-debian-based.patch 05_readme.disk-change.patch 06_notinteractive.patch -07_bad-partition-warn.patch -08_install-also-dat-files.patch -09_use-of-newer-debhelper.patch -10_fix-src-makefile.patch -11_add-compile-flags.patch diff --git a/debian/patches/ubuntu.series b/debian/patches/ubuntu.series index 55c1ac5..eac27f8 100644 --- a/debian/patches/ubuntu.series +++ b/debian/patches/ubuntu.series @@ -3,8 +3,3 @@ 03_keytab-lilo.8-debian-based.patch 05_readme.disk-change.patch 06_notinteractive.patch -07_bad-partition-warn.patch -08_install-also-dat-files.patch -09_use-of-newer-debhelper.patch -10_fix-src-makefile.patch -11_add-compile-flags.patch