[Pkg-xfce-commits] r4473 - goodies/branches/experimental/xfce4-xkb-plugin/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2010-11-05 19:44:29 +0000 (Fri, 05 Nov 2010)
New Revision: 4473

Modified:
   goodies/branches/experimental/xfce4-xkb-plugin/debian/changelog
   goodies/branches/experimental/xfce4-xkb-plugin/debian/control
   goodies/branches/experimental/xfce4-xkb-plugin/debian/rules
Log:
  - add build-dep on hardeninc-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-xkb-plugin/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-xkb-plugin/debian/changelog	2010-11-05 19:31:17 UTC (rev 4472)
+++ goodies/branches/experimental/xfce4-xkb-plugin/debian/changelog	2010-11-05 19:44:29 UTC (rev 4473)
@@ -2,9 +2,14 @@
 
   * debian/control:
     - update standards version to 3.9.1.
+    - add build-dep on hardeninc-includes.
   * 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 19:58:51 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 05 Nov 2010 20:37:50 +0100
 
 xfce4-xkb-plugin (0.5.3.3-3) unstable; urgency=low
 

Modified: goodies/branches/experimental/xfce4-xkb-plugin/debian/control
===================================================================
--- goodies/branches/experimental/xfce4-xkb-plugin/debian/control	2010-11-05 19:31:17 UTC (rev 4472)
+++ goodies/branches/experimental/xfce4-xkb-plugin/debian/control	2010-11-05 19:44:29 UTC (rev 4473)
@@ -6,7 +6,8 @@
  Yves-Alexis Perez <corsac at debian.org>, Lionel Le Folgoc <mrpouit at gmail.com>
 Build-Depends: autotools-dev, cdbs, debhelper (>= 7), libgtk2.0-dev,
   libxfcegui4-dev, xfce4-panel-dev (>= 4.4.1), libxml-parser-perl,
-  libxklavier-dev (>= 5.0), librsvg2-dev, libwnck-dev, intltool
+  libxklavier-dev (>= 5.0), librsvg2-dev, libwnck-dev, intltool,
+  hardening-includes
 Standards-Version: 3.9.1
 Homepage: http://goodies.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-xkb-plugin/

Modified: goodies/branches/experimental/xfce4-xkb-plugin/debian/rules
===================================================================
--- goodies/branches/experimental/xfce4-xkb-plugin/debian/rules	2010-11-05 19:31:17 UTC (rev 4472)
+++ goodies/branches/experimental/xfce4-xkb-plugin/debian/rules	2010-11-05 19:44:29 UTC (rev 4473)
@@ -2,6 +2,13 @@
 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-weather-plugin::
 	-rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.a
 	-rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.la