tags 713730 + patch
tags 713730 + pending
thanks
Hi Mats,
I have prepared an NMU for xstow (versioned as 1.0.0-2.1) and
uploaded it to DELAYED/7 to fix the FTBFS with gcc-4.8
and to add hardening flags. Please feel free to tell me if I should
delay it longer.
Best regards,
Johann Felix
--
Johann Felix Soden, DD
joh...@debian.org
diff -Nru xstow-1.0.0/debian/changelog xstow-1.0.0/debian/changelog
--- xstow-1.0.0/debian/changelog 2012-05-29 21:40:43.000000000 +0200
+++ xstow-1.0.0/debian/changelog 2014-02-12 23:20:36.000000000 +0100
@@ -1,3 +1,11 @@
+xstow (1.0.0-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload
+ * Fixed FTBFS with gcc-4.8 (closes: #713730)
+ * Added dpkg-buildflags support for hardening
+
+ -- Johann Felix Soden <joh...@debian.org> Wed, 12 Feb 2014 22:36:40 +0100
+
xstow (1.0.0-2) unstable; urgency=low
* Reverted directory fix for #589860 as it broke managing multiple
diff -Nru xstow-1.0.0/debian/patches/build-fix-gcc-4.8 xstow-1.0.0/debian/patches/build-fix-gcc-4.8
--- xstow-1.0.0/debian/patches/build-fix-gcc-4.8 1970-01-01 01:00:00.000000000 +0100
+++ xstow-1.0.0/debian/patches/build-fix-gcc-4.8 2014-02-12 22:36:32.000000000 +0100
@@ -0,0 +1,15 @@
+--- a/src/ref.h
++++ b/src/ref.h
+@@ -205,10 +205,10 @@
+ return true;
+ }
+
+- operator V() const { return *(address()); }
++ operator V&() const { return *(address()); }
+ operator V*() const { return address(); }
+
+- operator V() { return *(address()); }
++ operator V&() { return *(address()); }
+ operator V*() { return address(); }
+
+ private:
diff -Nru xstow-1.0.0/debian/patches/series xstow-1.0.0/debian/patches/series
--- xstow-1.0.0/debian/patches/series 2012-05-29 20:44:15.000000000 +0200
+++ xstow-1.0.0/debian/patches/series 2014-02-12 22:35:46.000000000 +0100
@@ -1,2 +1,3 @@
manpages
ld-as-needed
+build-fix-gcc-4.8
diff -Nru xstow-1.0.0/debian/rules xstow-1.0.0/debian/rules
--- xstow-1.0.0/debian/rules 2012-05-17 02:51:51.000000000 +0200
+++ xstow-1.0.0/debian/rules 2014-02-12 22:44:33.000000000 +0100
@@ -10,6 +10,8 @@
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DPKG_EXPORT_BUILDFLAGS = 1
+-include /usr/share/dpkg/buildflags.mk
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
CFLAGS += -g
