[Pkg-xfce-commits] r5021 - goodies/branches/experimental/ristretto/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2011-02-21 07:49:46 +0000 (Mon, 21 Feb 2011)
New Revision: 5021

Modified:
   goodies/branches/experimental/ristretto/debian/changelog
   goodies/branches/experimental/ristretto/debian/control
   goodies/branches/experimental/ristretto/debian/rules
Log:
  - add build-dep on hardening-includes.
* debian/rules:
  - pick {C,LD}FLAGS from dpkg-buildflags.
  - add -O1, -z,defs and --as-needed to LDFLAGGS.
  - add hardening flags to {C,LD}FLAGS.

Modified: goodies/branches/experimental/ristretto/debian/changelog
===================================================================
--- goodies/branches/experimental/ristretto/debian/changelog	2011-02-21 07:12:37 UTC (rev 5020)
+++ goodies/branches/experimental/ristretto/debian/changelog	2011-02-21 07:49:46 UTC (rev 5021)
@@ -16,6 +16,11 @@
   [ Yves-Alexis Perez ]
   * debian/control:
     - update standards version to 3.9.1.
+    - add build-dep on hardening-includes.
+  * debian/rules:
+    - pick {C,LD}FLAGS from dpkg-buildflags.
+    - add -O1, -z,defs and --as-needed to LDFLAGGS.
+    - add hardening flags to {C,LD}FLAGS.
 
  -- Lionel Le Folgoc <mrpouit at gmail.com>  Sun, 18 Jul 2010 00:19:25 +0200
 

Modified: goodies/branches/experimental/ristretto/debian/control
===================================================================
--- goodies/branches/experimental/ristretto/debian/control	2011-02-21 07:12:37 UTC (rev 5020)
+++ goodies/branches/experimental/ristretto/debian/control	2011-02-21 07:49:46 UTC (rev 5021)
@@ -7,7 +7,7 @@
  Lionel Le Folgoc <mrpouit at gmail.com>
 Build-Depends: debhelper (>= 7), libexif-dev, libgtk2.0-dev,
  libdbus-glib-1-dev, libxfcegui4-dev, libglib2.0-dev (>= 2.16.0),
- libxfconf-0-dev, libcairo2-dev (>= 1.8.0), intltool
+ libxfconf-0-dev, libcairo2-dev (>= 1.8.0), intltool, hardening-includes
 Standards-Version: 3.9.1
 Homepage: http://goodies.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/ristretto/

Modified: goodies/branches/experimental/ristretto/debian/rules
===================================================================
--- goodies/branches/experimental/ristretto/debian/rules	2011-02-21 07:12:37 UTC (rev 5020)
+++ goodies/branches/experimental/ristretto/debian/rules	2011-02-21 07:49:46 UTC (rev 5021)
@@ -1,11 +1,13 @@
 #!/usr/bin/make -f
 
-LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
+include /usr/share/hardening-includes/hardening.make
 
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
+CFLAGS+=$(HARDENING_CFLAGS)
+
+export CFLAGS LDFLAGS
+
 %:
 	dh $@