From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Wed, 10 May 2017 06:19:25 +0000 (+0200)
Subject: - rel 2; backport commandline_checks_require_admin option (workaround for holes like... 
X-Git-Tag: auto/th/exim-4.89-2~1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fexim.git;a=commitdiff_plain;h=d0b966c

- rel 2; backport commandline_checks_require_admin option (workaround for holes like last one in wordpress)
---

diff --git a/exim.spec b/exim.spec
index 4c20b9f..f192f43 100644
--- a/exim.spec
+++ b/exim.spec
@@ -24,7 +24,7 @@ Summary(pl.UTF-8):	Agent Transferu Poczty Uniwersytetu w Cambridge
 Summary(pt_BR.UTF-8):	Servidor de correio eletrônico exim
 Name:		exim
 Version:	4.89
-Release:	1
+Release:	2
 Epoch:		2
 License:	GPL
 Group:		Networking/Daemons/SMTP
@@ -57,6 +57,7 @@ Patch3:		exim-defs.patch
 Patch4:		%{name}4-Makefile-Default.patch
 # http://marc.merlins.org/linux/exim/files/sa-exim-cvs/localscan_dlopen_exim_4.20_or_better.patch
 Patch5:		localscan_dlopen_%{name}_4.20_or_better.patch
+Patch6:		exim-commandline_checks_require_admin.patch
 
 Patch8:		%{name}-spam-timeout.patch
 
@@ -183,6 +184,7 @@ Pliki nagłówkowe dla Exima.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p2
 
 %patch8 -p1
 
diff --git a/exim4.conf b/exim4.conf
index 5a5f2bf..32ff33d 100644
--- a/exim4.conf
+++ b/exim4.conf
@@ -218,6 +218,10 @@ tls_advertise_hosts =
 
 never_users = root
 
+# This option restricts various basic checking features (like -b* options)
+# to require an administrative user.
+
+commandline_checks_require_admin = true
 
 # The setting below causes Exim to do a reverse DNS lookup on all incoming
 # IP calls, in order to get the true host name. If you feel this is too