From 020646c3749516f7798829d1c1b939954395afde5d9850619e7d67ad1f412d82 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 28 Jul 2023 09:56:34 +0000 Subject: [PATCH] Update to file 5.45 OBS-URL: https://build.opensuse.org/package/show/Base:System/file?expand=0&rev=270 --- dc71304b.patch | 27 ---------------- file-5.17-option.dif | 8 ++--- file-5.19-biorad.dif | 2 +- file-5.19-zip2.0.dif | 12 +++---- file-5.22-elf.dif | 4 +-- file-5.44.tar.gz | 3 -- file-5.44.tar.gz.asc | 6 ---- file-5.44.dif => file-5.45.dif | 58 +++++++++++++++++----------------- file-5.45.tar.gz | 3 ++ file-5.45.tar.gz.asc | 6 ++++ file-secure_getenv.patch | 2 +- file.changes | 20 ++++++++++++ file.spec | 7 ++-- python-magic.spec | 2 +- 14 files changed, 74 insertions(+), 86 deletions(-) delete mode 100644 dc71304b.patch delete mode 100644 file-5.44.tar.gz delete mode 100644 file-5.44.tar.gz.asc rename file-5.44.dif => file-5.45.dif (92%) create mode 100644 file-5.45.tar.gz create mode 100644 file-5.45.tar.gz.asc diff --git a/dc71304b.patch b/dc71304b.patch deleted file mode 100644 index ca7acd7..0000000 --- a/dc71304b.patch +++ /dev/null @@ -1,27 +0,0 @@ -From dc71304b3b1fd2ed5f7098d59fb7f6ef10cfdc85 Mon Sep 17 00:00:00 2001 -From: Christos Zoulas -Date: Sat, 31 Dec 2022 20:24:08 +0000 -Subject: [PATCH] pyzip improvements (FC Stegerman) - ---- - magic/Magdir/archive | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - ---- magic/Magdir/archive -+++ magic/Magdir/archive 2023-01-11 12:59:19.451975877 +0000 -@@ -1876,9 +1876,14 @@ - # https://en.wikipedia.org/wiki/ZIP_(file_format)#End_of_central_directory_record_(EOCD) - # by Michal Gorny - -2 uleshort 0 -->&-22 string PK\005\006 Zip archive, with extra data prepended -+>&-22 string PK\005\006 -+# without #! -+>>0 string !#! Zip archive, with extra data prepended - !:mime application/zip - !:ext zip/cbz -+# with #! -+>>0 string/w #!\ a -+>>>&-1 string/T x %s script executable (Zip archive) - - # ACE archive (from http://www.wotsit.org/download.asp?f=ace) - # by Stefan `Sec` Zehl diff --git a/file-5.17-option.dif b/file-5.17-option.dif index 76bb7b0..a3d6273 100644 --- a/file-5.17-option.dif +++ b/file-5.17-option.dif @@ -2,7 +2,7 @@ Index: file-5.43/src/file.c =================================================================== --- file-5.43.orig/src/file.c +++ file-5.43/src/file.c -@@ -260,6 +260,8 @@ main(int argc, char *argv[]) +@@ -263,6 +263,8 @@ main(int argc, char *argv[]) break; case 'e': case OPT_EXCLUDE_QUIET: @@ -11,7 +11,7 @@ Index: file-5.43/src/file.c for (i = 0; i < __arraycount(nv); i++) if (strcmp(nv[i].name, optarg) == 0) break; -@@ -272,7 +274,7 @@ main(int argc, char *argv[]) +@@ -275,7 +277,7 @@ main(int argc, char *argv[]) break; case 'f': @@ -20,7 +20,7 @@ Index: file-5.43/src/file.c usage(); if (magic == NULL) if ((magic = load(magicfile, flags)) == NULL) -@@ -282,6 +284,8 @@ main(int argc, char *argv[]) +@@ -285,6 +287,8 @@ main(int argc, char *argv[]) ++didsomefiles; break; case 'F': @@ -29,7 +29,7 @@ Index: file-5.43/src/file.c separator = optarg; break; case 'i': -@@ -294,6 +298,8 @@ main(int argc, char *argv[]) +@@ -297,6 +301,8 @@ main(int argc, char *argv[]) action = FILE_LIST; break; case 'm': diff --git a/file-5.19-biorad.dif b/file-5.19-biorad.dif index 616f118..a997a17 100644 --- a/file-5.19-biorad.dif +++ b/file-5.19-biorad.dif @@ -6,7 +6,7 @@ Index: magic/Magdir/images =================================================================== --- magic/Magdir/images.orig +++ magic/Magdir/images -@@ -2167,6 +2167,8 @@ +@@ -2180,6 +2180,8 @@ # https://web.archive.org/web/20050317223257/www.cs.ubc.ca/spider/ladic/text/biorad.txt # Samples: https://www.loci.wisc.edu/software/sample-data 14 uleshort <2 diff --git a/file-5.19-zip2.0.dif b/file-5.19-zip2.0.dif index 313c646..82cc635 100644 --- a/file-5.19-zip2.0.dif +++ b/file-5.19-zip2.0.dif @@ -2,11 +2,9 @@ magic/Magdir/archive | 5 +++++ 1 file changed, 5 insertions(+) -Index: magic/Magdir/archive -=================================================================== ---- magic/Magdir/archive.orig -+++ magic/Magdir/archive -@@ -1504,6 +1504,11 @@ +--- magic/Magdir/archive ++++ magic/Magdir/archive 2023-07-28 09:40:12.243809381 +0000 +@@ -1622,6 +1622,11 @@ 0 string PK\x07\x08PK\x03\x04 Zip multi-volume archive data, at least PKZIP v2.50 to extract !:mime application/zip !:ext zip/cbz @@ -16,5 +14,5 @@ Index: magic/Magdir/archive +!:mime application/unknown+zip +!:ext zip/cbz - # Zip archives (Greg Roelofs, c/o zip-bugs@wkuvx1.wku.edu) - 0 string PK\005\006 Zip archive data (empty) + # Android APK file (Zip archive) + 0 string PK\003\004 diff --git a/file-5.22-elf.dif b/file-5.22-elf.dif index f996930..09bfa98 100644 --- a/file-5.22-elf.dif +++ b/file-5.22-elf.dif @@ -6,7 +6,7 @@ Index: src/readelf.c =================================================================== --- src/readelf.c.orig +++ src/readelf.c -@@ -828,7 +828,7 @@ do_core_note(struct magic_set *ms, unsig +@@ -825,7 +825,7 @@ do_core_note(struct magic_set *ms, unsig default: if (type == NT_PRPSINFO && *flags & FLAGS_IS_CORE) { @@ -15,7 +15,7 @@ Index: src/readelf.c unsigned char c; /* * Extract the program name. We assume -@@ -840,7 +840,9 @@ do_core_note(struct magic_set *ms, unsig +@@ -837,7 +837,9 @@ do_core_note(struct magic_set *ms, unsig * If the characters aren't all printable, * reject it. */ diff --git a/file-5.44.tar.gz b/file-5.44.tar.gz deleted file mode 100644 index e88de38..0000000 --- a/file-5.44.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3751c7fba8dbc831cb8d7cc8aff21035459b8ce5155ef8b0880a27d028475f3b -size 1186437 diff --git a/file-5.44.tar.gz.asc b/file-5.44.tar.gz.asc deleted file mode 100644 index 09c0df8..0000000 --- a/file-5.44.tar.gz.asc +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iF0EABECAB0WIQS+BJlbqPkO0MDBdsRxESqxbLM7OgUCY6nndwAKCRBxESqxbLM7 -OiUWAJ9ygauXJ3pohF38SQuLYu+J8qayuwCeIFPcEukUyNuYv04B9FIXkumreI8= -=/CFO ------END PGP SIGNATURE----- diff --git a/file-5.44.dif b/file-5.45.dif similarity index 92% rename from file-5.44.dif rename to file-5.45.dif index 0cf948a..1a39199 100644 --- a/file-5.44.dif +++ b/file-5.45.dif @@ -10,8 +10,8 @@ 8 files changed, 313 insertions(+), 68 deletions(-) --- magic/Magdir/elf -+++ magic/Magdir/elf 2023-01-09 14:36:25.751054574 +0000 -@@ -152,7 +152,7 @@ ++++ magic/Magdir/elf 2023-07-28 09:42:01.845813939 +0000 +@@ -154,7 +154,7 @@ >18 leshort 47 Renesas H8/300H, >18 leshort 48 Renesas H8S, >18 leshort 49 Renesas H8/500, @@ -21,7 +21,7 @@ >18 leshort 52 Motorola Coldfire, >18 leshort 53 Motorola M68HC12, --- magic/Magdir/linux -+++ magic/Magdir/linux 2023-01-09 14:36:25.751054574 +0000 ++++ magic/Magdir/linux 2023-07-28 09:42:01.845813939 +0000 @@ -140,27 +140,31 @@ # All known start with: b8 c0 07 8e d8 b8 00 90 8e c0 b9 00 01 29 f6 29 # Linux kernel boot images (i386 arch) (Wolfram Kleff) @@ -71,7 +71,7 @@ 0 belong 0xb8c0078e Linux kernel >0x1e3 string Loading version 1.3.79 or older --- magic/Magdir/msad -+++ magic/Magdir/msad 2023-01-09 14:36:25.751054574 +0000 ++++ magic/Magdir/msad 2023-07-28 09:42:01.845813939 +0000 @@ -0,0 +1,5 @@ +#------------------------------------------------------------------------------ +# msad: file(1) magic for msad @@ -79,8 +79,8 @@ +# This must precede the heuristic for raw G3 data +4 string Standard\ Jet\ DB Microsoft Access Database --- magic/Magdir/msdos -+++ magic/Magdir/msdos 2023-01-09 14:36:25.751054574 +0000 -@@ -296,9 +296,9 @@ ++++ magic/Magdir/msdos 2023-07-28 09:42:01.845813939 +0000 +@@ -298,9 +298,9 @@ >>(0x3c.l+22) leshort&0x0200 >0 (stripped to external PDB) >>(0x3c.l+22) leshort&0x1000 >0 system file >>(0x3c.l+24) leshort 0x010b @@ -92,7 +92,7 @@ # hooray, there's a DOS extender using the PE format, with a valid PE # executable inside (which just prints a message and exits if run in win) -@@ -1020,7 +1020,7 @@ +@@ -1026,7 +1026,7 @@ >1 leshort <-259 # that offset must be accessible # add 10000h to jump at end of 64 KiB segment, add 1 for jump instruction and 2 for 16-bit offset @@ -102,7 +102,7 @@ #>>>&-1 ubelong x \b, NEXT instruction %#8.8x >>>0 use msdos-com --- magic/Makefile.am -+++ magic/Makefile.am 2023-01-09 14:37:10.602219227 +0000 ++++ magic/Makefile.am 2023-07-28 09:42:01.849813866 +0000 @@ -5,7 +5,7 @@ MAGIC_FRAGMENT_BASE = Magdir MAGIC_DIR = $(top_srcdir)/magic MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE) @@ -120,7 +120,7 @@ $(MAGIC_FRAGMENT_DIR)/application \ $(MAGIC_FRAGMENT_DIR)/applix \ $(MAGIC_FRAGMENT_DIR)/apt \ -@@ -105,7 +104,6 @@ $(MAGIC_FRAGMENT_DIR)/erlang \ +@@ -106,7 +105,6 @@ $(MAGIC_FRAGMENT_DIR)/erlang \ $(MAGIC_FRAGMENT_DIR)/espressif \ $(MAGIC_FRAGMENT_DIR)/esri \ $(MAGIC_FRAGMENT_DIR)/fcs \ @@ -128,7 +128,7 @@ $(MAGIC_FRAGMENT_DIR)/finger \ $(MAGIC_FRAGMENT_DIR)/firmware \ $(MAGIC_FRAGMENT_DIR)/flash \ -@@ -152,6 +150,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \ +@@ -153,6 +151,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \ $(MAGIC_FRAGMENT_DIR)/java \ $(MAGIC_FRAGMENT_DIR)/javascript \ $(MAGIC_FRAGMENT_DIR)/jpeg \ @@ -137,7 +137,7 @@ $(MAGIC_FRAGMENT_DIR)/karma \ $(MAGIC_FRAGMENT_DIR)/kde \ $(MAGIC_FRAGMENT_DIR)/keepass \ -@@ -162,7 +162,6 @@ $(MAGIC_FRAGMENT_DIR)/lammps \ +@@ -163,7 +163,6 @@ $(MAGIC_FRAGMENT_DIR)/lammps \ $(MAGIC_FRAGMENT_DIR)/lecter \ $(MAGIC_FRAGMENT_DIR)/lex \ $(MAGIC_FRAGMENT_DIR)/lif \ @@ -145,7 +145,7 @@ $(MAGIC_FRAGMENT_DIR)/lisp \ $(MAGIC_FRAGMENT_DIR)/llvm \ $(MAGIC_FRAGMENT_DIR)/locoscript \ -@@ -170,7 +169,6 @@ $(MAGIC_FRAGMENT_DIR)/lua \ +@@ -171,7 +170,6 @@ $(MAGIC_FRAGMENT_DIR)/lua \ $(MAGIC_FRAGMENT_DIR)/luks \ $(MAGIC_FRAGMENT_DIR)/m4 \ $(MAGIC_FRAGMENT_DIR)/mach \ @@ -153,7 +153,7 @@ $(MAGIC_FRAGMENT_DIR)/macos \ $(MAGIC_FRAGMENT_DIR)/magic \ $(MAGIC_FRAGMENT_DIR)/mail.news \ -@@ -194,11 +192,11 @@ $(MAGIC_FRAGMENT_DIR)/misctools \ +@@ -195,11 +193,11 @@ $(MAGIC_FRAGMENT_DIR)/misctools \ $(MAGIC_FRAGMENT_DIR)/mkid \ $(MAGIC_FRAGMENT_DIR)/mlssa \ $(MAGIC_FRAGMENT_DIR)/mmdf \ @@ -166,7 +166,7 @@ $(MAGIC_FRAGMENT_DIR)/msooxml \ $(MAGIC_FRAGMENT_DIR)/msvc \ $(MAGIC_FRAGMENT_DIR)/msx \ -@@ -262,6 +260,8 @@ $(MAGIC_FRAGMENT_DIR)/qt \ +@@ -263,6 +261,8 @@ $(MAGIC_FRAGMENT_DIR)/qt \ $(MAGIC_FRAGMENT_DIR)/revision \ $(MAGIC_FRAGMENT_DIR)/ringdove \ $(MAGIC_FRAGMENT_DIR)/riff \ @@ -175,7 +175,7 @@ $(MAGIC_FRAGMENT_DIR)/rpi \ $(MAGIC_FRAGMENT_DIR)/rpm \ $(MAGIC_FRAGMENT_DIR)/rpmsg \ -@@ -353,9 +353,21 @@ EXTRA_DIST = \ +@@ -355,9 +355,21 @@ EXTRA_DIST = \ $(MAGIC_DIR)/scripts/create_filemagic_flac \ $(MAGIC_FRAGMENTS) @@ -199,7 +199,7 @@ # FIXME: Build file natively as well so that it can be used to compile # the target's magic file; for now we bail if the local version does not match -@@ -367,19 +379,22 @@ FILE_COMPILE = $(top_builddir)/src/file$ +@@ -369,19 +381,22 @@ FILE_COMPILE = $(top_builddir)/src/file$ FILE_COMPILE_DEP = $(FILE_COMPILE) endif @@ -239,8 +239,8 @@ +# $(FILE_COMPILE) -C -m magic +# @rm -fr magic --- magic/Makefile.in -+++ magic/Makefile.in 2023-01-09 14:37:31.561828862 +0000 -@@ -280,7 +280,7 @@ top_srcdir = @top_srcdir@ ++++ magic/Makefile.in 2023-07-28 09:42:01.849813866 +0000 +@@ -283,7 +283,7 @@ top_srcdir = @top_srcdir@ MAGIC_FRAGMENT_BASE = Magdir MAGIC_DIR = $(top_srcdir)/magic MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE) @@ -249,7 +249,7 @@ MAGIC_FRAGMENTS = \ $(MAGIC_DIR)/Header \ $(MAGIC_DIR)/Localstuff \ -@@ -298,7 +298,6 @@ $(MAGIC_FRAGMENT_DIR)/animation \ +@@ -301,7 +301,6 @@ $(MAGIC_FRAGMENT_DIR)/animation \ $(MAGIC_FRAGMENT_DIR)/aout \ $(MAGIC_FRAGMENT_DIR)/apache \ $(MAGIC_FRAGMENT_DIR)/apl \ @@ -257,7 +257,7 @@ $(MAGIC_FRAGMENT_DIR)/application \ $(MAGIC_FRAGMENT_DIR)/applix \ $(MAGIC_FRAGMENT_DIR)/apt \ -@@ -379,7 +378,6 @@ $(MAGIC_FRAGMENT_DIR)/erlang \ +@@ -383,7 +382,6 @@ $(MAGIC_FRAGMENT_DIR)/erlang \ $(MAGIC_FRAGMENT_DIR)/espressif \ $(MAGIC_FRAGMENT_DIR)/esri \ $(MAGIC_FRAGMENT_DIR)/fcs \ @@ -265,7 +265,7 @@ $(MAGIC_FRAGMENT_DIR)/finger \ $(MAGIC_FRAGMENT_DIR)/firmware \ $(MAGIC_FRAGMENT_DIR)/flash \ -@@ -426,6 +424,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \ +@@ -430,6 +428,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \ $(MAGIC_FRAGMENT_DIR)/java \ $(MAGIC_FRAGMENT_DIR)/javascript \ $(MAGIC_FRAGMENT_DIR)/jpeg \ @@ -274,7 +274,7 @@ $(MAGIC_FRAGMENT_DIR)/karma \ $(MAGIC_FRAGMENT_DIR)/kde \ $(MAGIC_FRAGMENT_DIR)/keepass \ -@@ -436,7 +436,6 @@ $(MAGIC_FRAGMENT_DIR)/lammps \ +@@ -440,7 +440,6 @@ $(MAGIC_FRAGMENT_DIR)/lammps \ $(MAGIC_FRAGMENT_DIR)/lecter \ $(MAGIC_FRAGMENT_DIR)/lex \ $(MAGIC_FRAGMENT_DIR)/lif \ @@ -282,7 +282,7 @@ $(MAGIC_FRAGMENT_DIR)/lisp \ $(MAGIC_FRAGMENT_DIR)/llvm \ $(MAGIC_FRAGMENT_DIR)/locoscript \ -@@ -444,7 +443,6 @@ $(MAGIC_FRAGMENT_DIR)/lua \ +@@ -448,7 +447,6 @@ $(MAGIC_FRAGMENT_DIR)/lua \ $(MAGIC_FRAGMENT_DIR)/luks \ $(MAGIC_FRAGMENT_DIR)/m4 \ $(MAGIC_FRAGMENT_DIR)/mach \ @@ -290,7 +290,7 @@ $(MAGIC_FRAGMENT_DIR)/macos \ $(MAGIC_FRAGMENT_DIR)/magic \ $(MAGIC_FRAGMENT_DIR)/mail.news \ -@@ -468,11 +466,11 @@ $(MAGIC_FRAGMENT_DIR)/misctools \ +@@ -472,11 +470,11 @@ $(MAGIC_FRAGMENT_DIR)/misctools \ $(MAGIC_FRAGMENT_DIR)/mkid \ $(MAGIC_FRAGMENT_DIR)/mlssa \ $(MAGIC_FRAGMENT_DIR)/mmdf \ @@ -303,7 +303,7 @@ $(MAGIC_FRAGMENT_DIR)/msooxml \ $(MAGIC_FRAGMENT_DIR)/msvc \ $(MAGIC_FRAGMENT_DIR)/msx \ -@@ -536,6 +534,8 @@ $(MAGIC_FRAGMENT_DIR)/qt \ +@@ -540,6 +538,8 @@ $(MAGIC_FRAGMENT_DIR)/qt \ $(MAGIC_FRAGMENT_DIR)/revision \ $(MAGIC_FRAGMENT_DIR)/ringdove \ $(MAGIC_FRAGMENT_DIR)/riff \ @@ -312,7 +312,7 @@ $(MAGIC_FRAGMENT_DIR)/rpi \ $(MAGIC_FRAGMENT_DIR)/rpm \ $(MAGIC_FRAGMENT_DIR)/rpmsg \ -@@ -627,10 +627,22 @@ EXTRA_DIST = \ +@@ -632,10 +632,22 @@ EXTRA_DIST = \ $(MAGIC_DIR)/scripts/create_filemagic_flac \ $(MAGIC_FRAGMENTS) @@ -336,7 +336,7 @@ # FIXME: Build file natively as well so that it can be used to compile # the target's magic file; for now we bail if the local version does not match @IS_CROSS_COMPILE_TRUE@FILE_COMPILE = file${EXEEXT} -@@ -855,23 +867,25 @@ uninstall-am: uninstall-pkgdataDATA +@@ -859,23 +871,25 @@ uninstall-am: uninstall-pkgdataDATA .PRECIOUS: Makefile @@ -379,7 +379,7 @@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- src/Makefile.am -+++ src/Makefile.am 2023-01-09 14:36:25.751054574 +0000 ++++ src/Makefile.am 2023-07-28 09:42:01.849813866 +0000 @@ -1,4 +1,4 @@ -MAGIC = $(pkgdatadir)/magic +MAGIC = $(sysconfdir)/magic:$(pkgdatadir)/magic @@ -387,7 +387,7 @@ nodist_include_HEADERS = magic.h --- src/dcore.c -+++ src/dcore.c 2023-01-09 14:36:25.751054574 +0000 ++++ src/dcore.c 2023-07-28 09:42:01.865813574 +0000 @@ -0,0 +1,207 @@ +/* + * Show goo about ELF core files diff --git a/file-5.45.tar.gz b/file-5.45.tar.gz new file mode 100644 index 0000000..884bfaa --- /dev/null +++ b/file-5.45.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fc97f51029bb0e2c9f4e3bffefdaf678f0e039ee872b9de5c002a6d09c784d82 +size 1246503 diff --git a/file-5.45.tar.gz.asc b/file-5.45.tar.gz.asc new file mode 100644 index 0000000..34e10a0 --- /dev/null +++ b/file-5.45.tar.gz.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iEYEABECAAYFAmTCz2IACgkQcREqsWyzOzpvCgCcDRR1icCs3FF4dXiIXCS3mykf +T5wAoI4+RrEesZEWRBl641Z1lshkK+4c +=bF1Y +-----END PGP SIGNATURE----- diff --git a/file-secure_getenv.patch b/file-secure_getenv.patch index 24030c7..5e6ddaa 100644 --- a/file-secure_getenv.patch +++ b/file-secure_getenv.patch @@ -17,7 +17,7 @@ AC_TYPE_SIZE_T --- file-5.42/src/file.h +++ file-5.42/src/file.h 2022-06-13 08:34:50.347521415 +0000 -@@ -709,4 +709,12 @@ static const char *rcsid(const char *p) +@@ -726,4 +726,12 @@ static const char *rcsid(const char *p) #define __RCSID(a) #endif diff --git a/file.changes b/file.changes index 745b859..1ff23df 100644 --- a/file.changes +++ b/file.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Fri Jul 28 09:48:53 UTC 2023 - Dr. Werner Fink + +- Update to 5.45: + * PR/465: psrok1: Avoid muslc asctime_r crash + * add SIMH tape format support + * bump the max size of the elf section notes to be read to 128K + and make it configurable + * PR/415: Fix decompression with program returning empty + * PR/408: fix -p with seccomp + * PR/412: fix MinGW compilation +- Remove upstream patch dc71304b.patch +- Modify patches + * file-5.17-option.dif + * file-5.19-biorad.dif + * file-5.19-zip2.0.dif + * file-5.22-elf.dif + * file-secure_getenv.patch +- Port and rename patch file-5.44.dif now file-5.45.dif + ------------------------------------------------------------------- Thu May 4 14:15:38 UTC 2023 - Frederic Crozat diff --git a/file.spec b/file.spec index c20b1ce..93181c5 100644 --- a/file.spec +++ b/file.spec @@ -34,7 +34,7 @@ Obsoletes: file-64bit %endif # # Set Version also in python-magic.spec -Version: 5.44 +Version: 5.45 Release: 0 Summary: A Tool to Determine File Types License: BSD-2-Clause @@ -44,7 +44,7 @@ Source2: baselibs.conf Source3: file-rpmlintrc Source4: https://www.astron.com/pub/file/file-%{version}.tar.gz.asc Source5: file.keyring -Patch0: file-5.44.dif +Patch0: file-5.45.dif Patch1: file-5.19-misc.dif Patch4: file-4.24-autoconf.dif Patch5: file-5.14-tex.dif @@ -63,8 +63,6 @@ Patch31: file-5.19-biorad.dif Patch32: file-5.19-clicfs.dif Patch37: file-secure_getenv.patch Patch39: file-5.28-btrfs-image.dif -# PATCH-FIX-UPSTREAM -Patch42: dc71304b.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir /etc %global magicdir %{_datadir}/file @@ -109,7 +107,6 @@ to develop applications that require the magic "file" interface. %prep %setup -q -n file-%{version} -%patch42 -p0 %patch1 -p0 -b .misc %patch4 -p0 -b .conf %patch5 -p0 -b .tex diff --git a/python-magic.spec b/python-magic.spec index 27a551b..3077f4f 100644 --- a/python-magic.spec +++ b/python-magic.spec @@ -21,7 +21,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %global _miscdir %{_datadir}/misc Name: python-magic -Version: 5.44 +Version: 5.45 Release: 0 Summary: Python module to use libmagic License: BSD-3-Clause AND BSD-4-Clause