rpm/gzip
SHA256
1
0
Fork 0
forked from pool/gzip
Code Pull Requests Activity

- Add support for xz and lzma (bnc#799561 - zgrep silently fails on

Browse Source 
LZMA compressed files)

OBS-URL: https://build.opensuse.org/package/show/Base:System/gzip?expand=0&rev=22
This commit is contained in:
Wojtek Dziewięcki 2013-01-31 16:49:11 +00:00 committed by Git OBS Bridge
parent aa667cf72c
commit f911255567
3 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gzip.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Jan 29 12:28:39 UTC 2013 - vdziewiecki@suse.com
- Add support for xz and lzma (bnc#799561 - zgrep silently fails on
LZMA compressed files)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Oct 16 10:48:48 UTC 2012 - vcizek@suse.com Tue Oct 16 10:48:48 UTC 2012 - vcizek@suse.com

5
gzip.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package gzip # spec file for package gzip
# #
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -31,6 +31,8 @@ Patch2: zmore.diff
Patch3: non-exec-stack.diff Patch3: non-exec-stack.diff
Patch4: http://rsync.samba.org/ftp/unpacked/rsync/patches/gzip-rsyncable.diff Patch4: http://rsync.samba.org/ftp/unpacked/rsync/patches/gzip-rsyncable.diff
Patch6: zdiff.diff Patch6: zdiff.diff
# PATCH FIX OPENSUSE BNC#799561 - zgrep silently fails on LZMA compressed files
Patch7: xz_lzma.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
@ -47,6 +49,7 @@ times.
%patch3 %patch3
%patch4 -p1 %patch4 -p1
%patch6 %patch6
%patch7 -p1
%build %build
CFLAGS="$RPM_OPT_FLAGS -fomit-frame-pointer \ CFLAGS="$RPM_OPT_FLAGS -fomit-frame-pointer \

30
xz_lzma.patch Normal file
View File

@ -0,0 +1,30 @@
Index: gzip-1.5/zgrep.1
===================================================================
--- gzip-1.5.orig/zgrep.1
+++ gzip-1.5/zgrep.1
@@ -10,7 +10,7 @@ zgrep \- search possibly compressed file
.I Zgrep
invokes
.I grep
-on compressed or gzipped files.
+on compressed, xz'ed, lzma'ed, bzip2'ed or gzipped files.
All options specified are passed directly to
.IR grep .
If no file is specified, then the standard input is decompressed
Index: gzip-1.5/zgrep.in
===================================================================
--- gzip-1.5.orig/zgrep.in
+++ gzip-1.5/zgrep.in
@@ -178,6 +178,12 @@ do
*.bz2)
uncompress=bzip2
;;
+ *.xz)
+ uncompress=xz
+ ;;
+ *.lzma)
+ uncompress=lzma
+ ;;
*)
uncompress=gzip
;;