+++ /dev/null
-Package: lilo
-Subject: use of newer debhelper 7.0.50 and above
-Author: Joachim Wiedorn <ad_debian at joonet.de>
-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
+++ /dev/null
-Package: lio
-Subject: add compile flags for hardening
-Author: Joachim Wiedorn <ad_debian at joonet.de>
-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 <disk.b | sed "s/ //g"` \
- -o bootsect.s bootsect.S
-
- pseudo1.s: bootsect.S pseudo.S disk.com
- cat bootsect.S pseudo.S >$(TMP).S
-- $(CPP) -traditional $(PCONFIG) \
-+ $(CPP) $(CPPFLAGS) -traditional $(PCONFIG) \
- -DSIZEKRNL=`wc -c <disk.com | sed "s/ //g"` \
- -DSIZEDISKB=512 -o pseudo1.s $(TMP).S
- rm -f $(TMP).S
-@@ -131,7 +130,7 @@
- pseudo2.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/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' <Makefile >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:
projects / rrq / maintain_lilo.git / commitdiff