[Git][debian-gis-team/grass][master] Disable PIE only on older Ubuntu releases.

[Bas Couwenberg]

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


Commits:
5ca968e8 by Bas Couwenberg at 2018-06-29T20:53:05+02:00
Disable PIE only on older Ubuntu releases.

- - - - -


3 changed files:

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


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+grass (7.4.1-3) UNRELEASED; urgency=medium
+
+  * Disable PIE only on older Ubuntu releases.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Fri, 29 Jun 2018 20:52:47 +0200
+
 grass (7.4.1-2) unstable; urgency=medium
 
   * Actually move from experimental to unstable.


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -36,6 +36,7 @@ Build-Depends: autoconf2.13,
                libtiff-dev,
                libwxgtk3.0-dev,
                libxmu-dev,
+               lsb-release,
                netcdf-bin,
 # install optipng if compressing the PNG images in the programmers' manual
 #              optipng,


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -8,9 +8,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
 
 VERSION=$(shell echo `head -2 $(CURDIR)/include/VERSION` | sed -e 's/ //')



View it on GitLab: https://salsa.debian.org/debian-gis-team/grass/commit/5ca968e8e91afe97cd8b0f4f65579a6c00be0e80

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/grass/commit/5ca968e8e91afe97cd8b0f4f65579a6c00be0e80
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/07c79a90/attachment-0001.html>