From 96c2e4b3f342934f4f869a3a88d9e06c3099bc1f Mon Sep 17 00:00:00 2001
From: Vincent Mihalkovic <vmihalko@redhat.com>
Date: Tue, 16 Jun 2020 17:37:52 +0200
Subject: [PATCH] update to new version 5.39

---
 file-5.38.tar.gz.asc         |  6 ------
 file-5.39.tar.gz.asc         |  6 ++++++
 file-localmagic.patch        | 18 +++++++++---------
 file-magic-filesystems.patch | 13 -------------
 file.spec                    | 11 ++++++-----
 sources                      |  2 +-
 6 files changed, 22 insertions(+), 34 deletions(-)
 delete mode 100644 file-5.38.tar.gz.asc
 create mode 100644 file-5.39.tar.gz.asc
 delete mode 100644 file-magic-filesystems.patch

diff --git a/file-5.38.tar.gz.asc b/file-5.38.tar.gz.asc
deleted file mode 100644
index 63fce2d..0000000
--- a/file-5.38.tar.gz.asc
+++ /dev/null
@@ -1,6 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iEYEABECAAYFAl34OjcACgkQcREqsWyzOzoVWwCfY69DDEEy9Uf5tQ/Ryr8CFjKu
-spYAoIMICtX8ZHca0UxCgha/8NL5PaJa
-=xRVg
------END PGP SIGNATURE-----
diff --git a/file-5.39.tar.gz.asc b/file-5.39.tar.gz.asc
new file mode 100644
index 0000000..93a8ccf
--- /dev/null
+++ b/file-5.39.tar.gz.asc
@@ -0,0 +1,6 @@
+-----BEGIN PGP SIGNATURE-----
+
+iEYEABECAAYFAl7mu3AACgkQcREqsWyzOzppXACgoqokKabq7bwN9aKvd/H/yhF+
+9PUAoOPrAtxFkfNUvtqK/trY+v/Gk5JM
+=tA6a
+-----END PGP SIGNATURE-----
diff --git a/file-localmagic.patch b/file-localmagic.patch
index 7c95b2b..ffa0351 100644
--- a/file-localmagic.patch
+++ b/file-localmagic.patch
@@ -1,4 +1,4 @@
-From 14569013793837d262084f3ac6260638d340f3bf Mon Sep 17 00:00:00 2001
+From 95c993ff6bdfe92a7f519c4db60157a421e65b38 Mon Sep 17 00:00:00 2001
 From: Siteshwar Vashisht <svashisht@redhat.com>
 Date: Thu, 21 Feb 2019 15:26:38 +0100
 Subject: [PATCH] Upstream says it's up to distributions to add a way to
@@ -22,7 +22,7 @@ index 0000000..283a863
 +# Insert here your local magic data. Format is described in magic(5).
 +
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 2fbefdb..3ca3e73 100644
+index 3f67f2c..b43cb8e 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
 @@ -1,4 +1,4 @@
@@ -32,10 +32,10 @@ index 2fbefdb..3ca3e73 100644
  nodist_include_HEADERS = magic.h
  
 diff --git a/src/Makefile.in b/src/Makefile.in
-index 29567c4..8222bc1 100644
+index 59f3b5e..a8f56cf 100644
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -337,7 +337,7 @@ target_alias = @target_alias@
+@@ -356,7 +356,7 @@ target_alias = @target_alias@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
@@ -45,12 +45,12 @@ index 29567c4..8222bc1 100644
  nodist_include_HEADERS = magic.h
  AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
 diff --git a/src/apprentice.c b/src/apprentice.c
-index eca3ae0..24b5663 100644
+index 1437bcc..b609dd1 100644
 --- a/src/apprentice.c
 +++ b/src/apprentice.c
-@@ -454,7 +454,7 @@ apprentice_1(struct magic_set *ms, const char *fn, int action)
- 	if (map == RCAST(struct magic_map *, -1))
- 		return -1;
+@@ -460,7 +460,7 @@ apprentice_1(struct magic_set *ms, const char *fn, int action)
+ #ifndef COMPILE_ONLY
+ 	map = apprentice_map(ms, fn);
  	if (map == NULL) {
 -		if (ms->flags & MAGIC_CHECK)
 +		if (ms->flags & MAGIC_CHECK && strcmp("/etc/magic", fn) != 0)
@@ -58,5 +58,5 @@ index eca3ae0..24b5663 100644
  		map = apprentice_load(ms, fn, action);
  		if (map == NULL)
 -- 
-2.17.2
+2.25.4
 
diff --git a/file-magic-filesystems.patch b/file-magic-filesystems.patch
deleted file mode 100644
index 020a822..0000000
--- a/file-magic-filesystems.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/magic/Magdir/filesystems b/magic/Magdir/filesystems
-index b1c8d0bf..8e91ba16 100644
---- a/magic/Magdir/filesystems
-+++ b/magic/Magdir/filesystems
-@@ -1994,7 +1994,7 @@
- # to display CD-ROM (70=81-11) after MBR (113=40+72+1), partition-table (71=50+21) and before Apple Driver Map (51)
- #!:strength -11
- # to display CD-ROM (114=81+33) before MBR (113=40+72+1), partition-table (71=50+21) and Apple Driver Map (51)
--!:strength +34
-+!:strength +35
- >0	use	cdrom
- 
- # URL: https://en.wikipedia.org/wiki/NRG_(file_format)
diff --git a/file.spec b/file.spec
index 32a3c5e..9f86ccb 100644
--- a/file.spec
+++ b/file.spec
@@ -14,8 +14,8 @@
 
 Summary: A utility for determining file types
 Name: file
-Version: 5.38
-Release: 6%{?dist}
+Version: 5.39
+Release: 1%{?dist}
 License: BSD
 Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
 
@@ -26,9 +26,6 @@ Patch0: file-localmagic.patch
 Patch1: file-4.17-rpm-name.patch
 Patch2: file-5.04-volume_key.patch
 
-# fixed in upstream; increase CDROM strength to beat MBR (#1696798) 
-Patch3:file-magic-filesystems.patch
-
 URL: http://www.darwinsys.com/file/
 Requires: file-libs = %{version}-%{release}
 BuildRequires: zlib-devel
@@ -178,6 +175,7 @@ cd %{py3dir}
 %{_libdir}/*.so
 %{_includedir}/magic.h
 %{_mandir}/man3/*
+%{_libdir}/pkgconfig/libmagic.pc
 
 %files static
 %{_libdir}/libmagic.a
@@ -206,6 +204,9 @@ cd %{py3dir}
 %endif
 
 %changelog
+* Tue Jun 16 2020 Vincent Mihalkovic <vmihalko@redhat.com> - 5.39-1
+- update to new version 5.39
+
 * Wed May 27 2020 Miro Hrončok <mhroncok@redhat.com> - 5.38-6
 - Rebuilt for Python 3.9
 
diff --git a/sources b/sources
index 5c74f3d..018777c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (file-5.38.tar.gz) = 9eeeba69cbc9f0c00a0bdf9eaf60c73a4a709e797068f109d85c1ef2a19c8b0e012ecd73714f03cbb1770dfa717e8a661ad746b644cc030cafbfb1f7aac35a40
+SHA512 (file-5.39.tar.gz) = 9cf1a7b769c56eb6f5b25c66ce85fa1300128396e445b2e53dbbd8951e5da973a7a07c4ef9f7ebd1fe945d47bdaf2cd9ef09bd2be6c217a0bcb907d9449835e6