- rel 2; backport commandline_checks_require_admin option (workaround for holes like...

diff --git a/exim.spec b/exim.spec
index 4c20b9fb6889d51d8df0d617c1aa1a7749cbbf9f..f192f43d3bb6c7d23a19250f93158da901d8c1b5 100644 (file)
--- 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
 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
 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
 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
 
 
 Patch8:                %{name}-spam-timeout.patch
 


@@ -183,6 +184,7 @@ Pliki nagłówkowe dla Exima.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1

+%patch6 -p2

 
 %patch8 -p1
 
 
 %patch8 -p1
 

diff --git a/exim4.conf b/exim4.conf
index 5a5f2bf78035b3961e4e1b595b372edc90e7a8d6..32ff33d5b44db149d5e6765ab4fb58877b188376 100644 (file)
--- a/exim4.conf
+++ b/exim4.conf
@@ -218,6 +218,10 @@ tls_advertise_hosts =
 
 never_users = root
 
 
 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
 
 # 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