- rel 11; update from upstream + zstd support in exigrep

diff --git a/exim.spec b/exim.spec
index 7f145a74d4b4e57d258bfd0298a649aae1e499c6..db37c7144e8ff61b047e00d467903676995aa153 100644 (file)
--- a/exim.spec
+++ b/exim.spec
@@ -24,7 +24,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.93
-Release:       10
+Release:       11
 Epoch:         2
 License:       GPL
 Group:         Networking/Daemons/SMTP
@@ -50,7 +50,7 @@ Source15:     %{name}4-smtp.pamd
 Source16:      %{name}on.png
 # sh branch.sh
 Patch100:      %{name}-git.patch
-# Patch100-md5:        40d68d9007976045f2a046ffb02418d0
+# Patch100-md5:        7f0355dc4e408a7d39ef9cf68c9cebcd
 Patch0:                %{name}4-EDITME.patch
 Patch1:                %{name}4-monitor-EDITME.patch
 Patch2:                %{name}4-cflags.patch
@@ -58,6 +58,7 @@ 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:                zstd.patch
 
 Patch8:                %{name}-spam-timeout.patch
 
@@ -182,6 +183,7 @@ Pliki nagłówkowe dla Exima.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p2
 
 %patch8 -p1
 

diff --git a/zstd.patch b/zstd.patch
new file mode 100644 (file)
index 0000000..3902498
--- /dev/null
+++ b/zstd.patch
@@ -0,0 +1,31 @@
+commit 4f252517dc0e8eda6c1eb1031ac0bcd29b6a7a93
+Author: Arkadiusz Miśkiewicz <arekm@maven.pl>
+Date:   Thu Jan 23 08:51:01 2020 +0100
+
+    Add support for zstd compressed .zst files (Bug 2515)
+
+diff --git a/src/src/exigrep.src b/src/src/exigrep.src
+index afd3538b6..835766fb4 100644
+--- a/src/src/exigrep.src
++++ b/src/src/exigrep.src
+@@ -159,7 +159,8 @@ my $compressors = {
+   gz   => { cmd => 'zcat',  args => '' },
+   bz2  => { cmd => 'bzcat', args => '' },
+   xz   => { cmd => 'xzcat', args => '' },
+-  lzma => { cmd => 'lzma',  args => '-dc' }
++  lzma => { cmd => 'lzma',  args => '-dc' },
++  zst  => { cmd => 'zstdcat', args => '' },
+ };
+ my $csearch = 0;
+ 
+@@ -313,8 +314,8 @@ given host, for example.
+ 
+ If no file names are given on the command line, the standard input is read.
+ 
+-For known file extensions indicating compression (F<.gz>, F<.bz2>, F<.xz>, and F<.lzma>)
+-a suitable de-compressor is used, if available.
++For known file extensions indicating compression (F<.gz>, F<.bz2>, F<.xz>,
++F<.lzma>, and F<.zst>) a suitable de-compressor is used, if available.
+ 
+ The output is sent through a pager if a terminal is connected to STDOUT. As
+ pager are considered: C<$ENV{PAGER}>, C<less>, C<more>.