diff --git a/0001-file-localmagic.patch b/0001-file-localmagic.patch index 3144a80..4440758 100644 --- a/0001-file-localmagic.patch +++ b/0001-file-localmagic.patch @@ -1,4 +1,4 @@ -From ab2220a8d4c1b52d12e9f3e0fa7a132e30849ee5 Mon Sep 17 00:00:00 2001 +From bba354e18cfac11cc69a1032cbda23960b7c05d0 Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: Thu, 15 Dec 2011 16:15:41 +0100 Subject: [PATCH] file-localmagic.patch @@ -9,9 +9,8 @@ Signed-off-by: Kamil Dudka --- magic/magic.local | 3 +++ src/Makefile.am | 2 +- - src/Makefile.in | 2 +- src/apprentice.c | 2 +- - 4 files changed, 6 insertions(+), 3 deletions(-) + 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 magic/magic.local diff --git a/magic/magic.local b/magic/magic.local @@ -24,7 +23,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 3f67f2c..b43cb8e 100644 +index 96749b5..e3eaf36 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ @@ -33,30 +32,17 @@ index 3f67f2c..b43cb8e 100644 lib_LTLIBRARIES = libmagic.la nodist_include_HEADERS = magic.h -diff --git a/src/Makefile.in b/src/Makefile.in -index 59f3b5e..a8f56cf 100644 ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -356,7 +356,7 @@ target_alias = @target_alias@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --MAGIC = $(pkgdatadir)/magic -+MAGIC = /etc/magic:$(pkgdatadir)/magic - lib_LTLIBRARIES = libmagic.la - nodist_include_HEADERS = magic.h - AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"' diff --git a/src/apprentice.c b/src/apprentice.c -index 1437bcc..b609dd1 100644 +index db21787..5134682 100644 --- a/src/apprentice.c +++ b/src/apprentice.c -@@ -460,7 +460,7 @@ apprentice_1(struct magic_set *ms, const char *fn, int action) +@@ -496,7 +496,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) -- diff --git a/0002-fix-typos-fxlb.patch b/0002-fix-typos-fxlb.patch deleted file mode 100644 index dd02052..0000000 --- a/0002-fix-typos-fxlb.patch +++ /dev/null @@ -1,24 +0,0 @@ -From ab812bb4f64a6d1410263259a6881c620730e7dd Mon Sep 17 00:00:00 2001 -From: Christos Zoulas -Date: Sun, 14 Nov 2021 17:42:43 +0000 -Subject: [PATCH] fix typos (fxlb) - ---- - magic/Magdir/images | 2 ++-- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/magic/Magdir/images b/magic/Magdir/images -index 6ce08725..71982d05 100644 ---- a/magic/Magdir/images -+++ b/magic/Magdir/images -@@ -1985,7 +1985,7 @@ - >>>14 leshort x \b%d) - # no Color LookUp Table (CLUT) - >>4 lelong ^8 --# image orgin X Y -+# image origin X Y - >>>12 leshort x Pixel at (%d, - >>>14 leshort x \b%d) Size= - # real image width = multiply by 4 (4BPP) 2 (8BPP) 1 (16BPP) 2/3 (24BPP) --- -2.37.0.windows.1 \ No newline at end of file diff --git a/file-5.41.tar.gz b/file-5.41.tar.gz deleted file mode 100644 index a4ab617..0000000 Binary files a/file-5.41.tar.gz and /dev/null differ diff --git a/file-5.44.tar.gz b/file-5.44.tar.gz new file mode 100644 index 0000000..365cd92 Binary files /dev/null and b/file-5.44.tar.gz differ diff --git a/file.spec b/file.spec index fe6e87f..b71adae 100644 --- a/file.spec +++ b/file.spec @@ -1,13 +1,12 @@ Name: file -Version: 5.41 -Release: 2 +Version: 5.44 +Release: 1 Summary: A tool to identify the type of a particular file type License: BSD URL: http://www.darwinsys.com/file/ Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz Patch1: 0001-file-localmagic.patch -Patch2: 0002-fix-typos-fxlb.patch Requires: %{name}-libs = %{version}-%{release} BuildRequires: autoconf automake libtool zlib-devel make @@ -131,6 +130,9 @@ make -C tests check %{python3_sitelib}/__pycache__/* %changelog +* Thu Feb 9 2023 lihaoxiang - 5.44-1 +- upgrade to 5.44 + * Wed Oct 19 2022 lihaoxiang - 5.41-2 - fix typos fxlb