Fixed greylist-conf patch

Related: rhbz#1679274
This commit is contained in:
Jaroslav Škarvada 2019-03-04 12:07:09 +01:00
parent a3db3d174c
commit 2600fcec66
4 changed files with 22 additions and 16 deletions

View File

@ -1,5 +1,5 @@
diff --git a/src/configure.default b/src/configure.default
index 9242bac..439287a 100644
index 9242bac..eabf102 100644
--- a/src/configure.default
+++ b/src/configure.default
@@ -119,6 +119,7 @@ hostlist relay_from_hosts = localhost
@ -85,9 +85,9 @@ index 9242bac..439287a 100644
# Deny if the message contains a virus. Before enabling this check, you
# must install a virus scanner and set the av_scanner option above.
@@ -669,8 +708,30 @@ acl_check_mime:
{\N(\.exe|\.pif|\.bat|\.scr|\.lnk|\.com)$\N} \
{1}{0}}
@@ -658,8 +697,31 @@ acl_check_data:
# message = Your message scored $spam_score SpamAssassin point. Report follows:\n\
# $spam_report
+ # Trigger greylisting (if enabled) if the SpamAssassin score is greater than 0.5
+ #
@ -113,6 +113,7 @@ index 9242bac..439287a 100644
+# To enable the greylisting, also uncomment this line:
+# .include /etc/exim/exim-greylist.conf.inc
+
acl_check_mime:
######################################################################
# ROUTERS CONFIGURATION #
# File extension filtering.

View File

@ -1,8 +1,8 @@
diff --git a/src/configure.default b/src/configure.default
index 439287a..241a961 100644
index eabf102..db2d98a 100644
--- a/src/configure.default
+++ b/src/configure.default
@@ -933,6 +933,15 @@ remote_smtp:
@@ -934,6 +934,15 @@ remote_smtp:
hosts_try_prdr = *
.endif
@ -18,7 +18,7 @@ index 439287a..241a961 100644
# This transport invokes procmail to deliver mail
procmail:
driver = pipe
@@ -1082,6 +1091,21 @@ begin rewrite
@@ -1083,6 +1092,21 @@ begin rewrite
# AUTHENTICATION CONFIGURATION #
######################################################################
@ -40,7 +40,7 @@ index 439287a..241a961 100644
# The following authenticators support plaintext username/password
# authentication using the standard PLAIN mechanism and the traditional
# but non-standard LOGIN mechanism, with Exim acting as the server.
@@ -1097,7 +1121,7 @@ begin rewrite
@@ -1098,7 +1122,7 @@ begin rewrite
# The default RCPT ACL checks for successful authentication, and will accept
# messages from authenticated users from anywhere on the Internet.

View File

@ -1,6 +1,8 @@
--- a/src/EDITME 2018-02-07 09:39:41.449345768 +0100
+++ b/src/EDITME 2018-02-07 09:40:08.993393374 +0100
@@ -942,12 +942,12 @@
diff --git a/src/EDITME b/src/EDITME
index 4e3a9a3..e3b98e9 100644
--- a/src/EDITME
+++ b/src/EDITME
@@ -972,12 +972,12 @@ SUPPORT_PAM=yes
# If you may want to use outbound (client-side) proxying, using Socks5,
# uncomment the line below.
@ -15,4 +17,3 @@
#------------------------------------------------------------------------------

View File

@ -14,7 +14,7 @@
Summary: The exim mail transfer agent
Name: exim
Version: 4.92
Release: 3%{?dist}
Release: 4%{?dist}
License: GPLv2+
Url: http://www.exim.org/
Provides: MTA smtpd smtpdaemon server(smtp)
@ -60,7 +60,7 @@ Patch26: exim-4.85-pic.patch
Patch27: exim-4.92-environment.patch
# Workaround for NIS removal from glibc, bug 1534920
Patch33: exim-4.90.1-nsl-fix.patch
Patch40: exim-4.89-support-proxies.patch
Patch40: exim-4.92-support-proxies.patch
Requires: /etc/pki/tls/certs /etc/pki/tls/private
Requires: /etc/aliases
@ -577,6 +577,10 @@ test "$1" = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null 2>&1 || :
%{_sysconfdir}/cron.daily/greylist-tidy.sh
%changelog
* Mon Mar 4 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 4.92-4
- Fixed greylist-conf patch
Related: rhbz#1679274
* Sat Mar 2 2019 Tim Landscheidt <tim@tim-landscheidt.de> - 4.92-3
- Fix syntax error in exim.conf (#1679274)
- Use properly compressed empty mailq.1.gz as ghost file