Bug#859393: unblock: grass/7.2.0-2

[Bas Couwenberg]

Package: release.debian.org
Severity: normal
User: release.debian.org at packages.debian.org
Usertags: unblock

Please unblock package grass

It fixes 859372 by enabling PIE.

unblock grass/7.2.0-2

Kind Regards,

Bas
-------------- next part --------------
diff -Nru grass-7.2.0/debian/changelog grass-7.2.0/debian/changelog
--- grass-7.2.0/debian/changelog	2016-12-28 19:05:08.000000000 +0100
+++ grass-7.2.0/debian/changelog	2017-04-02 23:38:40.000000000 +0200
@@ -1,3 +1,11 @@
+grass (7.2.0-2) unstable; urgency=medium
+
+  * Enable PIE hardening flags.
+    (closes: #859372)
+  * Drop unused lintian overrides for hardening-no-pie.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sun, 02 Apr 2017 23:38:40 +0200
+
 grass (7.2.0-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru grass-7.2.0/debian/grass-core.lintian-overrides grass-7.2.0/debian/grass-core.lintian-overrides
--- grass-7.2.0/debian/grass-core.lintian-overrides	2016-12-28 18:10:58.000000000 +0100
+++ grass-7.2.0/debian/grass-core.lintian-overrides	2017-04-02 23:38:05.000000000 +0200
@@ -44,6 +44,3 @@
 grass-core: extra-license-file usr/lib/grass*/etc/license
 grass-core: extra-license-file usr/share/doc/grass-core/COPYING
 
-# PIE breaks the build
-grass-core: hardening-no-pie *
-
diff -Nru grass-7.2.0/debian/grass-dev.lintian-overrides grass-7.2.0/debian/grass-dev.lintian-overrides
--- grass-7.2.0/debian/grass-dev.lintian-overrides	2016-12-01 20:04:08.000000000 +0100
+++ grass-7.2.0/debian/grass-dev.lintian-overrides	1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-# PIE breaks the build
-grass-dev: hardening-no-pie *
-
diff -Nru grass-7.2.0/debian/patches/hicolor-icons.patch grass-7.2.0/debian/patches/hicolor-icons.patch
--- grass-7.2.0/debian/patches/hicolor-icons.patch	2016-12-28 19:04:36.000000000 +0100
+++ grass-7.2.0/debian/patches/hicolor-icons.patch	2017-01-17 00:33:11.000000000 +0100
@@ -2,6 +2,7 @@
  grass.desktop uses Icon=grass not Icon=grass71.
 Author: Bas Couwenberg <sebastic at debian.org>
 Forwarded: https://trac.osgeo.org/grass/ticket/3233
+Applied-Upstream: https://trac.osgeo.org/grass/changeset/70166
 
 --- a/gui/icons/Makefile
 +++ b/gui/icons/Makefile
diff -Nru grass-7.2.0/debian/rules grass-7.2.0/debian/rules
--- grass-7.2.0/debian/rules	2016-12-28 18:53:46.000000000 +0100
+++ grass-7.2.0/debian/rules	2017-04-02 23:36:12.000000000 +0200
@@ -3,9 +3,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# Enable hardening build flags, except:
-#  pie: causes build failure
-export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
+# Enable hardening build flags
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 VERSION=$(shell echo `head -2 $(CURDIR)/include/VERSION` | sed -e 's/ //')
 ABI=$(shell echo `head -3 $(CURDIR)/include/VERSION` | sed -e 's/ //g' -e 's/RC/-/')