rpms
/
exim
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New version 

Resolves: rhbz#1246923
- Updated and defuzzified patches
This commit is contained in:
Jaroslav Škarvada 2015-07-27 14:43:48 +02:00
parent e30dd5b6f9
commit 1329eeaea1
12 changed files with 87 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
exim-4.82-allow-filter.patch → exim-4.86-allow-filter.patch
View File

@ -1,8 +1,8 @@
diff --git a/src/configure.default b/src/configure.default diff --git a/src/configure.default b/src/configure.default
index 37a6a00..52e0536 100644 index 96ffe56..843edd2 100644
--- a/src/configure.default --- a/src/configure.default
+++ b/src/configure.default +++ b/src/configure.default
@@ -684,7 +684,7 @@ userforward: @@ -699,7 +699,7 @@ userforward:
# local_part_suffix = +* : -* # local_part_suffix = +* : -*
# local_part_suffix_optional # local_part_suffix_optional
file = $home/.forward file = $home/.forward

36
exim-4.85-config.patch → exim-4.86-config.patch
View File

@ -12,7 +12,7 @@ index eeb26ee..9cb6385 100755
echo "" >>$mft echo "" >>$mft
cat $mftt >> $mft cat $mftt >> $mft
diff --git a/src/EDITME b/src/EDITME diff --git a/src/EDITME b/src/EDITME
index 4a290a4..b4c60cb 100644 index d481122..9372675 100644
--- a/src/EDITME --- a/src/EDITME
+++ b/src/EDITME +++ b/src/EDITME
@@ -98,7 +98,7 @@ @@ -98,7 +98,7 @@
@ -121,7 +121,7 @@ index 4a290a4..b4c60cb 100644
# If you're using ClamAV and are backporting fixes to an old version, instead # If you're using ClamAV and are backporting fixes to an old version, instead
# of staying current (which is the more usual approach) then you may need to # of staying current (which is the more usual approach) then you may need to
@@ -576,7 +578,7 @@ FIXED_NEVER_USERS=root @@ -583,7 +585,7 @@ FIXED_NEVER_USERS=root
# CONFIGURE_OWNER setting, to specify a configuration file which is listed in # CONFIGURE_OWNER setting, to specify a configuration file which is listed in
# the TRUSTED_CONFIG_LIST file, then root privileges are not dropped by Exim. # the TRUSTED_CONFIG_LIST file, then root privileges are not dropped by Exim.
@ -130,7 +130,7 @@ index 4a290a4..b4c60cb 100644
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
@@ -621,15 +623,13 @@ FIXED_NEVER_USERS=root @@ -628,16 +630,14 @@ FIXED_NEVER_USERS=root
# included in the Exim binary. You will then need to set up the run time # included in the Exim binary. You will then need to set up the run time
# configuration to make use of the mechanism(s) selected. # configuration to make use of the mechanism(s) selected.
@ -143,6 +143,7 @@ index 4a290a4..b4c60cb 100644
-# AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi -# AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi
-# AUTH_PLAINTEXT=yes -# AUTH_PLAINTEXT=yes
-# AUTH_SPA=yes -# AUTH_SPA=yes
-# AUTH_TLS=yes
+AUTH_CRAM_MD5=yes +AUTH_CRAM_MD5=yes
+AUTH_CYRUS_SASL=yes +AUTH_CYRUS_SASL=yes
+AUTH_DOVECOT=yes +AUTH_DOVECOT=yes
@ -150,10 +151,11 @@ index 4a290a4..b4c60cb 100644
+AUTH_GSASL_PC=libgsasl +AUTH_GSASL_PC=libgsasl
+AUTH_PLAINTEXT=yes +AUTH_PLAINTEXT=yes
+AUTH_SPA=yes +AUTH_SPA=yes
+AUTH_TLS=yes
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
@@ -650,7 +650,7 @@ FIXED_NEVER_USERS=root @@ -658,7 +658,7 @@ FIXED_NEVER_USERS=root
# one that is set in the headers_charset option. The default setting is # one that is set in the headers_charset option. The default setting is
# defined by this setting: # defined by this setting:
@ -162,7 +164,7 @@ index 4a290a4..b4c60cb 100644
# If you are going to make use of $header_xxx expansions in your configuration # If you are going to make use of $header_xxx expansions in your configuration
# file, or if your users are going to use them in filter files, and the normal # file, or if your users are going to use them in filter files, and the normal
@@ -670,7 +670,7 @@ HEADERS_CHARSET="ISO-8859-1" @@ -678,7 +678,7 @@ HEADERS_CHARSET="ISO-8859-1"
# the Sieve filter support. For those OS where iconv() is known to be installed # the Sieve filter support. For those OS where iconv() is known to be installed
# as standard, the file in OS/Makefile-xxxx contains # as standard, the file in OS/Makefile-xxxx contains
# #
@ -171,7 +173,7 @@ index 4a290a4..b4c60cb 100644
# #
# If you are not using one of those systems, but have installed iconv(), you # If you are not using one of those systems, but have installed iconv(), you
# need to uncomment that line above. In some cases, you may find that iconv() # need to uncomment that line above. In some cases, you may find that iconv()
@@ -732,11 +732,11 @@ HEADERS_CHARSET="ISO-8859-1" @@ -740,11 +740,11 @@ HEADERS_CHARSET="ISO-8859-1"
# leave these settings commented out. # leave these settings commented out.
# This setting is required for any TLS support (either OpenSSL or GnuTLS) # This setting is required for any TLS support (either OpenSSL or GnuTLS)
@ -186,7 +188,7 @@ index 4a290a4..b4c60cb 100644
# Uncomment the first and either the second or the third of these if you # Uncomment the first and either the second or the third of these if you
# are using GnuTLS. If you have pkg-config, then the second, else the third. # are using GnuTLS. If you have pkg-config, then the second, else the third.
@@ -801,7 +801,7 @@ HEADERS_CHARSET="ISO-8859-1" @@ -809,7 +809,7 @@ HEADERS_CHARSET="ISO-8859-1"
# Once you have done this, "make install" will build the info files and # Once you have done this, "make install" will build the info files and
# install them in the directory you have defined. # install them in the directory you have defined.
@ -195,7 +197,7 @@ index 4a290a4..b4c60cb 100644
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
@@ -814,7 +814,7 @@ HEADERS_CHARSET="ISO-8859-1" @@ -822,7 +822,7 @@ HEADERS_CHARSET="ISO-8859-1"
# %s. This will be replaced by one of the strings "main", "panic", or "reject" # %s. This will be replaced by one of the strings "main", "panic", or "reject"
# to form the final file names. Some installations may want something like this: # to form the final file names. Some installations may want something like this:
@ -204,7 +206,7 @@ index 4a290a4..b4c60cb 100644
# which results in files with names /var/log/exim_mainlog, etc. The directory # which results in files with names /var/log/exim_mainlog, etc. The directory
# in which the log files are placed must exist; Exim does not try to create # in which the log files are placed must exist; Exim does not try to create
@@ -880,7 +880,7 @@ ZCAT_COMMAND=/usr/bin/zcat @@ -894,7 +894,7 @@ ZCAT_COMMAND=/usr/bin/zcat
# (version 5.004 or later) installed, set EXIM_PERL to perl.o. Using embedded # (version 5.004 or later) installed, set EXIM_PERL to perl.o. Using embedded
# Perl costs quite a lot of resources. Only do this if you really need it. # Perl costs quite a lot of resources. Only do this if you really need it.
@ -213,7 +215,7 @@ index 4a290a4..b4c60cb 100644
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
@@ -890,7 +890,7 @@ ZCAT_COMMAND=/usr/bin/zcat @@ -904,7 +904,7 @@ ZCAT_COMMAND=/usr/bin/zcat
# that the local_scan API is made available by the linker. You may also need # that the local_scan API is made available by the linker. You may also need
# to add -ldl to EXTRALIBS so that dlopen() is available to Exim. # to add -ldl to EXTRALIBS so that dlopen() is available to Exim.
@ -222,7 +224,7 @@ index 4a290a4..b4c60cb 100644
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
@@ -900,7 +900,7 @@ ZCAT_COMMAND=/usr/bin/zcat @@ -914,7 +914,7 @@ ZCAT_COMMAND=/usr/bin/zcat
# support, which is intended for use in conjunction with the SMTP AUTH # support, which is intended for use in conjunction with the SMTP AUTH
# facilities, is included only when requested by the following setting: # facilities, is included only when requested by the following setting:
@ -231,7 +233,7 @@ index 4a290a4..b4c60cb 100644
# You probably need to add -lpam to EXTRALIBS, and in some releases of # You probably need to add -lpam to EXTRALIBS, and in some releases of
# GNU/Linux -ldl is also needed. # GNU/Linux -ldl is also needed.
@@ -968,7 +968,7 @@ ZCAT_COMMAND=/usr/bin/zcat @@ -982,7 +982,7 @@ ZCAT_COMMAND=/usr/bin/zcat
# group. Once you have installed saslauthd, you should arrange for it to be # group. Once you have installed saslauthd, you should arrange for it to be
# started by root at boot time. # started by root at boot time.
@ -240,7 +242,7 @@ index 4a290a4..b4c60cb 100644
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
@@ -981,9 +981,9 @@ ZCAT_COMMAND=/usr/bin/zcat @@ -995,9 +995,9 @@ ZCAT_COMMAND=/usr/bin/zcat
# You may well also have to specify a local "include" file and an additional # You may well also have to specify a local "include" file and an additional
# library for TCP wrappers, so you probably need something like this: # library for TCP wrappers, so you probably need something like this:
# #
@ -253,7 +255,7 @@ index 4a290a4..b4c60cb 100644
# #
# but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM # but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM
# as well. # as well.
@@ -1035,7 +1035,7 @@ SYSTEM_ALIASES_FILE=/etc/aliases @@ -1049,7 +1049,7 @@ SYSTEM_ALIASES_FILE=/etc/aliases
# is "yes", as well as supporting line editing, a history of input lines in the # is "yes", as well as supporting line editing, a history of input lines in the
# current run is maintained. # current run is maintained.
@ -262,7 +264,7 @@ index 4a290a4..b4c60cb 100644
# You may need to add -ldl to EXTRALIBS when you set USE_READLINE=yes. # You may need to add -ldl to EXTRALIBS when you set USE_READLINE=yes.
# Note that this option adds to the size of the Exim binary, because the # Note that this option adds to the size of the Exim binary, because the
@@ -1045,7 +1045,7 @@ SYSTEM_ALIASES_FILE=/etc/aliases @@ -1059,7 +1059,7 @@ SYSTEM_ALIASES_FILE=/etc/aliases
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Uncomment this setting to include IPv6 support. # Uncomment this setting to include IPv6 support.
@ -271,7 +273,7 @@ index 4a290a4..b4c60cb 100644
############################################################################### ###############################################################################
# THINGS YOU ALMOST NEVER NEED TO MENTION # # THINGS YOU ALMOST NEVER NEED TO MENTION #
@@ -1066,13 +1066,13 @@ SYSTEM_ALIASES_FILE=/etc/aliases @@ -1080,13 +1080,13 @@ SYSTEM_ALIASES_FILE=/etc/aliases
# haven't got Perl, Exim will still build and run; you just won't be able to # haven't got Perl, Exim will still build and run; you just won't be able to
# use those utilities. # use those utilities.
@ -292,7 +294,7 @@ index 4a290a4..b4c60cb 100644
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
@@ -1272,7 +1272,7 @@ TMPDIR="/tmp" @@ -1286,7 +1286,7 @@ TMPDIR="/tmp"
# (process id) to a file so that it can easily be identified. The path of the # (process id) to a file so that it can easily be identified. The path of the
# file can be specified here. Some installations may want something like this: # file can be specified here. Some installations may want something like this:

4
exim-4.82-cyrus.patch → exim-4.86-cyrus.patch
View File

@ -1,8 +1,8 @@
diff --git a/src/configure.default b/src/configure.default diff --git a/src/configure.default b/src/configure.default
index b631a4d..153c77b 100644 index 97e9053..5393ca3 100644
--- a/src/configure.default --- a/src/configure.default
+++ b/src/configure.default +++ b/src/configure.default
@@ -721,6 +721,16 @@ address_reply: @@ -736,6 +736,16 @@ address_reply:
driver = autoreply driver = autoreply

22
exim-4.85-dlopen-localscan.patch → exim-4.86-dlopen-localscan.patch
View File

@ -1,8 +1,8 @@
diff --git a/src/EDITME b/src/EDITME diff --git a/src/EDITME b/src/EDITME
index b4c60cb..5f95c89 100644 index 9372675..813dd41 100644
--- a/src/EDITME --- a/src/EDITME
+++ b/src/EDITME +++ b/src/EDITME
@@ -786,6 +786,20 @@ TLS_LIBS=-lssl -lcrypto @@ -794,6 +794,20 @@ TLS_LIBS=-lssl -lcrypto
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
@ -24,10 +24,10 @@ index b4c60cb..5f95c89 100644
# documentation. Other forms are available separately. If you want to install # documentation. Other forms are available separately. If you want to install
# the documentation in "info" format, first fetch the Texinfo documentation # the documentation in "info" format, first fetch the Texinfo documentation
diff --git a/src/config.h.defaults b/src/config.h.defaults diff --git a/src/config.h.defaults b/src/config.h.defaults
index a0997a0..9dd84f8 100644 index c33e098..6983a83 100644
--- a/src/config.h.defaults --- a/src/config.h.defaults
+++ b/src/config.h.defaults +++ b/src/config.h.defaults
@@ -27,6 +27,8 @@ it's a default value. */ @@ -28,6 +28,8 @@ it's a default value. */
#define AUTH_VARS 3 #define AUTH_VARS 3
@ -37,10 +37,10 @@ index a0997a0..9dd84f8 100644
#define CONFIGURE_FILE #define CONFIGURE_FILE
diff --git a/src/globals.c b/src/globals.c diff --git a/src/globals.c b/src/globals.c
index fb705d9..efee424 100644 index 66baffe..3a35d01 100644
--- a/src/globals.c --- a/src/globals.c
+++ b/src/globals.c +++ b/src/globals.c
@@ -170,6 +170,10 @@ uschar *tls_verify_certificates= NULL; @@ -169,6 +169,10 @@ uschar *tls_verify_certificates= US"system";
uschar *tls_verify_hosts = NULL; uschar *tls_verify_hosts = NULL;
#endif #endif
@ -52,10 +52,10 @@ index fb705d9..efee424 100644
/* Per Recipient Data Response variables */ /* Per Recipient Data Response variables */
BOOL prdr_enable = FALSE; BOOL prdr_enable = FALSE;
diff --git a/src/globals.h b/src/globals.h diff --git a/src/globals.h b/src/globals.h
index f4baa0b..729426c 100644 index ab03302..cb2db5a 100644
--- a/src/globals.h --- a/src/globals.h
+++ b/src/globals.h +++ b/src/globals.h
@@ -130,6 +130,10 @@ extern uschar *tls_verify_certificates;/* Path for certificates to check */ @@ -131,6 +131,10 @@ extern uschar *tls_verify_certificates;/* Path for certificates to check */
extern uschar *tls_verify_hosts; /* Mandatory client verification */ extern uschar *tls_verify_hosts; /* Mandatory client verification */
#endif #endif
@ -63,9 +63,9 @@ index f4baa0b..729426c 100644
+extern uschar *local_scan_path; /* Path to local_scan() library */ +extern uschar *local_scan_path; /* Path to local_scan() library */
+#endif +#endif
+ +
#ifdef EXPERIMENTAL_DSN
extern uschar *dsn_envid; /* DSN envid string */ extern uschar *dsn_envid; /* DSN envid string */
extern int dsn_ret; /* DSN ret type*/ extern int dsn_ret; /* DSN ret type*/
extern const pcre *regex_DSN; /* For recognizing DSN settings */
diff --git a/src/local_scan.c b/src/local_scan.c diff --git a/src/local_scan.c b/src/local_scan.c
index 3500047..8599172 100644 index 3500047..8599172 100644
--- a/src/local_scan.c --- a/src/local_scan.c
@ -250,10 +250,10 @@ index 3500047..8599172 100644
+ +
/* End of local_scan.c */ /* End of local_scan.c */
diff --git a/src/readconf.c b/src/readconf.c diff --git a/src/readconf.c b/src/readconf.c
index 40af940..81be47f 100644 index 8a62d02..69c8c89 100644
--- a/src/readconf.c --- a/src/readconf.c
+++ b/src/readconf.c +++ b/src/readconf.c
@@ -293,6 +293,9 @@ static optionlist optionlist_config[] = { @@ -295,6 +295,9 @@ static optionlist optionlist_config[] = {
{ "local_from_prefix", opt_stringptr, &local_from_prefix }, { "local_from_prefix", opt_stringptr, &local_from_prefix },
{ "local_from_suffix", opt_stringptr, &local_from_suffix }, { "local_from_suffix", opt_stringptr, &local_from_suffix },
{ "local_interfaces", opt_stringptr, &local_interfaces }, { "local_interfaces", opt_stringptr, &local_interfaces },

14
exim-4.82-greylist-conf.patch → exim-4.86-greylist-conf.patch
View File

@ -1,5 +1,5 @@
diff --git a/src/configure.default b/src/configure.default diff --git a/src/configure.default b/src/configure.default
index 3728043..0126880 100644 index 915806e..8b1f3bf 100644
--- a/src/configure.default --- a/src/configure.default
+++ b/src/configure.default +++ b/src/configure.default
@@ -106,6 +106,7 @@ hostlist relay_from_hosts = localhost @@ -106,6 +106,7 @@ hostlist relay_from_hosts = localhost
@ -10,7 +10,7 @@ index 3728043..0126880 100644
acl_smtp_rcpt = acl_check_rcpt acl_smtp_rcpt = acl_check_rcpt
acl_smtp_data = acl_check_data acl_smtp_data = acl_check_data
acl_smtp_mime = acl_check_mime acl_smtp_mime = acl_check_mime
@@ -340,6 +341,29 @@ timeout_frozen_after = 7d @@ -355,6 +356,29 @@ timeout_frozen_after = 7d
begin acl begin acl
@ -40,7 +40,7 @@ index 3728043..0126880 100644
# This access control list is used for every RCPT command in an incoming # This access control list is used for every RCPT command in an incoming
# SMTP message. The tests are run in order until the address is either # SMTP message. The tests are run in order until the address is either
# accepted or denied. # accepted or denied.
@@ -460,7 +484,8 @@ acl_check_rcpt: @@ -475,7 +499,8 @@ acl_check_rcpt:
# There are no default checks on DNS black lists because the domains that # There are no default checks on DNS black lists because the domains that
# contain these lists are changing all the time. However, here are two # contain these lists are changing all the time. However, here are two
# examples of how you can get Exim to perform a DNS black list lookup at this # examples of how you can get Exim to perform a DNS black list lookup at this
@ -50,7 +50,7 @@ index 3728043..0126880 100644
# #
# deny message = rejected because $sender_host_address is in a black list at $dnslist_domain\n$dnslist_text # deny message = rejected because $sender_host_address is in a black list at $dnslist_domain\n$dnslist_text
# dnslists = black.list.example # dnslists = black.list.example
@@ -468,6 +493,10 @@ acl_check_rcpt: @@ -483,6 +508,10 @@ acl_check_rcpt:
# warn dnslists = black.list.example # warn dnslists = black.list.example
# add_header = X-Warning: $sender_host_address is in a black list at $dnslist_domain # add_header = X-Warning: $sender_host_address is in a black list at $dnslist_domain
# log_message = found in $dnslist_domain # log_message = found in $dnslist_domain
@ -61,7 +61,7 @@ index 3728043..0126880 100644
############################################################################# #############################################################################
############################################################################# #############################################################################
@@ -481,6 +510,10 @@ acl_check_rcpt: @@ -496,6 +525,10 @@ acl_check_rcpt:
# require verify = csa # require verify = csa
############################################################################# #############################################################################
@ -72,7 +72,7 @@ index 3728043..0126880 100644
# At this point, the address has passed all the checks that have been # At this point, the address has passed all the checks that have been
# configured, so we accept it unconditionally. # configured, so we accept it unconditionally.
@@ -506,6 +539,12 @@ acl_check_data: @@ -521,6 +554,12 @@ acl_check_data:
# deny condition = ${if !def:h_Message-ID: {1}} # deny condition = ${if !def:h_Message-ID: {1}}
# message = RFC2822 says that all mail SHOULD have a Message-ID header.\n\ # message = RFC2822 says that all mail SHOULD have a Message-ID header.\n\
# Most messages without it are spam, so your mail has been rejected. # Most messages without it are spam, so your mail has been rejected.
@ -85,7 +85,7 @@ index 3728043..0126880 100644
# Deny if the message contains a virus. Before enabling this check, you # Deny if the message contains a virus. Before enabling this check, you
# must install a virus scanner and set the av_scanner option above. # must install a virus scanner and set the av_scanner option above.
@@ -540,8 +579,30 @@ acl_check_data: @@ -555,8 +594,30 @@ acl_check_data:
# message = Your message scored $spam_score SpamAssassin point. Report follows:\n\ # message = Your message scored $spam_score SpamAssassin point. Report follows:\n\
# $spam_report # $spam_report

10
exim-4.82-pamconfig.patch → exim-4.86-pamconfig.patch
View File

@ -1,5 +1,5 @@
diff --git a/src/configure.default b/src/configure.default diff --git a/src/configure.default b/src/configure.default
index 153c77b..38f0f56 100644 index 5393ca3..dae5a54 100644
--- a/src/configure.default --- a/src/configure.default
+++ b/src/configure.default +++ b/src/configure.default
@@ -141,7 +141,7 @@ acl_smtp_data = acl_check_data @@ -141,7 +141,7 @@ acl_smtp_data = acl_check_data
@ -56,9 +56,9 @@ index 153c77b..38f0f56 100644
+# +#
+auth_advertise_hosts = +auth_advertise_hosts =
# The settings below, which are actually the same as the defaults in the # The settings below cause Exim to make RFC 1413 (ident) callbacks
# code, cause Exim to make RFC 1413 (ident) callbacks for all incoming SMTP # for all incoming SMTP calls. You can limit the hosts to which these
@@ -800,7 +818,7 @@ begin authenticators @@ -815,7 +833,7 @@ begin authenticators
# driver = plaintext # driver = plaintext
# server_set_id = $auth2 # server_set_id = $auth2
# server_prompts = : # server_prompts = :
@ -67,7 +67,7 @@ index 153c77b..38f0f56 100644
# server_advertise_condition = ${if def:tls_in_cipher } # server_advertise_condition = ${if def:tls_in_cipher }
# LOGIN authentication has traditional prompts and responses. There is no # LOGIN authentication has traditional prompts and responses. There is no
@@ -812,7 +830,7 @@ begin authenticators @@ -827,7 +845,7 @@ begin authenticators
# driver = plaintext # driver = plaintext
# server_set_id = $auth1 # server_set_id = $auth1
# server_prompts = <| Username: | Password: # server_prompts = <| Username: | Password:

6
exim-4.82-procmail.patch → exim-4.86-procmail.patch
View File

@ -1,8 +1,8 @@
diff --git a/src/configure.default b/src/configure.default diff --git a/src/configure.default b/src/configure.default
index 8b599d2..37a6a00 100644 index 5250b58..96ffe56 100644
--- a/src/configure.default --- a/src/configure.default
+++ b/src/configure.default +++ b/src/configure.default
@@ -692,6 +692,12 @@ userforward: @@ -707,6 +707,12 @@ userforward:
pipe_transport = address_pipe pipe_transport = address_pipe
reply_transport = address_reply reply_transport = address_reply
@ -15,7 +15,7 @@ index 8b599d2..37a6a00 100644
# This router matches local user mailboxes. If the router fails, the error # This router matches local user mailboxes. If the router fails, the error
# message is "Unknown user". # message is "Unknown user".
@@ -729,6 +735,16 @@ begin transports @@ -744,6 +750,16 @@ begin transports
remote_smtp: remote_smtp:
driver = smtp driver = smtp

6
exim-rhl.patch → exim-4.86-rhl.patch
View File

@ -1,8 +1,8 @@
diff --git a/src/configure.default b/src/configure.default diff --git a/src/configure.default b/src/configure.default
index 1274349..b631a4d 100644 index 3223bff..97e9053 100644
--- a/src/configure.default --- a/src/configure.default
+++ b/src/configure.default +++ b/src/configure.default
@@ -590,7 +590,7 @@ system_aliases: @@ -605,7 +605,7 @@ system_aliases:
driver = redirect driver = redirect
allow_fail allow_fail
allow_defer allow_defer
@ -11,7 +11,7 @@ index 1274349..b631a4d 100644
# user = exim # user = exim
file_transport = address_file file_transport = address_file
pipe_transport = address_pipe pipe_transport = address_pipe
@@ -687,8 +687,8 @@ local_delivery: @@ -702,8 +702,8 @@ local_delivery:
delivery_date_add delivery_date_add
envelope_to_add envelope_to_add
return_path_add return_path_add

8
exim-4.82-smarthost-config.patch → exim-4.86-smarthost-config.patch
View File

@ -1,8 +1,8 @@
diff --git a/src/configure.default b/src/configure.default diff --git a/src/configure.default b/src/configure.default
index 0126880..b7c30ac 100644 index 8b1f3bf..b2c8046 100644
--- a/src/configure.default --- a/src/configure.default
+++ b/src/configure.default +++ b/src/configure.default
@@ -796,6 +796,15 @@ begin transports @@ -811,6 +811,15 @@ begin transports
remote_smtp: remote_smtp:
driver = smtp driver = smtp
@ -18,7 +18,7 @@ index 0126880..b7c30ac 100644
# This transport invokes procmail to deliver mail # This transport invokes procmail to deliver mail
procmail: procmail:
driver = pipe driver = pipe
@@ -904,6 +913,21 @@ begin rewrite @@ -919,6 +928,21 @@ begin rewrite
# AUTHENTICATION CONFIGURATION # # AUTHENTICATION CONFIGURATION #
###################################################################### ######################################################################
@ -40,7 +40,7 @@ index 0126880..b7c30ac 100644
# The following authenticators support plaintext username/password # The following authenticators support plaintext username/password
# authentication using the standard PLAIN mechanism and the traditional # authentication using the standard PLAIN mechanism and the traditional
# but non-standard LOGIN mechanism, with Exim acting as the server. # but non-standard LOGIN mechanism, with Exim acting as the server.
@@ -919,7 +943,7 @@ begin rewrite @@ -934,7 +958,7 @@ begin rewrite
# The default RCPT ACL checks for successful authentication, and will accept # The default RCPT ACL checks for successful authentication, and will accept
# messages from authenticated users from anywhere on the Internet. # messages from authenticated users from anywhere on the Internet.

26
exim-4.83-spamdconf.patch → exim-4.86-spamdconf.patch
View File

@ -1,5 +1,5 @@
diff --git a/src/configure.default b/src/configure.default diff --git a/src/configure.default b/src/configure.default
index 38f0f56..8b599d2 100644 index dae5a54..5250b58 100644
--- a/src/configure.default --- a/src/configure.default
+++ b/src/configure.default +++ b/src/configure.default
@@ -108,6 +108,7 @@ hostlist relay_from_hosts = localhost @@ -108,6 +108,7 @@ hostlist relay_from_hosts = localhost
@ -19,7 +19,7 @@ index 38f0f56..8b599d2 100644
# For spam scanning, there is a similar option that defines the interface to # For spam scanning, there is a similar option that defines the interface to
@@ -403,7 +404,8 @@ acl_check_rcpt: @@ -418,7 +419,8 @@ acl_check_rcpt:
accept local_parts = postmaster accept local_parts = postmaster
domains = +local_domains domains = +local_domains
@ -29,7 +29,7 @@ index 38f0f56..8b599d2 100644
require verify = sender require verify = sender
@@ -495,27 +497,63 @@ acl_check_rcpt: @@ -510,27 +512,63 @@ acl_check_rcpt:
acl_check_data: acl_check_data:
@ -53,10 +53,16 @@ index 38f0f56..8b599d2 100644
- # you must install SpamAssassin. You may also need to set the spamd_address - # you must install SpamAssassin. You may also need to set the spamd_address
- # option above. - # option above.
+ # Bypass SpamAssassin checks if the message is too large. + # Bypass SpamAssassin checks if the message is too large.
+ # #
- # warn spam = nobody
- # add_header = X-Spam_score: $spam_score\n\
- # X-Spam_score_int: $spam_score_int\n\
- # X-Spam_bar: $spam_bar\n\
- # X-Spam_report: $spam_report
+ # accept condition = ${if >={$message_size}{100000} {1}} + # accept condition = ${if >={$message_size}{100000} {1}}
+ # add_header = X-Spam-Note: SpamAssassin run bypassed due to message size + # add_header = X-Spam-Note: SpamAssassin run bypassed due to message size
+
- # Accept the message.
+ # Run SpamAssassin, but allow for it to fail or time out. Add a warning message + # Run SpamAssassin, but allow for it to fail or time out. Add a warning message
+ # and accept the mail if that happens. Add an X-Spam-Flag: header if the SA + # and accept the mail if that happens. Add an X-Spam-Flag: header if the SA
+ # score exceeds the SA system threshold. + # score exceeds the SA system threshold.
@ -66,19 +72,13 @@ index 38f0f56..8b599d2 100644
+ # + #
+ # accept condition = ${if !def:spam_score_int {1}} + # accept condition = ${if !def:spam_score_int {1}}
+ # add_header = X-Spam-Note: SpamAssassin invocation failed + # add_header = X-Spam-Note: SpamAssassin invocation failed
# + #
- # warn spam = nobody
- # add_header = X-Spam_score: $spam_score\n\
- # X-Spam_score_int: $spam_score_int\n\
- # X-Spam_bar: $spam_bar\n\
- # X-Spam_report: $spam_report
+ +
+ # Unconditionally add score and report headers + # Unconditionally add score and report headers
+ # + #
+ # warn add_header = X-Spam-Score: $spam_score ($spam_bar)\n\ + # warn add_header = X-Spam-Score: $spam_score ($spam_bar)\n\
+ # X-Spam-Report: $spam_report + # X-Spam-Report: $spam_report
+
- # Accept the message.
+ # And reject if the SpamAssassin score is greater than ten + # And reject if the SpamAssassin score is greater than ten
+ # + #
+ # deny condition = ${if >{$spam_score_int}{100} {1}} + # deny condition = ${if >{$spam_score_int}{100} {1}}

29
exim.spec
View File

@ -14,8 +14,8 @@
Summary: The exim mail transfer agent Summary: The exim mail transfer agent
Name: exim Name: exim
Version: 4.85 Version: 4.86
Release: 5%{?dist} Release: 1%{?dist}
License: GPLv2+ License: GPLv2+
Url: http://www.exim.org/ Url: http://www.exim.org/
Group: System Environment/Daemons Group: System Environment/Daemons
@ -54,18 +54,18 @@ Source25: exim-gen-cert
Source26: clamd.exim.service Source26: clamd.exim.service
%endif %endif
Patch4: exim-rhl.patch Patch4: exim-4.86-rhl.patch
Patch6: exim-4.85-config.patch Patch6: exim-4.86-config.patch
Patch8: exim-4.82-libdir.patch Patch8: exim-4.82-libdir.patch
Patch12: exim-4.82-cyrus.patch Patch12: exim-4.86-cyrus.patch
Patch13: exim-4.82-pamconfig.patch Patch13: exim-4.86-pamconfig.patch
Patch14: exim-4.83-spamdconf.patch Patch14: exim-4.86-spamdconf.patch
Patch18: exim-4.85-dlopen-localscan.patch Patch18: exim-4.86-dlopen-localscan.patch
Patch19: exim-4.82-procmail.patch Patch19: exim-4.86-procmail.patch
Patch20: exim-4.82-allow-filter.patch Patch20: exim-4.86-allow-filter.patch
Patch21: exim-4.82-localhost-is-local.patch Patch21: exim-4.82-localhost-is-local.patch
Patch22: exim-4.82-greylist-conf.patch Patch22: exim-4.86-greylist-conf.patch
Patch23: exim-4.82-smarthost-config.patch Patch23: exim-4.86-smarthost-config.patch
Patch25: exim-4.82-dynlookup-config.patch Patch25: exim-4.82-dynlookup-config.patch
# Upstream ticket: http://bugs.exim.org/show_bug.cgi?id=1584 # Upstream ticket: http://bugs.exim.org/show_bug.cgi?id=1584
Patch26: exim-4.85-pic.patch Patch26: exim-4.85-pic.patch
@ -634,6 +634,11 @@ test "$1" = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null 2>&1 || :
%{_sysconfdir}/cron.daily/greylist-tidy.sh %{_sysconfdir}/cron.daily/greylist-tidy.sh
%changelog %changelog
* Mon Jul 27 2015 Jaroslav Škarvada <jskarvad@redhat.com> - 4.86-1
- New version
Resolves: rhbz#1246923
- Updated and defuzzified patches
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.85-5 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.85-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild

2
sources
View File

@ -1 +1 @@
ebae28762b6f125726283dc9434e8709 exim-4.85.tar.bz2 797f248ef3e0c0e2f178e915f88fc4e9 exim-4.86.tar.bz2