[Pkg-xfce-commits] r4418 - desktop/branches/experimental/xfconf/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2010-11-05 07:48:19 +0000 (Fri, 05 Nov 2010)
New Revision: 4418

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

Modified: desktop/branches/experimental/xfconf/debian/changelog
===================================================================
--- desktop/branches/experimental/xfconf/debian/changelog	2010-11-05 05:08:20 UTC (rev 4417)
+++ desktop/branches/experimental/xfconf/debian/changelog	2010-11-05 07:48:19 UTC (rev 4418)
@@ -2,6 +2,10 @@
 
   [ Yves-Alexis Perez ]
   * New upstream development release.
+  * debian/control:
+    - add build-dep on hardening-includes
+  * debian/rules:
+    - add hardening flags to {C,LD}FLAGS.
   * debian/xfconf.install:
     - update xfconfd path.
 
@@ -13,7 +17,7 @@
       --remaining-packages for the others.
   * debian/control: bumped Standards-Version to 3.9.1, no further change.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sun, 05 Sep 2010 15:49:44 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 05 Nov 2010 00:03:35 +0100
 
 xfconf (4.6.2-1) unstable; urgency=low
 

Modified: desktop/branches/experimental/xfconf/debian/control
===================================================================
--- desktop/branches/experimental/xfconf/debian/control	2010-11-05 05:08:20 UTC (rev 4417)
+++ desktop/branches/experimental/xfconf/debian/control	2010-11-05 07:48:19 UTC (rev 4418)
@@ -7,7 +7,7 @@
  Lionel Le Folgoc <mrpouit at gmail.com>
 Build-Depends: debhelper (>= 7.0.50~), libxfce4util-dev (>= 4.6.0), 
  libdbus-1-dev, libdbus-glib-1-dev, libextutils-pkgconfig-perl,
- libextutils-depends-perl, libglib-perl, intltool
+ libextutils-depends-perl, libglib-perl, intltool, hardening-includes
 Standards-Version: 3.9.1
 Homepage: http://www.xfce.org
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfconf

Modified: desktop/branches/experimental/xfconf/debian/rules
===================================================================
--- desktop/branches/experimental/xfconf/debian/rules	2010-11-05 05:08:20 UTC (rev 4417)
+++ desktop/branches/experimental/xfconf/debian/rules	2010-11-05 07:48:19 UTC (rev 4418)
@@ -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)
 
+
 %:
 	dh $@