[Pkg-xfce-commits] r4405 - goodies/branches/experimental/xfce4-mailwatch-plugin/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2010-11-04 14:24:57 +0000 (Thu, 04 Nov 2010)
New Revision: 4405

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

Modified: goodies/branches/experimental/xfce4-mailwatch-plugin/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-mailwatch-plugin/debian/changelog	2010-11-04 14:24:42 UTC (rev 4404)
+++ goodies/branches/experimental/xfce4-mailwatch-plugin/debian/changelog	2010-11-04 14:24:57 UTC (rev 4405)
@@ -7,11 +7,15 @@
     - update standards version to 3.9.1.
     - add build-dep on xfce4-dev-tools, intltool and libtool in order to run
       xdt-autogen after patching.
+    - add build-dep on hardening-includes.
   * debian/rules:
     - run xdt-autogen after patching.
+    - pick {C,LD}FLAGS from dpkg-buildflags
+    - add hardening flags to {C,LD}FLAGS
+    - add -z,defs, -O1 and --as-needed to LDFLAGS.
   * Switch to 3.0 (quilt) source format.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Thu, 04 Nov 2010 15:08:05 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Thu, 04 Nov 2010 15:16:29 +0100
 
 xfce4-mailwatch-plugin (1.1.0-2) unstable; urgency=low
 

Modified: goodies/branches/experimental/xfce4-mailwatch-plugin/debian/control
===================================================================
--- goodies/branches/experimental/xfce4-mailwatch-plugin/debian/control	2010-11-04 14:24:42 UTC (rev 4404)
+++ goodies/branches/experimental/xfce4-mailwatch-plugin/debian/control	2010-11-04 14:24:57 UTC (rev 4405)
@@ -6,7 +6,7 @@
 Build-Depends: cdbs, debhelper (>= 7), libgtk2.0-dev, 
  xfce4-panel-dev (>= 4.3.90.2-3), libgnutls-dev, libxml-parser-perl, 
  libxfce4util-dev, libxfcegui4-dev, xfce4-dev-tools, intltool, libtool, 
- autoconf
+ autoconf, hardening-includes
 Standards-Version: 3.9.1
 Homepage: http://spuriousinterrupt.org/projects/mailwatch
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/xfce4-mailwatch-plugin/

Modified: goodies/branches/experimental/xfce4-mailwatch-plugin/debian/rules
===================================================================
--- goodies/branches/experimental/xfce4-mailwatch-plugin/debian/rules	2010-11-04 14:24:42 UTC (rev 4404)
+++ goodies/branches/experimental/xfce4-mailwatch-plugin/debian/rules	2010-11-04 14:24:57 UTC (rev 4405)
@@ -2,7 +2,11 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
-LDFLAGS+=-Wl,-z,-defs -Wl,--as-needed
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS+=-Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+CFLAGS+=$(HARDENING_CFLAGS)
+LDFLAGS+=$(HARDENING_LDFLAGS)
 
 post-patches::
 	NOCONFIGURE=1 xdt-autogen