[ace-of-penguins] 99/141: 1.3-11: Hardened build flags. Remve *.la (Closes: #621146)

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository ace-of-penguins.

commit 8b31cee23ec53f6677c7a02c1255c6f8834448df
Author: Jari Aalto <jari.aalto at cante.net>
Date:   Sun May 19 15:53:08 2013 +0300

    1.3-11: Hardened build flags. Remve *.la (Closes: #621146)
    
    Signed-off-by: Jari Aalto <jari.aalto at cante.net>
---
 debian/changelog | 12 ++++++++++++
 debian/control   |  2 +-
 debian/rules     | 50 +++++++++++++++++++++++++++++++-------------------
 3 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 53a8788..dc9d552 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+ace-of-penguins (1.3-11) unstable; urgency=low
+
+  * debian/control
+    - (Standards-Version): Update to 3.9.4.
+  * debian/rules
+    - (override_dh_auto_ins): Remove "*.la" file even in multiarch
+      (Closes: #621146).
+  * Use hardened build flags.
+    http://wiki.debian.org/ReleaseGoals/SecurityHardeningBuildFlags
+
+ -- Jari Aalto <jari.aalto at cante.net>  Sun, 19 May 2013 15:46:47 +0300
+
 ace-of-penguins (1.3-10) unstable; urgency=low
 
   * debian/series
diff --git a/debian/control b/debian/control
index 28d3890..4d33a81 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: games
 Priority: optional
 Maintainer: Jari Aalto <jari.aalto at cante.net>
 Build-Depends: debhelper (>= 9), autotools-dev, libpng-dev, libx11-dev, libxpm-dev, zlib1g-dev
-Standards-Version: 3.9.3.1
+Standards-Version: 3.9.4
 Vcs-Browser: http://git.debian.org/?p=collab-maint/ace-of-penguins.git
 Vcs-Git: git://git.debian.org/collab-maint/ace-of-penguins.git
 Homepage: http://freshmeat.net/projects/theaceofpenguins
diff --git a/debian/rules b/debian/rules
index 1eb6f7c..31b6889 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,18 +7,30 @@ ICON_SRC	= debian/penguin-pegged.png
 
 # list of programs taken from games/Makefile
 PROGS = \
-	canfield \
-	freecell \
-	golf \
-	mastermind \
-	merlin \
-	minesweeper \
-	pegged \
-	solitaire \
-	spider \
-	taipedit \
-	taipei \
-	thornq
+ canfield \
+ freecell \
+ golf \
+ mastermind \
+ merlin \
+ minesweeper \
+ pegged \
+ solitaire \
+ spider \
+ taipedit \
+ taipei \
+ thornq
+
+CPPFLAGS = $(shell \
+    DEB_BUILD_MAINT_OPTIONS=hardening=+all dpkg-buildflags --get CPPFLAGS)
+
+CFLAGS = -Wall $(shell \
+    DEB_BUILD_MAINT_OPTIONS=hardening=+all dpkg-buildflags --get CFLAGS)
+
+LDFLAGS = -Wl,--as-needed -Wl,-z,now $(shell \
+    DEB_BUILD_MAINT_OPTIONS=hardening=+all dpkg-buildflags --get LDFLAGS)
+
+cc := $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
+
 
 CONFFLAGS = --prefix=/usr --bindir=/usr/games
 
@@ -34,6 +46,12 @@ MANDIR = $(MANROOTDIR)/man6
 
 #######################################################################
 
+override_dh_auto_configure:
+	CC="$(cc)" dh_auto_configure -- $(CONFFLAGS)
+
+override_dh_auto_build: build-man
+	dh_auto_build -- CC="$(cc)" BUILD_CC="$(cc)"
+
 test:
 	# target: test
 
@@ -83,12 +101,6 @@ override_dh_clean: clean-man
 
 	dh_clean
 
-override_dh_auto_configure:
-	dh_auto_configure -- $(CONFFLAGS)
-
-override_dh_auto_build: build-man
-	dh_auto_build
-
 override_dh_installman:
 	dh_installman
 	# Check that all is in order
@@ -111,7 +123,7 @@ override_dh_auto_install:
 	rm -f $(PKGDIR)/usr/games/penguins
 
 	# Not used in Debian
-	rm -f $(LIBROOTDIR)/*.la
+	find $(PKGDIR) -name "*.la" | xargs --no-run-if-empty rm -f
 
 	# Install custom icon
 	install -D -m 644 $(ICON_SRC) $(ICONDIR)/hicolor/24x24/apps/$(ICON_NAME)

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