[Pkg-xfce-commits] r4432 - goodies/branches/experimental/xfce4-mount-plugin/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2010-11-05 09:03:04 +0000 (Fri, 05 Nov 2010)
New Revision: 4432

Modified:
   goodies/branches/experimental/xfce4-mount-plugin/debian/changelog
   goodies/branches/experimental/xfce4-mount-plugin/debian/control
   goodies/branches/experimental/xfce4-mount-plugin/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 LDFLAGS.
  - add hardening flags to {C,LD}FLAGS.

Modified: goodies/branches/experimental/xfce4-mount-plugin/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-mount-plugin/debian/changelog	2010-11-05 08:52:49 UTC (rev 4431)
+++ goodies/branches/experimental/xfce4-mount-plugin/debian/changelog	2010-11-05 09:03:04 UTC (rev 4432)
@@ -10,10 +10,15 @@
     - add build-dep on libxfcegui4-dev. 
     - update standards version to 3.9.1. 
     - update debhelper build-dep to 7.
+    - add build-dep on hardening-includes.
   * debian/compat bumped to 7. 
   * Switch to 3.0 (quilt) source format.
+  * debian/rules:
+    - pick {C,LD}FLAGS from dpkg-buildflags.
+    - add O1, -z,defs and --as-needed to LDFLAGS.
+    - add hardening flags to {C,LD}FLAGS.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Fri, 05 Nov 2010 09:41:40 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 05 Nov 2010 09:52:16 +0100
 
 xfce4-mount-plugin (0.5.5-1) unstable; urgency=low
 

Modified: goodies/branches/experimental/xfce4-mount-plugin/debian/control
===================================================================
--- goodies/branches/experimental/xfce4-mount-plugin/debian/control	2010-11-05 08:52:49 UTC (rev 4431)
+++ goodies/branches/experimental/xfce4-mount-plugin/debian/control	2010-11-05 09:03:04 UTC (rev 4432)
@@ -5,7 +5,7 @@
 Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
 Build-Depends: autotools-dev, cdbs, debhelper (>= 7), libgtk2.0-dev, 
  xfce4-panel-dev (>= 4.4.1), libxml2-dev, libstartup-notification0-dev, 
- libxml-parser-perl, libxfcegui4-dev
+ libxml-parser-perl, libxfcegui4-dev, hardening-includes, libxfcegui4-dev
 Standards-Version: 3.9.1
 Homepage: http://goodies.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-mount-plugin/

Modified: goodies/branches/experimental/xfce4-mount-plugin/debian/rules
===================================================================
--- goodies/branches/experimental/xfce4-mount-plugin/debian/rules	2010-11-05 08:52:49 UTC (rev 4431)
+++ goodies/branches/experimental/xfce4-mount-plugin/debian/rules	2010-11-05 09:03:04 UTC (rev 4432)
@@ -1,7 +1,13 @@
 #!/usr/bin/make -f
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
+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)
+
 binary-post-install/xfce4-mount-plugin::
 	-rm -rf debian/xfce4-mount-plugin/usr/lib/xfce4/panel-plugins/*.a
 	-rm -rf debian/xfce4-mount-plugin/usr/lib/xfce4/panel-plugins/*.la