Bug#836664: wsjtx: diff for NMU version 1.1.r3496-3.1

[Mattia Rizzolo]

Control: tags 836664 + pending

Dear maintainer,

I've prepared an NMU for wsjtx (versioned as 1.1.r3496-3.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

Regards.

-- 
regards,
                        Mattia Rizzolo

GPG Key: 66AE 2B4A FCCF 3F52 DA18  4D18 4B04 3FCD B944 4540      .''`.
more about me:  https://mapreri.org                             : :'  :
Launchpad user: https://launchpad.net/~mapreri                  `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia  `-

diff -Nru wsjtx-1.1.r3496/debian/changelog wsjtx-1.1.r3496/debian/changelog
--- wsjtx-1.1.r3496/debian/changelog	2013-09-09 18:19:22.000000000 +0000
+++ wsjtx-1.1.r3496/debian/changelog	2016-09-26 15:33:49.000000000 +0000
@@ -1,3 +1,15 @@
+wsjtx (1.1.r3496-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add patch so that the build system can make use of exported buildflags
+  * Bump compat level to 9, so that dh exports dpkg-buildflags in the env by
+    itself.
+  * Use DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie instead of using
+    hardening-wrapper.  Closes: #836664
+  * Remove a bunch of useless comments from d/rules.
+
+ -- Mattia Rizzolo <mat...@debian.org>  Mon, 26 Sep 2016 15:33:49 +0000
+
 wsjtx (1.1.r3496-3) unstable; urgency=low
 
   * remove -mno-stack-arg-probe from lib/Makefile.linux CFLAGS
diff -Nru wsjtx-1.1.r3496/debian/compat wsjtx-1.1.r3496/debian/compat
--- wsjtx-1.1.r3496/debian/compat	2013-05-29 01:16:36.000000000 +0000
+++ wsjtx-1.1.r3496/debian/compat	2016-09-26 15:22:49.000000000 +0000
@@ -1 +1 @@
-8
+9
diff -Nru wsjtx-1.1.r3496/debian/control wsjtx-1.1.r3496/debian/control
--- wsjtx-1.1.r3496/debian/control	2013-09-03 22:45:49.000000000 +0000
+++ wsjtx-1.1.r3496/debian/control	2016-09-26 15:22:57.000000000 +0000
@@ -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 (>= 9), 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 -Nru wsjtx-1.1.r3496/debian/patches/dpkg-buildflags.patch wsjtx-1.1.r3496/debian/patches/dpkg-buildflags.patch
--- wsjtx-1.1.r3496/debian/patches/dpkg-buildflags.patch	1970-01-01 00:00:00.000000000 +0000
+++ wsjtx-1.1.r3496/debian/patches/dpkg-buildflags.patch	2016-09-26 15:30:10.000000000 +0000
@@ -0,0 +1,29 @@
+Description: repspects CFLAGS, FFLAGS and LDFLAGS from the environment
+ This makes the build system to use the flags exported by dpkg-buildflags
+ including hardening ones.
+Author: Mattia Rizzolo <mat...@debian.org>
+Last-Updated: 2016-09-26
+Forwarded: no
+
+--- a/lib/Makefile.linux
++++ b/lib/Makefile.linux
+@@ -1,8 +1,8 @@
+ CC = gcc
+ FC = gfortran
+ 
+-FFLAGS = -O2 -fbounds-check -Wall -Wno-conversion -fno-second-underscore
+-CFLAGS = -I. -fbounds-check
++FFLAGS := -O2 -fbounds-check -Wall -Wno-conversion -fno-second-underscore $(FFLAGS)
++CFLAGS := -I. -fbounds-check $(CFLAGS)
+ 
+ # 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 $(LDFLAGS) -lfftw3f -lgfortran -lQtCore
+ 	cp jt9 ../wsjtx_install
+ 
+ OBJS3 = jt9sim.o 
diff -Nru wsjtx-1.1.r3496/debian/patches/series wsjtx-1.1.r3496/debian/patches/series
--- wsjtx-1.1.r3496/debian/patches/series	2013-09-09 18:13:38.000000000 +0000
+++ wsjtx-1.1.r3496/debian/patches/series	2016-09-26 15:14:37.000000000 +0000
@@ -3,3 +3,4 @@
 man_page.patch
 wsjtx_install.patch
 mno-stack-arg-probe.patch
+dpkg-buildflags.patch
diff -Nru wsjtx-1.1.r3496/debian/rules wsjtx-1.1.r3496/debian/rules
--- wsjtx-1.1.r3496/debian/rules	2013-07-22 16:59:55.000000000 +0000
+++ wsjtx-1.1.r3496/debian/rules	2016-09-26 15:20:25.000000000 +0000
@@ -1,30 +1,10 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-#
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-#
-# Modified to make a template file for a multi-binary package with separated
-# build-arch and build-indep targets  by Bill Allombert 2001
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# 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
+# enable hardedning.  Don't enable PIE as it causes wsjtx to segfault immediately
+export DEB_BUILD_OPTIONS = hardening=+all,-pie
 
 override_dh_auto_configure:
 	echo "running debian/rules/override_dh_auto_configure"

signature.asc
Description: PGP signature