From a4234ab10286486cd555ac63b19545f3ea4935bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Sun, 10 Apr 2016 23:30:22 +0200 Subject: [PATCH] New version Resolves: rhbz#1325557 --- ...lter.patch => exim-4.87-allow-filter.patch | 4 +- ....86-config.patch => exim-4.87-config.patch | 49 ++++++++++--------- ...-4.86-cyrus.patch => exim-4.87-cyrus.patch | 4 +- ....patch => exim-4.87-dlopen-localscan.patch | 27 +++++----- ....patch => exim-4.87-dynlookup-config.patch | 6 +-- ...onf.patch => exim-4.87-greylist-conf.patch | 16 +++--- ...atch => exim-4.87-localhost-is-local.patch | 4 +- ...mconfig.patch => exim-4.87-pamconfig.patch | 14 +++--- ...procmail.patch => exim-4.87-procmail.patch | 8 +-- exim-4.86-rhl.patch => exim-4.87-rhl.patch | 6 +-- ....patch => exim-4.87-smarthost-config.patch | 10 ++-- ...amdconf.patch => exim-4.87-spamdconf.patch | 14 +++--- exim.spec | 30 +++++++----- sources | 2 +- 14 files changed, 100 insertions(+), 94 deletions(-) rename exim-4.86-allow-filter.patch => exim-4.87-allow-filter.patch (81%) rename exim-4.86-config.patch => exim-4.87-config.patch (90%) rename exim-4.86-cyrus.patch => exim-4.87-cyrus.patch (90%) rename exim-4.86.2-dlopen-localscan.patch => exim-4.87-dlopen-localscan.patch (93%) rename exim-4.82-dynlookup-config.patch => exim-4.87-dynlookup-config.patch (86%) rename exim-4.86-greylist-conf.patch => exim-4.87-greylist-conf.patch (93%) rename exim-4.82-localhost-is-local.patch => exim-4.87-localhost-is-local.patch (90%) rename exim-4.86-pamconfig.patch => exim-4.87-pamconfig.patch (90%) rename exim-4.86-procmail.patch => exim-4.87-procmail.patch (83%) rename exim-4.86-rhl.patch => exim-4.87-rhl.patch (84%) rename exim-4.86-smarthost-config.patch => exim-4.87-smarthost-config.patch (88%) rename exim-4.86-spamdconf.patch => exim-4.87-spamdconf.patch (93%) diff --git a/exim-4.86-allow-filter.patch b/exim-4.87-allow-filter.patch similarity index 81% rename from exim-4.86-allow-filter.patch rename to exim-4.87-allow-filter.patch index ed83b69..c3a94f3 100644 --- a/exim-4.86-allow-filter.patch +++ b/exim-4.87-allow-filter.patch @@ -1,8 +1,8 @@ diff --git a/src/configure.default b/src/configure.default -index 96ffe56..843edd2 100644 +index e4ca5b9..d1ce2f1 100644 --- a/src/configure.default +++ b/src/configure.default -@@ -699,7 +699,7 @@ userforward: +@@ -722,7 +722,7 @@ userforward: # local_part_suffix = +* : -* # local_part_suffix_optional file = $home/.forward diff --git a/exim-4.86-config.patch b/exim-4.87-config.patch similarity index 90% rename from exim-4.86-config.patch rename to exim-4.87-config.patch index 26a3059..78bddc4 100644 --- a/exim-4.86-config.patch +++ b/exim-4.87-config.patch @@ -1,8 +1,8 @@ diff --git a/scripts/Configure-Makefile b/scripts/Configure-Makefile -index eeb26ee..9cb6385 100755 +index 4aa7d76..3a5263c 100755 --- a/scripts/Configure-Makefile +++ b/scripts/Configure-Makefile -@@ -249,7 +249,7 @@ if [ "${EXIM_PERL}" != "" ] ; then +@@ -253,7 +253,7 @@ if [ "${EXIM_PERL}" != "" ] ; then mv $mft $mftt echo "PERL_CC=`$PERL_COMMAND -MConfig -e 'print $Config{cc}'`" >>$mft @@ -12,7 +12,7 @@ index eeb26ee..9cb6385 100755 echo "" >>$mft cat $mftt >> $mft diff --git a/src/EDITME b/src/EDITME -index d481122..9372675 100644 +index d852103..bbb7527 100644 --- a/src/EDITME +++ b/src/EDITME @@ -98,7 +98,7 @@ @@ -73,7 +73,7 @@ index d481122..9372675 100644 #------------------------------------------------------------------------------ -@@ -296,18 +296,20 @@ LOOKUP_DBM=yes +@@ -301,19 +301,21 @@ LOOKUP_DBM=yes LOOKUP_LSEARCH=yes LOOKUP_DNSDB=yes @@ -96,15 +96,16 @@ index d481122..9372675 100644 # LOOKUP_ORACLE=yes -# LOOKUP_PASSWD=yes -# LOOKUP_PGSQL=yes --# LOOKUP_SQLITE=yes --# LOOKUP_SQLITE_PC=sqlite3 +LOOKUP_PASSWD=yes +LOOKUP_PGSQL=yes + # LOOKUP_REDIS=yes +-# LOOKUP_SQLITE=yes +-# LOOKUP_SQLITE_PC=sqlite3 +LOOKUP_SQLITE=yes # LOOKUP_WHOSON=yes # These two settings are obsolete; all three lookups are compiled when -@@ -383,14 +385,14 @@ EXIM_MONITOR=eximon.bin +@@ -390,14 +392,14 @@ EXIM_MONITOR=eximon.bin # and the MIME ACL. Please read the documentation to learn more about these # features. @@ -119,9 +120,9 @@ index d481122..9372675 100644 -# WITH_OLD_DEMIME=yes +WITH_OLD_DEMIME=yes + #------------------------------------------------------------------------------ # 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 -@@ -583,7 +585,7 @@ FIXED_NEVER_USERS=root +@@ -573,7 +575,7 @@ FIXED_NEVER_USERS=root # 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. @@ -130,7 +131,7 @@ index d481122..9372675 100644 #------------------------------------------------------------------------------ -@@ -628,16 +630,14 @@ FIXED_NEVER_USERS=root +@@ -618,16 +620,14 @@ FIXED_NEVER_USERS=root # included in the Exim binary. You will then need to set up the run time # configuration to make use of the mechanism(s) selected. @@ -155,7 +156,7 @@ index d481122..9372675 100644 #------------------------------------------------------------------------------ -@@ -658,7 +658,7 @@ FIXED_NEVER_USERS=root +@@ -648,7 +648,7 @@ FIXED_NEVER_USERS=root # one that is set in the headers_charset option. The default setting is # defined by this setting: @@ -164,7 +165,7 @@ index d481122..9372675 100644 # 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 -@@ -678,7 +678,7 @@ HEADERS_CHARSET="ISO-8859-1" +@@ -668,7 +668,7 @@ HEADERS_CHARSET="ISO-8859-1" # the Sieve filter support. For those OS where iconv() is known to be installed # as standard, the file in OS/Makefile-xxxx contains # @@ -173,7 +174,7 @@ index d481122..9372675 100644 # # 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() -@@ -740,11 +740,11 @@ HEADERS_CHARSET="ISO-8859-1" +@@ -730,11 +730,11 @@ HEADERS_CHARSET="ISO-8859-1" # leave these settings commented out. # This setting is required for any TLS support (either OpenSSL or GnuTLS) @@ -188,7 +189,7 @@ index d481122..9372675 100644 # 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. -@@ -809,7 +809,7 @@ HEADERS_CHARSET="ISO-8859-1" +@@ -799,7 +799,7 @@ HEADERS_CHARSET="ISO-8859-1" # Once you have done this, "make install" will build the info files and # install them in the directory you have defined. @@ -197,7 +198,7 @@ index d481122..9372675 100644 #------------------------------------------------------------------------------ -@@ -822,7 +822,7 @@ HEADERS_CHARSET="ISO-8859-1" +@@ -812,7 +812,7 @@ HEADERS_CHARSET="ISO-8859-1" # %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: @@ -206,7 +207,7 @@ index d481122..9372675 100644 # 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 -@@ -894,7 +894,7 @@ ZCAT_COMMAND=/usr/bin/zcat +@@ -884,7 +884,7 @@ ZCAT_COMMAND=/usr/bin/zcat # (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. @@ -215,7 +216,7 @@ index d481122..9372675 100644 #------------------------------------------------------------------------------ -@@ -904,7 +904,7 @@ ZCAT_COMMAND=/usr/bin/zcat +@@ -894,7 +894,7 @@ ZCAT_COMMAND=/usr/bin/zcat # 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. @@ -224,7 +225,7 @@ index d481122..9372675 100644 #------------------------------------------------------------------------------ -@@ -914,7 +914,7 @@ ZCAT_COMMAND=/usr/bin/zcat +@@ -904,7 +904,7 @@ ZCAT_COMMAND=/usr/bin/zcat # support, which is intended for use in conjunction with the SMTP AUTH # facilities, is included only when requested by the following setting: @@ -233,7 +234,7 @@ index d481122..9372675 100644 # You probably need to add -lpam to EXTRALIBS, and in some releases of # GNU/Linux -ldl is also needed. -@@ -982,7 +982,7 @@ ZCAT_COMMAND=/usr/bin/zcat +@@ -998,7 +998,7 @@ ZCAT_COMMAND=/usr/bin/zcat # group. Once you have installed saslauthd, you should arrange for it to be # started by root at boot time. @@ -242,7 +243,7 @@ index d481122..9372675 100644 #------------------------------------------------------------------------------ -@@ -995,9 +995,9 @@ ZCAT_COMMAND=/usr/bin/zcat +@@ -1011,9 +1011,9 @@ ZCAT_COMMAND=/usr/bin/zcat # 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: # @@ -255,7 +256,7 @@ index d481122..9372675 100644 # # but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM # as well. -@@ -1049,7 +1049,7 @@ SYSTEM_ALIASES_FILE=/etc/aliases +@@ -1065,7 +1065,7 @@ SYSTEM_ALIASES_FILE=/etc/aliases # is "yes", as well as supporting line editing, a history of input lines in the # current run is maintained. @@ -264,7 +265,7 @@ index d481122..9372675 100644 # 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 -@@ -1059,7 +1059,7 @@ SYSTEM_ALIASES_FILE=/etc/aliases +@@ -1075,7 +1075,7 @@ SYSTEM_ALIASES_FILE=/etc/aliases #------------------------------------------------------------------------------ # Uncomment this setting to include IPv6 support. @@ -273,7 +274,7 @@ index d481122..9372675 100644 ############################################################################### # THINGS YOU ALMOST NEVER NEED TO MENTION # -@@ -1080,13 +1080,13 @@ SYSTEM_ALIASES_FILE=/etc/aliases +@@ -1096,13 +1096,13 @@ SYSTEM_ALIASES_FILE=/etc/aliases # haven't got Perl, Exim will still build and run; you just won't be able to # use those utilities. @@ -294,7 +295,7 @@ index d481122..9372675 100644 #------------------------------------------------------------------------------ -@@ -1286,7 +1286,7 @@ TMPDIR="/tmp" +@@ -1304,7 +1304,7 @@ EXIM_TMPDIR="/tmp" # (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: diff --git a/exim-4.86-cyrus.patch b/exim-4.87-cyrus.patch similarity index 90% rename from exim-4.86-cyrus.patch rename to exim-4.87-cyrus.patch index 07f3407..97f2710 100644 --- a/exim-4.86-cyrus.patch +++ b/exim-4.87-cyrus.patch @@ -1,8 +1,8 @@ diff --git a/src/configure.default b/src/configure.default -index 97e9053..5393ca3 100644 +index 12ed1e0..0af6fb8 100644 --- a/src/configure.default +++ b/src/configure.default -@@ -736,6 +736,16 @@ address_reply: +@@ -763,6 +763,16 @@ address_reply: driver = autoreply diff --git a/exim-4.86.2-dlopen-localscan.patch b/exim-4.87-dlopen-localscan.patch similarity index 93% rename from exim-4.86.2-dlopen-localscan.patch rename to exim-4.87-dlopen-localscan.patch index b3ab1fc..6712860 100644 --- a/exim-4.86.2-dlopen-localscan.patch +++ b/exim-4.87-dlopen-localscan.patch @@ -1,8 +1,8 @@ diff --git a/src/EDITME b/src/EDITME -index 9372675..813dd41 100644 +index bbb7527..df3dcc8 100644 --- a/src/EDITME +++ b/src/EDITME -@@ -794,6 +794,20 @@ TLS_LIBS=-lssl -lcrypto +@@ -784,6 +784,20 @@ TLS_LIBS=-lssl -lcrypto #------------------------------------------------------------------------------ @@ -24,7 +24,7 @@ index 9372675..813dd41 100644 # documentation. Other forms are available separately. If you want to install # the documentation in "info" format, first fetch the Texinfo documentation diff --git a/src/config.h.defaults b/src/config.h.defaults -index c33e098..6983a83 100644 +index 266c268..6a4a1f8 100644 --- a/src/config.h.defaults +++ b/src/config.h.defaults @@ -28,6 +28,8 @@ it's a default value. */ @@ -37,11 +37,11 @@ index c33e098..6983a83 100644 #define CONFIGURE_FILE diff --git a/src/globals.c b/src/globals.c -index 1dbc015..10fb3e4 100644 +index ec2685b..f8375bf 100644 --- a/src/globals.c +++ b/src/globals.c -@@ -169,6 +169,10 @@ uschar *tls_verify_certificates= US"system"; - uschar *tls_verify_hosts = NULL; +@@ -171,6 +171,10 @@ uschar *tls_verify_hosts = NULL; + uschar *tls_advertise_hosts = NULL; #endif +#ifdef DLOPEN_LOCAL_SCAN @@ -52,20 +52,21 @@ index 1dbc015..10fb3e4 100644 /* Per Recipient Data Response variables */ BOOL prdr_enable = FALSE; diff --git a/src/globals.h b/src/globals.h -index f3e884b..7063d97 100644 +index 57a5695..0a60902 100644 --- a/src/globals.h +++ b/src/globals.h -@@ -131,6 +131,10 @@ extern uschar *tls_verify_certificates;/* Path for certificates to check */ +@@ -129,6 +129,11 @@ extern uschar *tls_try_verify_hosts; /* Optional client verification */ + extern uschar *tls_verify_certificates;/* Path for certificates to check */ extern uschar *tls_verify_hosts; /* Mandatory client verification */ #endif - ++ +#ifdef DLOPEN_LOCAL_SCAN +extern uschar *local_scan_path; /* Path to local_scan() library */ +#endif + + extern uschar *tls_advertise_hosts; /* host for which TLS is advertised */ + extern uschar *dsn_envid; /* DSN envid string */ - 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 index 3500047..8599172 100644 --- a/src/local_scan.c @@ -250,10 +251,10 @@ index 3500047..8599172 100644 + /* End of local_scan.c */ diff --git a/src/readconf.c b/src/readconf.c -index 1de6bd7..d1e5142 100644 +index 5ca6a84..f1ec503 100644 --- a/src/readconf.c +++ b/src/readconf.c -@@ -300,6 +300,9 @@ static optionlist optionlist_config[] = { +@@ -317,6 +317,9 @@ static optionlist optionlist_config[] = { { "local_from_prefix", opt_stringptr, &local_from_prefix }, { "local_from_suffix", opt_stringptr, &local_from_suffix }, { "local_interfaces", opt_stringptr, &local_interfaces }, diff --git a/exim-4.82-dynlookup-config.patch b/exim-4.87-dynlookup-config.patch similarity index 86% rename from exim-4.82-dynlookup-config.patch rename to exim-4.87-dynlookup-config.patch index a768af2..d922078 100644 --- a/exim-4.82-dynlookup-config.patch +++ b/exim-4.87-dynlookup-config.patch @@ -1,8 +1,8 @@ diff --git a/src/EDITME b/src/EDITME -index 07f8211..7d7a4a4 100644 +index df3dcc8..de01565 100644 --- a/src/EDITME +++ b/src/EDITME -@@ -301,14 +301,16 @@ LOOKUP_DSEARCH=yes +@@ -306,14 +306,16 @@ LOOKUP_DSEARCH=yes # LOOKUP_IBASE=yes LOOKUP_LDAP=yes LDAP_LIB_TYPE=OPENLDAP2 @@ -20,6 +20,6 @@ index 07f8211..7d7a4a4 100644 LOOKUP_PASSWD=yes -LOOKUP_PGSQL=yes +LOOKUP_PGSQL=2 + # LOOKUP_REDIS=yes LOOKUP_SQLITE=yes # LOOKUP_WHOSON=yes - diff --git a/exim-4.86-greylist-conf.patch b/exim-4.87-greylist-conf.patch similarity index 93% rename from exim-4.86-greylist-conf.patch rename to exim-4.87-greylist-conf.patch index fc20587..0741a3e 100644 --- a/exim-4.86-greylist-conf.patch +++ b/exim-4.87-greylist-conf.patch @@ -1,8 +1,8 @@ diff --git a/src/configure.default b/src/configure.default -index 915806e..8b1f3bf 100644 +index 1f10008..40b3bb2 100644 --- a/src/configure.default +++ b/src/configure.default -@@ -106,6 +106,7 @@ hostlist relay_from_hosts = localhost +@@ -107,6 +107,7 @@ hostlist relay_from_hosts = localhost # manual for details. The lists above are used in the access control lists for # checking incoming messages. The names of these ACLs are defined here: @@ -10,7 +10,7 @@ index 915806e..8b1f3bf 100644 acl_smtp_rcpt = acl_check_rcpt acl_smtp_data = acl_check_data acl_smtp_mime = acl_check_mime -@@ -355,6 +356,29 @@ timeout_frozen_after = 7d +@@ -368,6 +369,29 @@ timeout_frozen_after = 7d begin acl @@ -40,7 +40,7 @@ index 915806e..8b1f3bf 100644 # 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 # accepted or denied. -@@ -475,7 +499,8 @@ acl_check_rcpt: +@@ -493,7 +517,8 @@ acl_check_rcpt: # 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 # examples of how you can get Exim to perform a DNS black list lookup at this @@ -50,7 +50,7 @@ index 915806e..8b1f3bf 100644 # # deny message = rejected because $sender_host_address is in a black list at $dnslist_domain\n$dnslist_text # dnslists = black.list.example -@@ -483,6 +508,10 @@ acl_check_rcpt: +@@ -501,6 +526,10 @@ acl_check_rcpt: # warn dnslists = black.list.example # add_header = X-Warning: $sender_host_address is in a black list at $dnslist_domain # log_message = found in $dnslist_domain @@ -61,7 +61,7 @@ index 915806e..8b1f3bf 100644 ############################################################################# ############################################################################# -@@ -496,6 +525,10 @@ acl_check_rcpt: +@@ -514,6 +543,10 @@ acl_check_rcpt: # require verify = csa ############################################################################# @@ -72,7 +72,7 @@ index 915806e..8b1f3bf 100644 # At this point, the address has passed all the checks that have been # configured, so we accept it unconditionally. -@@ -521,6 +554,12 @@ acl_check_data: +@@ -544,6 +577,12 @@ acl_check_data: # deny condition = ${if !def:h_Message-ID: {1}} # 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. @@ -85,7 +85,7 @@ index 915806e..8b1f3bf 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. -@@ -555,8 +594,30 @@ acl_check_data: +@@ -578,8 +617,30 @@ acl_check_data: # message = Your message scored $spam_score SpamAssassin point. Report follows:\n\ # $spam_report diff --git a/exim-4.82-localhost-is-local.patch b/exim-4.87-localhost-is-local.patch similarity index 90% rename from exim-4.82-localhost-is-local.patch rename to exim-4.87-localhost-is-local.patch index 47cff55..5810698 100644 --- a/exim-4.82-localhost-is-local.patch +++ b/exim-4.87-localhost-is-local.patch @@ -1,8 +1,8 @@ diff --git a/src/configure.default b/src/configure.default -index 52e0536..3728043 100644 +index d1ce2f1..1f10008 100644 --- a/src/configure.default +++ b/src/configure.default -@@ -54,7 +54,7 @@ +@@ -55,7 +55,7 @@ # +local_domains, +relay_to_domains, and +relay_from_hosts, respectively. They # are all colon-separated lists: diff --git a/exim-4.86-pamconfig.patch b/exim-4.87-pamconfig.patch similarity index 90% rename from exim-4.86-pamconfig.patch rename to exim-4.87-pamconfig.patch index 51691ca..c068a96 100644 --- a/exim-4.86-pamconfig.patch +++ b/exim-4.87-pamconfig.patch @@ -1,8 +1,8 @@ diff --git a/src/configure.default b/src/configure.default -index 5393ca3..dae5a54 100644 +index 0af6fb8..531435b 100644 --- a/src/configure.default +++ b/src/configure.default -@@ -141,7 +141,7 @@ acl_smtp_data = acl_check_data +@@ -142,7 +142,7 @@ acl_smtp_data = acl_check_data # Allow any client to use TLS. @@ -11,7 +11,7 @@ index 5393ca3..dae5a54 100644 # Specify the location of the Exim server's TLS certificate and private key. # The private key must not be encrypted (password protected). You can put -@@ -149,8 +149,8 @@ acl_smtp_data = acl_check_data +@@ -150,8 +150,8 @@ acl_smtp_data = acl_check_data # need the first setting, or in separate files, in which case you need both # options. @@ -22,7 +22,7 @@ index 5393ca3..dae5a54 100644 # In order to support roaming users who wish to send email from anywhere, # you may want to make Exim listen on other ports as well as port 25, in -@@ -161,8 +161,8 @@ acl_smtp_data = acl_check_data +@@ -162,8 +162,8 @@ acl_smtp_data = acl_check_data # them you should also allow TLS-on-connect on the traditional but # non-standard port 465. @@ -33,7 +33,7 @@ index 5393ca3..dae5a54 100644 # Specify the domain you want to be added to all unqualified addresses -@@ -220,6 +220,24 @@ never_users = root +@@ -221,6 +221,24 @@ never_users = root host_lookup = * @@ -58,7 +58,7 @@ index 5393ca3..dae5a54 100644 # The settings below cause Exim to make RFC 1413 (ident) callbacks # for all incoming SMTP calls. You can limit the hosts to which these -@@ -815,7 +833,7 @@ begin authenticators +@@ -842,7 +860,7 @@ begin authenticators # driver = plaintext # server_set_id = $auth2 # server_prompts = : @@ -67,7 +67,7 @@ index 5393ca3..dae5a54 100644 # server_advertise_condition = ${if def:tls_in_cipher } # LOGIN authentication has traditional prompts and responses. There is no -@@ -827,7 +845,7 @@ begin authenticators +@@ -854,7 +872,7 @@ begin authenticators # driver = plaintext # server_set_id = $auth1 # server_prompts = <| Username: | Password: diff --git a/exim-4.86-procmail.patch b/exim-4.87-procmail.patch similarity index 83% rename from exim-4.86-procmail.patch rename to exim-4.87-procmail.patch index a995d1f..66b9fc2 100644 --- a/exim-4.86-procmail.patch +++ b/exim-4.87-procmail.patch @@ -1,8 +1,8 @@ diff --git a/src/configure.default b/src/configure.default -index 5250b58..96ffe56 100644 +index 374c51d..e4ca5b9 100644 --- a/src/configure.default +++ b/src/configure.default -@@ -707,6 +707,12 @@ userforward: +@@ -730,6 +730,12 @@ userforward: pipe_transport = address_pipe reply_transport = address_reply @@ -15,9 +15,9 @@ index 5250b58..96ffe56 100644 # This router matches local user mailboxes. If the router fails, the error # message is "Unknown user". -@@ -744,6 +750,16 @@ begin transports - remote_smtp: +@@ -771,6 +777,16 @@ remote_smtp: driver = smtp + message_size_limit = ${if > {$max_received_linelength}{998} {1}{0}} +# This transport invokes procmail to deliver mail +procmail: diff --git a/exim-4.86-rhl.patch b/exim-4.87-rhl.patch similarity index 84% rename from exim-4.86-rhl.patch rename to exim-4.87-rhl.patch index 33bb25e..8f8be4f 100644 --- a/exim-4.86-rhl.patch +++ b/exim-4.87-rhl.patch @@ -1,8 +1,8 @@ diff --git a/src/configure.default b/src/configure.default -index 3223bff..97e9053 100644 +index 3c8cf97..12ed1e0 100644 --- a/src/configure.default +++ b/src/configure.default -@@ -605,7 +605,7 @@ system_aliases: +@@ -628,7 +628,7 @@ system_aliases: driver = redirect allow_fail allow_defer @@ -11,7 +11,7 @@ index 3223bff..97e9053 100644 # user = exim file_transport = address_file pipe_transport = address_pipe -@@ -702,8 +702,8 @@ local_delivery: +@@ -729,8 +729,8 @@ local_delivery: delivery_date_add envelope_to_add return_path_add diff --git a/exim-4.86-smarthost-config.patch b/exim-4.87-smarthost-config.patch similarity index 88% rename from exim-4.86-smarthost-config.patch rename to exim-4.87-smarthost-config.patch index f119de0..8cdcebf 100644 --- a/exim-4.86-smarthost-config.patch +++ b/exim-4.87-smarthost-config.patch @@ -1,10 +1,10 @@ diff --git a/src/configure.default b/src/configure.default -index 8b1f3bf..b2c8046 100644 +index 40b3bb2..9acae90 100644 --- a/src/configure.default +++ b/src/configure.default -@@ -811,6 +811,15 @@ begin transports - remote_smtp: +@@ -838,6 +838,15 @@ remote_smtp: driver = smtp + message_size_limit = ${if > {$max_received_linelength}{998} {1}{0}} +# This transport is used for delivering messages over SMTP using the +# "message submission" port (RFC4409). @@ -18,7 +18,7 @@ index 8b1f3bf..b2c8046 100644 # This transport invokes procmail to deliver mail procmail: driver = pipe -@@ -919,6 +928,21 @@ begin rewrite +@@ -946,6 +955,21 @@ begin rewrite # AUTHENTICATION CONFIGURATION # ###################################################################### @@ -40,7 +40,7 @@ index 8b1f3bf..b2c8046 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. -@@ -934,7 +958,7 @@ begin rewrite +@@ -961,7 +985,7 @@ begin rewrite # The default RCPT ACL checks for successful authentication, and will accept # messages from authenticated users from anywhere on the Internet. diff --git a/exim-4.86-spamdconf.patch b/exim-4.87-spamdconf.patch similarity index 93% rename from exim-4.86-spamdconf.patch rename to exim-4.87-spamdconf.patch index f65b24f..031268e 100644 --- a/exim-4.86-spamdconf.patch +++ b/exim-4.87-spamdconf.patch @@ -1,8 +1,8 @@ diff --git a/src/configure.default b/src/configure.default -index dae5a54..5250b58 100644 +index 531435b..374c51d 100644 --- a/src/configure.default +++ b/src/configure.default -@@ -108,6 +108,7 @@ hostlist relay_from_hosts = localhost +@@ -109,6 +109,7 @@ hostlist relay_from_hosts = localhost acl_smtp_rcpt = acl_check_rcpt acl_smtp_data = acl_check_data @@ -10,7 +10,7 @@ index dae5a54..5250b58 100644 # You should not change those settings until you understand how ACLs work. -@@ -120,7 +121,7 @@ acl_smtp_data = acl_check_data +@@ -121,7 +122,7 @@ acl_smtp_data = acl_check_data # of what to set for other virus scanners. The second modification is in the # acl_check_data access control list (see below). @@ -19,7 +19,7 @@ index dae5a54..5250b58 100644 # For spam scanning, there is a similar option that defines the interface to -@@ -418,7 +419,8 @@ acl_check_rcpt: +@@ -431,7 +432,8 @@ acl_check_rcpt: accept local_parts = postmaster domains = +local_domains @@ -29,9 +29,9 @@ index dae5a54..5250b58 100644 require verify = sender -@@ -510,27 +512,63 @@ acl_check_rcpt: - - acl_check_data: +@@ -533,27 +535,63 @@ acl_check_data: + # + deny condition = ${if > {$max_received_linelength}{998}} + # Put simple tests first. A good one is to check for the presence of a + # Message-Id: header, which RFC2822 says SHOULD be present. Some broken diff --git a/exim.spec b/exim.spec index ec2dab6..ad3fb1c 100644 --- a/exim.spec +++ b/exim.spec @@ -17,7 +17,7 @@ Summary: The exim mail transfer agent Name: exim -Version: 4.86.2 +Version: 4.87 Release: 1%{?dist} License: GPLv2+ Url: http://www.exim.org/ @@ -57,19 +57,19 @@ Source25: exim-gen-cert Source26: clamd.exim.service %endif -Patch4: exim-4.86-rhl.patch -Patch6: exim-4.86-config.patch +Patch4: exim-4.87-rhl.patch +Patch6: exim-4.87-config.patch Patch8: exim-4.82-libdir.patch -Patch12: exim-4.86-cyrus.patch -Patch13: exim-4.86-pamconfig.patch -Patch14: exim-4.86-spamdconf.patch -Patch18: exim-4.86.2-dlopen-localscan.patch -Patch19: exim-4.86-procmail.patch -Patch20: exim-4.86-allow-filter.patch -Patch21: exim-4.82-localhost-is-local.patch -Patch22: exim-4.86-greylist-conf.patch -Patch23: exim-4.86-smarthost-config.patch -Patch25: exim-4.82-dynlookup-config.patch +Patch12: exim-4.87-cyrus.patch +Patch13: exim-4.87-pamconfig.patch +Patch14: exim-4.87-spamdconf.patch +Patch18: exim-4.87-dlopen-localscan.patch +Patch19: exim-4.87-procmail.patch +Patch20: exim-4.87-allow-filter.patch +Patch21: exim-4.87-localhost-is-local.patch +Patch22: exim-4.87-greylist-conf.patch +Patch23: exim-4.87-smarthost-config.patch +Patch25: exim-4.87-dynlookup-config.patch # Upstream ticket: http://bugs.exim.org/show_bug.cgi?id=1584 Patch26: exim-4.85-pic.patch @@ -637,6 +637,10 @@ test "$1" = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null 2>&1 || : %{_sysconfdir}/cron.daily/greylist-tidy.sh %changelog +* Sun Apr 10 2016 Jaroslav Škarvada - 4.87-1 +- New version + Resolves: rhbz#1325557 + * Thu Mar 3 2016 Jaroslav Škarvada - 4.86.2-1 - New version Resolves: rhbz#1314118 diff --git a/sources b/sources index 6c84ef6..d8e24d5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1443a4a88d6b78ad9b6a681c51437b55 exim-4.86.2.tar.bz2 +2effc2bd47ad2dc010f655c11a1b1173 exim-4.87.tar.bz2