Package: prank / 0.0.170427+dfsg-3

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
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
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
Author: Andreas Tille <tille@debian.org>
LastChanges: Wed, 13 Nov 2013 14:29:31 +0100
Description: Propagate hardening options

--- a/src/Makefile
+++ b/src/Makefile
@@ -7,11 +7,11 @@
 CC            = gcc
 CXX           = g++
 DEFINES       = 
-CFLAGS        = -m64 -pipe -O3 $(DEFINES)
-CXXFLAGS      = -m64 -pipe -O3 $(DEFINES)
+CFLAGS       += -pipe -O3 $(DEFINES)
+CXXFLAGS     += -pipe -O3 $(DEFINES)
 INCPATH       = -I. -I/usr/include
 LINK          = g++
-LFLAGS        = -m64
+#LFLAGS        = -m64
 LIBS          = $(SUBLIBS)    
 AR            = ar cqs
 RANLIB        = 
@@ -116,19 +116,19 @@
 .SUFFIXES: .o .c .cpp .cc .cxx .C
 
 .cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
 
 .cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
 
 .cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
 
 .C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
 
 .c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<"
+	$(CC) -c $(CPPFLAGS) $(CFLAGS) $(INCPATH) -o "$@" "$<"
 
 ####### Build rules
 
@@ -136,7 +136,7 @@
 all: Makefile $(TARGET) $(MANPAGES)
 
 $(TARGET):  $(OBJECTS)  
-	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
+	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) $(LDFLAGS)
 
 
 clean:compiler_clean 
@@ -167,7 +167,7 @@
 		dbmatrix.h \
 		boolmatrix.h \
 		ancestralsequence.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o writefile.o writefile.cpp
+	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(INCPATH) -o writefile.o writefile.cpp
 
 treenode.o: treenode.cpp config.h \
 		hmmodel.h \
@@ -187,7 +187,7 @@
 		fullprobability.h \
 		postprobability.h \
 		characterprobability.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o treenode.o treenode.cpp
+	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(INCPATH) -o treenode.o treenode.cpp
 
 translatesequences.o: translatesequences.cpp translatesequences.h \
 		config.h \
@@ -201,7 +201,7 @@
 		site.h \
 		boolmatrix.h \
 		ancestralsequence.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o translatesequences.o translatesequences.cpp
+	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(INCPATH) -o translatesequences.o translatesequences.cpp
 
 terminalsequence.o: terminalsequence.cpp terminalsequence.h \
 		sequence.h \
@@ -215,7 +215,7 @@
 		ancestralnode.h \
 		treenode.h \
 		ancestralsequence.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o terminalsequence.o terminalsequence.cpp
+	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(INCPATH) -o terminalsequence.o terminalsequence.cpp
 
 terminalnode.o: terminalnode.cpp terminalnode.h \
 		treenode.h \
@@ -230,7 +230,7 @@
 		hmmodel.h \
 		ancestralnode.h \
 		ancestralsequence.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o terminalnode.o terminalnode.cpp
+	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(INCPATH) -o terminalnode.o terminalnode.cpp
 
 site.o: site.cpp site.h \
 		intmatrix.h \
@@ -242,7 +242,7 @@
 		treenode.h \
 		sequence.h \
 		ancestralsequence.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o site.o site.cpp
+	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(INCPATH) -o site.o site.cpp
 
 sequence.o: sequence.cpp sequence.h \
 		site.h \
@@ -250,7 +250,7 @@
 		flmatrix.h \
 		dbmatrix.h \
 		boolmatrix.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o sequence.o sequence.cpp
+	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(INCPATH) -o sequence.o sequence.cpp
 
 readnewick.o: readnewick.cpp readnewick.h \
 		treenode.h \
@@ -263,10 +263,10 @@
 		ancestralnode.h \
 		ancestralsequence.h \
 		node.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o readnewick.o readnewick.cpp
+	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(INCPATH) -o readnewick.o readnewick.cpp
 
 readfile.o: readfile.cpp readfile.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o readfile.o readfile.cpp
+	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(INCPATH) -o readfile.o readfile.cpp
 
 readalignment.o: readalignment.cpp readalignment.h \
 		sequence.h \
@@ -282,12 +282,12 @@
 		config.h \
 		hmmodel.h \
 		ancestralnode.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o readalignment.o readalignment.cpp
+	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(INCPATH) -o readalignment.o readalignment.cpp
 
 pwsite.o: pwsite.cpp pwsite.h \
 		flmatrix.h \
 		intmatrix.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o pwsite.o pwsite.cpp
+	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(INCPATH) -o pwsite.o pwsite.cpp
 
 pwhirschberg.o: pwhirschberg.cpp config.h \
 		hmmodel.h \
@@ -303,7 +303,7 @@
 		pwhirschberg.h \
 		pwsite.h \
 		exonerate_reads.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o pwhirschberg.o pwhirschberg.cpp
+	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(INCPATH) -o pwhirschberg.o pwhirschberg.cpp
 
 progressivealignment.o: progressivealignment.cpp readnewick.h \
 		treenode.h \
@@ -330,7 +330,7 @@
 		readalignment.h \
 		exonerate_reads.h \
 		bppancestors.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o progressivealignment.o progressivealignment.cpp
+	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(INCPATH) -o progressivealignment.o progressivealignment.cpp
 
 prank.o: prank.cpp progressivealignment.h \
 		config.h \
@@ -353,7 +353,7 @@
 		mafft_alignment.h \
 		check_version.h \
 		prank.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o prank.o prank.cpp
+	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(INCPATH) -o prank.o prank.cpp
 
 postprobability.o: postprobability.cpp config.h \
 		hmmodel.h \
@@ -369,7 +369,7 @@
 		postprobability.h \
 		phylomatchscore.h \
 		terminalsequence.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o postprobability.o postprobability.cpp
+	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(INCPATH) -o postprobability.o postprobability.cpp
 
 phylomatchscore.o: phylomatchscore.cpp config.h \
 		hmmodel.h \
@@ -384,13 +384,13 @@
 		ancestralsequence.h \
 		phylomatchscore.h \
 		terminalsequence.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o phylomatchscore.o phylomatchscore.cpp
+	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(INCPATH) -o phylomatchscore.o phylomatchscore.cpp
 
 node.o: node.cpp node.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o node.o node.cpp
+	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(INCPATH) -o node.o node.cpp
 
 intmatrix.o: intmatrix.cpp intmatrix.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o intmatrix.o intmatrix.cpp
+	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(INCPATH) -o intmatrix.o intmatrix.cpp
 
 hmmodel.o: hmmodel.cpp hmmodel.h \
 		dbmatrix.h \
@@ -403,7 +403,7 @@
 		boolmatrix.h \
 		ancestralsequence.h \
 		eigen.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o hmmodel.o hmmodel.cpp
+	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(INCPATH) -o hmmodel.o hmmodel.cpp
 
 hirschberg.o: hirschberg.cpp config.h \
 		hmmodel.h \
@@ -420,7 +420,7 @@
 		hirschberg.h \
 		phylomatchscore.h \
 		terminalsequence.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o hirschberg.o hirschberg.cpp
+	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(INCPATH) -o hirschberg.o hirschberg.cpp
 
 guidetree.o: guidetree.cpp guidetree.h \
 		flmatrix.h \
@@ -437,7 +437,7 @@
 		boolmatrix.h \
 		ancestralsequence.h \
 		translatesequences.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o guidetree.o guidetree.cpp
+	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(INCPATH) -o guidetree.o guidetree.cpp
 
 fullprobability.o: fullprobability.cpp config.h \
 		hmmodel.h \
@@ -453,16 +453,16 @@
 		fullprobability.h \
 		phylomatchscore.h \
 		terminalsequence.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o fullprobability.o fullprobability.cpp
+	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(INCPATH) -o fullprobability.o fullprobability.cpp
 
 flmatrix.o: flmatrix.cpp flmatrix.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o flmatrix.o flmatrix.cpp
+	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(INCPATH) -o flmatrix.o flmatrix.cpp
 
 eigen.o: eigen.cpp eigen.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o eigen.o eigen.cpp
+	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(INCPATH) -o eigen.o eigen.cpp
 
 dbmatrix.o: dbmatrix.cpp dbmatrix.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o dbmatrix.o dbmatrix.cpp
+	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(INCPATH) -o dbmatrix.o dbmatrix.cpp
 
 characterprobability.o: characterprobability.cpp config.h \
 		hmmodel.h \
@@ -477,10 +477,10 @@
 		ancestralsequence.h \
 		characterprobability.h \
 		terminalsequence.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o characterprobability.o characterprobability.cpp
+	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(INCPATH) -o characterprobability.o characterprobability.cpp
 
 boolmatrix.o: boolmatrix.cpp boolmatrix.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o boolmatrix.o boolmatrix.cpp
+	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(INCPATH) -o boolmatrix.o boolmatrix.cpp
 
 ancestralsequence.o: ancestralsequence.cpp ancestralsequence.h \
 		sequence.h \
@@ -493,7 +493,7 @@
 		hmmodel.h \
 		ancestralnode.h \
 		treenode.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ancestralsequence.o ancestralsequence.cpp
+	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(INCPATH) -o ancestralsequence.o ancestralsequence.cpp
 
 ancestralnode.o: ancestralnode.cpp config.h \
 		hmmodel.h \
@@ -515,10 +515,10 @@
 		characterprobability.h \
 		terminalnode.h \
 		readalignment.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ancestralnode.o ancestralnode.cpp
+	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(INCPATH) -o ancestralnode.o ancestralnode.cpp
 
 check_version.o: check_version.cpp check_version.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o check_version.o check_version.cpp
+	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(INCPATH) -o check_version.o check_version.cpp
 
 exonerate_reads.o: exonerate_reads.cpp exonerate_reads.h \
 		config.h \
@@ -533,7 +533,7 @@
 		boolmatrix.h \
 		ancestralsequence.h \
 		translatesequences.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o exonerate_reads.o exonerate_reads.cpp
+	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(INCPATH) -o exonerate_reads.o exonerate_reads.cpp
 
 mafft_alignment.o: mafft_alignment.cpp mafft_alignment.h \
 		config.h \
@@ -547,7 +547,7 @@
 		site.h \
 		boolmatrix.h \
 		ancestralsequence.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o mafft_alignment.o mafft_alignment.cpp
+	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(INCPATH) -o mafft_alignment.o mafft_alignment.cpp
 
 bppancestors.o: bppancestors.cpp bppancestors.h \
 		ancestralnode.h \
@@ -563,7 +563,7 @@
 		hmmodel.h \
 		readfile.h \
 		readnewick.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o bppancestors.o bppancestors.cpp
+	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(INCPATH) -o bppancestors.o bppancestors.cpp
 
 ####### Manpages