[mupen64plus] 197/262: Use hardening-includes for CFLAGS and LDFLAGS hardened builds

[Sven Eckelmann]

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

ecsv-guest pushed a commit to branch master
in repository mupen64plus.

commit aae03afa6277b5d7eea6330676e737030337f18c
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Wed Sep 8 14:35:09 2010 +0200

    Use hardening-includes for CFLAGS and LDFLAGS hardened builds
---
 debian/changelog |  1 +
 debian/control   | 11 ++++++-----
 debian/rules     |  5 +++++
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 790568e..d708799 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ mupen64plus (1.5+dfsg1-14) UNRELEASED; urgency=low
   * Upgrade debhelper compat to v8
   * set *FLAGS using dpkg-buildflags in debian/rules to work like
     dpkg-buildpackage when called directly
+  * Use hardening-includes for CFLAGS and LDFLAGS hardened builds
 
  -- Sven Eckelmann <sven.eckelmann at gmx.de>  Mon, 26 Jul 2010 14:22:39 +0200
 
diff --git a/debian/control b/debian/control
index 1e54d29..73bb5ca 100644
--- a/debian/control
+++ b/debian/control
@@ -7,11 +7,12 @@ Homepage: http://code.google.com/p/mupen64plus/
 Standards-Version: 3.9.1
 Vcs-Browser: http://git.debian.org/?p=collab-maint/mupen64plus.git
 Vcs-Git: git://git.debian.org/git/collab-maint/mupen64plus.git
-Build-Depends: debhelper (>= 8.0.0), libsdl1.2-dev, libsdl-ttf2.0-dev,
- libfreetype6-dev, libglib2.0-dev, libgtk2.0-dev, libsamplerate0-dev,
- libpng12-dev | libpng-dev, libbz2-dev, zlib1g-dev | libz-dev,
- libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, binutils-dev,
- pkg-config, liblzma-dev, libxdg-basedir-dev
+Build-Depends: debhelper (>= 8.0.0), hardening-includes, libsdl1.2-dev,
+ libsdl-ttf2.0-dev, libfreetype6-dev, libglib2.0-dev, libgtk2.0-dev,
+ libsamplerate0-dev, libpng12-dev | libpng-dev, libbz2-dev,
+ zlib1g-dev | libz-dev, libgl1-mesa-dev | libgl-dev,
+ libglu1-mesa-dev | libglu-dev, binutils-dev, pkg-config, liblzma-dev,
+ libxdg-basedir-dev
 DM-Upload-Allowed: yes
 
 Package: mupen64plus
diff --git a/debian/rules b/debian/rules
index 5a6ded9..ab353cc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,11 @@ export CPPFLAGS=$(shell dpkg-buildflags --get CPPFLAGS)
 export CXXFLAGS=$(shell dpkg-buildflags --get CXXFLAGS)
 export LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
 
+include /usr/share/hardening-includes/hardening.make
+CFLAGS += $(HARDENING_CFLAGS)
+CXXFLAGS += $(HARDENING_CFLAGS)
+LDFLAGS += $(HARDENING_LDFLAGS)
+
 DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
 MAKEOPTIONS = UNAME='$(DEB_HOST_GNU_CPU)' DBGSYM=1 DBG=1 PREFIX=/usr/ LIBDIR=/usr/lib/mupen64plus/ BINDIR=/usr/games/
 

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