[Pkg-xfce-commits] r4421 - desktop/branches/experimental/xfce4-panel/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2010-11-05 08:13:40 +0000 (Fri, 05 Nov 2010)
New Revision: 4421

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

Modified: desktop/branches/experimental/xfce4-panel/debian/changelog
===================================================================
--- desktop/branches/experimental/xfce4-panel/debian/changelog	2010-11-05 08:08:35 UTC (rev 4420)
+++ desktop/branches/experimental/xfce4-panel/debian/changelog	2010-11-05 08:13:40 UTC (rev 4421)
@@ -32,8 +32,11 @@
     - update plugins paths
   * debian/rules:
     - update path when removing .a/.la files for plugins.
+    - add hardening flags to {C,LD}FLAGS
+  * debian/control:
+    - add build-dep on hardening-includes
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sun, 05 Sep 2010 14:53:55 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 05 Nov 2010 08:54:19 +0100
 
 xfce4-panel (4.6.4-1) unstable; urgency=low
 

Modified: desktop/branches/experimental/xfce4-panel/debian/control
===================================================================
--- desktop/branches/experimental/xfce4-panel/debian/control	2010-11-05 08:08:35 UTC (rev 4420)
+++ desktop/branches/experimental/xfce4-panel/debian/control	2010-11-05 08:13:40 UTC (rev 4421)
@@ -9,7 +9,7 @@
  libxfconf-0-dev (>= 4.7.2), libexo-1-dev (>= 0.5.1),
  libgtk2.0-dev (>= 2.14.0), libglib2.0-dev (>= 2.18.0),
  libdbus-glib-1-dev (>= 0.73), libcairo2-dev (>= 1.0.0),
- libwnck-dev (>= 2.22), libxml-parser-perl, intltool
+ libwnck-dev (>= 2.22), libxml-parser-perl, intltool, hardening-includes
 Standards-Version: 3.9.1
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-panel/

Modified: desktop/branches/experimental/xfce4-panel/debian/rules
===================================================================
--- desktop/branches/experimental/xfce4-panel/debian/rules	2010-11-05 08:08:35 UTC (rev 4420)
+++ desktop/branches/experimental/xfce4-panel/debian/rules	2010-11-05 08:13:40 UTC (rev 4421)
@@ -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_install:
 	rm -f $(CURDIR)/debian/tmp/usr/lib/xfce4/panel/plugins/*.a
 	dh_install --fail-missing --sourcedir=debian/tmp -X .la