- rel 14; fail exigrep if we don't have all decompressors needed

diff --git a/exim-bug-659.patch b/exim-bug-659.patch
index 21f7351e86a842d49a2680f23486bc851521ca54..5bd0e4929a00b3564fc5e517ad490c9ba8242ece 100644 (file)
--- a/exim-bug-659.patch
+++ b/exim-bug-659.patch
@@ -1,8 +1,21 @@
+From 83befcbcee0756af0c43f2a5f7dbed3bb5a4cd6e Mon Sep 17 00:00:00 2001
+From: Todd Lyons <tlyons@exim.org>
+Date: Sat, 12 Oct 2013 09:42:31 -0700
+Subject: [PATCH] Bug 1334: AutoDetect compression type in exigrep
+
+Does not use any extra perl modules.
+Attempts hard coded types first, so no extra code for the standard
+  case.
+Easy to add more compression types.
+---
+ src/src/exigrep.src |   53 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 53 insertions(+)
+
 diff --git a/src/src/exigrep.src b/src/src/exigrep.src
-index 0950b58..9e0ced3 100644
+index 0950b58..d22d362 100644
 --- a/src/src/exigrep.src
 +++ b/src/src/exigrep.src
-@@ -124,6 +124,60 @@ elsif ( ($invert && (($insensitive && !/$pattern/io) || !/$pattern/o)) ||
+@@ -124,6 +124,54 @@ elsif ( ($invert && (($insensitive && !/$pattern/io) || !/$pattern/o)) ||
    { print "$_\n"; }
  }
  
@@ -43,17 +56,11 @@ index 0950b58..9e0ced3 100644
 +    {
 +    if ($filename =~ /\.(?:$ext)$/)
 +      {
-+      # Undecided:
-+      # 1) Better to just print the error and return...
-+      if ($compressors->{$ext}->{bin} eq '')
-+        {
-+        warn("Didn't find $ext decompressor for $filename\n");
-+        return undef;
-+        }
-+      # 2) ...or just return undef that will result in no output
-+      $cmdline = ($compressors->{$ext}->{bin} eq '') ?
-+                 undef :
-+                 $compressors->{$ext}->{bin} ." ".
++      # Just die if compressor not found; if this occurrs in the middle of
++      # two valid files with a lot of matches, error could easily be missed.
++      die("Didn't find $ext decompressor for $filename\n")
++        if ($compressors->{$ext}->{bin} eq '');
++      $cmdline = $compressors->{$ext}->{bin} ." ".
 +                   $compressors->{$ext}->{args};
 +      last;
 +      }
@@ -63,7 +70,7 @@ index 0950b58..9e0ced3 100644
  
  # 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
-@@ -154,6 +208,11 @@ if (@ARGV)
+@@ -154,6 +202,11 @@ if (@ARGV)
        open(LOG, "ZCAT_COMMAND $filename |") ||
          die "Unable to zcat $filename: $!\n";
        }
@@ -75,3 +82,6 @@ index 0950b58..9e0ced3 100644
      else
        {
        open(LOG, "<$filename") || die "Unable to open $filename: $!\n";
+-- 
+1.7.9.5
+

diff --git a/exim.spec b/exim.spec
index 9e6324fa17c901e1f25dee30f9ff0a87d6e4c248..dc4ba74e640f4816470a9f997eb5635d2bbd8951 100644 (file)
--- a/exim.spec
+++ b/exim.spec
@@ -15,7 +15,7 @@ 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.80.1
-Release:       13
+Release:       14
 Epoch:         2
 License:       GPL
 Group:         Networking/Daemons/SMTP