[packages/exim] - rel 13; exigrep patch updated
arekm
arekm at pld-linux.org
Sun Oct 13 10:07:27 CEST 2013
commit cc8360fe714d47d530f95e3fbb69526053f34580
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Sun Oct 13 10:07:24 2013 +0200
- rel 13; exigrep patch updated
exim-bug-659.patch | 38 ++++++++++++++++----------------------
exim.spec | 2 +-
2 files changed, 17 insertions(+), 23 deletions(-)
---
diff --git a/exim.spec b/exim.spec
index 66e317c..9e6324f 100644
--- 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: 12
+Release: 13
Epoch: 2
License: GPL
Group: Networking/Daemons/SMTP
diff --git a/exim-bug-659.patch b/exim-bug-659.patch
index bd683f6..21f7351 100644
--- a/exim-bug-659.patch
+++ b/exim-bug-659.patch
@@ -1,21 +1,8 @@
-From 4f061bd7f1cd0d2410731f194cf1e6d23014df0d Mon Sep 17 00:00:00 2001
-From: Todd Lyons <tlyons at 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 | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 49 insertions(+)
-
diff --git a/src/src/exigrep.src b/src/src/exigrep.src
-index 0950b58..eadf4c7 100644
+index 0950b58..9e0ced3 100644
--- a/src/src/exigrep.src
+++ b/src/src/exigrep.src
-@@ -124,6 +124,50 @@ elsif ( ($invert && (($insensitive && !/$pattern/io) || !/$pattern/o)) ||
+@@ -124,6 +124,60 @@ elsif ( ($invert && (($insensitive && !/$pattern/io) || !/$pattern/o)) ||
{ print "$_\n"; }
}
@@ -37,7 +24,7 @@ index 0950b58..eadf4c7 100644
+ {
+ my $ext = shift();
+ my $c = $compressors->{$ext}->{cmd};
-+ $compressors->{$ext}->{bin} = `which $c`;
++ $compressors->{$ext}->{bin} = `which $c 2>/dev/null`;
+ chomp($compressors->{$ext}->{bin});
+ }
+
@@ -56,8 +43,18 @@ index 0950b58..eadf4c7 100644
+ {
+ if ($filename =~ /\.(?:$ext)$/)
+ {
-+ $cmdline = $compressors->{$ext}->{bin} ." ".
-+ $compressors->{$ext}->{args};
++ # 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} ." ".
++ $compressors->{$ext}->{args};
+ last;
+ }
+ }
@@ -66,7 +63,7 @@ index 0950b58..eadf4c7 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 +198,11 @@ if (@ARGV)
+@@ -154,6 +208,11 @@ if (@ARGV)
open(LOG, "ZCAT_COMMAND $filename |") ||
die "Unable to zcat $filename: $!\n";
}
@@ -78,6 +75,3 @@ index 0950b58..eadf4c7 100644
else
{
open(LOG, "<$filename") || die "Unable to open $filename: $!\n";
---
-1.7.9.5
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/exim.git/commitdiff/cc8360fe714d47d530f95e3fbb69526053f34580
More information about the pld-cvs-commit
mailing list