[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: Your Request to join the Debian GIS Project group



Hello Sebastiaan,

>sorry, I never received your email :/
>I'll fix to enable PIE for cosmic+ releases, and send here a patch so you
>can apply it by yourself!


Please accept the following patch and git am && git push it if you like it!
(seems to be working correctly, the code is inspired from src:gcc-8)

thanks!

G.
From 425eea2030c7ea2656d45c99b8c4fe4cdf1f65e3 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Fri, 29 Jun 2018 19:24:09 +0200
Subject: [PATCH] Fixup previous upload, to enable PIE only with 18.10+ (AKA
 Cosmic) Ubuntu releases and later

---
 debian/changelog | 7 +++++++
 debian/control   | 1 +
 debian/rules     | 5 ++++-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a92f32b6..dfa94146 100644
--- 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@debian.org>  Fri, 29 Jun 2018 18:13:09 +0200
+
 gdal (2.3.1+dfsg-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 5be165ab..a5800dd9 100644
--- 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~),
diff --git a/debian/rules b/debian/rules
index b7d83f26..6f0b0167 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,10 +12,13 @@
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 # Disable PIE on Ubuntu where it's still problematic
+distrelease	:= $(shell lsb_release -cs)
 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
+  ifneq (,$(filter $(distrelease),trusty xenial artful bionic))
+    export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
+  endif
 endif
 
 include /usr/share/dpkg/pkg-info.mk
-- 
2.17.1


Reply to: