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
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
|
Author: Moritz Muehlenhoff <jmm@debian.org>
Subject: enabling hardened build flags
Forwarded: not-needed
Last-Update: 2015-10-03
--- a/build/Makefile.linux
+++ b/build/Makefile.linux
@@ -28,7 +28,10 @@
# Debug
-FLAGS = -O2 -Wall -DSELECT_PROBLEM -DIPV6
+FLAGS = `dpkg-buildflags --get CFLAGS`
+FLAGS += -Wall -DSELECT_PROBLEM -DIPV6
+FLAGS += `dpkg-buildflags --get CPPFLAGS`
+FLAGS += `dpkg-buildflags --get LDFLAGS`
M="CC=$(CC) $(FLAGS)"
D="CC=$(CC) $(FLAGS) -DDEBUG -DTHREADS"
#FLAGS = -g
@@ -39,7 +42,8 @@
cd ../qual ; make $(M) ; cd ../server ; \
make $(M) $(V) COMPILED=\"$(COMPILED)\" ; \
cd ../tools ; make $(M) ; \
- cd ../deadwood-*/src/ ; make FLAGS="-O2 -DIPV6"; \
+ echo "FLAGS: $(FLAGS)"; \
+ cd ../deadwood-*/src/ ; make FLAGS="$(FLAGS)"; \
cd ../../tcp ; make $(M) $(V) ; cat ../00README.FIRST
debug:
--- a/deadwood-3.2.09/src/Makefile
+++ b/deadwood-3.2.09/src/Makefile
@@ -37,44 +37,44 @@
./make.version.h
DwStr.o: DwStr.c DwStr.h
- $(CC) $(FLAGS) -Wall -c -o DwStr.o DwStr.c
+ $(CC) $(FLAGS) -c -o DwStr.o DwStr.c
DwCompress.o: DwCompress.c DwStr.h
- $(CC) $(FLAGS) -Wall -c -o DwCompress.o DwCompress.c
+ $(CC) $(FLAGS) -c -o DwCompress.o DwCompress.c
DwDnsStr.o: DwDnsStr.c DwStr.h DwRecurse.h
- $(CC) $(FLAGS) -Wall -c -o DwDnsStr.o DwDnsStr.c
+ $(CC) $(FLAGS) -c -o DwDnsStr.o DwDnsStr.c
DwMararc.o: DwMararc.c DwMararc.h
- $(CC) $(FLAGS) -Wall -c -o DwMararc.o DwMararc.c
+ $(CC) $(FLAGS) -c -o DwMararc.o DwMararc.c
DwRadioGatun.o: DwRadioGatun.c DwRadioGatun.h DwStr.h
- $(CC) $(FLAGS) -Wall -c -o DwRadioGatun.o DwRadioGatun.c
+ $(CC) $(FLAGS) -c -o DwRadioGatun.o DwRadioGatun.c
DwTcpSocket.o: DwTcpSocket.c DwStr.h DwSocket.h
- $(CC) $(FLAGS) -Wall -c -o DwTcpSocket.o DwTcpSocket.c
+ $(CC) $(FLAGS) -c -o DwTcpSocket.o DwTcpSocket.c
DwUdpSocket.o: DwUdpSocket.c DwStr.h DwSocket.h
- $(CC) $(FLAGS) -Wall -c -o DwUdpSocket.o DwUdpSocket.c
+ $(CC) $(FLAGS) -c -o DwUdpSocket.o DwUdpSocket.c
DwSocket.o: DwSocket.c DwStr.h DwSocket.h
- $(CC) $(FLAGS) -Wall -c -o DwSocket.o DwSocket.c
+ $(CC) $(FLAGS) -c -o DwSocket.o DwSocket.c
DwSys.o: DwSys.c DwStr.h version.h
- $(CC) $(FLAGS) -Wall -c -o DwSys.o DwSys.c
+ $(CC) $(FLAGS) -c -o DwSys.o DwSys.c
DwHash.o: DwHash.c DwStr.h DwHash.h
- $(CC) $(FLAGS) -Wall -c -o DwHash.o DwHash.c
+ $(CC) $(FLAGS) -c -o DwHash.o DwHash.c
DwRecurse.o: DwRecurse.c DwRecurse.h
- $(CC) $(FLAGS) -Wall -c -o DwRecurse.o DwRecurse.c
+ $(CC) $(FLAGS) -c -o DwRecurse.o DwRecurse.c
DwDict.o: DwDict.c DwStr.h DwDict.h
- $(CC) $(FLAGS) -Wall -c -o DwDict.o DwDict.c
+ $(CC) $(FLAGS) -c -o DwDict.o DwDict.c
Test: Test.c DwStr.o DwStr.h DwStr_functions.h $(OBJS)
- $(CC) $(FLAGS) -Wall -o Test Test.c $(OBJS)
+ $(CC) $(FLAGS) -o Test Test.c $(OBJS)
deadwood: DwMain.c $(OBJS) DwStr_functions.h version.h
- $(CC) $(FLAGS) -Wall -o deadwood DwMain.c $(OBJS) -lrt
+ $(CC) $(FLAGS) -o deadwood DwMain.c $(OBJS) -lrt
--- a/build/Makefile.freebsd
+++ b/build/Makefile.freebsd
@@ -30,7 +30,10 @@
M="VERSION=$(VERSION)"
Q="DEFINES=-DSELECT_PROBLEM"
-FLAGS = -O2 -Wall -DIPV6 -pipe -D_THREAD_SAFE -pthread
+FLAGS = `dpkg-buildflags --get CFLAGS`
+FLAGS += -Wall -DIPV6 -pipe -D_THREAD_SAFE -pthread
+FLAGS += `dpkg-buildflags --get CPPFLAGS`
+FLAGS += `dpkg-buildflags --get LDFLAGS`
#FLAGS = -g
# FreeBSD needs some special flags to compile MaraDNS
@@ -47,7 +50,7 @@
cd ../qual ; make $(M) ; cd ../server ; \
make $(M) $(Q) COMPILED=\"$(COMPILED)\" $(V) ; \
cd ../tools ; make $(M) ; \
- cd ../deadwood-*/src/ ; make FLAGS="-O2 -DIPV6"; \
+ cd ../deadwood-*/src/ ; make FLAGS="$(FLAGS)"; \
cd ../../tcp ; make $(M) $(V) ; cat ../00README.FIRST
debug:
|
