[dpkg] 20/200: data: Improve PIE handling

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository dpkg.

commit 8ce8524a7268525b27e04cab550e92edd9ea18a5
Author: Guillem Jover <guillem at debian.org>
Date:   Thu Nov 10 04:55:02 2016 +0100

    data: Improve PIE handling
    
    - Rename the spec name cc1_options to self_spec.
    - Do not set PIE options if they have been negated, and do not reset
      them if they have been requested.
    
    Closes: #843791, #843826
---
 data/no-pie-compile.specs | 2 +-
 data/no-pie-link.specs    | 2 +-
 data/pie-compile.specs    | 4 ++--
 data/pie-link.specs       | 2 +-
 debian/changelog          | 6 ++++++
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/data/no-pie-compile.specs b/data/no-pie-compile.specs
index f85b394..2277b97 100644
--- a/data/no-pie-compile.specs
+++ b/data/no-pie-compile.specs
@@ -1,2 +1,2 @@
-*cc1_options:
+*self_spec:
 + %{!r:%{!fpie:%{!fPIE:%{!fpic:%{!fPIC:%{!fno-pic:-fno-PIE}}}}}}
diff --git a/data/no-pie-link.specs b/data/no-pie-link.specs
index 15243a0..54db649 100644
--- a/data/no-pie-link.specs
+++ b/data/no-pie-link.specs
@@ -1,2 +1,2 @@
 *self_spec:
-+ %{!shared:%{!r:-fno-PIE -no-pie}}
++ %{!shared:%{!r:%{!fPIE:%{!pie:-fno-PIE -no-pie}}}}
diff --git a/data/pie-compile.specs b/data/pie-compile.specs
index fc54bcb..74d8215 100644
--- a/data/pie-compile.specs
+++ b/data/pie-compile.specs
@@ -1,2 +1,2 @@
-*cc1_options:
-+ %{!r:%{!fpie:%{!fPIE:%{!fpic:%{!fPIC:%{!fno-pic:-fPIE}}}}}}
+*self_spec:
++ %{!r:%{!fpie:%{!fPIE:%{!fpic:%{!fPIC:%{!fno-pic:%{!fno-PIE:%{!no-pie:-fPIE}}}}}}}}
diff --git a/data/pie-link.specs b/data/pie-link.specs
index a5e0fe4..35d26e1 100644
--- a/data/pie-link.specs
+++ b/data/pie-link.specs
@@ -1,2 +1,2 @@
 *self_spec:
-+ %{!shared:%{!r:-fPIE -pie}}
++ %{!shared:%{!r:%{!fno-PIE:%{!no-pie:-fPIE -pie}}}}
diff --git a/debian/changelog b/debian/changelog
index 1143be4..ff40966 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,12 @@
 dpkg (1.18.14) UNRELEASED; urgency=medium
 
   [ Guillem Jover ]
+  * Improve PIE flags support:
+    - Rename the spec name cc1_options to self_spec.
+      Suggested by James Clarke <jrtc27 at jrtc27.com>
+    - Do not set PIE options if they have been negated, and do not reset
+      them if they have been requested.
+    Closes: #843791, #843826
   * Test suite:
     - Do not fail tests on missing fakeroot, just skip them.
   * Build system:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git