Package: open-iscsi
Version: 2.0.872-2
Severity: important
Tags: patch
Please enable hardened build flags through dpkg-buildflags.
Patch attached.
Cheers,
Moritz
diff -aur open-iscsi-2.0.872.harden/usr/Makefile open-iscsi-2.0.872/usr/Makefile
--- open-iscsi-2.0.872.harden/usr/Makefile 2012-02-12 22:54:46.000000000 +0100
+++ open-iscsi-2.0.872/usr/Makefile 2012-02-12 22:57:00.000000000 +0100
@@ -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)
@@ -53,14 +53,14 @@
iscsid: $(ISCSI_LIB_SRCS) $(IPC_OBJ) $(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: $(IPC_OBJ) $(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)
diff -aur open-iscsi-2.0.872.harden/utils/Makefile open-iscsi-2.0.872/utils/Makefile
--- open-iscsi-2.0.872.harden/utils/Makefile 2010-08-11 17:27:07.000000000 +0200
+++ open-iscsi-2.0.872/utils/Makefile 2012-02-12 22:57:36.000000000 +0100
@@ -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
Nur in open-iscsi-2.0.872/utils: Makefile~.
