[Pkg-xfce-commits] r4427 - desktop/branches/experimental/xfwm4/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2010-11-05 08:38:41 +0000 (Fri, 05 Nov 2010)
New Revision: 4427

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

Modified: desktop/branches/experimental/xfwm4/debian/changelog
===================================================================
--- desktop/branches/experimental/xfwm4/debian/changelog	2010-11-05 08:37:52 UTC (rev 4426)
+++ desktop/branches/experimental/xfwm4/debian/changelog	2010-11-05 08:38:41 UTC (rev 4427)
@@ -10,10 +10,12 @@
     - refresh build-deps for Xfce 4.7.
     - build-conflicts against libxfcegui4-dev to be sure to pick kbd headers
       from libxfce4ui-dev.
+    - add build-dep on hardening-includes.
   * debian/rules:
     - pick {C,LD}FLAGS from dpkg-buildflags.
+    - add hardening flags to {C,LD}FLAGS. 
 
- -- Yves-Alexis Perez <corsac at debian.org>  Thu, 04 Nov 2010 10:23:10 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 05 Nov 2010 09:34:42 +0100
 
 xfwm4 (4.6.2-1) unstable; urgency=low
 

Modified: desktop/branches/experimental/xfwm4/debian/control
===================================================================
--- desktop/branches/experimental/xfwm4/debian/control	2010-11-05 08:37:52 UTC (rev 4426)
+++ desktop/branches/experimental/xfwm4/debian/control	2010-11-05 08:38:41 UTC (rev 4427)
@@ -8,7 +8,8 @@
 Build-Depends: debhelper (>= 7.0.50~), libgtk2.0-dev (>= 2.10.6),
  libxft-dev, libxdamage-dev, libxrender-dev, libxcomposite-dev,
  libxfixes-dev, chrpath, libglade2-dev, libxfce4util-dev (>= 4.7.0),
- libxfce4ui-1-dev (>= 4.7.0), libxfconf-0-dev, libwnck-dev, intltool
+ libxfce4ui-1-dev (>= 4.7.0), libxfconf-0-dev, libwnck-dev, intltool,
+ hardening-includes
 Build-Conflicts: libxfcegui4-dev
 Standards-Version: 3.9.1
 Homepage: http://www.xfce.org/

Modified: desktop/branches/experimental/xfwm4/debian/rules
===================================================================
--- desktop/branches/experimental/xfwm4/debian/rules	2010-11-05 08:37:52 UTC (rev 4426)
+++ desktop/branches/experimental/xfwm4/debian/rules	2010-11-05 08:38:41 UTC (rev 4427)
@@ -1,9 +1,13 @@
 #!/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 -- --enable-compositor --libexecdir=\$${prefix}/lib