diff --git a/file-localmagic.patch b/file-localmagic.patch index ffa03519ed9b9aeefca00fa92e662537d9efeece..d099fe768e1632edef546386eb6c0ea3bcd8c15c 100644 --- a/file-localmagic.patch +++ b/file-localmagic.patch @@ -5,24 +5,23 @@ Subject: [PATCH] Upstream says it's up to distributions to add a way to support local-magic. --- - magic/magic.local | 3 +++ + magic/magic.local | 2 ++ src/Makefile.am | 2 +- src/Makefile.in | 2 +- src/apprentice.c | 2 +- - 4 files changed, 6 insertions(+), 3 deletions(-) + 4 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 magic/magic.local diff --git a/magic/magic.local b/magic/magic.local new file mode 100644 -index 0000000..283a863 +index 0000000..33580e4 --- /dev/null +++ b/magic/magic.local -@@ -0,0 +1,3 @@ +@@ -0,0 +1,2 @@ +# Magic local data for file(1) command. +# Insert here your local magic data. Format is described in magic(5). -+ diff --git a/src/Makefile.am b/src/Makefile.am -index 3f67f2c..b43cb8e 100644 +index 64c0414..fb04b7e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ @@ -32,10 +31,10 @@ index 3f67f2c..b43cb8e 100644 nodist_include_HEADERS = magic.h diff --git a/src/Makefile.in b/src/Makefile.in -index 59f3b5e..a8f56cf 100644 +index 08184ed..a0be67b 100644 --- a/src/Makefile.in +++ b/src/Makefile.in -@@ -356,7 +356,7 @@ target_alias = @target_alias@ +@@ -358,7 +358,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @@ -45,18 +44,18 @@ index 59f3b5e..a8f56cf 100644 nodist_include_HEADERS = magic.h AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"' diff --git a/src/apprentice.c b/src/apprentice.c -index 1437bcc..b609dd1 100644 +index e795741..7907841 100644 --- a/src/apprentice.c +++ b/src/apprentice.c -@@ -460,7 +460,7 @@ apprentice_1(struct magic_set *ms, const char *fn, int action) +@@ -495,7 +495,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) - file_magwarn(ms, "using regular magic file `%s'", fn); + file_magwarn(NULL, "using regular magic file `%s'", fn); map = apprentice_load(ms, fn, action); if (map == NULL) -- -2.25.4 +2.41.0 diff --git a/file.spec b/file.spec index 81f1b86c121a87291db7abc9c43f4e9d2c245ceb..f19459532074e922d0c6ac58c6ec0bbafa412a9a 100644 --- a/file.spec +++ b/file.spec @@ -4,8 +4,8 @@ Summary: A command-line tool that tells you in words what kind of data a file contains Name: file -Version: 5.41 -Release: 3%{?dist} +Version: 5.45 +Release: 1%{?dist} License: BSD URL: https://www.darwinsys.com/file/ Source0: http://ftp.astron.com/pub/file/file-%{version}.tar.gz @@ -134,6 +134,9 @@ make -C tests check %{python3_sitelib}/__pycache__/* %changelog +* Thu Aug 03 2023 Xiaojie Chen - 5.45-1 +- Upgrade to upstream version 5.45 + * Fri Apr 28 2023 OpenCloudOS Release Engineering - 5.41-3 - Rebuilt for OpenCloudOS Stream 23.05 diff --git a/sources b/sources index 3d7adea95b63da15a966b8e31b37324ea31f6ca1..beb48de1be29db1a4d85bde5889a7d0a996a4f53 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (file-5.41.tar.gz) = bbf2d8e39450b31d0ba8d76d202790fea953775657f942f06e6dc9091798d4a395f7205e542388e4a25b6a4506d07f36c5c4da37cfce0734133e9203a3b00654 +SHA512 (file-5.45.tar.gz) = 12611a59ff766c22a55db4b4a9f80f95a0a2e916a1d8593612c6ead32c247102a8fdc23693c6bf81bda9b604d951a62c0051e91580b1b79e190a3504c0efc20a