[Pkg-xfce-commits] r4306 - goodies/branches/experimental/xfce4-cellmodem-plugin/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2010-10-17 13:43:52 +0000 (Sun, 17 Oct 2010)
New Revision: 4306

Modified:
   goodies/branches/experimental/xfce4-cellmodem-plugin/debian/changelog
   goodies/branches/experimental/xfce4-cellmodem-plugin/debian/control
   goodies/branches/experimental/xfce4-cellmodem-plugin/debian/rules
Log:
  - add build-dep on hardening-includes.
  - add hardening flags to {C,LD}FLAGS.

Modified: goodies/branches/experimental/xfce4-cellmodem-plugin/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-cellmodem-plugin/debian/changelog	2010-10-17 13:10:36 UTC (rev 4305)
+++ goodies/branches/experimental/xfce4-cellmodem-plugin/debian/changelog	2010-10-17 13:43:52 UTC (rev 4306)
@@ -12,17 +12,19 @@
     - add build-dep on libxfcegui4-dev.
     - add build-dep on automake, autoconf, intltool and xfce4-dev-tools in 
       order to run xdt-autogen after patching configure.ac/Makefile.am.
+    - add build-dep on hardening-includes.
   * Switch to 3.0 (quilt) source format.
   * Update standards version to 3.9.1.
   * debian/rules:
     - switch to dh 7 rules.
     - run xdt-autogen before configure.
     - add --as-needed to LDFLAGS.
+    - add hardening flags to {C,LD}FLAGS.
   * debian/patches:
     - 01_explicit-linking-to-libxfcegui4 and 02_typo-linking added, fix
       linking with libxfcegui4 before port to Xfce 4.7 and libxfce4ui is done.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sun, 17 Oct 2010 15:08:24 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 17 Oct 2010 15:14:05 +0200
 
 xfce4-cellmodem-plugin (0.0.5-1) unstable; urgency=low
 

Modified: goodies/branches/experimental/xfce4-cellmodem-plugin/debian/control
===================================================================
--- goodies/branches/experimental/xfce4-cellmodem-plugin/debian/control	2010-10-17 13:10:36 UTC (rev 4305)
+++ goodies/branches/experimental/xfce4-cellmodem-plugin/debian/control	2010-10-17 13:43:52 UTC (rev 4306)
@@ -6,7 +6,7 @@
  Yves-Alexis Perez <corsac at debian.org>
 Build-Depends: debhelper (>= 7.0.50~), autotools-dev, libpci-dev, libusb-dev,
  libxml-parser-perl, pkg-config, xfce4-panel-dev, libxfcegui4-dev,
- intltool, automake, autoconf, xfce4-dev-tools
+ intltool, automake, autoconf, xfce4-dev-tools, hardening-includes
 Standards-Version: 3.9.1
 Homepage: http://goodies.xfce.org/projects/panel-plugins/xfce4-cellmodem-plugin
 Vcs-Svn: svn://svn.debian.org/svn/pkg-xfce/goodies/trunk/xfce4-cellmodem-plugin/

Modified: goodies/branches/experimental/xfce4-cellmodem-plugin/debian/rules
===================================================================
--- goodies/branches/experimental/xfce4-cellmodem-plugin/debian/rules	2010-10-17 13:10:36 UTC (rev 4305)
+++ goodies/branches/experimental/xfce4-cellmodem-plugin/debian/rules	2010-10-17 13:43:52 UTC (rev 4306)
@@ -1,9 +1,14 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
+include /usr/share/hardening-includes/hardening.make
+# plugins are shared objects, seems that it fails with PIE for now
+DEB_BUILD_HARDENING_PIE:=0
+
 CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
 LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
-LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
+CDLAGS+=$(HARDENING_CFLAGS)
+LDFLAGS+=-Wl,-z,defs -Wl,--as-needed $(HARDENING_LDFLAGS)
 
 override_dh_auto_configure:
 	xdt-autogen