[Pkg-xfce-commits] r4423 - desktop/branches/experimental/xfce4-utils/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2010-11-05 08:33:54 +0000 (Fri, 05 Nov 2010)
New Revision: 4423

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

Modified: desktop/branches/experimental/xfce4-utils/debian/changelog
===================================================================
--- desktop/branches/experimental/xfce4-utils/debian/changelog	2010-11-05 08:23:28 UTC (rev 4422)
+++ desktop/branches/experimental/xfce4-utils/debian/changelog	2010-11-05 08:33:54 UTC (rev 4423)
@@ -7,12 +7,14 @@
   * debian/control:
     - refresh build-deps for Xfce 4.7
     - bump standards version to 3.9.1
+    - add build-dep on hardening-includes
   * debian/patches:
     - 01_xflock4-test-running-screensaver refreshed.
     - 02_use-Xsessions.options-for-ssh-agent-handling dropped, Xfce has an
       internal parameter so it can now be disabled there.
   * debian/rules:
     - pick {C,LD}FLAGS from dpkg-buildflags.
+    - add hardening flags to {C,LD}FLAGS
 
   [ Lionel Le Folgoc ]
   * debian/rules: force $docdir to /usr/share/doc/xfce4-utils, and drop
@@ -21,7 +23,7 @@
   * debian/patches/05_do-not-launch-a-consolekit-session.patch: drop
     ck-launch-session as CK is handled in xfce4-session (Xfce #6684)
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sun, 05 Sep 2010 16:11:55 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 05 Nov 2010 09:24:37 +0100
 
 xfce4-utils (4.6.2-1) unstable; urgency=low
 

Modified: desktop/branches/experimental/xfce4-utils/debian/control
===================================================================
--- desktop/branches/experimental/xfce4-utils/debian/control	2010-11-05 08:23:28 UTC (rev 4422)
+++ desktop/branches/experimental/xfce4-utils/debian/control	2010-11-05 08:33:54 UTC (rev 4423)
@@ -6,7 +6,7 @@
  Yves-Alexis Perez <corsac at debian.org>, Lionel Le Folgoc <mrpouit at gmail.com>
 Build-Depends: debhelper (>= 7.0.50~), libxfce4util-dev (>= 4.7.0),
  libxfce4ui-1-dev (>= 4.7.0), chrpath, intltool, 
-  libgtk2.0-dev (>= 2.10.0)
+ libgtk2.0-dev (>= 2.10.0), hardening-includes
 Standards-Version: 3.9.1
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-utils/

Modified: desktop/branches/experimental/xfce4-utils/debian/rules
===================================================================
--- desktop/branches/experimental/xfce4-utils/debian/rules	2010-11-05 08:23:28 UTC (rev 4422)
+++ desktop/branches/experimental/xfce4-utils/debian/rules	2010-11-05 08:33:54 UTC (rev 4423)
@@ -2,9 +2,12 @@
 
 export PWD=$(shell pwd)
 
+include /usr/share/hardening-includes/hardening.make
+
 CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
 LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
-LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
+LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
+CFLAGS+=$(HARDENING_CFLAGS)
 
 override_dh_auto_configure:
 	dh_auto_configure -- --with-vendor-info=Debian --with-x \