testing/file
SHA256
3
0
Fork 0
forked from pool/file
Code Pull Requests Activity

Update to file version 5.37

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/file?expand=0&rev=189
This commit is contained in:
Dr. Werner Fink 2019-05-27 09:37:06 +00:00 committed by Git OBS Bridge
parent 3467dee9fb
commit ab5943019a
17 changed files with 108 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
file-5.12-zip.dif
View File

@ -3,11 +3,11 @@
1 file changed, 19 insertions(+) 1 file changed, 19 insertions(+)
--- magic/Magdir/archive --- magic/Magdir/archive
+++ magic/Magdir/archive 2019-02-21 06:46:47.000750101 +0000 +++ magic/Magdir/archive 2019-05-27 08:45:06.163107524 +0000
@@ -1044,6 +1044,25 @@ @@ -1072,6 +1072,25 @@
!:ext zip/cbz
!:strength +1 !:strength +1
0 string PK\003\004 0 string PK\003\004
!:strength +1
+>30 ubelong !0x6d696d65 +>30 ubelong !0x6d696d65
+>>4 byte 0x00 Zip archive data +>>4 byte 0x00 Zip archive data
+!:mime application/zip +!:mime application/zip

16
file-5.16-ocloexec.patch
View File

@ -6,7 +6,7 @@
4 files changed, 6 insertions(+), 6 deletions(-) 4 files changed, 6 insertions(+), 6 deletions(-)
--- src/apprentice.c --- src/apprentice.c
+++ src/apprentice.c 2019-02-21 06:49:57.677147690 +0000 +++ src/apprentice.c 2019-05-27 08:53:31.057488035 +0000
@@ -1154,7 +1154,7 @@ load_1(struct magic_set *ms, int action, @@ -1154,7 +1154,7 @@ load_1(struct magic_set *ms, int action,
ssize_t len; ssize_t len;
struct magic_entry me; struct magic_entry me;
@ -35,8 +35,8 @@
file_error(ms, errno, "cannot open `%s'", dbname); file_error(ms, errno, "cannot open `%s'", dbname);
goto out; goto out;
--- src/compress.c --- src/compress.c
+++ src/compress.c 2019-02-21 06:51:15.447677279 +0000 +++ src/compress.c 2019-05-27 08:53:31.057488035 +0000
@@ -423,7 +423,7 @@ file_pipe2file(struct magic_set *ms, int @@ -435,7 +435,7 @@ file_pipe2file(struct magic_set *ms, int
{ {
int te; int te;
mode_t ou = umask(0); mode_t ou = umask(0);
@ -46,8 +46,8 @@
te = errno; te = errno;
(void)unlink(buf); (void)unlink(buf);
--- src/file.c --- src/file.c
+++ src/file.c 2019-02-21 06:49:57.681147615 +0000 +++ src/file.c 2019-05-27 08:53:31.057488035 +0000
@@ -500,7 +500,7 @@ unwrap(struct magic_set *ms, const char @@ -498,7 +498,7 @@ unwrap(struct magic_set *ms, const char
f = stdin; f = stdin;
wid = 1; wid = 1;
} else { } else {
@ -57,8 +57,8 @@
return 1; return 1;
} }
--- src/magic.c --- src/magic.c
+++ src/magic.c 2019-02-21 06:49:57.681147615 +0000 +++ src/magic.c 2019-05-27 09:00:04.010005617 +0000
@@ -435,7 +435,7 @@ file_or_fd(struct magic_set *ms, const c @@ -436,7 +436,7 @@ file_or_fd(struct magic_set *ms, const c
_setmode(STDIN_FILENO, O_BINARY); _setmode(STDIN_FILENO, O_BINARY);
#endif #endif
if (inname != NULL) { if (inname != NULL) {
@ -66,4 +66,4 @@
+ int flags = O_RDONLY|O_BINARY|O_NONBLOCK|O_CLOEXEC; + int flags = O_RDONLY|O_BINARY|O_NONBLOCK|O_CLOEXEC;
errno = 0; errno = 0;
if ((fd = open(inname, flags)) < 0) { if ((fd = open(inname, flags)) < 0) {
int okstat = stat(inname, &sb) == 0; okstat = stat(inname, &sb) == 0;

12
file-5.17-option.dif
View File

@ -3,17 +3,17 @@
1 file changed, 7 insertions(+), 1 deletion(-) 1 file changed, 7 insertions(+), 1 deletion(-)
--- src/file.c --- src/file.c
+++ src/file.c 2018-06-12 14:16:45.847489541 +0000 +++ src/file.c 2019-05-27 08:48:39.047051545 +0000
@@ -244,6 +244,8 @@ main(int argc, char *argv[]) @@ -242,6 +242,8 @@ main(int argc, char *argv[])
flags |= MAGIC_ERROR; flags |= MAGIC_ERROR;
break; break;
case 'e': case 'e':
+ if (!optarg) + if (!optarg)
+ usage(); + usage();
for (i = 0; i < sizeof(nv) / sizeof(nv[0]); i++) for (i = 0; i < __arraycount(nv); i++)
if (strcmp(nv[i].name, optarg) == 0) if (strcmp(nv[i].name, optarg) == 0)
break; break;
@@ -255,7 +257,7 @@ main(int argc, char *argv[]) @@ -253,7 +255,7 @@ main(int argc, char *argv[])
break; break;
case 'f': case 'f':
@ -22,7 +22,7 @@
usage(); usage();
if (magic == NULL) if (magic == NULL)
if ((magic = load(magicfile, flags)) == NULL) if ((magic = load(magicfile, flags)) == NULL)
@@ -265,6 +267,8 @@ main(int argc, char *argv[]) @@ -263,6 +265,8 @@ main(int argc, char *argv[])
++didsomefiles; ++didsomefiles;
break; break;
case 'F': case 'F':
@ -31,7 +31,7 @@
separator = optarg; separator = optarg;
break; break;
case 'i': case 'i':
@@ -277,6 +281,8 @@ main(int argc, char *argv[]) @@ -275,6 +279,8 @@ main(int argc, char *argv[])
action = FILE_LIST; action = FILE_LIST;
break; break;
case 'm': case 'm':

8
file-5.19-biorad.dif
View File

@ -3,10 +3,10 @@
1 file changed, 2 insertions(+) 1 file changed, 2 insertions(+)
--- magic/Magdir/images --- magic/Magdir/images
+++ magic/Magdir/images 2018-06-12 14:20:39.967297749 +0000 +++ magic/Magdir/images 2019-05-27 08:52:51.674238380 +0000
@@ -1026,6 +1026,8 @@ @@ -1028,6 +1028,8 @@
# http://web.archive.org/web/20050317223257/www.cs.ubc.ca/spider/ladic/text/biorad.txt # https://web.archive.org/web/20050317223257/www.cs.ubc.ca/spider/ladic/text/biorad.txt
# Samples: http://www.loci.wisc.edu/software/sample-data # Samples: https://www.loci.wisc.edu/software/sample-data
14 leshort <2 14 leshort <2
+>4 leshort >0 +>4 leshort >0
+>49 byte 0 +>49 byte 0

2
file-5.19-zip2.0.dif
View File

@ -4,7 +4,7 @@
--- magic/Magdir/archive --- magic/Magdir/archive
+++ magic/Magdir/archive 2019-02-21 06:49:05.298138025 +0000 +++ magic/Magdir/archive 2019-02-21 06:49:05.298138025 +0000
@@ -1037,6 +1037,11 @@ @@ -1064,6 +1064,11 @@
0 string PK\x07\x08PK\x03\x04 Zip multi-volume archive data, at least PKZIP v2.50 to extract 0 string PK\x07\x08PK\x03\x04 Zip multi-volume archive data, at least PKZIP v2.50 to extract
!:mime application/zip !:mime application/zip
!:ext zip/cbz !:ext zip/cbz

4
file-5.22-elf.dif
View File

@ -4,7 +4,7 @@
--- src/readelf.c --- src/readelf.c
+++ src/readelf.c 2019-02-21 06:41:38.598573505 +0000 +++ src/readelf.c 2019-02-21 06:41:38.598573505 +0000
@@ -805,7 +805,7 @@ do_core_note(struct magic_set *ms, unsig @@ -810,7 +810,7 @@ do_core_note(struct magic_set *ms, unsig
default: default:
if (type == NT_PRPSINFO && *flags & FLAGS_IS_CORE) { if (type == NT_PRPSINFO && *flags & FLAGS_IS_CORE) {
@ -13,7 +13,7 @@
unsigned char c; unsigned char c;
/* /*
* Extract the program name. We assume * Extract the program name. We assume
@@ -817,7 +817,9 @@ do_core_note(struct magic_set *ms, unsig @@ -822,7 +822,9 @@ do_core_note(struct magic_set *ms, unsig
* If the characters aren't all printable, * If the characters aren't all printable,
* reject it. * reject it.
*/ */

4
file-5.24-nitpick.dif
View File

@ -18,7 +18,7 @@
#undef OPT_LONGONLY #undef OPT_LONGONLY
{0, 0, NULL, 0} {0, 0, NULL, 0}
}; };
@@ -649,6 +651,7 @@ docprint(const char *opts, int def) @@ -647,6 +649,7 @@ docprint(const char *opts, int def)
private void private void
help(void) help(void)
{ {
@ -26,7 +26,7 @@
(void)fputs( (void)fputs(
"Usage: file [OPTION...] [FILE...]\n" "Usage: file [OPTION...] [FILE...]\n"
"Determine type of FILEs.\n" "Determine type of FILEs.\n"
@@ -656,11 +659,16 @@ help(void) @@ -654,11 +657,16 @@ help(void)
#define OPT(shortname, longname, opt, def, doc) \ #define OPT(shortname, longname, opt, def, doc) \
fprintf(stdout, " -%c, --" longname, shortname), \ fprintf(stdout, " -%c, --" longname, shortname), \
docprint(doc, def); docprint(doc, def);

2
file-5.28-btrfs-image.dif
View File

@ -16,7 +16,7 @@ contained within the image.
diff --git a/magic/Magdir/filesystems b/magic/Magdir/filesystems diff --git a/magic/Magdir/filesystems b/magic/Magdir/filesystems
--- a/magic/Magdir/filesystems --- a/magic/Magdir/filesystems
+++ b/magic/Magdir/filesystems +++ b/magic/Magdir/filesystems
@@ -2270,20 +2270,29 @@ @@ -2291,20 +2291,29 @@
>>0x10060 string >\0 lockproto %s) >>0x10060 string >\0 lockproto %s)
# Russell Coker <russell@coker.com.au> # Russell Coker <russell@coker.com.au>

3
file-5.36.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fb608290c0fd2405a8f63e5717abf6d03e22e183fb21884413d1edd918184379
size 875792

6
file-5.36.tar.gz.asc
View File

@ -1,6 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iEYEABECAAYFAlxtcFoACgkQcREqsWyzOzp+cQCg1EKjv0nl2ecPjbh4wHffQ+Gz
Y2kAn2eyPWcbVtM1rER2qBS7NSaRzhrW
=J7wy
-----END PGP SIGNATURE-----

70
file-5.36.dif → file-5.37.dif
View File

@ -10,7 +10,7 @@
8 files changed, 312 insertions(+), 67 deletions(-) 8 files changed, 312 insertions(+), 67 deletions(-)
--- magic/Magdir/elf --- magic/Magdir/elf
+++ magic/Magdir/elf 2019-02-21 07:07:41.093015260 +0000 +++ magic/Magdir/elf 2019-05-27 09:12:24.240057311 +0000
@@ -135,7 +135,7 @@ @@ -135,7 +135,7 @@
>18 leshort 47 Renesas H8/300H, >18 leshort 47 Renesas H8/300H,
>18 leshort 48 Renesas H8S, >18 leshort 48 Renesas H8S,
@ -21,14 +21,18 @@
>18 leshort 52 Motorola Coldfire, >18 leshort 52 Motorola Coldfire,
>18 leshort 53 Motorola M68HC12, >18 leshort 53 Motorola M68HC12,
--- magic/Magdir/linux --- magic/Magdir/linux
+++ magic/Magdir/linux 2019-02-21 07:07:41.093015260 +0000 +++ magic/Magdir/linux 2019-05-27 09:16:20.143608597 +0000
@@ -111,23 +111,27 @@ @@ -112,27 +112,31 @@
# and Nicolas Lichtmaier <nick@debian.org>
# All known start with: b8 c0 07 8e d8 b8 00 90 8e c0 b9 00 01 29 f6 29 # 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) # Linux kernel boot images (i386 arch) (Wolfram Kleff)
# URL: https://www.kernel.org/doc/Documentation/x86/boot.txt
-514 string HdrS Linux kernel -514 string HdrS Linux kernel
+514 string HdrS Linux +514 string HdrS Linux
!:strength + 55 !:strength + 55
# often no extension like in linux, vmlinuz, bzimage or memdisk but sometimes
# Acronis Recovery kernel64.dat and Plop Boot Manager plpbtrom.bin
# DamnSmallLinux 1.5 damnsmll.lnx
!:ext /dat/bin/lnx
->510 leshort 0xAA55 x86 boot executable ->510 leshort 0xAA55 x86 boot executable
->>518 leshort >0x1ff ->>518 leshort >0x1ff
->>>529 byte 0 zImage, ->>>529 byte 0 zImage,
@ -67,7 +71,7 @@
0 belong 0xb8c0078e Linux kernel 0 belong 0xb8c0078e Linux kernel
>0x1e3 string Loading version 1.3.79 or older >0x1e3 string Loading version 1.3.79 or older
--- magic/Magdir/msad --- magic/Magdir/msad
+++ magic/Magdir/msad 2019-02-21 07:07:41.093015260 +0000 +++ magic/Magdir/msad 2019-05-27 09:12:24.240057311 +0000
@@ -0,0 +1,5 @@ @@ -0,0 +1,5 @@
+#------------------------------------------------------------------------------ +#------------------------------------------------------------------------------
+# msad: file(1) magic for msad +# msad: file(1) magic for msad
@ -75,7 +79,7 @@
+# This must precede the heuristic for raw G3 data +# This must precede the heuristic for raw G3 data
+4 string Standard\ Jet\ DB Microsoft Access Database +4 string Standard\ Jet\ DB Microsoft Access Database
--- magic/Magdir/msdos --- magic/Magdir/msdos
+++ magic/Magdir/msdos 2019-02-21 07:07:41.097015184 +0000 +++ magic/Magdir/msdos 2019-05-27 09:12:24.240057311 +0000
@@ -135,9 +135,9 @@ @@ -135,9 +135,9 @@
>>>(0x3c.l+22) leshort&0x0200 >0 (stripped to external PDB) >>>(0x3c.l+22) leshort&0x0200 >0 (stripped to external PDB)
>>>(0x3c.l+22) leshort&0x1000 >0 system file >>>(0x3c.l+22) leshort&0x1000 >0 system file
@ -98,7 +102,7 @@
# updated by Joerg Jenderek at Oct 2008,2015 # updated by Joerg Jenderek at Oct 2008,2015
--- magic/Makefile.am --- magic/Makefile.am
+++ magic/Makefile.am 2019-02-21 07:08:08.552495225 +0000 +++ magic/Makefile.am 2019-05-27 09:18:21.205329508 +0000
@@ -5,7 +5,7 @@ MAGIC_FRAGMENT_BASE = Magdir @@ -5,7 +5,7 @@ MAGIC_FRAGMENT_BASE = Magdir
MAGIC_DIR = $(top_srcdir)/magic MAGIC_DIR = $(top_srcdir)/magic
MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE) MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE)
@ -116,7 +120,7 @@
$(MAGIC_FRAGMENT_DIR)/application \ $(MAGIC_FRAGMENT_DIR)/application \
$(MAGIC_FRAGMENT_DIR)/applix \ $(MAGIC_FRAGMENT_DIR)/applix \
$(MAGIC_FRAGMENT_DIR)/apt \ $(MAGIC_FRAGMENT_DIR)/apt \
@@ -93,7 +92,6 @@ $(MAGIC_FRAGMENT_DIR)/erlang \ @@ -94,7 +93,6 @@ $(MAGIC_FRAGMENT_DIR)/erlang \
$(MAGIC_FRAGMENT_DIR)/espressif \ $(MAGIC_FRAGMENT_DIR)/espressif \
$(MAGIC_FRAGMENT_DIR)/esri \ $(MAGIC_FRAGMENT_DIR)/esri \
$(MAGIC_FRAGMENT_DIR)/fcs \ $(MAGIC_FRAGMENT_DIR)/fcs \
@ -124,7 +128,7 @@
$(MAGIC_FRAGMENT_DIR)/finger \ $(MAGIC_FRAGMENT_DIR)/finger \
$(MAGIC_FRAGMENT_DIR)/flash \ $(MAGIC_FRAGMENT_DIR)/flash \
$(MAGIC_FRAGMENT_DIR)/flif \ $(MAGIC_FRAGMENT_DIR)/flif \
@@ -137,6 +135,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \ @@ -138,6 +136,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \
$(MAGIC_FRAGMENT_DIR)/java \ $(MAGIC_FRAGMENT_DIR)/java \
$(MAGIC_FRAGMENT_DIR)/javascript \ $(MAGIC_FRAGMENT_DIR)/javascript \
$(MAGIC_FRAGMENT_DIR)/jpeg \ $(MAGIC_FRAGMENT_DIR)/jpeg \
@ -133,7 +137,7 @@
$(MAGIC_FRAGMENT_DIR)/karma \ $(MAGIC_FRAGMENT_DIR)/karma \
$(MAGIC_FRAGMENT_DIR)/kde \ $(MAGIC_FRAGMENT_DIR)/kde \
$(MAGIC_FRAGMENT_DIR)/keepass \ $(MAGIC_FRAGMENT_DIR)/keepass \
@@ -146,7 +146,6 @@ $(MAGIC_FRAGMENT_DIR)/kml \ @@ -147,14 +147,12 @@ $(MAGIC_FRAGMENT_DIR)/kml \
$(MAGIC_FRAGMENT_DIR)/lecter \ $(MAGIC_FRAGMENT_DIR)/lecter \
$(MAGIC_FRAGMENT_DIR)/lex \ $(MAGIC_FRAGMENT_DIR)/lex \
$(MAGIC_FRAGMENT_DIR)/lif \ $(MAGIC_FRAGMENT_DIR)/lif \
@ -141,15 +145,14 @@
$(MAGIC_FRAGMENT_DIR)/lisp \ $(MAGIC_FRAGMENT_DIR)/lisp \
$(MAGIC_FRAGMENT_DIR)/llvm \ $(MAGIC_FRAGMENT_DIR)/llvm \
$(MAGIC_FRAGMENT_DIR)/lua \ $(MAGIC_FRAGMENT_DIR)/lua \
@@ -154,7 +153,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \ $(MAGIC_FRAGMENT_DIR)/luks \
$(MAGIC_FRAGMENT_DIR)/m4 \ $(MAGIC_FRAGMENT_DIR)/m4 \
$(MAGIC_FRAGMENT_DIR)/mach \ $(MAGIC_FRAGMENT_DIR)/mach \
$(MAGIC_FRAGMENT_DIR)/macos \
-$(MAGIC_FRAGMENT_DIR)/macintosh \ -$(MAGIC_FRAGMENT_DIR)/macintosh \
$(MAGIC_FRAGMENT_DIR)/macos \
$(MAGIC_FRAGMENT_DIR)/magic \ $(MAGIC_FRAGMENT_DIR)/magic \
$(MAGIC_FRAGMENT_DIR)/mail.news \ $(MAGIC_FRAGMENT_DIR)/mail.news \
$(MAGIC_FRAGMENT_DIR)/make \ @@ -178,10 +176,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \
@@ -177,10 +175,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \
$(MAGIC_FRAGMENT_DIR)/mkid \ $(MAGIC_FRAGMENT_DIR)/mkid \
$(MAGIC_FRAGMENT_DIR)/mlssa \ $(MAGIC_FRAGMENT_DIR)/mlssa \
$(MAGIC_FRAGMENT_DIR)/mmdf \ $(MAGIC_FRAGMENT_DIR)/mmdf \
@ -159,9 +162,9 @@
$(MAGIC_FRAGMENT_DIR)/msdos \ $(MAGIC_FRAGMENT_DIR)/msdos \
+$(MAGIC_FRAGMENT_DIR)/modem \ +$(MAGIC_FRAGMENT_DIR)/modem \
$(MAGIC_FRAGMENT_DIR)/msooxml \ $(MAGIC_FRAGMENT_DIR)/msooxml \
$(MAGIC_FRAGMENT_DIR)/msx \
$(MAGIC_FRAGMENT_DIR)/msvc \ $(MAGIC_FRAGMENT_DIR)/msvc \
@@ -232,6 +230,8 @@ $(MAGIC_FRAGMENT_DIR)/python \ $(MAGIC_FRAGMENT_DIR)/msx \
@@ -234,6 +232,8 @@ $(MAGIC_FRAGMENT_DIR)/python \
$(MAGIC_FRAGMENT_DIR)/qt \ $(MAGIC_FRAGMENT_DIR)/qt \
$(MAGIC_FRAGMENT_DIR)/revision \ $(MAGIC_FRAGMENT_DIR)/revision \
$(MAGIC_FRAGMENT_DIR)/riff \ $(MAGIC_FRAGMENT_DIR)/riff \
@ -169,8 +172,8 @@
+$(MAGIC_FRAGMENT_DIR)/macintosh \ +$(MAGIC_FRAGMENT_DIR)/macintosh \
$(MAGIC_FRAGMENT_DIR)/rpi \ $(MAGIC_FRAGMENT_DIR)/rpi \
$(MAGIC_FRAGMENT_DIR)/rpm \ $(MAGIC_FRAGMENT_DIR)/rpm \
$(MAGIC_FRAGMENT_DIR)/rtf \ $(MAGIC_FRAGMENT_DIR)/rpmsg \
@@ -308,8 +308,20 @@ $(MAGIC_FRAGMENT_DIR)/zilog \ @@ -311,8 +311,20 @@ $(MAGIC_FRAGMENT_DIR)/zilog \
$(MAGIC_FRAGMENT_DIR)/zip \ $(MAGIC_FRAGMENT_DIR)/zip \
$(MAGIC_FRAGMENT_DIR)/zyxel $(MAGIC_FRAGMENT_DIR)/zyxel
@ -192,7 +195,7 @@
# FIXME: Build file natively as well so that it can be used to compile # 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 # the target's magic file; for now we bail if the local version does not match
@@ -321,19 +333,22 @@ FILE_COMPILE = $(top_builddir)/src/file$ @@ -324,19 +336,22 @@ FILE_COMPILE = $(top_builddir)/src/file$
FILE_COMPILE_DEP = $(FILE_COMPILE) FILE_COMPILE_DEP = $(FILE_COMPILE)
endif endif
@ -232,7 +235,7 @@
+# $(FILE_COMPILE) -C -m magic +# $(FILE_COMPILE) -C -m magic
+# @rm -fr magic +# @rm -fr magic
--- magic/Makefile.in --- magic/Makefile.in
+++ magic/Makefile.in 2019-02-21 07:07:58.924677558 +0000 +++ magic/Makefile.in 2019-05-27 09:19:14.804321308 +0000
@@ -278,7 +278,7 @@ top_srcdir = @top_srcdir@ @@ -278,7 +278,7 @@ top_srcdir = @top_srcdir@
MAGIC_FRAGMENT_BASE = Magdir MAGIC_FRAGMENT_BASE = Magdir
MAGIC_DIR = $(top_srcdir)/magic MAGIC_DIR = $(top_srcdir)/magic
@ -250,7 +253,7 @@
$(MAGIC_FRAGMENT_DIR)/application \ $(MAGIC_FRAGMENT_DIR)/application \
$(MAGIC_FRAGMENT_DIR)/applix \ $(MAGIC_FRAGMENT_DIR)/applix \
$(MAGIC_FRAGMENT_DIR)/apt \ $(MAGIC_FRAGMENT_DIR)/apt \
@@ -365,7 +364,6 @@ $(MAGIC_FRAGMENT_DIR)/erlang \ @@ -366,7 +365,6 @@ $(MAGIC_FRAGMENT_DIR)/erlang \
$(MAGIC_FRAGMENT_DIR)/espressif \ $(MAGIC_FRAGMENT_DIR)/espressif \
$(MAGIC_FRAGMENT_DIR)/esri \ $(MAGIC_FRAGMENT_DIR)/esri \
$(MAGIC_FRAGMENT_DIR)/fcs \ $(MAGIC_FRAGMENT_DIR)/fcs \
@ -258,7 +261,7 @@
$(MAGIC_FRAGMENT_DIR)/finger \ $(MAGIC_FRAGMENT_DIR)/finger \
$(MAGIC_FRAGMENT_DIR)/flash \ $(MAGIC_FRAGMENT_DIR)/flash \
$(MAGIC_FRAGMENT_DIR)/flif \ $(MAGIC_FRAGMENT_DIR)/flif \
@@ -409,6 +407,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \ @@ -410,6 +408,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \
$(MAGIC_FRAGMENT_DIR)/java \ $(MAGIC_FRAGMENT_DIR)/java \
$(MAGIC_FRAGMENT_DIR)/javascript \ $(MAGIC_FRAGMENT_DIR)/javascript \
$(MAGIC_FRAGMENT_DIR)/jpeg \ $(MAGIC_FRAGMENT_DIR)/jpeg \
@ -267,7 +270,7 @@
$(MAGIC_FRAGMENT_DIR)/karma \ $(MAGIC_FRAGMENT_DIR)/karma \
$(MAGIC_FRAGMENT_DIR)/kde \ $(MAGIC_FRAGMENT_DIR)/kde \
$(MAGIC_FRAGMENT_DIR)/keepass \ $(MAGIC_FRAGMENT_DIR)/keepass \
@@ -418,7 +418,6 @@ $(MAGIC_FRAGMENT_DIR)/kml \ @@ -419,14 +419,12 @@ $(MAGIC_FRAGMENT_DIR)/kml \
$(MAGIC_FRAGMENT_DIR)/lecter \ $(MAGIC_FRAGMENT_DIR)/lecter \
$(MAGIC_FRAGMENT_DIR)/lex \ $(MAGIC_FRAGMENT_DIR)/lex \
$(MAGIC_FRAGMENT_DIR)/lif \ $(MAGIC_FRAGMENT_DIR)/lif \
@ -275,15 +278,14 @@
$(MAGIC_FRAGMENT_DIR)/lisp \ $(MAGIC_FRAGMENT_DIR)/lisp \
$(MAGIC_FRAGMENT_DIR)/llvm \ $(MAGIC_FRAGMENT_DIR)/llvm \
$(MAGIC_FRAGMENT_DIR)/lua \ $(MAGIC_FRAGMENT_DIR)/lua \
@@ -426,7 +425,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \ $(MAGIC_FRAGMENT_DIR)/luks \
$(MAGIC_FRAGMENT_DIR)/m4 \ $(MAGIC_FRAGMENT_DIR)/m4 \
$(MAGIC_FRAGMENT_DIR)/mach \ $(MAGIC_FRAGMENT_DIR)/mach \
$(MAGIC_FRAGMENT_DIR)/macos \
-$(MAGIC_FRAGMENT_DIR)/macintosh \ -$(MAGIC_FRAGMENT_DIR)/macintosh \
$(MAGIC_FRAGMENT_DIR)/macos \
$(MAGIC_FRAGMENT_DIR)/magic \ $(MAGIC_FRAGMENT_DIR)/magic \
$(MAGIC_FRAGMENT_DIR)/mail.news \ $(MAGIC_FRAGMENT_DIR)/mail.news \
$(MAGIC_FRAGMENT_DIR)/make \ @@ -450,10 +448,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \
@@ -449,10 +447,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \
$(MAGIC_FRAGMENT_DIR)/mkid \ $(MAGIC_FRAGMENT_DIR)/mkid \
$(MAGIC_FRAGMENT_DIR)/mlssa \ $(MAGIC_FRAGMENT_DIR)/mlssa \
$(MAGIC_FRAGMENT_DIR)/mmdf \ $(MAGIC_FRAGMENT_DIR)/mmdf \
@ -293,9 +295,9 @@
$(MAGIC_FRAGMENT_DIR)/msdos \ $(MAGIC_FRAGMENT_DIR)/msdos \
+$(MAGIC_FRAGMENT_DIR)/modem \ +$(MAGIC_FRAGMENT_DIR)/modem \
$(MAGIC_FRAGMENT_DIR)/msooxml \ $(MAGIC_FRAGMENT_DIR)/msooxml \
$(MAGIC_FRAGMENT_DIR)/msx \
$(MAGIC_FRAGMENT_DIR)/msvc \ $(MAGIC_FRAGMENT_DIR)/msvc \
@@ -504,6 +502,8 @@ $(MAGIC_FRAGMENT_DIR)/python \ $(MAGIC_FRAGMENT_DIR)/msx \
@@ -506,6 +504,8 @@ $(MAGIC_FRAGMENT_DIR)/python \
$(MAGIC_FRAGMENT_DIR)/qt \ $(MAGIC_FRAGMENT_DIR)/qt \
$(MAGIC_FRAGMENT_DIR)/revision \ $(MAGIC_FRAGMENT_DIR)/revision \
$(MAGIC_FRAGMENT_DIR)/riff \ $(MAGIC_FRAGMENT_DIR)/riff \
@ -303,8 +305,8 @@
+$(MAGIC_FRAGMENT_DIR)/macintosh \ +$(MAGIC_FRAGMENT_DIR)/macintosh \
$(MAGIC_FRAGMENT_DIR)/rpi \ $(MAGIC_FRAGMENT_DIR)/rpi \
$(MAGIC_FRAGMENT_DIR)/rpm \ $(MAGIC_FRAGMENT_DIR)/rpm \
$(MAGIC_FRAGMENT_DIR)/rtf \ $(MAGIC_FRAGMENT_DIR)/rpmsg \
@@ -580,10 +580,22 @@ $(MAGIC_FRAGMENT_DIR)/zilog \ @@ -583,10 +583,22 @@ $(MAGIC_FRAGMENT_DIR)/zilog \
$(MAGIC_FRAGMENT_DIR)/zip \ $(MAGIC_FRAGMENT_DIR)/zip \
$(MAGIC_FRAGMENT_DIR)/zyxel $(MAGIC_FRAGMENT_DIR)/zyxel
@ -328,7 +330,7 @@
# FIXME: Build file natively as well so that it can be used to compile # 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 # the target's magic file; for now we bail if the local version does not match
@IS_CROSS_COMPILE_TRUE@FILE_COMPILE = file${EXEEXT} @IS_CROSS_COMPILE_TRUE@FILE_COMPILE = file${EXEEXT}
@@ -805,23 +817,25 @@ uninstall-am: uninstall-pkgdataDATA @@ -808,23 +820,25 @@ uninstall-am: uninstall-pkgdataDATA
.PRECIOUS: Makefile .PRECIOUS: Makefile
@ -371,7 +373,7 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables. # 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. # Otherwise a system limit (for SysV at least) may be exceeded.
--- src/Makefile.am --- src/Makefile.am
+++ src/Makefile.am 2019-02-21 07:07:41.129014579 +0000 +++ src/Makefile.am 2019-05-27 09:12:24.272056708 +0000
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-MAGIC = $(pkgdatadir)/magic -MAGIC = $(pkgdatadir)/magic
+MAGIC = $(sysconfdir)/magic:$(pkgdatadir)/magic +MAGIC = $(sysconfdir)/magic:$(pkgdatadir)/magic
@ -379,7 +381,7 @@
nodist_include_HEADERS = magic.h nodist_include_HEADERS = magic.h
--- src/dcore.c --- src/dcore.c
+++ src/dcore.c 2019-02-21 07:07:41.133014502 +0000 +++ src/dcore.c 2019-05-27 09:12:24.272056708 +0000
@@ -0,0 +1,207 @@ @@ -0,0 +1,207 @@
+/* +/*
+ * Show goo about ELF core files + * Show goo about ELF core files

3
file-5.37.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e9c13967f7dd339a3c241b7710ba093560b9a33013491318e88e6b8b57bae07f
size 887682

6
file-5.37.tar.gz.asc Normal file
View File

@ -0,0 +1,6 @@
-----BEGIN PGP SIGNATURE-----
iEYEABECAAYFAlzeHJcACgkQcREqsWyzOzrudwCg6X2ESwogvW+LinRPNULUDrZV
bE4An2pcK2m7rmImJ3TBoFEH+osRFwyO
=AZbT
-----END PGP SIGNATURE-----

4
file-secure_getenv.patch
View File

@ -18,7 +18,7 @@
AC_TYPE_OFF_T AC_TYPE_OFF_T
--- file-5.35/src/file.c --- file-5.35/src/file.c
+++ file-5.35/src/file.c 2018-10-22 07:57:43.206223603 +0000 +++ file-5.35/src/file.c 2018-10-22 07:57:43.206223603 +0000
@@ -651,7 +651,7 @@ docprint(const char *opts, int def) @@ -649,7 +649,7 @@ docprint(const char *opts, int def)
private void private void
help(void) help(void)
{ {
@ -29,7 +29,7 @@
"Determine type of FILEs.\n" "Determine type of FILEs.\n"
--- file-5.35/src/file.h --- file-5.35/src/file.h
+++ file-5.35/src/file.h 2018-10-22 07:57:43.206223603 +0000 +++ file-5.35/src/file.h 2018-10-22 07:57:43.206223603 +0000
@@ -658,4 +658,12 @@ static const char *rcsid(const char *p) @@ -649,4 +649,12 @@ static const char *rcsid(const char *p)
#define __RCSID(a) #define __RCSID(a)
#endif #endif

30
file.changes
View File

@ -1,3 +1,33 @@
-------------------------------------------------------------------
Mon May 27 09:26:52 UTC 2019 - Dr. Werner Fink <werner@suse.de>
- Update to file version 5.37
* Make sure that continuation separators are printed
with -k within softmagic
* Change SIGPIPE saving and restoring during compression to use
sigaction(2) instead of signal(3) and cache it. (Denys Vlasenko)
* Cache stat(2) calls more to reduce number of calls (Denys Vlasenko)
* PR/77: Handle --mime-type and -k correctly.
* Switch decompression code to use vfork() because
tools like rpmdiff and rpmbuild call libmagic
with large process footprints (Denys Vlasenko)
* PR/75: --enable-zlib, did not work.
* Improve regex efficiency (Michael Schroeder) by:
1. Prefixing regex searches with regular search
for keywords where possible
2. Using memmem(3) where available
- Modify the patches
* file-5.12-zip.dif
* file-5.16-ocloexec.patch
* file-5.17-option.dif
* file-5.19-biorad.dif
* file-5.19-zip2.0.dif
* file-5.22-elf.dif
* file-5.24-nitpick.dif
* file-5.28-btrfs-image.dif
* file-secure_getenv.patch
- Modify and rename patch file-5.36.dif which becomes file-5.37.dif
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Feb 21 07:12:21 UTC 2019 - Dr. Werner Fink <werner@suse.de> Thu Feb 21 07:12:21 UTC 2019 - Dr. Werner Fink <werner@suse.de>

6
file.spec
View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
@ -30,7 +30,7 @@ Obsoletes: file-64bit
%endif %endif
# #
# Set Version also in python-magic.spec # Set Version also in python-magic.spec
Version: 5.36 Version: 5.37
Release: 0 Release: 0
Summary: A Tool to Determine File Types Summary: A Tool to Determine File Types
License: BSD-2-Clause License: BSD-2-Clause
@ -40,7 +40,7 @@ Source2: baselibs.conf
Source3: file-rpmlintrc Source3: file-rpmlintrc
Source4: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz.asc Source4: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz.asc
Source5: file.keyring Source5: file.keyring
Patch: file-5.36.dif Patch: file-5.37.dif
Patch1: file-5.19-misc.dif Patch1: file-5.19-misc.dif
Patch4: file-4.24-autoconf.dif Patch4: file-4.24-autoconf.dif
Patch5: file-5.14-tex.dif Patch5: file-5.14-tex.dif

2
python-magic.spec
View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #