[Pkg-xfce-commits] r4827 - goodies/branches/experimental/xfburn/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2011-01-22 13:07:13 +0000 (Sat, 22 Jan 2011)
New Revision: 4827

Modified:
   goodies/branches/experimental/xfburn/debian/changelog
   goodies/branches/experimental/xfburn/debian/control
   goodies/branches/experimental/xfburn/debian/rules
Log:
  - add build-dep on hardening-includes.
  - build with --disable-hal.
  - pick {C,LD}FLAGS from dpkg-buildflags.
  - add hardening flags to {C,LD}FLAGS.
  - add -z,defs, -O1 and --as-needed to LDFLAGS.

Modified: goodies/branches/experimental/xfburn/debian/changelog
===================================================================
--- goodies/branches/experimental/xfburn/debian/changelog	2011-01-22 12:57:45 UTC (rev 4826)
+++ goodies/branches/experimental/xfburn/debian/changelog	2011-01-22 13:07:13 UTC (rev 4827)
@@ -11,11 +11,15 @@
     - drop hal depends so we can get rid of it.
     - update debhelper build-dep to 7.0.50~ for overrides
     - drop thunar-vfs build-dep since we don't use hal anymore.
+    - add build-dep on hardening-includes.
   * debian/rules:
     - switch to debhelper tiny rules.
-    - build with --disable-hal
+    - build with --disable-hal.
+    - pick {C,LD}FLAGS from dpkg-buildflags.
+    - add hardening flags to {C,LD}FLAGS.
+    - add -z,defs, -O1 and --as-needed to LDFLAGS.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sat, 22 Jan 2011 13:57:29 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 22 Jan 2011 13:58:13 +0100
 
 xfburn (0.4.3-1+b1) unstable; urgency=low
 

Modified: goodies/branches/experimental/xfburn/debian/control
===================================================================
--- goodies/branches/experimental/xfburn/debian/control	2011-01-22 12:57:45 UTC (rev 4826)
+++ goodies/branches/experimental/xfburn/debian/control	2011-01-22 13:07:13 UTC (rev 4827)
@@ -6,7 +6,8 @@
  Simon Huggins <huggie at earth.li>, Lionel Le Folgoc <mrpouit at gmail.com>
 Build-Depends: debhelper (>= 7.0.50~), cdbs, libxfcegui4-dev (>= 4.6.0),
  libexo-1-dev (>= 0.5.0), libburn-dev, libisofs-dev, libdbus-glib-1-dev,
- libgstreamer0.10-dev, intltool, libgstreamer-plugins-base0.10-dev
+ libgstreamer0.10-dev, intltool, libgstreamer-plugins-base0.10-dev,
+ hardening-includes
 Standards-Version: 3.9.1
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfburn/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfburn/

Modified: goodies/branches/experimental/xfburn/debian/rules
===================================================================
--- goodies/branches/experimental/xfburn/debian/rules	2011-01-22 12:57:45 UTC (rev 4826)
+++ goodies/branches/experimental/xfburn/debian/rules	2011-01-22 13:07:13 UTC (rev 4827)
@@ -1,5 +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)
+CFLAGS+=$(HARDENING_CFLAGS)
+LDFLAGS+=-Wl,-z,defs -Wl,--as-needed -Wl,-O1 $(HARDENING_LDFLAGS)
+
+export CFLAGS LDFLAGS
+
 override_dh_auto_configure:
 	dh_auto_configure -- --disable-hal