[med-svn] [nut-nutrition] 04/09: Added patch for hardening flags

[Iain Learmonth]

This is an automated email from the git hooks/post-receive script.

irl-guest pushed a commit to branch master
in repository nut-nutrition.

commit 9bc89c332f9cd6eb61bc6890650ef969b20ce4b6
Author: Iain R. Learmonth <irl at fsfe.org>
Date:   Sat Jun 7 00:19:08 2014 +0100

    Added patch for hardening flags
---
 debian/patches/import_ldflags.patch | 34 ++++++++++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 2 files changed, 35 insertions(+)

diff --git a/debian/patches/import_ldflags.patch b/debian/patches/import_ldflags.patch
new file mode 100644
index 0000000..7d39cfe
--- /dev/null
+++ b/debian/patches/import_ldflags.patch
@@ -0,0 +1,34 @@
+Author: Iain R. Learmonth <irl at fsfe.org>
+Last-Update: Sat, 07 June 2014 00:18:29 +0100
+Description: Added hardening flags to build process
+
+--- nut-nutrition.orig/Makefile
++++ nut-nutrition/Makefile
+@@ -8,6 +8,11 @@
+ EXECUTABLE := nut
+ LIBS := -lm
+ 
++CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
++CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
++CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
++LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
++
+ FLTK_CONFIG := $(shell fltk-config --version 2>/dev/null)
+ ifeq ($(FLTK_CONFIG),)
+ HAVE_FLTK = 0
+@@ -26,12 +31,12 @@
+ endif
+ 
+ ifeq ($(OS),HP-UX)
+-CFLAGS := $(OPT) -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR)
++CFLAGS += $(OPT) -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR)
+ else
+-CFLAGS := $(OPT) -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR)
++CFLAGS += $(OPT) -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR)
+ endif
+ 
+-CXXFLAGS := $(CFLAGS) `fltk-config --cxxflags`
++CXXFLAGS += $(CFLAGS) `fltk-config --cxxflags`
+ 
+ SOURCE := $(wildcard *.c)
+ OBJS := $(patsubst %.c,%.o,$(SOURCE))
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..bb2fc0f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+import_ldflags.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/nut-nutrition.git