[Pkg-privacy-commits] [pidgin-otr] 169/255: Make ld hardening [DEP, ALSR] work on Windows builds.

[Ximin Luo]

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

infinity0 pushed a commit to branch experimental
in repository pidgin-otr.

commit 0da7cfd88f8b3e4a81061ee943246455263223db
Author: Ian Goldberg <iang at cs.uwaterloo.ca>
Date:   Sun Sep 9 09:50:47 2012 -0400

    Make ld hardening [DEP, ALSR] work on Windows builds.
    
    Thanks to Daniel Atallah <datallah at pidgin.im> for noticing that it
    wasn't working before.
---
 ChangeLog                        | 6 ++++++
 Makefile.mingw                   | 4 ++--
 packaging/windows/pidgin-otr.nsi | 3 ++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 74fad13..6e7f942 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-09-09
+
+	* Makefile.mingw: Make ld hardening [DEP, ALSR] work on Windows
+	builds.  Thanks to Daniel Atallah <datallah at pidgin.im>
+	for noticing that it wasn't working before.
+
 2012-09-06
 
 	* gtk-dialog.c:
diff --git a/Makefile.mingw b/Makefile.mingw
index 4a0bd8d..8e8ba1c 100644
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -65,8 +65,8 @@ CC_HARDENING_OPTIONS ?= -fstack-protector-all -Wstack-protector -fwrapv \
 	--param ssp-buffer-size=1 -fno-strict-overflow -Wall -Wextra \
 	-Wno-unused-parameter -Wno-missing-field-initializers -Wformat-security
 # In theory, we'd also like the following:
-# LD_HARDENING_OPTIONS ?= -dynamicbase --nxcompat -pie -z relro -z now
-LD_HARDENING_OPTIONS ?= --dynamicbase --nxcompat
+# LD_HARDENING_OPTIONS ?= -Wl,-dynamicbase -Wl,--nxcompat -pie -z relro -z now
+LD_HARDENING_OPTIONS ?= -Wl,--dynamicbase -Wl,--nxcompat
 
 CC = i586-mingw32msvc-gcc
 LDFLAGS = -Wl,--enable-auto-image-base $(LD_HARDENING_OPTIONS)
diff --git a/packaging/windows/pidgin-otr.nsi b/packaging/windows/pidgin-otr.nsi
index 26d8b30..fdcd74d 100644
--- a/packaging/windows/pidgin-otr.nsi
+++ b/packaging/windows/pidgin-otr.nsi
@@ -3,6 +3,7 @@
 ;
 ; known issue. installer induced uninstaller abortion causes overwrite
 ; by installer without uninstall.
+; v4.0.0-1 - Include linker hardening [DEP, ALSR] for Windows build
 ; v4.0.0   - New source version.
 ; v3.2.0   - New source version.
 ; v3.1.0   - New source version.  Install and uninstall i18n files.
@@ -26,7 +27,7 @@
 ; todo: SetBrandingImage
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "pidgin-otr"
-!define PRODUCT_VERSION "4.0.0-0"
+!define PRODUCT_VERSION "4.0.0-1"
 !define PRODUCT_PUBLISHER "Cypherpunks CA"
 !define PRODUCT_WEB_SITE "http://otr.cypherpunks.ca/"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/pidgin-otr.git