[Pkg-iscsi-maintainers] [SCM] Debian iscsitarget packaging branch, master, updated. debian/1.4.20.2-6-3-gd9cf820

[Ritesh Raj Sarraf]

The following commit has been merged in the master branch:
commit 627d8e43fc017ef184da96bacb450bc8beae3b24
Author: Ritesh Raj Sarraf <rrs at researchut.com>
Date:   Wed Feb 1 00:41:52 2012 +0530

    Enable hardened build flags
    
    Thanks: Moritz Muehlenhoff
    Closes: #656867

diff --git a/debian/rules b/debian/rules
index 1ae8853..aa5eb16 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,8 +12,6 @@
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
-
-
 # get-orig-source target
 DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
 
@@ -36,13 +34,13 @@ MA_DIR ?= /usr/share/modass
 -include $(MA_DIR)/include/generic.make
 -include $(MA_DIR)/include/common-rules.make
 
-CFLAGS = -Wall -g
+CFLAGS = `dpkg-buildflags --get CFLAGS`
+CFLAGS += -Wall
+CFLAGS += `dpkg-buildflags --get CPPFLAGS`
+LDFLAGS = `dpkg-buildflags --get LDFLAGS`
+export CFLAGS
+export LDFLAGS
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	INSTALL_PROGRAM += -s
 endif

-- 
Debian iscsitarget packaging