fix hardening build

* debian/control:
  - replace hardening-includes build-dep by hardening-wrapper.
* debian/rules:
  - enable hardening.
* Non-maintainer upload.

diff --git a/debian/changelog b/debian/changelog
index fe7305e2cab5c7d1f3dcf0d6697c80fa62e4b29b..0713f1288b9adbab4618128a828348dfd54f40cc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+midori (0.3.0-1.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/control:
+    - replace hardening-includes build-dep by hardening-wrapper.
+  * debian/rules:
+    - enable hardening.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Thu, 03 Feb 2011 23:43:07 +0100
+
 midori (0.3.0-1.2) unstable; urgency=low
 
   * Non-maintainer upload.

diff --git a/debian/control b/debian/control
index de6ed9aaee5b070c7ec86d95081ddcef76e5c62d..e269a29192fbebe135c6233dbff48fded8e42b04 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Build-Depends: debhelper (>= 7.0.50),
  xvfb,
  xauth,
  xfonts-base,
- hardening-includes,
+ hardening-wrapper,
  libxss-dev
 # Disabled optional dependencies:
 Build-Conflicts: gtk-doc-tools,

diff --git a/debian/rules b/debian/rules
index e4f9c03965ef4429f60d20b528e579057487c2dc..5f0a52c0ec84afb3bcc60867c28b8270c8a9bd9b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -2,13 +2,13 @@
 
 LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
 CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
-CFLAGS+=$(HARDENING_CFLAGS)
-#LDFLAGS+=-Wl,-z,defs -Wl,--as-needed -Wl,-O1 $(HARDENING_LDFLAGS)
-LDFLAGS+=-Wl,--as-needed -Wl,-O1 $(HARDENING_LDFLAGS)
+LDFLAGS+=-Wl,--as-needed -Wl,-O1
 
 # waf, thank you _so_ much
-CCFLAGS=$(CFLAGS)
-LINKFLAGS=$(LDFLAGS)
+export LINKFLAGS=$(LDFLAGS)
+export CCFLAGS=$(CFLAGS)
+
+export DEB_BUILD_HARDENING=1
 
 CMD=$(shell echo $@ | sed 's/override_//')
 
@@ -44,10 +44,10 @@ override_dh_auto_clean:
        rm -rf .lock-wscript
 
 override_dh_auto_configure:
-       $(WAF) --nocache configure --prefix /usr
+       $(WAF) --nocache configure --debug-level=none --prefix /usr
 
 override_dh_auto_build:
-       $(WAF) build --nocache --debug full
+       $(WAF) build --nocache -v
 
 #override_dh_auto_test:
 #      xvfb-run $(WAF) --nocache check