[Git][debian-gis-team/gdal][master] Revert "Revert "Disable PIE on Ubuntu where it's still problematic.""

[Bas Couwenberg]

Bas Couwenberg pushed to branch master at Debian GIS Project / gdal


Commits:
7569d359 by Bas Couwenberg at 2018-06-29T17:08:21+02:00
Revert "Revert "Disable PIE on Ubuntu where it's still problematic.""

This reverts commit 4257b5032e5601896ebffd7ce2cc4403cd472461.

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,3 @@
-gdal (2.3.1+dfsg-2) UNRELEASED; urgency=medium
-
-  * Enable PIE in Ubuntu too, now it is enabled everywhere by default.
-
- -- Gianfranco Costamagna <locutusofborg at debian.org>  Fri, 29 Jun 2018 12:54:54 +0200
-
 gdal (2.3.1+dfsg-1) unstable; urgency=medium
 
   * New upstream release.


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,13 @@
 # Enable hardening build flags
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
+# Disable PIE on Ubuntu where it's still problematic
+VENDOR_DERIVES_FROM_UBUNTU ?= $(shell dpkg-vendor --derives-from Ubuntu && echo yes)
+
+ifeq ($(VENDOR_DERIVES_FROM_UBUNTU),yes)
+	export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
+endif
+
 include /usr/share/dpkg/pkg-info.mk
 
 UPSTREAM_VERSION = $(shell echo $(DEB_VERSION_UPSTREAM) | sed -e 's/\+.*//')



View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal/commit/7569d359c9421066cf70f873ccd93e8e827f1785

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal/commit/7569d359c9421066cf70f873ccd93e8e827f1785
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20180629/57fec208/attachment-0001.html>