File: 40-hardening.diff

package info (click to toggle)
netpipes 4.2-8.1
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid
  • size: 940 kB
  • sloc: ansic: 11,895; makefile: 353
file content (60 lines) | stat: -rw-r--r-- 1,754 bytes parent folder | download | duplicates (3)
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
Description: Better use of compiler flags.
 The original source is neglecting the use of
 CPPFLAGS and LDFLAGS.  They are needed for
 hardening.
Author: Mats Erik Andersson <debian@gisladisker.se>
Forwarded: no
Last-Update: 2013-06-27

--- netpipes-4.2.debian/Makefile
+++ netpipes-4.2/Makefile
@@ -59,7 +59,7 @@
 #CFLAGS = -DPOSIX_SIG -DHAVE_INET_ATON $(CDEBUGFLAGS)
 
 # Linux (developed with RedHat 4.2, libc5)
-CFLAGS = -DUSE_IOCTL -DPOSIX_SIG -DHAVE_INET_ATON $(CDEBUGFLAGS)
+CFLAGS += -DUSE_IOCTL -DPOSIX_SIG -DHAVE_INET_ATON $(CDEBUGFLAGS)
 
 # SGI
 #CFLAGS = -DSYSV $(CDEBUGFLAGS)
@@ -115,31 +115,31 @@
 all	: ${PROGRAMS}
 
 faucet	: ${FOBJS}
-	${CC} ${CFLAGS} -o $@ ${FOBJS} ${LDLIBS}
+	${CC} ${LDFLAGS} ${CFLAGS} -o $@ ${FOBJS} ${LDLIBS}
 
 hose	: ${HOBJS}
-	${CC} ${CFLAGS} -o $@ ${HOBJS} ${LDLIBS}
+	${CC} ${LDFLAGS} ${CFLAGS} -o $@ ${HOBJS} ${LDLIBS}
 
 sockdown: ${SOBJS}
-	${CC} ${CFLAGS} -o $@ ${SOBJS} ${LDLIBS}
+	${CC} ${LDFLAGS} ${CFLAGS} -o $@ ${SOBJS} ${LDLIBS}
 
 getpeername: ${GOBJS}
-	${CC} ${CFLAGS} -o $@ ${GOBJS} ${LDLIBS}
+	${CC} ${LDFLAGS} ${CFLAGS} -o $@ ${GOBJS} ${LDLIBS}
 
 ${TIMELIMIT}: ${TOBJS}
-	${CC} ${CFLAGS} -o $@ ${TOBJS} ${LDLIBS}
+	${CC} ${LDFLAGS} ${CFLAGS} -o $@ ${TOBJS} ${LDLIBS}
 
 encapsulate: ${EOBJS}
-	${CC} ${CFLAGS} -o $@ ${EOBJS} ${LDLIBS}
+	${CC} ${LDFLAGS} ${CFLAGS} -o $@ ${EOBJS} ${LDLIBS}
 
 ssl-auth: ${SSLOBJS}
-	${CC} ${CFLAGS} -o $@ ${SSLOBJS} ${LDLIBS} ${SSLLIB}
+	${CC} ${LDFLAGS} ${CFLAGS} -o $@ ${SSLOBJS} ${LDLIBS} ${SSLLIB}
 
 ssl-auth.o: ssl-auth.c
-	${CC} ${CFLAGS} ${SSLINC} -c $<
+	${CC} ${CPPFLAGS} ${CFLAGS} ${SSLINC} -c $<
 
 ssl-criteria.o: ssl-criteria.c
-	${CC} ${CFLAGS} ${SSLINC} -c $<
+	${CC} ${CPPFLAGS} ${CFLAGS} ${SSLINC} -c $<
 
 install : all
 	mkdir -p ${INSTBIN}