tags 836664 patch
thanks
On Sun, Sep 04, 2016 at 01:17:05PM +0000, Matthias Klose wrote:
> Package: wsjtx
> Version: 1.1.r3496-3
> Severity: important
> Tags: sid stretch
> User: debian-...@lists.debian.org
> Usertags: hardening-wrapper
>
> This package builds using the hardening-wrapper package, which
> is now replaced by dpkg-dev's DEB_BUILD_MAINT_OPTIONS settings.
>
> Please consider dropping the build dependency of hardening-wrapper
> and use the DEB_BUILD_MAINT_OPTIONS settings.
>
> The goal is to remove hardening-wrapper for the stretch release.
> Discussion about the removal is tracked in https://bugs.debian.org/836162
>
> The severity of this report is likely to be raised before the release,
> so that the hardening-wrapper package can be removed for the release.
Patch attached. I've verified that it uses the same hardening flags.
Cheers,
Moritz
diff -aur wsjtx-1.1.r3496.orig/debian/control wsjtx-1.1.r3496/debian/control
--- wsjtx-1.1.r3496.orig/debian/control 2013-09-04 00:45:49.000000000 +0200
+++ wsjtx-1.1.r3496/debian/control 2016-09-22 00:35:44.255965990 +0200
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Hams group <debian-h...@lists.debian.org>
Uploaders: John T. Nogatch <jnoga...@gmail.com>, Kamal Mostafa <ka...@whence.com>
-Build-Depends: debhelper (>= 8.0.0), qt4-dev-tools, qt4-qmake, libqt4-dev, gfortran, hardening-wrapper, libfftw3-dev, libhamlib-dev, libqwt5-qt4-dev, libsamplerate0-dev, portaudio19-dev (>= 19+svn20111121-1~)
+Build-Depends: debhelper (>= 8.0.0), qt4-dev-tools, qt4-qmake, libqt4-dev, gfortran, libfftw3-dev, libhamlib-dev, libqwt5-qt4-dev, libsamplerate0-dev, portaudio19-dev (>= 19+svn20111121-1~)
Standards-Version: 3.9.4
Homepage: http://www.physics.princeton.edu/pulsar/K1JT/wsjtx.html
#Vcs-Git: git://git.debian.org/collab-maint/wsjt.git
diff -aur wsjtx-1.1.r3496.orig/debian/rules wsjtx-1.1.r3496/debian/rules
--- wsjtx-1.1.r3496.orig/debian/rules 2013-07-22 18:59:55.000000000 +0200
+++ wsjtx-1.1.r3496/debian/rules 2016-09-22 00:38:29.316744521 +0200
@@ -16,15 +16,8 @@
# This has to be exported to make some magic below work.
export DH_OPTIONS
-# enable hardening-wrapper
-export DEB_BUILD_HARDENING=1
-export DEB_BUILD_HARDENING_FORMAT=1
-export DEB_BUILD_HARDENING_FORTIFY=1
-export DEB_BUILD_HARDENING_STACKPROTECTOR=1
-# PIE causes wsjtx to seg fault immediately
-export DEB_BUILD_HARDENING_PIE=0
-export DEB_BUILD_HARDENING_RELRO=1
-export DEB_BUILD_HARDENING_BINDNOW=1
+export DEB_BUILD_MAINT_OPTIONS= hardening=+relro,+bindnow
+# Don't use PIE, causes wsjtx to seg fault immediately
override_dh_auto_configure:
echo "running debian/rules/override_dh_auto_configure"
diff -aur wsjtx-1.1.r3496.orig/lib/Makefile.linux wsjtx-1.1.r3496/lib/Makefile.linux
--- wsjtx-1.1.r3496.orig/lib/Makefile.linux 2016-09-22 14:33:50.000000000 +0200
+++ wsjtx-1.1.r3496/lib/Makefile.linux 2016-09-22 00:25:24.573388316 +0200
@@ -2,7 +2,7 @@
FC = gfortran
FFLAGS = -O2 -fbounds-check -Wall -Wno-conversion -fno-second-underscore
-CFLAGS = -I. -fbounds-check
+CFLAGS = -I. -fbounds-check `dpkg-buildflags --get CFLAGS` `dpkg-buildflags --get CPPFLAGS`
# Default rules
%.o: %.c
@@ -44,7 +44,7 @@
OBJS2 = jt9.o jt9a.o jt9b.o jt9c.o
jt9: $(OBJS2) libjt9.a
- g++ -o jt9 $(OBJS2) libjt9.a -lfftw3f -lgfortran -lQtCore
+ g++ -o jt9 $(OBJS2) libjt9.a -lfftw3f -lgfortran -lQtCore `dpkg-buildflags --get LDFLAGS`
cp jt9 ../wsjtx_install
OBJS3 = jt9sim.o
