Bug#859466: unblock: mapnik/3.0.12+ds-3

[Bas Couwenberg]

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

Please unblock package mapnik

It fixes #859424 by enabling the PIE hardening buildflags.

unblock mapnik/3.0.12+ds-3

Kind Regards,

Bas
-------------- next part --------------
diff -Nru mapnik-3.0.12+ds/debian/changelog mapnik-3.0.12+ds/debian/changelog
--- mapnik-3.0.12+ds/debian/changelog	2016-11-05 14:15:44.000000000 +0100
+++ mapnik-3.0.12+ds/debian/changelog	2017-04-03 14:47:38.000000000 +0200
@@ -1,3 +1,11 @@
+mapnik (3.0.12+ds-3) unstable; urgency=medium
+
+  * Update branch in gbp.conf & Vcs-Git URL.
+  * Enable PIE hardening buildflags.
+    (closes: #859424)
+
+ -- Bas Couwenberg <sebastic at debian.org>  Mon, 03 Apr 2017 14:47:38 +0200
+
 mapnik (3.0.12+ds-2) unstable; urgency=medium
 
   * Add patch to fix 'dependencies' typo.
diff -Nru mapnik-3.0.12+ds/debian/control mapnik-3.0.12+ds/debian/control
--- mapnik-3.0.12+ds/debian/control	2016-10-30 12:18:51.000000000 +0100
+++ mapnik-3.0.12+ds/debian/control	2017-04-03 14:45:40.000000000 +0200
@@ -33,7 +33,7 @@
                zlib1g-dev
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/mapnik.git
-Vcs-Git: https://anonscm.debian.org/git/pkg-grass/mapnik.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-grass/mapnik.git -b stretch
 Homepage: http://www.mapnik.org/
 
 Package: libmapnik3.0
diff -Nru mapnik-3.0.12+ds/debian/gbp.conf mapnik-3.0.12+ds/debian/gbp.conf
--- mapnik-3.0.12+ds/debian/gbp.conf	2016-10-15 20:08:15.000000000 +0200
+++ mapnik-3.0.12+ds/debian/gbp.conf	2017-04-03 14:45:48.000000000 +0200
@@ -6,7 +6,7 @@
 
 # The default name for the Debian branch is "master".
 # Change it if the name is different (for instance, "debian/unstable").
-debian-branch = master
+debian-branch = stretch
 
 # git-import-orig uses the following names for the upstream tags.
 # Change the value if you are not using git-import-orig
diff -Nru mapnik-3.0.12+ds/debian/rules mapnik-3.0.12+ds/debian/rules
--- mapnik-3.0.12+ds/debian/rules	2016-11-05 14:13:46.000000000 +0100
+++ mapnik-3.0.12+ds/debian/rules	2017-04-03 14:46:26.000000000 +0200
@@ -4,9 +4,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# Enable hardening build flags, except:
-#  pie: causes python-mapnik build failure
-export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
+# Enable hardening build flags
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 NJOBS := -j1
 ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))