[SCM] xvidcore/master: Pass hardened CPPFLAGS to CFLAGS. (Closes: #664512)

[ceros-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6cfe7c9819377a5cb32ab99a3126eac951397d12
Author: Andres Mejia <amejia004 at gmail.com>
Date:   Sun Mar 18 10:18:24 2012 -0400

    Pass hardened CPPFLAGS to CFLAGS. (Closes: #664512)

diff --git a/debian/changelog b/debian/changelog
index 39bccd1..f09603f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xvidcore (2:1.3.2-9) unstable; urgency=low
+
+  * Pass hardened CPPFLAGS to CFLAGS. (Closes: #664512)
+
+ -- Andres Mejia <amejia at debian.org>  Sun, 18 Mar 2012 10:15:39 -0400
+
 xvidcore (2:1.3.2-8) unstable; urgency=low
 
   * Add in hardened CFLAGS.
diff --git a/debian/confflags b/debian/confflags
index 07ec00d..89ee48c 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -3,9 +3,10 @@
 
 # Set hardened CFLAGS
 HARDENED_CFLAGS = $(shell dpkg-buildflags --get CFLAGS 2>/dev/null | sed -e 's/-g\|-O2//g')
+HARDENED_CFLAGS += $(shell dpkg-buildflags --get CPPFLAGS)
 ifeq (,$(HARDENED_CFLAGS))
   # Handle case for versions of Debian/Ubuntu that have dpkg-dev (<< 1.15.7).
-  HARDENED_CFLAGS = -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security
+  HARDENED_CFLAGS = -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2
 endif
 
 # Set CFLAGS from DEB_CFLAGS if defined, otherwise let xvidcore's build system

-- 
xvidcore packaging