From 78692d1818f26f5b85980817d61d953dbe35daca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
Date: Mon, 18 Apr 2016 16:34:25 +0200
Subject: [PATCH] Used sane environment defaults in default configuration

  Resolves: rhbz#1323775
---
 exim-4.84.2-environment.patch | 23 +++++++++++++++++++++++
 exim.spec                     |  8 +++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 exim-4.84.2-environment.patch

diff --git a/exim-4.84.2-environment.patch b/exim-4.84.2-environment.patch
new file mode 100644
index 0000000..255c5ce
--- /dev/null
+++ b/exim-4.84.2-environment.patch
@@ -0,0 +1,23 @@
+diff --git a/src/configure.default b/src/configure.default
+index d1c94ad..d264c9a 100644
+--- a/src/configure.default
++++ b/src/configure.default
+@@ -334,6 +334,18 @@ timeout_frozen_after = 7d
+ # accept_8bitmime = false
+ 
+ 
++# Exim does not make use of environment variables itself. However,
++# libraries that Exim uses (e.g. LDAP) depend on specific environment settings.
++# There are two lists: keep_environment for the variables we trust, and
++# add_environment for variables we want to set to a specific value.
++# Note that TZ is handled separateley by the timezone runtime option
++# and TIMEZONE_DEFAULT buildtime option.
++
++keep_environment = ^LDAP
++add_environment = PATH=/usr/bin::/bin
++
++
++
+ ######################################################################
+ #                       ACL CONFIGURATION                            #
+ #         Specifies access control lists for incoming SMTP mail      #
diff --git a/exim.spec b/exim.spec
index bb30698..7c11c3e 100644
--- a/exim.spec
+++ b/exim.spec
@@ -13,7 +13,7 @@
 Summary: The exim mail transfer agent
 Name: exim
 Version: 4.84.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Url: http://www.exim.org/
 Group: System Environment/Daemons
@@ -57,6 +57,7 @@ Patch22: exim-4.82-greylist-conf.patch
 Patch23: exim-4.82-smarthost-config.patch
 Patch25: exim-4.82-dynlookup-config.patch
 Patch26: exim-4.84-mime-fix.patch
+Patch27: exim-4.84.2-environment.patch
 
 Requires: /etc/pki/tls/certs /etc/pki/tls/private
 Requires: /etc/aliases
@@ -190,6 +191,7 @@ greylisting unconditional.
 %patch23 -p1 -b .smarthost
 %patch25 -p1 -b .dynconfig
 %patch26 -p1 -b .mime-fix
+%patch27 -p1 -b .environment
 
 cp src/EDITME Local/Makefile
 sed -i 's@^# LOOKUP_MODULE_DIR=.*@LOOKUP_MODULE_DIR=%{_libdir}/exim/%{version}-%{release}/lookups@' Local/Makefile
@@ -517,6 +519,10 @@ test "$1"  = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null || :
 %{_sysconfdir}/cron.daily/greylist-tidy.sh
 
 %changelog
+* Mon Apr 18 2016 Jaroslav Škarvada <jskarvad@redhat.com> - 4.84.2-2
+- Used sane environment defaults in default configuration
+  Resolves: rhbz#1323775
+
 * Thu Mar 24 2016 Jaroslav Škarvada <jskarvad@redhat.com> - 4.84.2-1
 - New version
   Resolves: rhbz#1314118