From ce6e6ec49c69b029bfa248b12398660da437d6d157000810e62ee764587d30c5 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 6 Apr 2021 07:26:22 +0000 Subject: [PATCH] Accepting request 882779 from home:AndreasStieger:branches:Base:System file 5.40 OBS-URL: https://build.opensuse.org/request/show/882779 OBS-URL: https://build.opensuse.org/package/show/Base:System/file?expand=0&rev=222 --- file-5.16-ocloexec.patch | 69 ------------------------- file-5.18-javacheck.dif | 16 +++--- file-5.39-alternate_format.dif | 20 -------- file-5.39.dif | 92 ++++++++++++++++++++-------------- file-5.39.tar.gz | 3 -- file-5.39.tar.gz.asc | 6 --- file-5.40.tar.gz | 3 ++ file-5.40.tar.gz.asc | 6 +++ file.changes | 14 ++++++ file.spec | 6 +-- python-magic.changes | 6 +++ python-magic.spec | 2 +- 12 files changed, 95 insertions(+), 148 deletions(-) delete mode 100644 file-5.16-ocloexec.patch delete mode 100644 file-5.39-alternate_format.dif delete mode 100644 file-5.39.tar.gz delete mode 100644 file-5.39.tar.gz.asc create mode 100644 file-5.40.tar.gz create mode 100644 file-5.40.tar.gz.asc diff --git a/file-5.16-ocloexec.patch b/file-5.16-ocloexec.patch deleted file mode 100644 index b13709c..0000000 --- a/file-5.16-ocloexec.patch +++ /dev/null @@ -1,69 +0,0 @@ ---- - src/apprentice.c | 6 +++--- - src/compress.c | 2 +- - src/file.c | 2 +- - src/magic.c | 2 +- - 4 files changed, 6 insertions(+), 6 deletions(-) - ---- src/apprentice.c -+++ src/apprentice.c 2019-05-27 08:53:31.057488035 +0000 -@@ -1184,7 +1184,7 @@ load_1(struct magic_set *ms, int action, - ssize_t len; - struct magic_entry me; - -- FILE *f = fopen(ms->file = fn, "r"); -+ FILE *f = fopen(ms->file = fn, "re"); - if (f == NULL) { - if (errno != ENOENT) - file_error(ms, errno, "cannot read magic file `%s'", -@@ -3108,7 +3108,7 @@ apprentice_map(struct magic_set *ms, con - if (dbname == NULL) - goto error; - -- if ((fd = open(dbname, O_RDONLY|O_BINARY)) == -1) -+ if ((fd = open(dbname, O_RDONLY|O_BINARY|O_CLOEXEC)) == -1) - goto error; - - if (fstat(fd, &st) == -1) { -@@ -3243,7 +3243,7 @@ apprentice_compile(struct magic_set *ms, - if (dbname == NULL) - goto out; - -- if ((fd = open(dbname, O_WRONLY|O_CREAT|O_TRUNC|O_BINARY, 0644)) == -1) -+ if ((fd = open(dbname, O_WRONLY|O_CREAT|O_TRUNC|O_BINARY|O_CLOEXEC, 0644)) == -1) - { - file_error(ms, errno, "cannot open `%s'", dbname); - goto out; ---- src/compress.c -+++ src/compress.c 2019-05-27 08:53:31.057488035 +0000 -@@ -462,7 +462,7 @@ file_pipe2file(struct magic_set *ms, int - { - int te; - mode_t ou = umask(0); -- tfd = mkstemp(buf); -+ tfd = mkostemp(buf, O_CLOEXEC); - (void)umask(ou); - te = errno; - (void)unlink(buf); ---- src/file.c -+++ src/file.c 2019-05-27 08:53:31.057488035 +0000 -@@ -509,7 +509,7 @@ unwrap(struct magic_set *ms, const char - f = stdin; - wid = 1; - } else { -- if ((f = fopen(fn, "r")) == NULL) { -+ if ((f = fopen(fn, "re")) == NULL) { - file_warn("Cannot open `%s'", fn); - return 1; - } ---- src/magic.c -+++ src/magic.c 2019-05-27 09:00:04.010005617 +0000 -@@ -436,7 +436,7 @@ file_or_fd(struct magic_set *ms, const c - _setmode(STDIN_FILENO, O_BINARY); - #endif - if (inname != NULL) { -- int flags = O_RDONLY|O_BINARY|O_NONBLOCK; -+ int flags = O_RDONLY|O_BINARY|O_NONBLOCK|O_CLOEXEC; - errno = 0; - if ((fd = open(inname, flags)) < 0) { - okstat = stat(inname, &sb) == 0; diff --git a/file-5.18-javacheck.dif b/file-5.18-javacheck.dif index 196d117..f8178cf 100644 --- a/file-5.18-javacheck.dif +++ b/file-5.18-javacheck.dif @@ -1,11 +1,13 @@ ---- magic/Magdir/cafebabe -+++ magic/Magdir/cafebabe 2014-03-28 10:15:13.354235294 +0000 -@@ -15,7 +15,7 @@ - # might add another one or two as time goes by... - # +Index: magic/Magdir/cafebabe +=================================================================== +--- magic/Magdir/cafebabe.orig ++++ magic/Magdir/cafebabe +@@ -17,7 +17,7 @@ ### JAVA START ### + # Reference: http://en.wikipedia.org/wiki/Java_class_file + # Update: Joerg Jenderek -0 belong 0xcafebabe +0 belong 0xcafebabe Cafe Babe - >4 belong >30 compiled Java class data, + >4 ubelong >30 compiled Java class data, !:mime application/x-java-applet - >>6 beshort x version %d. + #!:mime application/java-byte-code diff --git a/file-5.39-alternate_format.dif b/file-5.39-alternate_format.dif deleted file mode 100644 index 36f3317..0000000 --- a/file-5.39-alternate_format.dif +++ /dev/null @@ -1,20 +0,0 @@ -commit 85b7ab83257b3191a1a7ca044589a092bcef2bb3 -Author: Christos Zoulas -Date: Thu Jun 25 16:52:48 2020 +0000 - - Include # (alternate format) to the list of uninteresting formats - Reported by Werner Fink - -diff --git src/funcs.c src/funcs.c -index 299b8f02..ecbfa28c 100644 ---- src/funcs.c -+++ src/funcs.c -@@ -93,7 +93,7 @@ file_checkfmt(char *msg, size_t mlen, const char *fmt) - if (*++p == '%') - continue; - // Skip uninteresting. -- while (strchr("0.'+- ", *p) != NULL) -+ while (strchr("#0.'+- ", *p) != NULL) - p++; - if (*p == '*') { - if (msg) diff --git a/file-5.39.dif b/file-5.39.dif index 7c71d4e..ff57314 100644 --- a/file-5.39.dif +++ b/file-5.39.dif @@ -9,9 +9,11 @@ src/dcore.c | 207 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 312 insertions(+), 67 deletions(-) ---- magic/Magdir/elf -+++ magic/Magdir/elf 2020-07-01 07:22:26.488294151 +0000 -@@ -136,7 +136,7 @@ +Index: magic/Magdir/elf +=================================================================== +--- magic/Magdir/elf.orig ++++ magic/Magdir/elf +@@ -152,7 +152,7 @@ >18 leshort 47 Renesas H8/300H, >18 leshort 48 Renesas H8S, >18 leshort 49 Renesas H8/500, @@ -20,8 +22,10 @@ >18 leshort 51 Stanford MIPS-X, >18 leshort 52 Motorola Coldfire, >18 leshort 53 Motorola M68HC12, ---- magic/Magdir/linux -+++ magic/Magdir/linux 2020-07-01 07:22:26.488294151 +0000 +Index: magic/Magdir/linux +=================================================================== +--- magic/Magdir/linux.orig ++++ magic/Magdir/linux @@ -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) @@ -70,17 +74,21 @@ # This also matches new kernels, which were caught above by "HdrS". 0 belong 0xb8c0078e Linux kernel >0x1e3 string Loading version 1.3.79 or older ---- magic/Magdir/msad -+++ magic/Magdir/msad 2020-07-01 07:22:26.488294151 +0000 +Index: magic/Magdir/msad +=================================================================== +--- /dev/null ++++ magic/Magdir/msad @@ -0,0 +1,5 @@ +#------------------------------------------------------------------------------ +# msad: file(1) magic for msad +# Microsoft visual C +# This must precede the heuristic for raw G3 data +4 string Standard\ Jet\ DB Microsoft Access Database ---- magic/Magdir/msdos -+++ magic/Magdir/msdos 2020-07-01 07:22:26.492294076 +0000 -@@ -143,9 +143,9 @@ +Index: magic/Magdir/msdos +=================================================================== +--- magic/Magdir/msdos.orig ++++ magic/Magdir/msdos +@@ -145,9 +145,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 +100,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) -@@ -532,7 +532,7 @@ +@@ -554,7 +554,7 @@ # negative offset, must not lead into PSP >1 short <-259 # that offset must be accessible @@ -101,8 +109,10 @@ >>>0 use msdos-com # updated by Joerg Jenderek at Oct 2008,2015 ---- magic/Makefile.am -+++ magic/Makefile.am 2020-07-01 07:22:26.492294076 +0000 +Index: magic/Makefile.am +=================================================================== +--- magic/Makefile.am.orig ++++ magic/Makefile.am @@ -5,7 +5,7 @@ MAGIC_FRAGMENT_BASE = Magdir MAGIC_DIR = $(top_srcdir)/magic MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE) @@ -112,7 +122,7 @@ EXTRA_DIST = \ $(MAGIC_DIR)/Header \ -@@ -23,7 +23,6 @@ $(MAGIC_FRAGMENT_DIR)/animation \ +@@ -24,7 +24,6 @@ $(MAGIC_FRAGMENT_DIR)/animation \ $(MAGIC_FRAGMENT_DIR)/aout \ $(MAGIC_FRAGMENT_DIR)/apache \ $(MAGIC_FRAGMENT_DIR)/apl \ @@ -120,7 +130,7 @@ $(MAGIC_FRAGMENT_DIR)/application \ $(MAGIC_FRAGMENT_DIR)/applix \ $(MAGIC_FRAGMENT_DIR)/apt \ -@@ -96,7 +95,6 @@ $(MAGIC_FRAGMENT_DIR)/erlang \ +@@ -100,7 +99,6 @@ $(MAGIC_FRAGMENT_DIR)/erlang \ $(MAGIC_FRAGMENT_DIR)/espressif \ $(MAGIC_FRAGMENT_DIR)/esri \ $(MAGIC_FRAGMENT_DIR)/fcs \ @@ -128,7 +138,7 @@ $(MAGIC_FRAGMENT_DIR)/finger \ $(MAGIC_FRAGMENT_DIR)/flash \ $(MAGIC_FRAGMENT_DIR)/flif \ -@@ -142,6 +140,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \ +@@ -146,6 +144,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \ $(MAGIC_FRAGMENT_DIR)/java \ $(MAGIC_FRAGMENT_DIR)/javascript \ $(MAGIC_FRAGMENT_DIR)/jpeg \ @@ -137,14 +147,15 @@ $(MAGIC_FRAGMENT_DIR)/karma \ $(MAGIC_FRAGMENT_DIR)/kde \ $(MAGIC_FRAGMENT_DIR)/keepass \ -@@ -151,14 +151,12 @@ $(MAGIC_FRAGMENT_DIR)/kml \ +@@ -156,7 +156,6 @@ $(MAGIC_FRAGMENT_DIR)/lammps \ $(MAGIC_FRAGMENT_DIR)/lecter \ $(MAGIC_FRAGMENT_DIR)/lex \ $(MAGIC_FRAGMENT_DIR)/lif \ -$(MAGIC_FRAGMENT_DIR)/linux \ $(MAGIC_FRAGMENT_DIR)/lisp \ $(MAGIC_FRAGMENT_DIR)/llvm \ - $(MAGIC_FRAGMENT_DIR)/lua \ + $(MAGIC_FRAGMENT_DIR)/locoscript \ +@@ -164,7 +163,6 @@ $(MAGIC_FRAGMENT_DIR)/lua \ $(MAGIC_FRAGMENT_DIR)/luks \ $(MAGIC_FRAGMENT_DIR)/m4 \ $(MAGIC_FRAGMENT_DIR)/mach \ @@ -152,7 +163,7 @@ $(MAGIC_FRAGMENT_DIR)/macos \ $(MAGIC_FRAGMENT_DIR)/magic \ $(MAGIC_FRAGMENT_DIR)/mail.news \ -@@ -182,11 +180,11 @@ $(MAGIC_FRAGMENT_DIR)/misctools \ +@@ -188,11 +186,11 @@ $(MAGIC_FRAGMENT_DIR)/misctools \ $(MAGIC_FRAGMENT_DIR)/mkid \ $(MAGIC_FRAGMENT_DIR)/mlssa \ $(MAGIC_FRAGMENT_DIR)/mmdf \ @@ -165,7 +176,7 @@ $(MAGIC_FRAGMENT_DIR)/msooxml \ $(MAGIC_FRAGMENT_DIR)/msvc \ $(MAGIC_FRAGMENT_DIR)/msx \ -@@ -242,6 +240,8 @@ $(MAGIC_FRAGMENT_DIR)/python \ +@@ -250,6 +248,8 @@ $(MAGIC_FRAGMENT_DIR)/python \ $(MAGIC_FRAGMENT_DIR)/qt \ $(MAGIC_FRAGMENT_DIR)/revision \ $(MAGIC_FRAGMENT_DIR)/riff \ @@ -174,7 +185,7 @@ $(MAGIC_FRAGMENT_DIR)/rpi \ $(MAGIC_FRAGMENT_DIR)/rpm \ $(MAGIC_FRAGMENT_DIR)/rpmsg \ -@@ -325,8 +325,20 @@ $(MAGIC_FRAGMENT_DIR)/zilog \ +@@ -334,8 +334,20 @@ $(MAGIC_FRAGMENT_DIR)/zilog \ $(MAGIC_FRAGMENT_DIR)/zip \ $(MAGIC_FRAGMENT_DIR)/zyxel @@ -196,7 +207,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 -@@ -338,19 +350,22 @@ FILE_COMPILE = $(top_builddir)/src/file$ +@@ -347,19 +359,22 @@ FILE_COMPILE = $(top_builddir)/src/file$ FILE_COMPILE_DEP = $(FILE_COMPILE) endif @@ -235,8 +246,10 @@ +# fi) +# $(FILE_COMPILE) -C -m magic +# @rm -fr magic ---- magic/Makefile.in -+++ magic/Makefile.in 2020-07-01 07:22:26.492294076 +0000 +Index: magic/Makefile.in +=================================================================== +--- magic/Makefile.in.orig ++++ magic/Makefile.in @@ -279,7 +279,7 @@ top_srcdir = @top_srcdir@ MAGIC_FRAGMENT_BASE = Magdir MAGIC_DIR = $(top_srcdir)/magic @@ -246,7 +259,7 @@ EXTRA_DIST = \ $(MAGIC_DIR)/Header \ $(MAGIC_DIR)/Localstuff \ -@@ -296,7 +296,6 @@ $(MAGIC_FRAGMENT_DIR)/animation \ +@@ -297,7 +297,6 @@ $(MAGIC_FRAGMENT_DIR)/animation \ $(MAGIC_FRAGMENT_DIR)/aout \ $(MAGIC_FRAGMENT_DIR)/apache \ $(MAGIC_FRAGMENT_DIR)/apl \ @@ -254,7 +267,7 @@ $(MAGIC_FRAGMENT_DIR)/application \ $(MAGIC_FRAGMENT_DIR)/applix \ $(MAGIC_FRAGMENT_DIR)/apt \ -@@ -369,7 +368,6 @@ $(MAGIC_FRAGMENT_DIR)/erlang \ +@@ -373,7 +372,6 @@ $(MAGIC_FRAGMENT_DIR)/erlang \ $(MAGIC_FRAGMENT_DIR)/espressif \ $(MAGIC_FRAGMENT_DIR)/esri \ $(MAGIC_FRAGMENT_DIR)/fcs \ @@ -262,7 +275,7 @@ $(MAGIC_FRAGMENT_DIR)/finger \ $(MAGIC_FRAGMENT_DIR)/flash \ $(MAGIC_FRAGMENT_DIR)/flif \ -@@ -415,6 +413,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \ +@@ -419,6 +417,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \ $(MAGIC_FRAGMENT_DIR)/java \ $(MAGIC_FRAGMENT_DIR)/javascript \ $(MAGIC_FRAGMENT_DIR)/jpeg \ @@ -271,14 +284,15 @@ $(MAGIC_FRAGMENT_DIR)/karma \ $(MAGIC_FRAGMENT_DIR)/kde \ $(MAGIC_FRAGMENT_DIR)/keepass \ -@@ -424,14 +424,12 @@ $(MAGIC_FRAGMENT_DIR)/kml \ +@@ -429,7 +429,6 @@ $(MAGIC_FRAGMENT_DIR)/lammps \ $(MAGIC_FRAGMENT_DIR)/lecter \ $(MAGIC_FRAGMENT_DIR)/lex \ $(MAGIC_FRAGMENT_DIR)/lif \ -$(MAGIC_FRAGMENT_DIR)/linux \ $(MAGIC_FRAGMENT_DIR)/lisp \ $(MAGIC_FRAGMENT_DIR)/llvm \ - $(MAGIC_FRAGMENT_DIR)/lua \ + $(MAGIC_FRAGMENT_DIR)/locoscript \ +@@ -437,7 +436,6 @@ $(MAGIC_FRAGMENT_DIR)/lua \ $(MAGIC_FRAGMENT_DIR)/luks \ $(MAGIC_FRAGMENT_DIR)/m4 \ $(MAGIC_FRAGMENT_DIR)/mach \ @@ -286,7 +300,7 @@ $(MAGIC_FRAGMENT_DIR)/macos \ $(MAGIC_FRAGMENT_DIR)/magic \ $(MAGIC_FRAGMENT_DIR)/mail.news \ -@@ -455,11 +453,11 @@ $(MAGIC_FRAGMENT_DIR)/misctools \ +@@ -461,11 +459,11 @@ $(MAGIC_FRAGMENT_DIR)/misctools \ $(MAGIC_FRAGMENT_DIR)/mkid \ $(MAGIC_FRAGMENT_DIR)/mlssa \ $(MAGIC_FRAGMENT_DIR)/mmdf \ @@ -299,7 +313,7 @@ $(MAGIC_FRAGMENT_DIR)/msooxml \ $(MAGIC_FRAGMENT_DIR)/msvc \ $(MAGIC_FRAGMENT_DIR)/msx \ -@@ -515,6 +513,8 @@ $(MAGIC_FRAGMENT_DIR)/python \ +@@ -523,6 +521,8 @@ $(MAGIC_FRAGMENT_DIR)/python \ $(MAGIC_FRAGMENT_DIR)/qt \ $(MAGIC_FRAGMENT_DIR)/revision \ $(MAGIC_FRAGMENT_DIR)/riff \ @@ -308,7 +322,7 @@ $(MAGIC_FRAGMENT_DIR)/rpi \ $(MAGIC_FRAGMENT_DIR)/rpm \ $(MAGIC_FRAGMENT_DIR)/rpmsg \ -@@ -598,10 +598,22 @@ $(MAGIC_FRAGMENT_DIR)/zilog \ +@@ -607,10 +607,22 @@ $(MAGIC_FRAGMENT_DIR)/zilog \ $(MAGIC_FRAGMENT_DIR)/zip \ $(MAGIC_FRAGMENT_DIR)/zyxel @@ -332,7 +346,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} -@@ -826,23 +838,25 @@ uninstall-am: uninstall-pkgdataDATA +@@ -835,23 +847,25 @@ uninstall-am: uninstall-pkgdataDATA .PRECIOUS: Makefile @@ -374,16 +388,20 @@ # 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 2020-07-01 07:22:26.504293856 +0000 +Index: src/Makefile.am +=================================================================== +--- src/Makefile.am.orig ++++ src/Makefile.am @@ -1,4 +1,4 @@ -MAGIC = $(pkgdatadir)/magic +MAGIC = $(sysconfdir)/magic:$(pkgdatadir)/magic lib_LTLIBRARIES = libmagic.la nodist_include_HEADERS = magic.h ---- src/dcore.c -+++ src/dcore.c 2020-07-01 07:22:26.504293856 +0000 +Index: src/dcore.c +=================================================================== +--- /dev/null ++++ src/dcore.c @@ -0,0 +1,207 @@ +/* + * Show goo about ELF core files diff --git a/file-5.39.tar.gz b/file-5.39.tar.gz deleted file mode 100644 index 3fccf64..0000000 --- a/file-5.39.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f05d286a76d9556243d0cb05814929c2ecf3a5ba07963f8f70bfaaa70517fad1 -size 954266 diff --git a/file-5.39.tar.gz.asc b/file-5.39.tar.gz.asc deleted file mode 100644 index 67b26a7..0000000 --- a/file-5.39.tar.gz.asc +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iEYEABECAAYFAl7mu3AACgkQcREqsWyzOzppXACgoqokKabq7bwN9aKvd/H/yhF+ -9PUAoOPrAtxFkfNUvtqK/trY+v/Gk5JM -=tA6a ------END PGP SIGNATURE----- diff --git a/file-5.40.tar.gz b/file-5.40.tar.gz new file mode 100644 index 0000000..e52ac23 --- /dev/null +++ b/file-5.40.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:167321f43c148a553f68a0ea7f579821ef3b11c27b8cbe158e4df897e4a5dd57 +size 1004214 diff --git a/file-5.40.tar.gz.asc b/file-5.40.tar.gz.asc new file mode 100644 index 0000000..bc40f88 --- /dev/null +++ b/file-5.40.tar.gz.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iEYEABECAAYFAmBjwi8ACgkQcREqsWyzOzqPZACg3n6WHlN341UvKicQmlHzHH4k +pAEAoM0y5+X+eyLF2gMhUpFMI5CCvZZG +=5WpY +-----END PGP SIGNATURE----- diff --git a/file.changes b/file.changes index 6f1e979..7c56e9b 100644 --- a/file.changes +++ b/file.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Sat Apr 3 07:32:11 UTC 2021 - Andreas Stieger + +- update to 5.40: + * Add limit to the number of bytes to scan for encoding + * Fix /T (trim flag) for regex + * Trim trailing separator. + * Convert system read errors from corrupt ELF + files into human readable error messages + * Exclude surrogate pairs from utf-8 detection +- drop upstreamed patches: + * file-5.16-ocloexec.patch + * file-5.39-alternate_format.dif + ------------------------------------------------------------------- Wed Mar 10 13:41:42 UTC 2021 - Dr. Werner Fink diff --git a/file.spec b/file.spec index 366c83f..82214e9 100644 --- a/file.spec +++ b/file.spec @@ -33,7 +33,7 @@ Obsoletes: file-64bit %endif # # Set Version also in python-magic.spec -Version: 5.39 +Version: 5.40 Release: 0 Summary: A Tool to Determine File Types License: BSD-2-Clause @@ -60,12 +60,10 @@ Patch26: file-5.19-solv.dif Patch27: file-5.19-zip2.0.dif Patch31: file-5.19-biorad.dif Patch32: file-5.19-clicfs.dif -Patch33: file-5.16-ocloexec.patch Patch34: file-5.23-endian.patch Patch37: file-secure_getenv.patch Patch39: file-5.28-btrfs-image.dif Patch40: file-5.38-allow-readlinkat.dif -Patch42: file-5.39-alternate_format.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir /etc %global _miscdir %{_datadir}/misc @@ -125,12 +123,10 @@ to develop applications that require the magic "file" interface. %patch27 -p0 -b .zip2.0 %patch31 -p0 -b .biorad %patch32 -p0 -b .clicfs -%patch33 -p0 -b .clexe %patch34 -p0 -b .endian %patch37 -p1 -b .getenv %patch39 -p1 -b .btrfs %patch40 -p1 -b .readlinkat -%patch42 -p0 -b .af %patch -b .0 test -s src/magic.h.in || cp -p src/magic.h src/magic.h.in rm -fv src/magic.h diff --git a/python-magic.changes b/python-magic.changes index fad39aa..86a619f 100644 --- a/python-magic.changes +++ b/python-magic.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Apr 3 07:32:11 UTC 2021 - Andreas Stieger + +- update to 5.40: + * file 5.40, no changes specific to python-magic + ------------------------------------------------------------------- Wed Jun 17 14:03:49 UTC 2020 - Paolo Stivanin diff --git a/python-magic.spec b/python-magic.spec index 7f015cc..259da62 100644 --- a/python-magic.spec +++ b/python-magic.spec @@ -27,7 +27,7 @@ BuildRequires: libtool BuildRequires: python-rpm-macros BuildRequires: zlib-devel URL: http://www.darwinsys.com/file/ -Version: 5.39 +Version: 5.40 Release: 0 Summary: Python module to use libmagic License: BSD-3-Clause AND BSD-4-Clause