[Git][debian-gis-team/gdal][master] 2 commits: Fixup previous upload, to enable PIE only with 18.10+ (AKA Cosmic) Ubuntu releases and later

[Bas Couwenberg]

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


Commits:
86985e8c by Gianfranco Costamagna at 2018-06-29T20:47:24+02:00
Fixup previous upload, to enable PIE only with 18.10+ (AKA Cosmic) Ubuntu releases and later

- - - - -
43e30195 by Bas Couwenberg at 2018-06-29T20:50:12+02:00
Use more consistent variable name.

- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gdal (2.3.1+dfsg-2) UNRELEASED; urgency=medium
+
+  * Disable PIE for older ubuntu releases, PIE
+    works correctly with cosmic+ releases.
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Fri, 29 Jun 2018 18:13:09 +0200
+
 gdal (2.3.1+dfsg-1) unstable; urgency=medium
 
   * New upstream release.


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -50,6 +50,7 @@ Build-Depends: debhelper (>= 9.20160114),
                libxerces-c-dev,
                libxml2-dev,
                libzstd-dev,
+               lsb-release,
                netcdf-bin,
                patch,
                python-all-dev (>= 2.6.6-3~),


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -13,9 +13,12 @@ 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)
+DISTRIBUTION_RELEASE       := $(shell lsb_release -cs)
 
 ifeq ($(VENDOR_DERIVES_FROM_UBUNTU),yes)
-	export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
+  ifneq (,$(filter $(DISTRIBUTION_RELEASE),trusty xenial artful bionic))
+    export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
+  endif
 endif
 
 include /usr/share/dpkg/pkg-info.mk



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

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal/compare/7569d359c9421066cf70f873ccd93e8e827f1785...43e301951d5d26bcca61413dd64cf52f9c3b8078
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/57846f7c/attachment-0001.html>