Accepting request 973075 from Base:System

OBS-URL: https://build.opensuse.org/request/show/973075
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gzip?expand=0&rev=61
This commit is contained in:
Dominique Leuenberger 2022-05-01 16:53:16 +00:00 committed by Git OBS Bridge
commit 74ac46472d
3 changed files with 12 additions and 3 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Apr 27 08:53:53 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
- Rename xz_lzma.patch xz_lzma_zstd.patch and expand the patch to
supprt zstd compression (boo#1198922).
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Apr 9 11:45:49 UTC 2022 - Dirk Müller <dmueller@suse.com> Sat Apr 9 11:45:49 UTC 2022 - Dirk Müller <dmueller@suse.com>

View File

@ -32,7 +32,7 @@ Patch2: zmore.diff
Patch3: non-exec-stack.diff Patch3: non-exec-stack.diff
Patch6: zdiff.diff Patch6: zdiff.diff
# PATCH FIX OPENSUSE BNC#799561 - zgrep silently fails on LZMA compressed files # PATCH FIX OPENSUSE BNC#799561 - zgrep silently fails on LZMA compressed files
Patch7: xz_lzma.patch Patch7: xz_lzma_zstd.patch
Patch8: manpage-no-date.patch Patch8: manpage-no-date.patch
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake

View File

@ -7,7 +7,7 @@ Index: gzip-1.12/zgrep.1
command invokes command invokes
.B grep .B grep
-on compressed or gzipped files. -on compressed or gzipped files.
+on compressed, xz'ed, lzma'ed, bzip2'ed or gzipped files. +on compressed, xz'ed, lzma'ed, zstd'ed, bzip2'ed or gzipped files.
All options specified are passed directly to All options specified are passed directly to
.BR grep . .BR grep .
If no file is specified, then the standard input is decompressed If no file is specified, then the standard input is decompressed
@ -15,7 +15,7 @@ Index: gzip-1.12/zgrep.in
=================================================================== ===================================================================
--- gzip-1.12.orig/zgrep.in --- gzip-1.12.orig/zgrep.in
+++ gzip-1.12/zgrep.in +++ gzip-1.12/zgrep.in
@@ -215,6 +215,12 @@ do @@ -215,6 +215,15 @@ do
*.bz2) *.bz2)
uncompress=bzip2 uncompress=bzip2
;; ;;
@ -24,6 +24,9 @@ Index: gzip-1.12/zgrep.in
+ ;; + ;;
+ *.lzma) + *.lzma)
+ uncompress=lzma + uncompress=lzma
+ ;;
+ *.zst)
+ uncompress=zstd
+ ;; + ;;
*) *)
uncompress=gzip uncompress=gzip