r11535 - packages/trunk/cookietool/debian

Peter Pentchev roam-guest at alioth.debian.org
Tue Nov 30 14:29:08 UTC 2010


Author: roam-guest
Date: 2010-11-30 14:29:02 +0000 (Tue, 30 Nov 2010)
New Revision: 11535

Modified:
   packages/trunk/cookietool/debian/changelog
   packages/trunk/cookietool/debian/control
   packages/trunk/cookietool/debian/rules
Log:
Use hardening-includes instead of hardening-wrapper so that
the hardened flags, if requested, are visible in CFLAGS and LDFLAGS.


Modified: packages/trunk/cookietool/debian/changelog
===================================================================
--- packages/trunk/cookietool/debian/changelog	2010-11-28 23:06:06 UTC (rev 11534)
+++ packages/trunk/cookietool/debian/changelog	2010-11-30 14:29:02 UTC (rev 11535)
@@ -9,6 +9,8 @@
     bump the year on my packaging copyright notice.
   * Use dpkg-buildflags from dpkg-dev 1.15.7 to obtain the default values
     for CFLAGS, CPPFLAGS, and LDFLAGS.
+  * Use hardening-includes instead of hardening-wrapper so that
+    the hardened flags (if requested) are visible in CFLAGS and LDFLAGS.
 
  -- Peter Pentchev <roam at ringlet.net>  Sun, 28 Nov 2010 16:58:20 +0200
 

Modified: packages/trunk/cookietool/debian/control
===================================================================
--- packages/trunk/cookietool/debian/control	2010-11-28 23:06:06 UTC (rev 11534)
+++ packages/trunk/cookietool/debian/control	2010-11-30 14:29:02 UTC (rev 11535)
@@ -1,7 +1,7 @@
 Source: cookietool
 Section: games
 Priority: optional
-Build-Depends: debhelper (>= 7.0.50), dpkg-dev (>= 1.15.7~), hardening-wrapper
+Build-Depends: debhelper (>= 7.0.50), dpkg-dev (>= 1.15.7~), hardening-includes
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Peter Pentchev <roam at ringlet.net>
 Standards-Version: 3.9.1

Modified: packages/trunk/cookietool/debian/rules
===================================================================
--- packages/trunk/cookietool/debian/rules	2010-11-28 23:06:06 UTC (rev 11534)
+++ packages/trunk/cookietool/debian/rules	2010-11-30 14:29:02 UTC (rev 11535)
@@ -13,14 +13,15 @@
 	CFLAGS+=	-Werror
 endif
 
-export CFLAGS CPPFLAGS LDFLAGS
+include /usr/share/hardening-includes/hardening.make
 
 ifneq (,$(filter hardening,$(DEB_BUILD_OPTIONS)))
-export DEB_BUILD_HARDENING=1
-else
-export DEB_BUILD_HARDENING=0
+CFLAGS+=	$(HARDENING_CFLAGS)
+LDFLAGS+=	$(HARDENING_LDFLAGS)
 endif
 
+export CFLAGS CPPFLAGS LDFLAGS
+
 override_dh_auto_build:
 	dh_auto_build
 	awk '/^[0-9]+\..*History/ { disp = 1 } \




More information about the Pkg-games-commits mailing list