[Pkg-xfce-commits] r4404 - goodies/branches/experimental/xfce4-messenger-plugin/debian

[Yves-Alexis Perez]

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

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

Modified: goodies/branches/experimental/xfce4-messenger-plugin/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-messenger-plugin/debian/changelog	2010-11-04 14:14:59 UTC (rev 4403)
+++ goodies/branches/experimental/xfce4-messenger-plugin/debian/changelog	2010-11-04 14:24:42 UTC (rev 4404)
@@ -5,12 +5,16 @@
       xfce4-panel-dev doesn't bring the flags.
   * debian/rules:
     - run xdt-autogen after applying patches touching Makefile.am
+    - pick {C,LD}FLAGS from dpkg-buildflags
+    - add hardening flags to {C,LD}FLAGS
+    - add -z,defs, -O1 and --as-needed to LDFLAGS.
   * debian/control:
     - add build-dep on xfce4-dev-tools, intltool and libtool to run
       xdt-autogen after applying patches.
+    - add build-dep on hardening-includes
   * Switch to 3.0 (quilt) source format.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Thu, 04 Nov 2010 15:09:14 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Thu, 04 Nov 2010 15:17:27 +0100
 
 xfce4-messenger-plugin (0.1.0-4) unstable; urgency=low
 

Modified: goodies/branches/experimental/xfce4-messenger-plugin/debian/control
===================================================================
--- goodies/branches/experimental/xfce4-messenger-plugin/debian/control	2010-11-04 14:14:59 UTC (rev 4403)
+++ goodies/branches/experimental/xfce4-messenger-plugin/debian/control	2010-11-04 14:24:42 UTC (rev 4404)
@@ -6,7 +6,7 @@
  Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>
 Build-Depends: debhelper (>= 7), cdbs, xfce4-panel-dev (>= 4.3.90.2-3),
  libdbus-1-dev, libdbus-glib-1-dev, libxt-dev, autotools-dev, libxfcegui4-dev,
- xfce4-dev-tools, libtool, intltool
+ xfce4-dev-tools, libtool, intltool, hardening-includes
 Standards-Version: 3.8.2
 Homepage: http://goodies.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-messenger-plugin/

Modified: goodies/branches/experimental/xfce4-messenger-plugin/debian/rules
===================================================================
--- goodies/branches/experimental/xfce4-messenger-plugin/debian/rules	2010-11-04 14:14:59 UTC (rev 4403)
+++ goodies/branches/experimental/xfce4-messenger-plugin/debian/rules	2010-11-04 14:24:42 UTC (rev 4404)
@@ -2,6 +2,12 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
+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