[Pkg-xfce-commits] r4503 - goodies/branches/experimental/xfce4-systemload-plugin/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2010-11-06 10:45:11 +0000 (Sat, 06 Nov 2010)
New Revision: 4503

Modified:
   goodies/branches/experimental/xfce4-systemload-plugin/debian/changelog
   goodies/branches/experimental/xfce4-systemload-plugin/debian/control
   goodies/branches/experimental/xfce4-systemload-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-systemload-plugin/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-systemload-plugin/debian/changelog	2010-11-06 10:31:28 UTC (rev 4502)
+++ goodies/branches/experimental/xfce4-systemload-plugin/debian/changelog	2010-11-06 10:45:11 UTC (rev 4503)
@@ -3,9 +3,14 @@
   * debian/control:
     - add build-dep on libxfcegui4-dev.
     - update standards version to 3.9.1.
+    - add build-dep on hardening-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>  Sat, 06 Nov 2010 11:22:38 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 06 Nov 2010 11:31:44 +0100
 
 xfce4-systemload-plugin (0.4.2-3) unstable; urgency=low
 

Modified: goodies/branches/experimental/xfce4-systemload-plugin/debian/control
===================================================================
--- goodies/branches/experimental/xfce4-systemload-plugin/debian/control	2010-11-06 10:31:28 UTC (rev 4502)
+++ goodies/branches/experimental/xfce4-systemload-plugin/debian/control	2010-11-06 10:45:11 UTC (rev 4503)
@@ -5,7 +5,8 @@
 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), 
- xfce4-panel-dev (>= 4.6.0), libxml2-dev, libxml-parser-perl, libxfcegui4-dev
+ xfce4-panel-dev (>= 4.6.0), libxml2-dev, libxml-parser-perl, libxfcegui4-dev,
+ hardening-includes
 Standards-Version: 3.9.1
 Homepage: http://goodies.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/xfce4-systemload-plugin/

Modified: goodies/branches/experimental/xfce4-systemload-plugin/debian/rules
===================================================================
--- goodies/branches/experimental/xfce4-systemload-plugin/debian/rules	2010-11-06 10:31:28 UTC (rev 4502)
+++ goodies/branches/experimental/xfce4-systemload-plugin/debian/rules	2010-11-06 10:45:11 UTC (rev 4503)
@@ -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)
+
 DEB_CONFIGURE_EXTRA_FLAGS := --enable-debug=yes
 
 binary-post-install/xfce4-systemload-plugin::