[file/f21] remove weak zlib pattern

Jan Kaluža jkaluza at fedoraproject.org
Mon Feb 16 08:13:05 UTC 2015


commit 45919261a1e9bf8350c51636a3a1af38cf473fb1
Author: Jan Kaluza <jkaluza at redhat.com>
Date:   Mon Feb 16 09:12:54 2015 +0100

    remove weak zlib pattern

 file-5.22-zlib.patch |   16 ++++++++++++++++
 file.spec            |    7 ++++++-
 2 files changed, 22 insertions(+), 1 deletions(-)
---
diff --git a/file-5.22-zlib.patch b/file-5.22-zlib.patch
new file mode 100644
index 0000000..3a77879
--- /dev/null
+++ b/file-5.22-zlib.patch
@@ -0,0 +1,16 @@
+diff --git a/magic/Magdir/compress b/magic/Magdir/compress
+index beb8ebe..ae1c90f 100644
+--- a/magic/Magdir/compress
++++ b/magic/Magdir/compress
+@@ -257,7 +257,7 @@
+ !:mime	application/x-qpress
+ 
+ # Zlib https://www.ietf.org/rfc/rfc6713.txt
+-0	beshort%31	=0	
+->0	byte&0xf	=8
+->>0	byte&0x80 	=0	zlib compressed data
+-!:mime	application/zlib
++#0	beshort%31	=0	
++#>0	byte&0xf	=8
++#>>0	byte&0x80 	=0	zlib compressed data
++#!:mime	application/zlib
diff --git a/file.spec b/file.spec
index 27441b5..5ac8daf 100644
--- a/file.spec
+++ b/file.spec
@@ -4,7 +4,7 @@
 Summary: A utility for determining file types
 Name: file
 Version: 5.22
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Group: Applications/File
 Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@@ -20,6 +20,7 @@ Patch7: file-5.14-x86boot.patch
 Patch8: file-5.14-perl.patch
 Patch14: file-5.19-cafebabe.patch
 Patch15: file-5.22-awk-perl.patch
+Patch16: file-5.22-zlib.patch
 URL: http://www.darwinsys.com/file/
 Requires: file-libs = %{version}-%{release}
 BuildRequires: zlib-devel
@@ -90,6 +91,7 @@ file(1) command.
 %patch8 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 
 # Patches can generate *.orig files, which can't stay in the magic dir,
 # otherwise there will be problems with compiling magic file!
@@ -198,6 +200,9 @@ cd %{py3dir}
 %endif
 
 %changelog
+* Mon Feb 16 2015 Jan Kaluza <jkaluza at redhat.com> - 5.22-2
+- remove weak zlib pattern
+
 * Wed Feb 04 2015 Jan Kaluza <jkaluza at redhat.com> - 5.22-1
 - update to new version 5.22
 


More information about the scm-commits mailing list