[Pkg-xfce-commits] r4490 - goodies/branches/experimental/xfce4-wavelan-plugin/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2010-11-06 09:22:46 +0000 (Sat, 06 Nov 2010)
New Revision: 4490

Modified:
   goodies/branches/experimental/xfce4-wavelan-plugin/debian/changelog
   goodies/branches/experimental/xfce4-wavelan-plugin/debian/control
   goodies/branches/experimental/xfce4-wavelan-plugin/debian/rules
Log:
  - 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-wavelan-plugin/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-wavelan-plugin/debian/changelog	2010-11-06 09:15:22 UTC (rev 4489)
+++ goodies/branches/experimental/xfce4-wavelan-plugin/debian/changelog	2010-11-06 09:22:46 UTC (rev 4490)
@@ -8,9 +8,12 @@
   * debian/rules:
     - run xdt-autogen after applying patches touching
       configure.in/Makefile.am.
+    - pick {C,LD}FLAGS from dpkg-buildflags.
+    - add -O1, -z,defs and --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>  Sat, 06 Nov 2010 10:09:12 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 06 Nov 2010 10:18:44 +0100
 
 xfce4-wavelan-plugin (0.5.5-3) unstable; urgency=low
 

Modified: goodies/branches/experimental/xfce4-wavelan-plugin/debian/control
===================================================================
--- goodies/branches/experimental/xfce4-wavelan-plugin/debian/control	2010-11-06 09:15:22 UTC (rev 4489)
+++ goodies/branches/experimental/xfce4-wavelan-plugin/debian/control	2010-11-06 09:22:46 UTC (rev 4490)
@@ -6,7 +6,7 @@
  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, intltool,
- libxfcegui4-dev, xfce4-dev-tools, libtool
+ libxfcegui4-dev, xfce4-dev-tools, libtool, hardening-includes
 Standards-Version: 3.8.2
 Homepage: http://goodies.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-wavelan-plugin/

Modified: goodies/branches/experimental/xfce4-wavelan-plugin/debian/rules
===================================================================
--- goodies/branches/experimental/xfce4-wavelan-plugin/debian/rules	2010-11-06 09:15:22 UTC (rev 4489)
+++ goodies/branches/experimental/xfce4-wavelan-plugin/debian/rules	2010-11-06 09:22:46 UTC (rev 4490)
@@ -4,6 +4,13 @@
 
 DEB_DH_INSTALL_ARGS := --fail-missing
 
+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