[Pkg-xfce-commits] r4449 - goodies/branches/experimental/xfce4-netload-plugin/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2010-11-05 13:30:20 +0000 (Fri, 05 Nov 2010)
New Revision: 4449

Modified:
   goodies/branches/experimental/xfce4-netload-plugin/debian/changelog
   goodies/branches/experimental/xfce4-netload-plugin/debian/control
   goodies/branches/experimental/xfce4-netload-plugin/debian/rules
Log:
  - pick {C,LD}FLAGS from dpkg-buildflags.
  - add -O1, -z,defs, --as-needed to LDFLAGS.
  - add hardening flags to {C,LD}FLAGS.

Modified: goodies/branches/experimental/xfce4-netload-plugin/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-netload-plugin/debian/changelog	2010-11-05 13:19:14 UTC (rev 4448)
+++ goodies/branches/experimental/xfce4-netload-plugin/debian/changelog	2010-11-05 13:30:20 UTC (rev 4449)
@@ -9,9 +9,12 @@
     - 03_link-against-libxfcegui4 added, link against libxfcegui4 explicitly.
   * debian/rules:
     - run xdt-autogen after applying patches.
+    - pick {C,LD}FLAGS from dpkg-buildflags.
+    - add -O1, -z,defs, --as-needed to LDFLAGS.
+    - add hardening flags to {C,LD}FLAGS.
   * Switch to 3.0 (quilt) source format.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Fri, 05 Nov 2010 13:42:58 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 05 Nov 2010 14:24:11 +0100
 
 xfce4-netload-plugin (0.4.0-4) unstable; urgency=low
 

Modified: goodies/branches/experimental/xfce4-netload-plugin/debian/control
===================================================================
--- goodies/branches/experimental/xfce4-netload-plugin/debian/control	2010-11-05 13:19:14 UTC (rev 4448)
+++ goodies/branches/experimental/xfce4-netload-plugin/debian/control	2010-11-05 13:30:20 UTC (rev 4449)
@@ -6,7 +6,7 @@
  Yves-Alexis Perez <corsac at debian.org>
 Build-Depends: cdbs, debhelper (>= 7), xfce4-panel-dev (>= 4.6.0), libxml2-dev, 
  libxml-parser-perl, libxfcegui4-dev, xfce4-dev-tools, libtool, autoconf, 
- intltool
+ intltool, hardening-includes
 Standards-Version: 3.9.1
 Homepage: http://goodies.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-netload-plugin/

Modified: goodies/branches/experimental/xfce4-netload-plugin/debian/rules
===================================================================
--- goodies/branches/experimental/xfce4-netload-plugin/debian/rules	2010-11-05 13:19:14 UTC (rev 4448)
+++ goodies/branches/experimental/xfce4-netload-plugin/debian/rules	2010-11-05 13:30:20 UTC (rev 4449)
@@ -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)
+
 post-patches::
 	NOCONFIGURE=1 xdt-autogen