New version

Resolves: rhbz#1024196
- Fixed bogus dates in the changelog (best effort)
- De-fuzzified patches
- Fixed double packaging of mailq.1.gz

exim-4.63-allow-filter.patch

@@ -1,11 +0,0 @@
---- exim-4.63/src/configure.default~	2006-09-03 15:02:28.000000000 -0700
-+++ exim-4.63/src/configure.default	2006-09-03 15:46:53.000000000 -0700
-@@ -672,7 +672,7 @@ userforward:
- # local_part_suffix = +* : -*
- # local_part_suffix_optional
-   file = $home/.forward
--# allow_filter
-+  allow_filter
-   no_verify
-   no_expn
-   check_ancestor

exim-4.63-localhost-is-local.patch

@@ -1,11 +0,0 @@
---- exim-4.63/src/configure.default~	2006-09-03 19:31:28.000000000 -0700
-+++ exim-4.63/src/configure.default	2006-09-03 19:37:42.000000000 -0700
-@@ -56,7 +56,7 @@
- # +local_domains, +relay_to_domains, and +relay_from_hosts, respectively. They
- # are all colon-separated lists:
- 
--domainlist local_domains = @
-+domainlist local_domains = @ : localhost : localhost.localdomain
- domainlist relay_to_domains =
- hostlist   relay_from_hosts = 127.0.0.1
- 

exim-4.82-allow-filter.patch

@@ -0,0 +1,13 @@
+diff --git a/src/configure.default b/src/configure.default
+index 37a6a00..52e0536 100644
+--- a/src/configure.default
++++ b/src/configure.default
+@@ -684,7 +684,7 @@ userforward:
+ # local_part_suffix = +* : -*
+ # local_part_suffix_optional
+   file = $home/.forward
+-# allow_filter
++  allow_filter
+   no_verify
+   no_expn
+   check_ancestor

exim-4.82-config.patch

@@ -1,6 +1,8 @@
---- exim-4.73/scripts/Configure-Makefile.config	2010-12-26 18:17:23.000000000 +0000
+diff --git a/scripts/Configure-Makefile b/scripts/Configure-Makefile
-+++ exim-4.73/scripts/Configure-Makefile	2011-01-05 22:25:49.000000000 +0000
+index 5e8a726..31a5aad 100755
-@@ -137,7 +137,7 @@ if [ "${EXIM_PERL}" != "" ] ; then
+--- a/scripts/Configure-Makefile
++++ b/scripts/Configure-Makefile
+@@ -233,7 +233,7 @@ if [ "${EXIM_PERL}" != "" ] ; then
  
    mv $mft $mftt
    echo "PERL_CC=`$PERL_COMMAND -MConfig -e 'print $Config{cc}'`" >>$mft
@@ -9,9 +11,11 @@
    echo "PERL_LIBS=`$PERL_COMMAND -MExtUtils::Embed -e ldopts`" >>$mft
    echo "" >>$mft
    cat $mftt >> $mft
---- exim-4.73/src/EDITME.config	2010-12-26 18:17:23.000000000 +0000
+diff --git a/src/EDITME b/src/EDITME
-+++ exim-4.73/src/EDITME	2011-01-05 22:29:05.000000000 +0000
+index 3f818f3..6cc58a8 100644
-@@ -100,7 +100,7 @@
+--- a/src/EDITME
++++ b/src/EDITME
+@@ -98,7 +98,7 @@
  # /usr/local/sbin. The installation script will try to create this directory,
  # and any superior directories, if they do not exist.
  
@@ -20,7 +24,7 @@
  
  
  #------------------------------------------------------------------------------
-@@ -116,7 +116,7 @@ BIN_DIRECTORY=/usr/exim/bin
+@@ -114,7 +114,7 @@ BIN_DIRECTORY=/usr/exim/bin
  # don't exist. It will also install a default runtime configuration if this
  # file does not exist.
  
@@ -29,7 +33,7 @@
  
  # It is possible to specify a colon-separated list of files for CONFIGURE_FILE.
  # In this case, Exim will use the first of them that exists when it is run.
-@@ -133,7 +133,7 @@ CONFIGURE_FILE=/usr/exim/configure
+@@ -131,7 +131,7 @@ CONFIGURE_FILE=/usr/exim/configure
  # deliveries. (Local deliveries run as various non-root users, typically as the
  # owner of a local mailbox.) Specifying these values as root is not supported.
  
@@ -38,7 +42,7 @@
  
  # If you specify EXIM_USER as a name, this is looked up at build time, and the
  # uid number is built into the binary. However, you can specify that this
-@@ -154,7 +154,7 @@ EXIM_USER=
+@@ -152,7 +152,7 @@ EXIM_USER=
  # for EXIM_USER (e.g. EXIM_USER=exim), you don't need to set EXIM_GROUP unless
  # you want to use a group other than the default group for the given user.
  
@@ -47,7 +51,7 @@
  
  # Many sites define a user called "exim", with an appropriate default group,
  # and use
-@@ -234,7 +234,7 @@ TRANSPORT_SMTP=yes
+@@ -232,7 +232,7 @@ TRANSPORT_SMTP=yes
  # This one is special-purpose, and commonly not required, so it is not
  # included by default.
  
@@ -56,7 +60,7 @@
  
  
  #------------------------------------------------------------------------------
-@@ -243,9 +243,9 @@ TRANSPORT_SMTP=yes
+@@ -241,9 +241,9 @@ TRANSPORT_SMTP=yes
  # MBX, is included only when requested. If you do not know what this is about,
  # leave these settings commented out.
  
@@ -69,7 +73,7 @@
  
  
  #------------------------------------------------------------------------------
-@@ -261,18 +261,20 @@ LOOKUP_DBM=yes
+@@ -296,18 +296,20 @@ LOOKUP_DBM=yes
  LOOKUP_LSEARCH=yes
  LOOKUP_DNSDB=yes
  
@@ -100,7 +104,7 @@
  # LOOKUP_WHOSON=yes
  
  # These two settings are obsolete; all three lookups are compiled when
-@@ -342,14 +345,14 @@ EXIM_MONITOR=eximon.bin
+@@ -383,14 +385,14 @@ EXIM_MONITOR=eximon.bin
  # and the MIME ACL. Please read the documentation to learn more about these
  # features.
  
@@ -117,7 +121,7 @@
  
  # 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
-@@ -482,7 +485,7 @@ FIXED_NEVER_USERS=root
+@@ -560,7 +562,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.
  
@@ -126,7 +130,7 @@
  
  
  #------------------------------------------------------------------------------
-@@ -527,15 +530,13 @@ FIXED_NEVER_USERS=root
+@@ -605,15 +607,13 @@ 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.
  
@@ -149,7 +153,7 @@
  
  
  #------------------------------------------------------------------------------
-@@ -548,7 +551,7 @@ FIXED_NEVER_USERS=root
+@@ -634,7 +634,7 @@ FIXED_NEVER_USERS=root
  # one that is set in the headers_charset option. The default setting is
  # defined by this setting:
  
@@ -158,7 +162,7 @@
  
  # 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
-@@ -568,7 +571,7 @@ HEADERS_CHARSET="ISO-8859-1"
+@@ -654,7 +654,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
  #
@@ -167,7 +171,7 @@
  #
  # 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()
-@@ -630,11 +633,11 @@ HEADERS_CHARSET="ISO-8859-1"
+@@ -716,11 +716,11 @@ HEADERS_CHARSET="ISO-8859-1"
  # leave these settings commented out.
  
  # This setting is required for any TLS support (either OpenSSL or GnuTLS)
@@ -182,7 +186,7 @@
  
  # 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.
-@@ -684,7 +688,7 @@ HEADERS_CHARSET="ISO-8859-1"
+@@ -785,7 +785,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.
  
@@ -191,7 +195,7 @@
  
  
  #------------------------------------------------------------------------------
-@@ -697,7 +701,7 @@ HEADERS_CHARSET="ISO-8859-1"
+@@ -798,7 +798,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:
  
@@ -200,25 +204,7 @@
  
  # 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
-@@ -746,7 +750,7 @@ EXICYCLOG_MAX=10
+@@ -864,7 +864,7 @@ ZCAT_COMMAND=/usr/bin/zcat
- # files. Both the name of the command and the suffix that it adds to files
- # need to be defined here. See also the EXICYCLOG_MAX configuration.
- 
--COMPRESS_COMMAND=/usr/bin/gzip
-+COMPRESS_COMMAND=/bin/gzip
- COMPRESS_SUFFIX=gz
- 
- 
-@@ -754,7 +758,7 @@ COMPRESS_SUFFIX=gz
- # If the exigrep utility is fed compressed log files, it tries to uncompress
- # them using this command.
- 
--ZCAT_COMMAND=/usr/bin/zcat
-+ZCAT_COMMAND=/bin/zcat
- 
- 
- #------------------------------------------------------------------------------
-@@ -763,7 +767,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.
  
@@ -227,7 +213,7 @@
  
  
  #------------------------------------------------------------------------------
-@@ -773,7 +777,7 @@ ZCAT_COMMAND=/usr/bin/zcat
+@@ -874,7 +874,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.
  
@@ -236,7 +222,7 @@
  
  
  #------------------------------------------------------------------------------
-@@ -783,7 +787,7 @@ ZCAT_COMMAND=/usr/bin/zcat
+@@ -884,7 +884,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:
  
@@ -245,7 +231,7 @@
  
  # You probably need to add -lpam to EXTRALIBS, and in some releases of
  # GNU/Linux -ldl is also needed.
-@@ -851,7 +855,7 @@ ZCAT_COMMAND=/usr/bin/zcat
+@@ -952,7 +952,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.
  
@@ -254,7 +240,7 @@
  
  
  #------------------------------------------------------------------------------
-@@ -864,9 +868,9 @@ ZCAT_COMMAND=/usr/bin/zcat
+@@ -965,9 +965,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:
  #
@@ -267,7 +253,7 @@
  #
  # but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM
  # as well.
-@@ -918,17 +922,17 @@ SYSTEM_ALIASES_FILE=/etc/aliases
+@@ -1019,7 +1019,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.
  
@@ -276,9 +262,7 @@
  
  # 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
- # dynamic loading library is not otherwise included.
+@@ -1029,7 +1029,7 @@ SYSTEM_ALIASES_FILE=/etc/aliases
- 
- 
  #------------------------------------------------------------------------------
  # Uncomment this setting to include IPv6 support.
  
@@ -287,7 +271,7 @@
  
  ###############################################################################
  #              THINGS YOU ALMOST NEVER NEED TO MENTION                        #
-@@ -945,13 +949,13 @@ SYSTEM_ALIASES_FILE=/etc/aliases
+@@ -1050,13 +1050,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.
  
@@ -298,17 +282,17 @@
 -# RM_COMMAND=/bin/rm
 -# TOUCH_COMMAND=/usr/bin/touch
 -# PERL_COMMAND=/usr/bin/perl
-+CHOWN_COMMAND=/bin/chown
++CHOWN_COMMAND=/usr/bin/chown
-+CHGRP_COMMAND=/bin/chgrp
++CHGRP_COMMAND=/usr/bin/chgrp
-+CHMOD_COMMAND=/bin/chmod
++CHMOD_COMMAND=/usr/bin/chmod
-+MV_COMMAND=/bin/mv
++MV_COMMAND=/usr/bin/mv
-+RM_COMMAND=/bin/rm
++RM_COMMAND=/usr/bin/rm
-+TOUCH_COMMAND=/bin/touch
++TOUCH_COMMAND=/usr/bin/touch
 +PERL_COMMAND=/usr/bin/perl
  
  
  #------------------------------------------------------------------------------
-@@ -1145,7 +1149,7 @@ TMPDIR="/tmp"
+@@ -1256,7 +1256,7 @@ 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:
  

exim-4.82-cyrus.patch

@@ -1,6 +1,8 @@
---- exim-4.33/src/configure.default.cyrus	2004-07-02 15:00:27.941635455 +0200
+diff --git a/src/configure.default b/src/configure.default
-+++ exim-4.33/src/configure.default	2004-07-02 15:41:39.505133889 +0200
+index b631a4d..153c77b 100644
-@@ -595,6 +595,16 @@
+--- a/src/configure.default
++++ b/src/configure.default
+@@ -721,6 +721,16 @@ address_reply:
    driver = autoreply
  
  

exim-4.82-dlopen-localscan.patch

@@ -1,17 +1,32 @@
---- exim-4.71/src/globals.c.dl	2009-11-16 19:50:37.000000000 +0000
+diff --git a/src/EDITME b/src/EDITME
-+++ exim-4.71/src/globals.c	2009-12-24 19:27:17.000000000 +0000
+index 6cc58a8..07f8211 100644
-@@ -129,6 +129,9 @@ uschar *tls_verify_certificates= NULL;
+--- a/src/EDITME
- uschar *tls_verify_hosts       = NULL;
++++ b/src/EDITME
- #endif
+@@ -770,6 +770,20 @@ TLS_LIBS=-lssl -lcrypto
  
-+#ifdef DLOPEN_LOCAL_SCAN
-+uschar *local_scan_path        = NULL;
-+#endif
  
- /* Input-reading functions for messages, so we can use special ones for
+ #------------------------------------------------------------------------------
- incoming TCP/IP. The defaults use stdin. We never need these for any
++# On systems which support dynamic loading of shared libraries, Exim can
---- exim-4.71/src/config.h.defaults.dl	2009-11-16 19:50:36.000000000 +0000
++# load a local_scan function specified in its config file instead of having
-+++ exim-4.71/src/config.h.defaults	2009-12-24 19:27:17.000000000 +0000
++# to be recompiled with the desired local_scan function. For a full
++# description of the API to this function, see the Exim specification.
++
++DLOPEN_LOCAL_SCAN=yes
++
++# If you set DLOPEN_LOCAL_SCAN, then you need to include -rdynamic in the
++# linker flags.  Without it, the loaded .so won't be able to access any
++# functions from exim.
++
++LFLAGS=-rdynamic -ldl
++
++#------------------------------------------------------------------------------
+ # The default distribution of Exim contains only the plain text form of the
+ # 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 8c1e799..d5f9e55 100644
+--- a/src/config.h.defaults
++++ b/src/config.h.defaults
 @@ -27,6 +27,8 @@ it's a default value. */
  
  #define AUTH_VARS                     3
@@ -21,21 +36,40 @@
  #define BIN_DIRECTORY
  
  #define CONFIGURE_FILE
---- exim-4.71/src/readconf.c.dl	2009-11-16 19:50:37.000000000 +0000
+diff --git a/src/globals.c b/src/globals.c
-+++ exim-4.71/src/readconf.c	2009-12-24 19:27:17.000000000 +0000
+index 133a7bf..4423f07 100644
-@@ -269,6 +269,9 @@ static optionlist optionlist_config[] = 
+--- a/src/globals.c
-   { "local_from_prefix",        opt_stringptr,   &local_from_prefix },
++++ b/src/globals.c
-   { "local_from_suffix",        opt_stringptr,   &local_from_suffix },
+@@ -149,6 +149,10 @@ uschar *tls_verify_certificates= NULL;
-   { "local_interfaces",         opt_stringptr,   &local_interfaces },
+ uschar *tls_verify_hosts       = NULL;
+ #endif
+ 
 +#ifdef DLOPEN_LOCAL_SCAN
-+  { "local_scan_path",          opt_stringptr,   &local_scan_path },
++uschar *local_scan_path        = NULL;
 +#endif
-   { "local_scan_timeout",       opt_time,        &local_scan_timeout },
++
-   { "local_sender_retain",      opt_bool,        &local_sender_retain },
+ #ifdef EXPERIMENTAL_PRDR
-   { "localhost_number",         opt_stringptr,   &host_number_string },
+ /* Per Recipient Data Response variables */
---- exim-4.71/src/local_scan.c.dl	2009-11-16 19:50:37.000000000 +0000
+ BOOL    prdr_enable            = FALSE;
-+++ exim-4.71/src/local_scan.c	2009-12-24 19:27:17.000000000 +0000
+diff --git a/src/globals.h b/src/globals.h
-@@ -7,60 +7,131 @@
+index 265f94e..fde0f47 100644
+--- a/src/globals.h
++++ b/src/globals.h
+@@ -117,6 +117,9 @@ 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
+ 
+ /* Input-reading functions for messages, so we can use special ones for
+ incoming TCP/IP. */
+diff --git a/src/local_scan.c b/src/local_scan.c
+index 3500047..8599172 100644
+--- a/src/local_scan.c
++++ b/src/local_scan.c
+@@ -5,60 +5,131 @@
  /* Copyright (c) University of Cambridge 1995 - 2009 */
  /* See the file NOTICE for conditions of use and distribution. */
  
@@ -129,8 +163,8 @@
 +else
 +#endif
 +  return LOCAL_SCAN_ACCEPT;
-+}
+ }
-+
+ 
 +#ifdef DLOPEN_LOCAL_SCAN
 +
 +static int load_local_scan_library(void)
@@ -204,48 +238,27 @@
 +  {
 +  dlclose(local_scan_lib);
 +  log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() library doesn't contain "
-+    "local_scan() function - message temporarily rejected");      
++    "local_scan() function - message temporarily rejected");
 +  return FALSE;
 +  }
 +
 +return TRUE;
- }
++}
- 
++
 +#endif /* DLOPEN_LOCAL_SCAN */
 +
  /* End of local_scan.c */
---- exim-4.71/src/globals.h.dl	2009-11-16 19:50:37.000000000 +0000
+diff --git a/src/readconf.c b/src/readconf.c
-+++ exim-4.71/src/globals.h	2009-12-24 19:27:17.000000000 +0000
+index 77c7984..da9d582 100644
-@@ -89,6 +89,9 @@ extern uschar *tls_verify_certificates;/
+--- a/src/readconf.c
- extern uschar *tls_verify_hosts;       /* Mandatory client verification */
++++ b/src/readconf.c
- #endif
+@@ -286,6 +286,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 },
 +#ifdef DLOPEN_LOCAL_SCAN
-+extern uschar *local_scan_path;        /* Path to local_scan() library */
++  { "local_scan_path",          opt_stringptr,   &local_scan_path },
 +#endif
- 
+   { "local_scan_timeout",       opt_time,        &local_scan_timeout },
- /* Input-reading functions for messages, so we can use special ones for
+   { "local_sender_retain",      opt_bool,        &local_sender_retain },
- incoming TCP/IP. */
+   { "localhost_number",         opt_stringptr,   &host_number_string },
---- exim-4.71/src/EDITME.dl	2009-12-24 19:26:59.000000000 +0000
-+++ exim-4.71/src/EDITME	2009-12-24 19:27:17.000000000 +0000
-@@ -632,6 +632,20 @@ TLS_LIBS=-lssl -lcrypto
- 
- 
- #------------------------------------------------------------------------------
-+# On systems which support dynamic loading of shared libraries, Exim can
-+# load a local_scan function specified in its config file instead of having
-+# to be recompiled with the desired local_scan function. For a full 
-+# description of the API to this function, see the Exim specification.
-+
-+DLOPEN_LOCAL_SCAN=yes
-+
-+# If you set DLOPEN_LOCAL_SCAN, then you need to include -rdynamic in the
-+# linker flags.  Without it, the loaded .so won't be able to access any
-+# functions from exim.
-+
-+LFLAGS=-rdynamic -ldl
-+
-+#------------------------------------------------------------------------------
- # The default distribution of Exim contains only the plain text form of the
- # documentation. Other forms are available separately. If you want to install
- # the documentation in "info" format, first fetch the Texinfo documentation

exim-4.82-dynlookup-config.patch

@@ -1,6 +1,8 @@
---- exim-4.69/src/EDITME.orig	2008-08-13 15:30:05.000000000 +0100
+diff --git a/src/EDITME b/src/EDITME
-+++ exim-4.69/src/EDITME	2008-08-13 15:30:56.000000000 +0100
+index 07f8211..7d7a4a4 100644
-@@ -282,14 +282,16 @@
+--- a/src/EDITME
++++ b/src/EDITME
+@@ -301,14 +301,16 @@ LOOKUP_DSEARCH=yes
  # LOOKUP_IBASE=yes
  LOOKUP_LDAP=yes
  LDAP_LIB_TYPE=OPENLDAP2

exim-4.82-greylist-conf.patch

@@ -1,6 +1,8 @@
---- exim-4.66/src/configure.default.grey	2007-02-07 13:07:40.000000000 +0000
+diff --git a/src/configure.default b/src/configure.default
-+++ exim-4.66/src/configure.default	2007-02-08 10:16:17.000000000 +0000
+index 3728043..0126880 100644
-@@ -105,6 +105,7 @@ hostlist   relay_from_hosts = 127.0.0.1
+--- a/src/configure.default
++++ b/src/configure.default
+@@ -106,6 +106,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:
  
@@ -8,7 +10,7 @@
  acl_smtp_rcpt = acl_check_rcpt
  acl_smtp_data = acl_check_data
  acl_smtp_mime = acl_check_mime
-@@ -318,6 +319,29 @@ timeout_frozen_after = 7d
+@@ -340,6 +341,29 @@ timeout_frozen_after = 7d
  
  begin acl
  
@@ -27,10 +29,10 @@
 +
 +  # Use the lack of reverse DNS to trigger greylisting. Some people
 +  # even reject for it but that would be a little excessive.
-+  
++
 +  warn condition = ${if eq{$sender_host_name}{} {1}}
 +       set acl_m_greylistreasons = Host $sender_host_address lacks reverse DNS\n$acl_m_greylistreasons
-+  
++
 +  accept
 +
 +
@@ -38,7 +40,7 @@
  # 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.
-@@ -435,7 +459,8 @@ acl_check_rcpt:
+@@ -460,7 +484,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
@@ -48,7 +50,7 @@
    #
    # deny    message       = rejected because $sender_host_address is in a black list at $dnslist_domain\n$dnslist_text
    #         dnslists      = black.list.example
-@@ -443,6 +468,10 @@ acl_check_rcpt:
+@@ -468,6 +493,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
@@ -59,7 +61,7 @@
    #############################################################################
  
    #############################################################################
-@@ -456,6 +485,10 @@ acl_check_rcpt:
+@@ -481,6 +510,10 @@ acl_check_rcpt:
    # require verify = csa
    #############################################################################
  
@@ -70,12 +72,12 @@
    # At this point, the address has passed all the checks that have been
    # configured, so we accept it unconditionally.
  
-@@ -481,6 +514,12 @@ acl_check_data:
+@@ -506,6 +539,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.
 +  #
-+  # Alternatively if we're feeling more lenient we could just use it to 
++  # Alternatively if we're feeling more lenient we could just use it to
 +  # trigger greylisting instead:
 +
 +  warn    condition  = ${if !def:h_Message-ID: {1}}
@@ -83,7 +85,7 @@
  
    # Deny if the message contains a virus. Before enabling this check, you
    # must install a virus scanner and set the av_scanner option above.
-@@ -515,8 +554,30 @@ acl_check_data:
+@@ -540,8 +579,30 @@ acl_check_data:
    #         message   = Your message scored $spam_score SpamAssassin point. Report follows:\n\
    #  	    	        $spam_report
  
@@ -109,7 +111,7 @@
 +
    accept
  
-+# To enable the greylisting, also uncomment this line: 
++# To enable the greylisting, also uncomment this line:
 +# .include /etc/exim/exim-greylist.conf.inc
  
  acl_check_mime:

exim-4.82-libdir.patch

@@ -1,6 +1,8 @@
---- exim-4.24/OS/Makefile-Linux.libdir	2003-09-22 10:29:52.000000000 +0200
+diff --git a/OS/Makefile-Linux b/OS/Makefile-Linux
-+++ exim-4.24/OS/Makefile-Linux	2003-11-13 12:05:15.000000000 +0100
+index 990f884..d1ef114 100644
-@@ -17,8 +17,8 @@
+--- a/OS/Makefile-Linux
++++ b/OS/Makefile-Linux
+@@ -24,8 +24,8 @@ LIBRESOLV = -lresolv
  
  X11=/usr/X11R6
  XINCLUDE=-I$(X11)/include

exim-4.82-localhost-is-local.patch

@@ -0,0 +1,13 @@
+diff --git a/src/configure.default b/src/configure.default
+index 52e0536..3728043 100644
+--- a/src/configure.default
++++ b/src/configure.default
+@@ -54,7 +54,7 @@
+ # +local_domains, +relay_to_domains, and +relay_from_hosts, respectively. They
+ # are all colon-separated lists:
+ 
+-domainlist local_domains = @
++domainlist local_domains = @ : localhost : localhost.localdomain
+ domainlist relay_to_domains =
+ hostlist   relay_from_hosts = localhost
+ # (We rely upon hostname resolution working for localhost, because the default

exim-4.82-pamconfig.patch

@@ -1,7 +1,8 @@
-diff -uNr exim-4.69-new/src/configure.default exim-4.69/src/configure.default
+diff --git a/src/configure.default b/src/configure.default
---- exim-4.69-new/src/configure.default	2008-08-13 15:15:01.000000000 +0100
+index 153c77b..38f0f56 100644
-+++ exim-4.69/src/configure.default	2008-08-13 15:16:44.000000000 +0100
+--- a/src/configure.default
-@@ -140,7 +140,7 @@
++++ b/src/configure.default
+@@ -141,7 +141,7 @@ acl_smtp_data = acl_check_data
  
  # Allow any client to use TLS.
  
@@ -10,7 +11,7 @@ diff -uNr exim-4.69-new/src/configure.default exim-4.69/src/configure.default
  
  # 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
-@@ -148,8 +148,8 @@
+@@ -149,8 +149,8 @@ acl_smtp_data = acl_check_data
  # need the first setting, or in separate files, in which case you need both
  # options.
  
@@ -21,7 +22,7 @@ diff -uNr exim-4.69-new/src/configure.default exim-4.69/src/configure.default
  
  # 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
-@@ -160,8 +160,8 @@
+@@ -161,8 +161,8 @@ acl_smtp_data = acl_check_data
  # them you should also allow TLS-on-connect on the traditional but
  # non-standard port 465.
  
@@ -32,7 +33,7 @@ diff -uNr exim-4.69-new/src/configure.default exim-4.69/src/configure.default
  
  
  # Specify the domain you want to be added to all unqualified addresses
-@@ -219,6 +219,24 @@
+@@ -220,6 +220,24 @@ never_users = root
  
  host_lookup = *
  
@@ -57,21 +58,21 @@ diff -uNr exim-4.69-new/src/configure.default exim-4.69/src/configure.default
  
  # The settings below, which are actually the same as the defaults in the
  # code, cause Exim to make RFC 1413 (ident) callbacks for all incoming SMTP
-@@ -756,7 +774,7 @@
+@@ -800,7 +818,7 @@ begin authenticators
  #  driver                     = plaintext
  #  server_set_id              = $auth2
  #  server_prompts             = :
 -#  server_condition           = Authentication is not yet configured
 +#  server_condition           = ${if saslauthd{{$2}{$3}{smtp}} {1}}
- #  server_advertise_condition = ${if def:tls_cipher }
+ #  server_advertise_condition = ${if def:tls_in_cipher }
  
  # LOGIN authentication has traditional prompts and responses. There is no
-@@ -768,7 +786,7 @@
+@@ -812,7 +830,7 @@ begin authenticators
  #  driver                     = plaintext
  #  server_set_id              = $auth1
  #  server_prompts             = <| Username: | Password:
 -#  server_condition           = Authentication is not yet configured
 +#  server_condition           = ${if saslauthd{{$1}{$2}{smtp}} {1}}
- #  server_advertise_condition = ${if def:tls_cipher }
+ #  server_advertise_condition = ${if def:tls_in_cipher }
  
  

exim-4.82-procmail.patch

@@ -1,6 +1,8 @@
---- exim-4.63/src/configure.default~	2006-09-03 15:02:28.000000000 -0700
+diff --git a/src/configure.default b/src/configure.default
-+++ exim-4.63/src/configure.default	2006-09-03 15:46:53.000000000 -0700
+index 8b599d2..37a6a00 100644
-@@ -680,6 +680,12 @@ userforward:
+--- a/src/configure.default
++++ b/src/configure.default
+@@ -692,6 +692,12 @@ userforward:
    pipe_transport = address_pipe
    reply_transport = address_reply
  
@@ -13,7 +15,7 @@
  
  # This router matches local user mailboxes. If the router fails, the error
  # message is "Unknown user".
-@@ -717,6 +723,16 @@ begin transports
+@@ -729,6 +735,16 @@ begin transports
  remote_smtp:
    driver = smtp
  

exim-4.82-smarthost-config.patch

@@ -1,27 +1,8 @@
---- exim-4.67/src/configure.default~	2007-06-27 09:28:31.000000000 +0100
+diff --git a/src/configure.default b/src/configure.default
-+++ exim-4.67/src/configure.default	2007-06-27 09:57:09.000000000 +0100
+index 0126880..b7c30ac 100644
-@@ -636,6 +636,20 @@ dnslookup:
+--- a/src/configure.default
-   ignore_target_hosts = 0.0.0.0 : 127.0.0.0/8
++++ b/src/configure.default
-   no_more
+@@ -796,6 +796,15 @@ begin transports
- 
-+# Alternatively, comment out the above router and uncomment this one to
-+# route all mail to a smarthost instead of sending it directly to the
-+# intended recipients. If your smarthost requires authentication, change
-+# 'remote_smtp' to 'remote_msa' and set up the 'client_auth' authenticator
-+# later in this file. You might need to change the port number in the
-+# remote_msa transport.
-+#
-+#smarthost:
-+#  driver = manualroute
-+#  domains = ! +local_domains
-+#  transport = remote_smtp
-+#  route_data = smarthost.myisp.net
-+#  no_more
-+
- 
- # The remaining routers handle addresses in the local domain(s), that is those
- # domains that are defined by "domainlist local_domains" above.
-@@ -752,6 +766,15 @@ begin transports
  remote_smtp:
    driver = smtp
  
@@ -37,7 +18,7 @@
  # This transport invokes procmail to deliver mail
  procmail:
    driver = pipe
-@@ -854,6 +877,21 @@ begin rewrite
+@@ -904,6 +913,21 @@ begin rewrite
  #                   AUTHENTICATION CONFIGURATION                     #
  ######################################################################
  
@@ -59,12 +40,12 @@
  # 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.
-@@ -869,7 +907,7 @@ begin rewrite
+@@ -919,7 +943,7 @@ begin rewrite
  # The default RCPT ACL checks for successful authentication, and will accept
  # messages from authenticated users from anywhere on the Internet.
  
 -begin authenticators
-+# 
++#
  
  # PLAIN authentication has no server prompts. The client sends its
  # credentials in one lump, containing an authorization ID (which we do not

exim-4.82-spamdconf.patch

@@ -1,7 +1,8 @@
-diff -uNr exim-4.69-old/src/configure.default exim-4.69/src/configure.default
+diff --git a/src/configure.default b/src/configure.default
---- exim-4.69-old/src/configure.default	2008-08-13 15:20:18.000000000 +0100
+index 38f0f56..8b599d2 100644
-+++ exim-4.69/src/configure.default	2008-08-13 15:20:36.000000000 +0100
+--- a/src/configure.default
-@@ -107,6 +107,7 @@
++++ b/src/configure.default
+@@ -108,6 +108,7 @@ hostlist   relay_from_hosts = localhost
  
  acl_smtp_rcpt = acl_check_rcpt
  acl_smtp_data = acl_check_data
@@ -9,7 +10,7 @@ diff -uNr exim-4.69-old/src/configure.default exim-4.69/src/configure.default
  
  # You should not change those settings until you understand how ACLs work.
  
-@@ -119,7 +120,7 @@
+@@ -120,7 +121,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).
  
@@ -18,7 +19,7 @@ diff -uNr exim-4.69-old/src/configure.default exim-4.69/src/configure.default
  
  
  # For spam scanning, there is a similar option that defines the interface to
-@@ -380,7 +381,8 @@
+@@ -403,7 +404,8 @@ acl_check_rcpt:
    accept  local_parts   = postmaster
            domains       = +local_domains
  
@@ -28,7 +29,7 @@ diff -uNr exim-4.69-old/src/configure.default exim-4.69/src/configure.default
  
    require verify        = sender
  
-@@ -470,27 +472,63 @@
+@@ -495,27 +497,63 @@ acl_check_rcpt:
  
  acl_check_data:
  
@@ -51,18 +52,11 @@ diff -uNr exim-4.69-old/src/configure.default exim-4.69/src/configure.default
 -  # Add headers to a message if it is judged to be spam. Before enabling this,
 -  # you must install SpamAssassin. You may also need to set the spamd_address
 -  # option above.
--  #
--  # 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
 +  # Bypass SpamAssassin checks if the message is too large.
 +  #
 +  # accept  condition  = ${if >={$message_size}{100000} {1}}
 +  #         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
 +  # and accept the mail if that happens. Add an X-Spam-Flag: header if the SA
 +  # score exceeds the SA system threshold.
@@ -72,13 +66,19 @@ diff -uNr exim-4.69-old/src/configure.default exim-4.69/src/configure.default
 +  #
 +  # accept  condition  = ${if !def:spam_score_int {1}}
 +  #         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
 +  #
 +  # warn    add_header = X-Spam-Score: $spam_score ($spam_bar)\n\
 +  #                      X-Spam-Report: $spam_report
-+
+ 
+-  # Accept the message.
 +  # And reject if the SpamAssassin score is greater than ten
 +  #
 +  # deny    condition = ${if >{$spam_score_int}{100} {1}}

exim-rhl.patch

@@ -1,7 +1,8 @@
-diff -uNr exim-4.69.orig/src/configure.default exim-4.69/src/configure.default
+diff --git a/src/configure.default b/src/configure.default
---- exim-4.69.orig/src/configure.default	2007-06-26 12:21:36.000000000 +0100
+index 1274349..b631a4d 100644
-+++ exim-4.69/src/configure.default	2008-08-13 14:41:14.000000000 +0100
+--- a/src/configure.default
-@@ -548,7 +548,7 @@
++++ b/src/configure.default
+@@ -590,7 +590,7 @@ system_aliases:
    driver = redirect
    allow_fail
    allow_defer
@@ -10,7 +11,7 @@ diff -uNr exim-4.69.orig/src/configure.default exim-4.69/src/configure.default
  # user = exim
    file_transport = address_file
    pipe_transport = address_pipe
-@@ -643,8 +643,8 @@
+@@ -687,8 +687,8 @@ local_delivery:
    delivery_date_add
    envelope_to_add
    return_path_add

exim.spec

@@ -13,8 +13,8 @@
 
 Summary: The exim mail transfer agent
 Name: exim
-Version: 4.80.1
+Version: 4.82
-Release: 6%{?dist}
+Release: 1%{?dist}
 License: GPLv2+
 Url: http://www.exim.org/
 Group: System Environment/Daemons
@@ -50,18 +50,18 @@ Source25: exim-gen-cert
 Source26: clamd.exim.service
 
 Patch4: exim-rhl.patch
-Patch6: exim-4.80-config.patch
+Patch6: exim-4.82-config.patch
-Patch8: exim-4.24-libdir.patch
+Patch8: exim-4.82-libdir.patch
-Patch12: exim-4.33-cyrus.patch
+Patch12: exim-4.82-cyrus.patch
-Patch13: exim-4.43-pamconfig.patch
+Patch13: exim-4.82-pamconfig.patch
-Patch14: exim-4.50-spamdconf.patch
+Patch14: exim-4.82-spamdconf.patch
-Patch18: exim-4.71-dlopen-localscan.patch
+Patch18: exim-4.82-dlopen-localscan.patch
-Patch19: exim-4.63-procmail.patch
+Patch19: exim-4.82-procmail.patch
-Patch20: exim-4.63-allow-filter.patch
+Patch20: exim-4.82-allow-filter.patch
-Patch21: exim-4.63-localhost-is-local.patch
+Patch21: exim-4.82-localhost-is-local.patch
-Patch22: exim-4.66-greylist-conf.patch
+Patch22: exim-4.82-greylist-conf.patch
-Patch23: exim-4.67-smarthost-config.patch
+Patch23: exim-4.82-smarthost-config.patch
-Patch25: exim-4.69-dynlookup-config.patch
+Patch25: exim-4.82-dynlookup-config.patch
 
 Requires: /etc/pki/tls/certs /etc/pki/tls/private
 Requires: /etc/aliases
@@ -472,7 +472,7 @@ fi
 %{_bindir}/rmail.exim
 %{_bindir}/newaliases.exim
 /usr/lib/sendmail.exim
-%{_mandir}/*/*
+%{_mandir}/man8/*
 %dir %{_libdir}/exim
 %dir %{_libdir}/exim/%{version}-%{release}
 %dir %{_libdir}/exim/%{version}-%{release}/lookups
@@ -603,6 +603,13 @@ test "$1"  = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null 2>&1 || :
 %{_sysconfdir}/cron.daily/greylist-tidy.sh
 
 %changelog
+* Tue Oct 29 2013 Jaroslav Škarvada <jskarvad@redhat.com> - 4.82-1
+- New version
+  Resolves: rhbz#1024196
+- Fixed bogus dates in the changelog (best effort)
+- De-fuzzified patches
+- Fixed double packaging of mailq.1.gz
+
 * Sat Aug 03 2013 Petr Pisar <ppisar@redhat.com> - 4.80.1-6
 - Perl 5.18 rebuild
 
@@ -835,7 +842,7 @@ test "$1"  = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null 2>&1 || :
 - fixed permissions for some binaries
 - fixed pam file to use include instead of pam_stack
 
-* Fri Jul  4 2006 David Woodhouse <dwmw2@redhat.com> 4.62-4
+* Tue Jul  4 2006 David Woodhouse <dwmw2@redhat.com> 4.62-4
 - Package review
 
 * Wed Jun 28 2006 David Woodhouse <dwmw2@redhat.com> 4.62-3
@@ -1187,7 +1194,7 @@ test "$1"  = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null 2>&1 || :
 - Added eximconfig script, thanks to Mark Baker
 - Exim now uses the Berkeley DB library.
 
-* Fri Aug 4 1999 Mark Bergsma <mark@mbergsma.demon.nl>
+* Wed Aug 4 1999 Mark Bergsma <mark@mbergsma.demon.nl>
 - Upgraded to version 3.03
 - Removed version number out of the spec file name.
 

sources

@@ -1 +1 @@
-1a95dc9f02834b1b7430403a75edf162  exim-4.80.1.tar.bz2
+feb933baa4db773c2ef76b794c60b647  exim-4.82.tar.bz2