maradns (2.0.06-2) maradns-harden.patch

Author: Moritz Muehlenhoff <jmm@debian.org>
Subject: enabling hardened build flags
Forwarded: not-needed
Last-Update: 2012-02-12
--- 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.02/src/Makefile
+++ b/deadwood-3.2.02/src/Makefile
@@ -37,31 +37,31 @@
 	./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
-	$(CC) $(FLAGS) -Wall -c -o DwSys.o DwSys.c
+	$(CC) $(FLAGS) -c -o DwSys.o DwSys.c
 
 RandomPrime:	RandomPrime.c
 	$(CC) -O3 -o RandomPrime RandomPrime.c
--- 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: