- up to 4.85

diff --git a/exim-exigrep.patch b/exim-exigrep.patch
deleted file mode 100644 (file)
index ca42e4a..0000000
--- a/exim-exigrep.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-commit 0eb51736637f6c93a2fd6cb65316f8ae11f0a0be
-Author: Todd Lyons <tlyons@exim.org>
-Date:   Fri Sep 12 06:22:24 2014 -0700
-
-    Bug 1216: Add -M (related) to exigrep.
-    
-    Thanks to Arkadiusz for pointing out that this was never merged.
-
-diff --git a/src/src/exigrep.src b/src/src/exigrep.src
-index 2d3b40c..419fcb5 100644
---- a/src/src/exigrep.src
-+++ b/src/src/exigrep.src
-@@ -60,6 +60,11 @@ return $seconds;
- 
- my (%saved, %id_list, $pattern, $queue_time, $insensitive, $invert);
- 
-+# If using "related" option, have to track extra message IDs
-+my $related;
-+my $related_re='';
-+my @Mids = ();
-+
- sub do_line {
- 
- # Convert syslog lines to mainlog format, as in eximstats.
-@@ -90,8 +95,16 @@ if (defined $id)
-     }
-   else
-     {
--    $id_list{$id} = 1 if defined $id_list{$id} ||
--      ($insensitive && /$pattern/io) || /$pattern/o;
-+    if (defined $id_list{$id} ||
-+      ($insensitive && /$pattern/io) || /$pattern/o)
-+      {
-+      $id_list{$id} = 1;
-+      get_related_ids($id) if $related;
-+      }
-+    elsif ($related && $related_re)
-+      {
-+      grep_for_related($_, $id);
-+      }
-     }
- 
-   # See if this is a completion for some message. If it is interesting,
-@@ -173,16 +186,30 @@ sub detect_compressor_capable
-   return $cmdline;
-   }
- 
-+sub grep_for_related {
-+  my ($line,$id) = @_;
-+  $id_list{$id} = 1 if $line =~ m/$related_re/;
-+}
-+
-+sub get_related_ids {
-+  my ($id) = @_;
-+  push @Mids, $id unless grep /\b$id\b/, @Mids;
-+  my $re = join '|', @Mids;
-+  $related_re = qr/$re/;
-+}
-+
- # The main program. Extract the pattern and make sure any relevant characters
- # are quoted if the -l flag is given. The -t flag gives a time-on-queue value
--# which is an additional condition.
-+# which is an additional condition. The -M flag will also display "related"
-+# loglines (msgid from matched lines is searched in following lines).
- 
--getopts('Ilvt:',\my %args);
-+getopts('Ilvt:M',\my %args);
- $queue_time  = $args{'t'}? $args{'t'} : -1;
- $insensitive = $args{'I'}? 0 : 1;
- $invert      = $args{'v'}? 1 : 0;
-+$related     = $args{'M'}? 1 : 0;
- 
--die "usage: exigrep [-I] [-l] [-t <seconds>] [-v] <pattern> [<log file>]...\n"
-+die "usage: exigrep [-I] [-l] [-M] [-t <seconds>] [-v] <pattern> [<log file>]...\n"
-   if ($#ARGV < 0);
- 
- $pattern = shift @ARGV;

diff --git a/exim.spec b/exim.spec
index 9e925da18d3736b6dc0b987aab9bf6a72af82688..f0506c457db00a2c1b99fba8cbab8dd1afb67e0a 100644 (file)
--- a/exim.spec
+++ b/exim.spec
@@ -21,15 +21,15 @@ Summary:    University of Cambridge Mail Transfer Agent
 Summary(pl.UTF-8):     Agent Transferu Poczty Uniwersytetu w Cambridge
 Summary(pt_BR.UTF-8):  Servidor de correio eletrônico exim
 Name:          exim
-Version:       4.84
-Release:       3
+Version:       4.85
+Release:       1
 Epoch:         2
 License:       GPL
 Group:         Networking/Daemons/SMTP
 Source0:       ftp://ftp.exim.org/pub/exim/exim4/%{name}-%{version}.tar.bz2
-# Source0-md5: 3d14522e604b687b9e515f5aa739b2c0
+# Source0-md5: ebae28762b6f125726283dc9434e8709
 Source1:       ftp://ftp.exim.org/pub/exim/exim4/%{name}-html-%{version}.tar.bz2
-# Source1-md5: 18835729357264ecff7c5468b05ccc80
+# Source1-md5: ac087bcf14337f152adfdf8b64145c37
 Source2:       %{name}.init
 Source3:       %{name}.cron.db
 Source4:       %{name}4.conf
@@ -54,7 +54,6 @@ Patch3:               exim-defs.patch
 Patch4:                %{name}4-Makefile-Default.patch
 # http://marc.merlins.org/linux/exim/files/sa-exim-cvs/localscan_dlopen_exim_4.20_or_better.patch
 Patch5:                localscan_dlopen_%{name}_4.20_or_better.patch
-Patch6:                %{name}-exigrep.patch
 
 Patch8:                %{name}-spam-timeout.patch
 
@@ -173,7 +172,6 @@ Pliki nagłówkowe dla Exima.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p2
 
 %patch8 -p1
 
@@ -194,7 +192,7 @@ X11_LD_LIB=%{_prefix}/X11R6/%{_lib}
 SUPPORT_DSN=yes
 EXPERIMENTAL_DCC=yes
 EXPERIMENTAL_PRDR=yes
-EXPERIMENTAL_TPDA=yes
+EXPERIMENTAL_EVENT=yes
 EXPERIMENTAL_PROXY=yes
 EXPERIMENTAL_CERTNAMES=yes
 %{?with_dsn:EXPERIMENTAL_DSN=yes}