From f4ec379d1087757567602dcb80327409914cb5de Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Oct 30 2018 05:11:03 +0000
Subject: import file-5.11-35.el7


---

diff --git a/SOURCES/file-5.11-gzip-strength.patch b/SOURCES/file-5.11-gzip-strength.patch
new file mode 100644
index 0000000..ddcdd74
--- /dev/null
+++ b/SOURCES/file-5.11-gzip-strength.patch
@@ -0,0 +1,30 @@
+From af069cb735df84c45b9ab06a789eb9fd89bee38d Mon Sep 17 00:00:00 2001
+From: Christos Zoulas <christos@zoulas.com>
+Date: Wed, 11 Dec 2013 17:55:00 +0000
+Subject: [PATCH] Bump the strength of gzip and reorder printing of attributes
+ (Thomas Ledoux)
+
+Upstream-commit: 5c945517d8b4e4c7db9f132f04fa4814dc957a83
+
+Rordering of attributes dropped from this patch to stay compatible.
+
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ magic/Magdir/compress | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/magic/Magdir/compress b/magic/Magdir/compress
+index 94c209d..5dc4dcf 100644
+--- a/magic/Magdir/compress
++++ b/magic/Magdir/compress
+@@ -22,6 +22,7 @@
+ #         other than 8 ("deflate", the only method defined in RFC 1952).
+ 0       string          \037\213        gzip compressed data
+ !:mime	application/x-gzip
++!:strength * 2
+ >2	byte		<8		\b, reserved method
+ >2	byte		>8		\b, unknown method
+ >3	byte		&0x01		\b, ASCII
+-- 
+2.13.5
+
diff --git a/SOURCES/file-5.11-python-comment.patch b/SOURCES/file-5.11-python-comment.patch
new file mode 100644
index 0000000..d0d6693
--- /dev/null
+++ b/SOURCES/file-5.11-python-comment.patch
@@ -0,0 +1,39 @@
+From ac2eb47fe154aa01460414de987491b02ea225e2 Mon Sep 17 00:00:00 2001
+From: Christos Zoulas <christos@zoulas.com>
+Date: Sat, 15 Feb 2014 01:30:52 +0000
+Subject: [PATCH] comment out python comment magic cause other things like
+ mediawiki use it.
+
+Upstream-commit: eced9dbd4aa438de22ff453c723136beac41a558
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ magic/Magdir/python | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/magic/Magdir/python b/magic/Magdir/python
+index 53cae42..b3ee014 100644
+--- a/magic/Magdir/python
++++ b/magic/Magdir/python
+@@ -46,13 +46,13 @@
+ !:mime text/x-python
+ 
+ # comments
+-0	search/4096	'''
+->&0	regex	.*'''$	Python script text executable
+-!:mime text/x-python
++#0	search/4096	'''
++#>&0	regex	.*'''$	Python script text executable
++#!:mime text/x-python
+ 
+-0	search/4096	"""
+->&0	regex	.*"""$	Python script text executable
+-!:mime text/x-python
++#0	search/4096	"""
++#>&0	regex	.*"""$	Python script text executable
++#!:mime text/x-python
+ 
+ # try:
+ # except: or finally:
+-- 
+2.14.4
+
diff --git a/SPECS/file.spec b/SPECS/file.spec
index 459222a..f24bf82 100644
--- a/SPECS/file.spec
+++ b/SPECS/file.spec
@@ -5,7 +5,7 @@
 Summary: A utility for determining file types
 Name: file
 Version: 5.11
-Release: 33%{?dist}
+Release: 35%{?dist}
 License: BSD
 Group: Applications/File
 Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@@ -66,6 +66,12 @@ Patch58: file-5.11-pascal.patch
 # fix #1246385 - 'file --version' now exits successfully
 Patch59: file-5.11-version.patch
 
+# fix #1488898 - bump the strength of gzip
+Patch60: file-5.11-gzip-strength.patch
+
+# fix #1562135 - do not classify groovy script as python code
+Patch61: file-5.11-python-comment.patch
+
 URL: http://www.darwinsys.com/file/
 Requires: file-libs = %{version}-%{release}
 BuildRequires: zlib-devel
@@ -171,6 +177,8 @@ file(1) command.
 %patch57 -p1
 %patch58 -p1
 %patch59 -p1
+%patch60 -p1
+%patch61 -p1
 
 # Patches can generate *.orig files, which can't stay in the magic dir,
 # otherwise there will be problems when compiling magic file!
@@ -250,6 +258,12 @@ cd python
 %endif
 
 %changelog
+* Wed Jun 06 2018 Kamil Dudka <kdudka@redhat.com> 5.11-35
+- fix #1562135 - do not classify groovy script as python code
+
+* Thu Sep 07 2017 Kamil Dudka <kdudka@redhat.com> 5.11-34
+- fix #1488898 - bump the strength of gzip
+
 * Mon Jun 27 2016 Kamil Dudka <kdudka@redhat.com> 5.11-33
 - fix #1246385 - 'file --version' now exits successfully