diff --git a/file-5.17-option.dif b/file-5.17-option.dif index 6576a47..d2ad535 100644 --- a/file-5.17-option.dif +++ b/file-5.17-option.dif @@ -1,19 +1,15 @@ ---- - src/file.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - ---- src/file.c -+++ src/file.c 2019-05-27 08:48:39.047051545 +0000 -@@ -237,6 +237,8 @@ main(int argc, char *argv[]) - flags |= MAGIC_ERROR; +--- file-5.39/src/file.c.orig 2020-06-17 16:13:36.625305367 +0200 ++++ file-5.39/src/file.c 2020-06-17 16:15:12.429553163 +0200 +@@ -249,6 +249,8 @@ break; case 'e': -+ if (!optarg) -+ usage(); + case OPT_EXCLUDE_QUIET: ++ if (!optarg) ++ usage(); for (i = 0; i < __arraycount(nv); i++) if (strcmp(nv[i].name, optarg) == 0) break; -@@ -248,7 +250,7 @@ main(int argc, char *argv[]) +@@ -261,7 +263,7 @@ break; case 'f': @@ -22,21 +18,21 @@ usage(); if (magic == NULL) if ((magic = load(magicfile, flags)) == NULL) -@@ -258,6 +260,8 @@ main(int argc, char *argv[]) +@@ -271,6 +273,8 @@ ++didsomefiles; break; case 'F': -+ if (!optarg) -+ usage(); ++ if(!optarg) ++ usage(); separator = optarg; break; case 'i': -@@ -270,6 +274,8 @@ main(int argc, char *argv[]) +@@ -283,6 +287,8 @@ action = FILE_LIST; break; case 'm': -+ if (!optarg) -+ usage(); ++ if(!optarg) ++ usage(); magicfile = optarg; break; case 'n': diff --git a/file-5.38.tar.gz b/file-5.38.tar.gz deleted file mode 100644 index 8b95c30..0000000 --- a/file-5.38.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:593c2ffc2ab349c5aea0f55fedfe4d681737b6b62376a9b3ad1e77b2cc19fa34 -size 932528 diff --git a/file-5.38.tar.gz.asc b/file-5.38.tar.gz.asc deleted file mode 100644 index 914ad30..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 b/file-5.39.tar.gz new file mode 100644 index 0000000..3fccf64 --- /dev/null +++ b/file-5.39.tar.gz @@ -0,0 +1,3 @@ +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 new file mode 100644 index 0000000..67b26a7 --- /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.changes b/file.changes index 698a434..e45e96e 100644 --- a/file.changes +++ b/file.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Wed Jun 17 14:01:25 UTC 2020 - Paolo Stivanin + +- Update to 5.39 + * Remove unused subtype_mime (Steve Grubb) + * Remove unused check in okstat (Steve Grubb) + * Fix mime-type in elf binaries by making sure $x is set + * Fix indirect negative offsets broken by OFFNEGATIVE + * Fix GUID equality check + * PR/165: Handle empty array and strings in JSON + * PR/162: Add --exclude-quiet + * Various fixes + * add guid support +- Removed undo-24c9c0.patch as it is now part of upstream +- Updated file-5.17-option.dif + ------------------------------------------------------------------- Mon May 4 13:51:18 UTC 2020 - Dr. Werner Fink diff --git a/file.spec b/file.spec index 345affd..827bf26 100644 --- a/file.spec +++ b/file.spec @@ -33,7 +33,7 @@ Obsoletes: file-64bit %endif # # Set Version also in python-magic.spec -Version: 5.38 +Version: 5.39 Release: 0 Summary: A Tool to Determine File Types License: BSD-2-Clause @@ -66,7 +66,6 @@ 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 -Patch41: undo-24c9c0.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir /etc %global _miscdir %{_datadir}/misc @@ -118,7 +117,7 @@ to develop applications that require the magic "file" interface. %patch9 -p0 -b .elf %patch10 -p0 -b .prtf %patch11 -p0 -b .zip -%patch12 -p0 -b .opt +%patch12 -p1 -b .opt %patch13 -p0 -b .scri %patch15 -p0 -b .xcur %patch22 -p0 -b .cromfs @@ -132,7 +131,6 @@ to develop applications that require the magic "file" interface. %patch37 -p1 -b .getenv %patch39 -p1 -b .btrfs %patch40 -p1 -b .readlinkat -%patch41 -p0 -b .undo %patch -b .0 test -s src/magic.h.in || cp -p src/magic.h src/magic.h.in rm -fv src/magic.h @@ -204,6 +202,7 @@ rm -f %{buildroot}%{_libdir}/*.la %defattr (-,root,root) %{_libdir}/lib*.so %{_includedir}/magic.h +%{_libdir}/pkgconfig/libmagic.pc %doc %{_mandir}/man3/libmagic.3.gz %license COPYING %doc README AUTHORS NEWS ChangeLog diff --git a/python-magic.changes b/python-magic.changes index 87e9e7e..fad39aa 100644 --- a/python-magic.changes +++ b/python-magic.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jun 17 14:03:49 UTC 2020 - Paolo Stivanin + +- Update to 5.39 + ------------------------------------------------------------------- Tue Dec 17 09:59:08 UTC 2019 - Dr. Werner Fink diff --git a/python-magic.spec b/python-magic.spec index e1a2e55..b4097c6 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.38 +Version: 5.39 Release: 0 Summary: Python module to use libmagic License: BSD-3-Clause AND BSD-4-Clause diff --git a/undo-24c9c0.patch b/undo-24c9c0.patch deleted file mode 100644 index e598281..0000000 --- a/undo-24c9c0.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 028a15617a7f2c9172e3ac2d903af0f03010c8b4 Mon Sep 17 00:00:00 2001 -From: Christos Zoulas -Date: Sun, 26 Apr 2020 17:43:13 +0000 -Subject: [PATCH] PR/93: Undo previous: There are dynamic objects (shared - libraries for example) that don't have interpeters and should not be counted - as static. We need to figure out what to do with static-pie and gcc-9 - separately. - ---- - src/readelf.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git src/readelf.c src/readelf.c -index 9d1d1ad5..517b3aec 100644 ---- src/readelf.c -+++ src/readelf.c -@@ -1646,6 +1646,7 @@ dophn_exec(struct magic_set *ms, int clazz, int swap, int fd, off_t off, - switch (xph_type) { - case PT_DYNAMIC: - doread = 1; -+ linking_style = "dynamically"; - break; - case PT_NOTE: - if (sh_num) /* Did this through section headers */ -@@ -1660,7 +1661,6 @@ dophn_exec(struct magic_set *ms, int clazz, int swap, int fd, off_t off, - } - /*FALLTHROUGH*/ - case PT_INTERP: -- linking_style = "dynamically"; - doread = 1; - break; - default: