[openfoam] 03/03: Do not hardcode hardening flags.

[Anton Gladky]

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

gladk pushed a commit to branch master
in repository openfoam.

commit 12f4f81d5a40519c1aba4b0547817275fadf52b5
Author: Anton Gladky <gladk at debian.org>
Date:   Wed Sep 28 20:55:51 2016 +0200

    Do not hardcode hardening flags.
---
 debian/patches/30_hardening.patch | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/debian/patches/30_hardening.patch b/debian/patches/30_hardening.patch
index a039adf..0156fe2 100644
--- a/debian/patches/30_hardening.patch
+++ b/debian/patches/30_hardening.patch
@@ -1,25 +1,32 @@
 Description: Use hardening flags
- TODO: One need to use dpkg-buildflags
 Author: Anton Gladky <gladk at debian.org>
 Last-Update: 2016-09-28
 
---- openfoam-4.0+dfsg1.orig/wmake/rules/linux64Gcc/c
-+++ openfoam-4.0+dfsg1/wmake/rules/linux64Gcc/c
+Index: OpenFOAM-dev-version-4.0/wmake/rules/linux64Gcc/c
+===================================================================
+--- OpenFOAM-dev-version-4.0.orig/wmake/rules/linux64Gcc/c
++++ OpenFOAM-dev-version-4.0/wmake/rules/linux64Gcc/c
 @@ -1,6 +1,6 @@
  SUFFIXES += .c
  
 -cWARN        = -Wall
-+cWARN        = -Wall -fstack-protector-strong -Wformat -Werror=format-security
++cWARN        = -Wall $(shell dpkg-buildflags --get CFLAGS)
  
  cc          = gcc -m64
  
---- openfoam-4.0+dfsg1.orig/wmake/rules/linux64Gcc/c++
-+++ openfoam-4.0+dfsg1/wmake/rules/linux64Gcc/c++
-@@ -1,6 +1,6 @@
+Index: OpenFOAM-dev-version-4.0/wmake/rules/linux64Gcc/c++
+===================================================================
+--- OpenFOAM-dev-version-4.0.orig/wmake/rules/linux64Gcc/c++
++++ OpenFOAM-dev-version-4.0/wmake/rules/linux64Gcc/c++
+@@ -1,9 +1,9 @@
  SUFFIXES += .C
  
 -c++WARN     = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof
-+c++WARN     = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof -Wformat -Werror=format-security -fstack-protector-strong
++c++WARN     = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof $(shell dpkg-buildflags --get CXXFLAGS)
  
  # Suppress some warnings for flex++ and CGAL
- c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds
+-c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds
++c++LESSWARN = 
+ 
+ CC          = g++ -std=c++0x -m64
+ 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/openfoam.git