From ce65d65db6cae656fbb013d5c382233bda185175 Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@redhat.com>
Date: Thu, 20 Aug 2015 11:27:41 +0200
Subject: Enabled pie - rhbz#1246287

---
 firefox-mozconfig | 1 +
 firefox.spec      | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/firefox-mozconfig b/firefox-mozconfig
index c0cda82..8dd90c3 100644
--- a/firefox-mozconfig
+++ b/firefox-mozconfig
@@ -35,6 +35,7 @@ ac_add_options --enable-pulseaudio
 ac_add_options --with-system-icu
 ac_add_options --with-mozilla-api-keyfile=../mozilla-api-key
 ac_add_options --enable-release
+ac_add_options --enable-pie
 
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
diff --git a/firefox.spec b/firefox.spec
index 363ef6b..ab72923 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -84,7 +84,7 @@
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        40.0
-Release:        6%{?pre_tag}%{?dist}
+Release:        7%{?pre_tag}%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -422,7 +422,7 @@ MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS" | %{__sed} -e 's/-Wall//')
 MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -Wformat-security -Wformat -Werror=format-security"
 # Use hardened build?
 %if 0%{?fedora} > 22
-MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fPIC -pie -Wl,-z,relro -Wl,-z,now"
+MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fPIC -Wl,-z,relro -Wl,-z,now"
 %endif
 %if %{?debug_build}
 MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-O2//')
@@ -770,6 +770,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Thu Aug 20 2015 Martin Stransky <stransky@redhat.com> - 40.0-7
+- Enabled pie - rhbz#1246287
+
 * Thu Aug 20 2015 Petr Jasicek <pjasicek@redhat.com> - 40.0-6
 - Fix crash reporter layout under GTK3 - mozbz#1192243
 
-- 
cgit