Package: loki / 2.4.7.4-10

hardening.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
Author: Andreas Tille <tille@debian.org>
LastChanged: Mon, 28 Oct 2013 17:08:17 +0100
Description: Propagate hardening for linker also into subdirectory utils

--- a/utils/Makefile.in
+++ b/utils/Makefile.in
@@ -11,8 +11,8 @@ exec_prefix = @exec_prefix@
 bindir = @bindir@
 INSTALL_PERM = 755
 
-CFLAGS = $(MY_CFLAGS) -I../include
-LDFLAGS = 
+CFLAGS += $(MY_CFLAGS) -I../include
+LDFLAGS := $(LDFLAGS) 
 LIBS = -lm 
 ALL_LIBS = $(LIBS)
 
@@ -26,7 +26,7 @@ qavg: qavg.c
 	$(CC) $(CFLAGS) -o $@ qavg.c $(LDFLAGS) $(ALL_LIBS)
 
 hist: hist.c
-	$(CC) $(CFLAGS) -o $@ hist.c
+	$(CC) $(CFLAGS) -o $@ hist.c $(LDFLAGS)
 
 ../bin:
 	mkdir ../bin
--- a/libsrc/Makefile.in
+++ b/libsrc/Makefile.in
@@ -9,7 +9,7 @@ INCLUDES = -I../include/
 #DMALLOC_INC = @DMALLOC_INC@
 #DMALLOC_FLAGS = @DMALLOC_FLAGS@
 
-CFLAGS = $(MY_CFLAGS) $(INCLUDES) $(DMALLOC_FLAGS)
+CFLAGS += $(MY_CFLAGS) $(INCLUDES) $(DMALLOC_FLAGS)
 
 LIB_SRC = io_stuff.c ranlib.c genrand.c ran_xtra.c mkbackup.c strsep.c \
 utils.c remember.c peel_utils.c qsort.c min_deg.c bin_tree.c getopt_long.c
--- a/lokisrc/Makefile.in
+++ b/lokisrc/Makefile.in
@@ -26,7 +26,7 @@ INSTALL_PERM = 755
 #DMALLOC_FLAGS = @DMALLOC_FLAGS@
 
 INCLUDES = -I../include
-CFLAGS = $(MY_CFLAGS) $(INCLUDES) $(DMALLOC_FLAGS) $(MONITOR_FLAGS)
+CFLAGS += $(MY_CFLAGS) $(INCLUDES) $(DMALLOC_FLAGS) $(MONITOR_FLAGS)
 ALL_LIBS = $(DMALLOC_LIB) -L. -L../libsrc -lloki -lgen $(LIBS)
 
 LKLIB_SRC = param_parse.c param_lex.c read_binfiles.c loki_utils.c kinship.c \