From: Aki Tuomi <cmouse@desteem.org>
Date: Fri, 22 Aug 2014 06:33:19 +0000 (+0300)
Subject: Test -D_FORTIFY_SOURCE=2 and --param ssp-buffer-size=4
X-Git-Tag: auth-3.4.0-rc2~37^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5801cd92942af77a3e89bca79d5511fe214fce7c;p=pdns

Test -D_FORTIFY_SOURCE=2 and --param ssp-buffer-size=4
---

diff --git a/configure.ac b/configure.ac
index 89f27d0bd..6e5a124cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,7 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip tar-ustar -Wno-portability sub
 AM_SILENT_RULES([yes])
 
 AC_CANONICAL_HOST
-: ${CXXFLAGS="-Wall -O2 -D_FORTIY_SOURCE=2"}
+: ${CXXFLAGS="-Wall -g -O2"}
 
 AC_PROG_CC
 AM_PROG_CC_C_O
@@ -32,6 +32,8 @@ AC_LANG([C++])
 
 AC_CC_PIE
 AC_CC_STACK_PROTECTOR
+AC_CC_PARAM_SSP_SIZE([4])
+AC_CC_D_FORTIFY_SOURCE
 
 AC_CHECK_FUNC([socket], [], [
  AC_CHECK_LIB([socket], [socket], [LIBS="-lsocket $LIBS"])
diff --git a/m4/pdns_d_fortify_source.m4 b/m4/pdns_d_fortify_source.m4
new file mode 100644
index 000000000..721c9cce0
--- /dev/null
+++ b/m4/pdns_d_fortify_source.m4
@@ -0,0 +1,26 @@
+dnl
+dnl Check for support for position independent executables
+dnl
+dnl Copyright (C) 2013 Red Hat, Inc.
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License, or (at your option) any later version.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library.  If not, see
+dnl <http://www.gnu.org/licenses/>.
+dnl
+
+AC_DEFUN([AC_CC_D_FORTIFY_SOURCE],[
+      gl_COMPILER_OPTION_IF([-D_FORTIFY_SOURCE=2], [
+        CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"
+        CXXFLAGS="$CXXFLAGS -D_FORTIFY_SOURCE=2"
+      ])
+]) 
diff --git a/m4/pdns_param_ssp_buffer_size.m4 b/m4/pdns_param_ssp_buffer_size.m4
new file mode 100644
index 000000000..3bf444c23
--- /dev/null
+++ b/m4/pdns_param_ssp_buffer_size.m4
@@ -0,0 +1,26 @@
+dnl
+dnl Check for support for position independent executables
+dnl
+dnl Copyright (C) 2013 Red Hat, Inc.
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License, or (at your option) any later version.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library.  If not, see
+dnl <http://www.gnu.org/licenses/>.
+dnl
+
+AC_DEFUN([AC_CC_PARAM_SSP_BUFFER_SIZE],[
+      gl_COMPILER_OPTION_IF([--param ssp-buffer-size=$1], [
+        CFLAGS="$CFLAGS --param ssp-buffer-size=$1"
+        CXXFLAGS="$CXXFLAGS --param ssp-buffer-size=$1"
+      ])
+])