[exim/f20] Do not override LFLAGS (problem reported by Todd Lyons)

Jaroslav Škarvada jskarvad at fedoraproject.org
Fri Oct 10 09:04:47 UTC 2014


commit b929a63329f8bff0b860cbe6b34ca4e7d0066057
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Fri Oct 10 11:04:37 2014 +0200

    Do not override LFLAGS (problem reported by Todd Lyons)

 exim-4.71-dlopen-localscan.patch |    2 +-
 exim.spec                        |    7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/exim-4.71-dlopen-localscan.patch b/exim-4.71-dlopen-localscan.patch
index 09ebad8..3c8399f 100644
--- a/exim-4.71-dlopen-localscan.patch
+++ b/exim-4.71-dlopen-localscan.patch
@@ -243,7 +243,7 @@
 +# linker flags.  Without it, the loaded .so won't be able to access any
 +# functions from exim.
 +
-+LFLAGS=-rdynamic -ldl
++LFLAGS=-rdynamic -ldl -pie
 +
 +#------------------------------------------------------------------------------
  # The default distribution of Exim contains only the plain text form of the
diff --git a/exim.spec b/exim.spec
index 0bacd4f..4f2cd97 100644
--- a/exim.spec
+++ b/exim.spec
@@ -14,7 +14,7 @@
 Summary: The exim mail transfer agent
 Name: exim
 Version: 4.80.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 Url: http://www.exim.org/
 Group: System Environment/Daemons
@@ -231,7 +231,7 @@ cp exim_monitor/EDITME Local/eximon.conf
 %else
 	export PIE=-fPIE
 %endif
-make LFLAGS=-pie _lib=%{_lib} FULLECHO=
+make _lib=%{_lib} FULLECHO=
 
 %if 0%{?buildsa}
 # build sa-exim
@@ -605,6 +605,9 @@ test "$1"  = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null 2>&1 || :
 %{_sysconfdir}/cron.daily/greylist-tidy.sh
 
 %changelog
+* Fri Oct 10 2014 Jaroslav Škarvada <jskarvad at redhat.com> - 4.80.1-8
+- Do not override LFLAGS (problem reported by Todd Lyons)
+
 * Wed Jul 23 2014 Jaroslav Škarvada <jskarvad at redhat.com> - 4.80.1-7
 - Only expand integers for integer math once
   Resolves: CVE-2014-2972


More information about the scm-commits mailing list