[Git][debian-gis-team/gdal-grass][master] Drop Ubuntu PIE changes.

[Bas Couwenberg (@sebastic)]

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


Commits:
9c9f5c1e by Bas Couwenberg at 2022-04-21T20:01:15+02:00
Drop Ubuntu PIE changes.

- - - - -


3 changed files:

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


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+libgdal-grass (3.4.2-3) UNRELEASED; urgency=medium
+
+  * Drop Ubuntu PIE changes.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Thu, 21 Apr 2022 20:01:14 +0200
+
 libgdal-grass (3.4.2-2) unstable; urgency=medium
 
   * Update packaging for GRASS 8.0.1.


=====================================
debian/control
=====================================
@@ -9,7 +9,6 @@ Build-Depends: debhelper-compat (= 12),
                grass-dev (>= 8.0.1),
                libgdal-dev (>= 3.4.2),
                libpq-dev,
-               lsb-release,
                pkg-config
 Standards-Version: 4.6.0
 Vcs-Browser: https://salsa.debian.org/debian-gis-team/gdal-grass


=====================================
debian/rules
=====================================
@@ -10,16 +10,6 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 # Don't link with as-needed to prevent missing libraries
 export DEB_LDFLAGS_MAINT_APPEND=-Wl,--no-as-needed
 
-# 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)
-  ifneq (,$(filter $(DISTRIBUTION_RELEASE),xenial bionic))
-    export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
-  endif
-endif
-
 PKGNAME=$(shell grep Package: debian/control | head -1 | cut -d' ' -f2)
 GRASS=grass$(subst .,,$(shell pkg-config --modversion grass | cut -d. -f1,2))
 GRASS_ABI=grass$(subst .,,$(shell pkg-config --modversion grass | cut -d. -f1,2,3 | sed -e 's/RC/-/'))



View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal-grass/-/commit/9c9f5c1e32cc324116619485d5c36fc1ad90e6c9

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal-grass/-/commit/9c9f5c1e32cc324116619485d5c36fc1ad90e6c9
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/20220421/4d25247c/attachment-0001.htm>