[libreoffice] 02/02: make -fstack-protector-strong removal from configure.ac/gbuild more clear

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-5.4
in repository libreoffice.

commit 4dce8e6dd51d466e0ee851dd3f640a3c666f7710
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Thu Oct 19 15:36:41 2017 +0200

    make -fstack-protector-strong removal from configure.ac/gbuild more clear
---
 changelog                                          |  4 +++
 ...d-buildflags-no-LO-fstack-protector-strong.diff | 40 ++++++++++++++++++++++
 patches/series                                     |  1 +
 3 files changed, 45 insertions(+)

diff --git a/changelog b/changelog
index 4a92e5c..7579d66 100644
--- a/changelog
+++ b/changelog
@@ -6,6 +6,10 @@ libreoffice (1:5.4.3~rc1-1) UNRELEASED; urgency=medium
     given policy implies "build" should be able to run as root... :(
   * debian/patches/avoid-throwing-cpp-exceptions-across-libgpeg-c-frames.diff:
     add from master, fixing CppunitTest_vcl_filters_test on armhf
+  * debian/patches/debian-hardened-buildflags-CPPFLAGS.diff: split this up,
+    into the CPPFLAGS part here ..
+  * debian/patches/debian-hardened-buildflags-no-LO-fstack-protector-strong.diff:
+    and the removal of the explicit default -fstack-protector-strong here.
 
   * debian/rules:
     - make armhf test failures fatal now that above test is fixed which
diff --git a/patches/debian-hardened-buildflags-no-LO-fstack-protector-strong.diff b/patches/debian-hardened-buildflags-no-LO-fstack-protector-strong.diff
new file mode 100644
index 0000000..e97bb22
--- /dev/null
+++ b/patches/debian-hardened-buildflags-no-LO-fstack-protector-strong.diff
@@ -0,0 +1,40 @@
+don't hardcode -fstack-protector-strong in configure.ac/gbuild. We get the
+hardening flags from dpkg-buildflags anyway.
+
+--- a/configure.ac-old	2012-03-02 21:48:47.000000000 +0000
++++ b/configure.ac	2012-03-02 21:51:29.000000000 +0000
+@@ -5751,17 +5751,6 @@ if test "$GCC" = "yes"; then
+         AC_MSG_RESULT([no])
+     fi
+ 
+-    AC_MSG_CHECKING([whether $CC supports -fstack-protector-strong])
+-    save_CFLAGS=$CFLAGS
+-    CFLAGS="$CFLAGS -Werror -fstack-protector-strong"
+-    AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[ HAVE_GCC_STACK_PROTECTOR_STRONG=TRUE ],[])
+-    CFLAGS=$save_CFLAGS
+-    if test "$HAVE_GCC_STACK_PROTECTOR_STRONG" = "TRUE"; then
+-        AC_MSG_RESULT([yes])
+-    else
+-        AC_MSG_RESULT([no])
+-    fi
+-
+     AC_MSG_CHECKING([whether $CC supports atomic functions])
+     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[
+     int v = 0;
+diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
+index 7acd068..b6d9735 100644
+--- a/solenv/gbuild/platform/com_GCC_defs.mk
++++ b/solenv/gbuild/platform/com_GCC_defs.mk
+@@ -113,12 +113,6 @@ endif
+ gb_VISIBILITY_FLAGS_CXX := -fvisibility-inlines-hidden
+ gb_CXXFLAGS_COMMON += $(gb_VISIBILITY_FLAGS_CXX)
+ 
+-ifeq ($(HAVE_GCC_STACK_PROTECTOR_STRONG),TRUE)
+-gb_CFLAGS_COMMON += -fstack-protector-strong
+-gb_CXXFLAGS_COMMON += -fstack-protector-strong
+-gb_LinkTarget_LDFLAGS += -fstack-protector-strong
+-endif
+-
+ ifeq ($(ENABLE_PCH),TRUE)
+ ifneq ($(COM_IS_CLANG),TRUE)
+ gb_CFLAGS_COMMON += -fpch-preprocess -Winvalid-pch
diff --git a/patches/series b/patches/series
index dfd2894..847e31a 100644
--- a/patches/series
+++ b/patches/series
@@ -16,6 +16,7 @@ mysqlcppconn-libmysqlclient-SONAME.diff
 make-package-modules-not-suck.diff
 mediwiki-oor-replace.diff
 debian-hardened-buildflags-CPPFLAGS.diff
+debian-hardened-buildflags-no-LO-fstack-protector-strong.diff
 disable-flaky-tests.diff
 #dont-touch-urd.diff
 fix-internal-hsqldb-build.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git