[Pkg-octave-commit] [octave-pkg-dev] 01/01: Revert changes related to the bindnow linker flag

[Rafael Laboissière]

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

rlaboiss-guest pushed a commit to branch master
in repository octave-pkg-dev.

commit 706af8be3b6412a958041cbd3fa33fb9dd6228d6
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Sun Feb 7 08:00:44 2016 -0200

    Revert changes related to the bindnow linker flag
    
    Gbp-Dch: Ignore
---
 debian/changelog | 9 ---------
 octave-pkg.mk    | 6 +-----
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5c1a2af..e286c80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,3 @@
-octave-pkg-dev (1.3.3) UNRELEASED; urgency=medium
-
-  * d/control: Use secure URIs in the Vcs-* fields
-  * octave-pkg.mk: Hardening issue with "bindnow" linker flag.
-    Tell the mkoctfile linker to resolve all symbols when the .oct file is
-    loaded.
-
- -- Rafael Laboissiere <rafael at laboissiere.net>  Sun, 31 Jan 2016 20:03:27 -0200
-
 octave-pkg-dev (1.3.2) unstable; urgency=medium
 
   * make-octave-forge-debpkg.in: Remove spurious print command
diff --git a/octave-pkg.mk b/octave-pkg.mk
index c40fee3..8b60813 100644
--- a/octave-pkg.mk
+++ b/octave-pkg.mk
@@ -62,11 +62,7 @@ export OCTAVE_HISTFILE=/dev/null
 # Export buildflags to the environment, they will be picked up by mkoctfile.
 # Link with --as-needed since that drastically reduces the number of linked
 # libraries.
-DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
-#  Also, link with the "bindnow" flag for telling the dynamic linker
-# to resolve all symbols when the .oct file is loaded (hardening issues).
-DEB_BUILD_MAINT_OPTIONS=hardening=+bindnow
-
+DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 # Oct-files ldflags are taken from the following variable

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave-pkg-dev.git