From: Joachim Wiedorn <ad_debian@joonet.de>
Date: Tue, 2 Jul 2013 21:29:24 +0000 (+0200)
Subject: Fix with compiler option 'freestanding'
X-Git-Tag: debian/24.0-2^0
X-Git-Url: https://git.rrq.au/?a=commitdiff_plain;h=570b9132b7f7b75f7add9d03e019fd689ab53f21;p=rrq%2Fmaintain_lilo.git

Fix with compiler option 'freestanding'
---

diff --git a/debian/changelog b/debian/changelog
index b43c7c3..6b85b0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+lilo (1:24.0-2) unstable; urgency=medium
+
+  * Fix: compiler option 'freestanding' must be used with cpp
+      (in patch 11_add-compile-flags.patch). Closes: #713504
+
+ -- Joachim Wiedorn <ad_debian@joonet.de>  Tue, 02 Jul 2013 21:13:11 +0200
+
 lilo (1:24.0-1) unstable; urgency=low
 
   * New upstream release:
diff --git a/debian/patches/11_add-compile-flags.patch b/debian/patches/11_add-compile-flags.patch
index 406729c..ca518e7 100644
--- a/debian/patches/11_add-compile-flags.patch
+++ b/debian/patches/11_add-compile-flags.patch
@@ -2,34 +2,24 @@ Package:     lio
 Subject:     add compile flags for hardening
 Author:      Joachim Wiedorn <ad_debian at joonet.de>
 Forwarded:   no
-Last-Update: 2013-06-08
+Last-Update: 2013-07-02
 
-To support hardening CFLAGS and LDFLAGS must be used
-by compiler executions.
+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-06-08 13:16:36.415275904 +0200
-@@ -16,14 +16,14 @@
- 
- SHELL=/bin/sh
- CC=gcc
--CPP=$(CC) -E -P -ffreestanding
-+CPP=$(CC) -E
- AS86=as86 -0 -a
- LD86=ld86 -0
- NASM=nasm
++++ 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)
+ CFLAGS=$(OPT) -Wall $(PCONFIG)
 -LDFLAGS=#-Xlinker -qmagic
-+FREE=-P -ffreestanding
-+CFLAGS=$(FREE) $(OPT) -Wall $(PCONFIG)
  LIBS=$(DEVMAPPER)
  
  OBJS=lilo.o raid.o map.o geometry.o boot.o device.o common.o bsect.o cfg.o \
-@@ -79,7 +79,7 @@
+@@ -79,7 +78,7 @@
  	echo $(MAN_DIR)
  
  .c.o:
@@ -38,7 +28,7 @@ diff -urNa s10/src/Makefile s11/src/Makefile
  
  .s.o:
  		$(AS86) -w -l $*.lis -o $*.o $*.s
-@@ -91,7 +91,7 @@
+@@ -91,7 +90,7 @@
  		dd if=$*.img of=$*.b bs=32 skip=1
  
  edit:		$(EDIT)
@@ -47,7 +37,7 @@ diff -urNa s10/src/Makefile s11/src/Makefile
  
  loader.i:	mkloader first.b second.b third.b bitmap.b mbr.b chain.b mbr2.b
  		./mkloader >loader.i
-@@ -100,30 +100,30 @@
+@@ -100,30 +99,30 @@
  		cp disk.b disk.com
  
  disk.s:		disk.S read.S bdata.h biosdata.S lilo.h Makefile
@@ -83,7 +73,7 @@ diff -urNa s10/src/Makefile s11/src/Makefile
  		-DSIZEKRNL=`wc -c <disk.com | sed "s/ //g"` \
  		-DSIZEDISKB=512 -o pseudo1.s $(TMP).S
  	rm -f $(TMP).S
-@@ -131,7 +131,7 @@
+@@ -131,7 +130,7 @@
  pseudo2.s: bootsect.S pseudo.S
  	$(MAKE) -C ../diagnose all
  	cat bootsect.S pseudo.S >$(TMP).S
@@ -92,7 +82,7 @@ diff -urNa s10/src/Makefile s11/src/Makefile
  		-DSIZEKRNL=`wc -c <../diagnose/test4.com | sed "s/ //g"` \
  		-DSIZEDISKB=512 -o pseudo2.s $(TMP).S
  	rm -f $(TMP).S
-@@ -139,7 +139,7 @@
+@@ -139,7 +138,7 @@
  pseudo3.s: bootsect.S pseudo.S
  	$(MAKE) -C ../diagnose all
  	cat bootsect.S pseudo.S >$(TMP).S
@@ -101,7 +91,7 @@ diff -urNa s10/src/Makefile s11/src/Makefile
  		-DSIZEKRNL=`wc -c <../diagnose/test5.com | sed "s/ //g"` \
  		-DSIZEDISKB=512 -o pseudo3.s $(TMP).S
  	rm -f $(TMP).S
-@@ -176,13 +176,13 @@
+@@ -176,13 +175,13 @@
  		cp -p dparam.S dparam.s
  
  lilo:		$(OBJS)
@@ -118,7 +108,7 @@ diff -urNa s10/src/Makefile s11/src/Makefile
  
  bitmap.o: bitmap.s common.s
  third.o: third.s common.s
-@@ -191,25 +191,25 @@
+@@ -191,25 +190,25 @@
  chain.o: chain.s common.s
  
  first.s:	first.S lilo.h version.h Makefile
@@ -150,7 +140,7 @@ diff -urNa s10/src/Makefile s11/src/Makefile
  
  $(OBJS):	Makefile
  
-@@ -254,14 +254,14 @@
+@@ -254,14 +253,14 @@
  
  dep:
  	sed '/\#\#\# Dependencies/q' <Makefile >tmp_make
diff --git a/debian/watch b/debian/watch
index da07a66..0570dd4 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
 # watch control file for uscan for the lilo package
 version=3
-http://alioth.debian.org/frs/?group_id=100507  (?:.*/)?lilo-(\d.+)\.tar\.gz
+http://alioth.debian.org/frs/?group_id=100507  .*/lilo-(\d.+).tar.gz