[Pkg-iscsi-maintainers] [SCM] Debian Open-iSCSI Packaging branch, master, updated. debian/2.0.871.3-6-37-g5567e07

[Ritesh Raj Sarraf]

The following commit has been merged in the master branch:
commit 593f187c92a44321c003e52675bae43d42eda856
Author: Ritesh Raj Sarraf <rrs at researchut.com>
Date:   Sat Apr 7 20:03:22 2012 +0530

    Add hardened build flags
    
    Thanks: Moritz Muehlenhoff
    Closes: #659662

diff --git a/debian/patches/03_hardened-build-flags.patch b/debian/patches/03_hardened-build-flags.patch
new file mode 100644
index 0000000..505be8d
--- /dev/null
+++ b/debian/patches/03_hardened-build-flags.patch
@@ -0,0 +1,51 @@
+hardened build flags - wheezy release goal
+Index: open-iscsi/usr/Makefile
+===================================================================
+--- open-iscsi.orig/usr/Makefile	2012-04-07 19:58:23.341694200 +0530
++++ open-iscsi/usr/Makefile	2012-04-07 20:00:41.622379886 +0530
+@@ -28,7 +28,7 @@
+ endif
+ endif
+ 
+-OPTFLAGS ?= -O2 -g
++OPTFLAGS ?= `dpkg-buildflags --get CFLAGS` `dpkg-buildflags --get CPPFLAGS`
+ WARNFLAGS ?= -Wall -Wstrict-prototypes
+ CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -I../include -I. -I../utils/open-isns \
+ 				-D$(OSNAME) $(IPC_CFLAGS)
+@@ -54,14 +54,14 @@
+ 
+ iscsid: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(DISCOVERY_SRCS) \
+ 	iscsid.o session_mgmt.o discoveryd.o
+-	$(CC) $(CFLAGS) $^ -o $@  -L../utils/open-isns -lisns
++	$(CC) $(CFLAGS) $^ -o $@  -L../utils/open-isns -lisns `dpkg-buildflags --get LDFLAGS`
+ 
+ iscsiadm: $(ISCSI_LIB_SRCS) $(DISCOVERY_SRCS) iscsiadm.o session_mgmt.o
+-	$(CC) $(CFLAGS) $^ -o $@ -L../utils/open-isns -lisns
++	$(CC) $(CFLAGS) $^ -o $@ -L../utils/open-isns -lisns `dpkg-buildflags --get LDFLAGS`
+ 
+ iscsistart: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \
+ 		iscsistart.o statics.o
+-	$(CC) $(CFLAGS) $^ -o $@
++	$(CC) $(CFLAGS) $^ -o $@ `dpkg-buildflags --get LDFLAGS`
+ clean:
+ 	rm -f *.o $(PROGRAMS) .depend $(LIBSYS)
+ 
+Index: open-iscsi/utils/Makefile
+===================================================================
+--- open-iscsi.orig/utils/Makefile	2012-04-07 19:54:51.056641535 +0530
++++ open-iscsi/utils/Makefile	2012-04-07 20:01:57.138754352 +0530
+@@ -1,12 +1,12 @@
+ # This Makefile will work only with GNU make.
+ 
+-CFLAGS += $(OPTFLAGS) -O2 -fno-inline -Wall -Wstrict-prototypes -g
++CFLAGS += $(OPTFLAGS) -fno-inline -Wall -Wstrict-prototypes `dpkg-buildflags --get CFLAGS` `dpkg-buildflags --get CPPFLAGS`
+ PROGRAMS = iscsi-iname
+ 
+ all: $(PROGRAMS)
+ 
+ iscsi-iname: md5.o iscsi-iname.o
+-	$(CC) $(CFLAGS) $^ $(DBM_LIB) -o $@
++	$(CC) $(CFLAGS) $^ $(DBM_LIB) -o $@ `dpkg-buildflags --get LDFLAGS`
+ 
+ clean:
+ 	rm -f *.o $(PROGRAMS) .depend
diff --git a/debian/patches/series b/debian/patches/series
index 7324554..d1eb837 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01_spelling-error-fixes.patch
 02_make-iscsistart-a-dynamic-binary.patch
+03_hardened-build-flags.patch

-- 
Debian Open-iSCSI Packaging