[netbsd-iscsi] Enable hardening (Dhiru Kholia, #955290)

[Lubomir Rintel]

commit 99401ce175098ce3d2a986a971b561c07c22044d
Author: Lubomir Rintel <lkundrak at v3.sk>
Date:   Tue Sep 2 09:12:59 2014 +0200

    Enable hardening (Dhiru Kholia, #955290)

 netbsd-iscsi-20140902-ldflags.patch |   46 +++++++++++++++++++++++++++++++++++
 netbsd-iscsi.spec                   |    9 ++++++-
 2 files changed, 54 insertions(+), 1 deletions(-)
---
diff --git a/netbsd-iscsi-20140902-ldflags.patch b/netbsd-iscsi-20140902-ldflags.patch
new file mode 100644
index 0000000..636258a
--- /dev/null
+++ b/netbsd-iscsi-20140902-ldflags.patch
@@ -0,0 +1,46 @@
+From e90784fb5d54ffb3633479d66b90a0071c43d7f6 Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak at v3.sk>
+Date: Tue, 2 Sep 2014 09:22:25 +0200
+Subject: [PATCH] Allow overriding LDFLAGS
+
+---
+ src/Makefile.in | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/src/Makefile.in b/src/Makefile.in
+index 11db60d..7ce176c 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -25,6 +25,9 @@ COMMON_CFLAGS += -DHAVE_CONFIG_H
+ COMMON_CFLAGS += -I${INCDIR}
+ CFLAGS= @CFLAGS@ ${GCC_CFLAGS} ${COMMON_CFLAGS} -I${INCLUDE} ${PTHREAD_FLAGS}
+ LIBS= @LIBS@
++LIBS+= ${PTHREAD_LIBS}
++LDFLAGS= @LDFLAGS@
++LDFLAGS+= ${PTHREAD_LDFLAGS}
+ 
+ INSTALL= @INSTALL@
+ PREFIX= @prefix@
+@@ -49,16 +52,16 @@ COMPATOBJS= strlcpy.o snprintf.o strtoll.o uuid.o
+ 
+ USER_TARGET_OBJS = target.o iscsi.o util.o parameters.o netmask.o conffile.o storage.o md5c.o md5hl.c ${COMPATOBJS}
+ iscsi-target: iscsi-target.c disk.c $(USER_TARGET_OBJS)
+-	$(CC) $(CFLAGS) iscsi-target.c disk.c $(USER_TARGET_OBJS) ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} ${LIBS} -o iscsi-target
++	$(CC) $(CFLAGS) iscsi-target.c disk.c $(USER_TARGET_OBJS) ${LDFLAGS} ${LIBS} -o iscsi-target
+ osd: osd-target.c osd.c $(USER_TARGET_OBJS)
+-	$(CC) $(CFLAGS) osd-target.c osd.c $(USER_TARGET_OBJS) ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} ${LIBS} -o osd
++	$(CC) $(CFLAGS) osd-target.c osd.c $(USER_TARGET_OBJS) ${LDFLAGS} ${LIBS} -o osd
+ 
+ #
+ # Test harness (initiators)
+ #
+ 
+ iscsifs: iscsifs.o iscsi.o util.o initiator.o parameters.o conffile.o virtdir.o md5c.o md5hl.o
+-	$(CC) iscsifs.o iscsi.o util.o initiator.o parameters.o md5c.o md5hl.o conffile.o virtdir.o -o iscsifs ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} -L${LIBDIR} -Wl,-R${LIBDIR} ${LIBS} -lfuse
++	$(CC) iscsifs.o iscsi.o util.o initiator.o parameters.o md5c.o md5hl.o conffile.o virtdir.o -o iscsifs ${LDFLAGS} -L${LIBDIR} -Wl,-R${LIBDIR} ${LIBS} -lfuse
+ 
+ #
+ # Dependencies
+-- 
+1.9.3
+
diff --git a/netbsd-iscsi.spec b/netbsd-iscsi.spec
index 4611586..cd83dce 100644
--- a/netbsd-iscsi.spec
+++ b/netbsd-iscsi.spec
@@ -1,6 +1,8 @@
+%global _hardened_build 1
+
 Name:           netbsd-iscsi
 Version:        20080207
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        User-space implementation of iSCSI target from NetBSD project
 
 Group:          System Environment/Daemons
@@ -12,6 +14,7 @@ Source2:        netbsd-iscsi.sysconfig
 Patch0:         netbsd-iscsi-20071205-linux.patch
 Patch1:         netbsd-iscsi-20080207-utf8.patch
 Patch2:         netbsd-iscsi-20080207-allocate.patch
+Patch3:         netbsd-iscsi-20140902-ldflags.patch
 
 Requires(post): systemd
 Requires(preun): systemd
@@ -29,6 +32,7 @@ tested with the Microsoft iSCSI initiator, version 1.06.
 %patch0 -p1 -b .linux
 %patch1 -p1 -b .utf8
 %patch2 -p1 -b .allocate
+%patch3 -p1 -b .ldflags
 
 
 %build
@@ -77,6 +81,9 @@ install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/netbsd-iscsi
 
 
 %changelog
+* Tue Sep  2 2014 Lubomir Rintel <lkundrak at v3.sk> - 20080207-14
+- Enable hardening (Dhiru Kholia, #955290)
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20080207-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild