[Pkg-xfce-commits] r4422 - desktop/branches/experimental/xfce4-session/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2010-11-05 08:23:28 +0000 (Fri, 05 Nov 2010)
New Revision: 4422

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

Modified: desktop/branches/experimental/xfce4-session/debian/changelog
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/changelog	2010-11-05 08:13:40 UTC (rev 4421)
+++ desktop/branches/experimental/xfce4-session/debian/changelog	2010-11-05 08:23:28 UTC (rev 4422)
@@ -7,11 +7,13 @@
     - 04_gk-dont-check-running-use-start refreshed. 
   * debian/control:
     - refresh build-deps for Xfce 4.7.
+    - add build-dep on hardening-includes.
   * debian/rules:
     - don't pass libexecdir, useless now
     - update xfsm-shutdown-helper path in chrpath call.
     - update splash-engine path.
     - pick {C,LD}FLAGS from dpkg-buildflags.
+    - add hardening flags to {C,LD}FLAGS.
   * debian/xfce4-session.lintian-overrides:
     - drop xfsm-shutdown-helper and balou theme overrides, useless now.
 
@@ -31,7 +33,7 @@
     - 04_gk-dont-check-running-use-start.patch: ditto
     - 05_reuse-existing-ck-session.patch: dropped too.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sun, 05 Sep 2010 16:12:47 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 05 Nov 2010 09:14:25 +0100
 
 xfce4-session (4.6.2-2) unstable; urgency=low
 

Modified: desktop/branches/experimental/xfce4-session/debian/control
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/control	2010-11-05 08:13:40 UTC (rev 4421)
+++ desktop/branches/experimental/xfce4-session/debian/control	2010-11-05 08:23:28 UTC (rev 4422)
@@ -8,7 +8,7 @@
  fortune-mod, libdbus-1-dev, libdbus-glib-1-dev, 
  libxfce4util-dev (>= 4.6.0), libxfce4ui-1-dev (>= 4.7.0), libwnck-dev, 
  x11-xserver-utils, libxfconf-0-dev (>= 4.7.0), libglade2-dev, 
- intltool (>= 0.31)
+ intltool (>= 0.31), hardening-includes
 Standards-Version: 3.9.1
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-session/

Modified: desktop/branches/experimental/xfce4-session/debian/rules
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/rules	2010-11-05 08:13:40 UTC (rev 4421)
+++ desktop/branches/experimental/xfce4-session/debian/rules	2010-11-05 08:23:28 UTC (rev 4422)
@@ -1,9 +1,14 @@
 #!/usr/bin/make -f
 
+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
 	find .pc -type f -name '*.c' -exec echo '{}' >> po/POTFILES.skip \;