From: bert hubert <bert.hubert@netherlabs.nl>
Date: Sat, 31 Jan 2015 21:26:02 +0000 (+0100)
Subject: Merge branch 'master' into dnsdist11
X-Git-Tag: dnsdist-1.0.0-alpha1~310
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c6fa223bd09e7b3f4f7b4a24180b6723a24c1711;p=thirdparty%2Fpdns.git

Merge branch 'master' into dnsdist11

Conflicts:
	configure.ac
---

c6fa223bd09e7b3f4f7b4a24180b6723a24c1711
diff --cc configure.ac
index 1dd538cc7c,cb9998237a..f34cc63313
--- a/configure.ac
+++ b/configure.ac
@@@ -35,12 -34,16 +35,18 @@@ AC_DEFINE([_GNU_SOURCE], [1]
    [Define _GNU_SOURCE so that we get all necessary prototypes]
  )
  
 +AX_CXX_COMPILE_STDCXX_11(,optional)
 +AM_CONDITIONAL([CXX2011],[test "$HAVE_CXX11" = "1"])
- AC_CC_PIE
- AC_CC_STACK_PROTECTOR
- AC_CC_PARAM_SSP_BUFFER_SIZE([4])
- AC_CC_D_FORTIFY_SOURCE
+ AC_ARG_ENABLE([hardening], [
+   AS_HELP_STRING([--disable-hardening, disable compiler security checks])
+ ])
+ AS_IF([test "x$enable_hardening" != "xno"], [
+   AC_CC_PIE
+   AC_CC_STACK_PROTECTOR
+   AC_CC_PARAM_SSP_BUFFER_SIZE([4])
+   AC_CC_D_FORTIFY_SOURCE
+   AC_LD_RELRO
+ ])
  
  AC_SEARCH_LIBS([socket], [socket])
  AC_SEARCH_LIBS([gethostent], [nsl])
diff --cc pdns/Makefile.am
index cab789a994,e92434e7e0..d19a3efd5e
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@@ -462,31 -463,8 +468,30 @@@ sdig_SOURCES = 
  	statbag.cc \
  	unix_utility.cc
  
- sdig_LDADD = $(POLARSSL_LIBS) 	
- sdig_LDFLAGS=$(THREADFLAGS) 
+ sdig_LDADD = $(POLARSSL_LIBS)
  
 +calidns_SOURCES = \
 +	base32.cc \
 +	base64.cc base64.hh \
 +	calidns.cc \
 +	dnslabeltext.cc \
 +	dnsparser.cc dnsparser.hh \
 +	dnsrecords.cc \
 +	dnswriter.cc dnswriter.hh \
 +	logger.cc \
 +	misc.cc misc.hh \
 +	nsecrecords.cc \
 +	qtype.cc \
 +	rcpgenerator.cc rcpgenerator.hh \
 +	sillyrecords.cc \
 +	sstuff.hh \
 +	statbag.cc \
 +	unix_utility.cc
 +
 +calidns_LDADD = $(POLARSSL_LIBS) 	
 +calidns_LDFLAGS=$(THREADFLAGS) 
 +
 +
  saxfr_SOURCES = \
  	base32.cc \
  	base64.cc base64.hh \