From: Joachim Wiedorn <joodebian@joonet.de>
Date: Fri, 15 Jul 2016 20:37:14 +0000 (+0200)
Subject: Patch for better support of hardening
X-Git-Tag: debian/24.2-2~2
X-Git-Url: https://git.rrq.au/?a=commitdiff_plain;ds=sidebyside;h=f18f64c92a221ff56b5e287701f5bed30104c19d;p=rrq%2Fmaintain_lilo.git

Patch for better support of hardening
---

diff --git a/debian/changelog b/debian/changelog
index 50724fb..0ea64fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ lilo (1:24.2-2) UNRELEASED; urgency=medium
       (creating only arch-independent packages). Closes: #806656
   * debian/control:
     - Bump Standards Version to 3.9.8 (no changes).
+  * New patches:
+    - Fix warning found in buildd logs: dpkg-buildflags-missing CFLAGS
 
  -- Joachim Wiedorn <joodebian@joonet.de>  Fri, 15 Jul 2016 21:23:45 +0200
 
diff --git a/debian/patches/07_hardening-cflags+cppflags.patch b/debian/patches/07_hardening-cflags+cppflags.patch
new file mode 100644
index 0000000..5fc6e74
--- /dev/null
+++ b/debian/patches/07_hardening-cflags+cppflags.patch
@@ -0,0 +1,21 @@
+Package:     lilo
+Subject:     hardening CFLAGS and CPPFLAGS
+Author:      Joachim Wiedorn <joodebian at joonet.de>
+Origin:      issues found in buildd logs for lilo
+Forwarded:   no
+Last-Update: 2016-07-15
+---
+
+diff -urN s06/src/Makefile s07/src/Makefile
+--- s06/src/Makefile	2016-07-15 21:41:14.977602579 +0200
++++ s07/src/Makefile	2016-07-15 21:52:35.979409943 +0200
+@@ -22,7 +22,8 @@
+ NASM=nasm
+ G=`cat foo1 foo2 | grep version | cut -d " " -f 3`
+ 
+-CFLAGS=$(OPT) -Wall $(PCONFIG)
++CFLAGS = $(OPT) -Wall $(PCONFIG) `dpkg-buildflags --get CFLAGS`
++CPPFLAGS = `dpkg-buildflags --get CPPFLAGS`
+ LIBS=$(DEVMAPPER)
+ 
+ OBJS=lilo.o raid.o map.o geometry.o boot.o device.o common.o bsect.o cfg.o \
diff --git a/debian/patches/series b/debian/patches/series
index a7b98cc..fac4a84 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 03_keytab-lilo.8-debian-based.patch
 05_readme.disk-change.patch
 06_notinteractive.patch
+07_hardening-cflags+cppflags.patch
diff --git a/debian/patches/ubuntu.series b/debian/patches/ubuntu.series
index eac27f8..43bff48 100644
--- a/debian/patches/ubuntu.series
+++ b/debian/patches/ubuntu.series
@@ -3,3 +3,4 @@
 03_keytab-lilo.8-debian-based.patch
 05_readme.disk-change.patch
 06_notinteractive.patch
+07_hardening-cflags+cppflags.patch