Merge branch 'master' into dnsdist11

Conflicts:
	configure.ac

diff --cc .travis.yml
Simple merge

diff --cc configure.ac
index 1dd538cc7ce431796605763b2888fb7644f9f7a5,cb9998237ab94c97c6787ec5b5a98e9933c99e4b..f34cc6331385f1d8a0f0183177aecec2f9cca39b
--- 1/configure.ac
--- 2/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]
  )
  
- AC_CC_PIE
- AC_CC_STACK_PROTECTOR
- AC_CC_PARAM_SSP_BUFFER_SIZE([4])
- AC_CC_D_FORTIFY_SOURCE
 +AX_CXX_COMPILE_STDCXX_11(,optional)
 +AM_CONDITIONAL([CXX2011],[test "$HAVE_CXX11" = "1"])
+ 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 cab789a9947b772ab9ce3e915811d42e664129e9,e92434e7e00d1ee04f883181a62fa416c3e7ad5c..d19a3efd5ecb6eccdce87a6a3682a28fd818479d
--- 1/pdns/Makefile.am
--- 2/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 \