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

Update to file-5.35

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/file?expand=0&rev=184
This commit is contained in:
Dr. Werner Fink 2018-10-22 08:10:34 +00:00 committed by Git OBS Bridge
parent 650ab2cba7
commit c8540fe22b
16 changed files with 142 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
file-5.16-ocloexec.patch
View File

@ -6,8 +6,8 @@
4 files changed, 6 insertions(+), 6 deletions(-) 4 files changed, 6 insertions(+), 6 deletions(-)
--- src/apprentice.c --- src/apprentice.c
+++ src/apprentice.c 2018-06-12 14:21:21.286557983 +0000 +++ src/apprentice.c 2018-10-22 07:46:50.986423768 +0000
@@ -1146,7 +1146,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;
@ -16,7 +16,7 @@
if (f == NULL) { if (f == NULL) {
if (errno != ENOENT) if (errno != ENOENT)
file_error(ms, errno, "cannot read magic file `%s'", file_error(ms, errno, "cannot read magic file `%s'",
@@ -3051,7 +3051,7 @@ apprentice_map(struct magic_set *ms, con @@ -3061,7 +3061,7 @@ apprentice_map(struct magic_set *ms, con
if (dbname == NULL) if (dbname == NULL)
goto error; goto error;
@ -25,29 +25,29 @@
goto error; goto error;
if (fstat(fd, &st) == -1) { if (fstat(fd, &st) == -1) {
@@ -3188,7 +3188,7 @@ apprentice_compile(struct magic_set *ms, @@ -3198,7 +3198,7 @@ apprentice_compile(struct magic_set *ms,
if (dbname == NULL) if (dbname == NULL)
goto out; 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, 0644)) == -1)
+ if ((fd = open(dbname, O_WRONLY|O_CREAT|O_TRUNC|O_BINARY|O_CLOEXEC, 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); file_error(ms, errno, "cannot open `%s'", dbname);
goto out; goto out;
--- src/compress.c --- src/compress.c
+++ src/compress.c 2018-06-12 14:21:21.286557983 +0000 +++ src/compress.c 2018-10-22 07:47:40.645502604 +0000
@@ -411,7 +411,7 @@ file_pipe2file(struct magic_set *ms, int @@ -423,7 +423,7 @@ file_pipe2file(struct magic_set *ms, int
#else
{ {
int te; int te;
int ou = umask(0);
- tfd = mkstemp(buf); - tfd = mkstemp(buf);
+ tfd = mkostemp(buf, O_CLOEXEC); + tfd = mkostemp(buf, O_CLOEXEC);
(void)umask(ou);
te = errno; te = errno;
(void)unlink(buf); (void)unlink(buf);
errno = te;
--- src/file.c --- src/file.c
+++ src/file.c 2018-06-12 14:22:13.777618129 +0000 +++ src/file.c 2018-10-22 07:45:35.907816294 +0000
@@ -496,7 +496,7 @@ unwrap(struct magic_set *ms, const char @@ -499,7 +499,7 @@ unwrap(struct magic_set *ms, const char
f = stdin; f = stdin;
wid = 1; wid = 1;
} else { } else {
@ -57,13 +57,13 @@
return 1; return 1;
} }
--- src/magic.c --- src/magic.c
+++ src/magic.c 2018-06-12 14:21:21.286557983 +0000 +++ src/magic.c 2018-10-22 07:49:39.471290675 +0000
@@ -442,7 +442,7 @@ file_or_fd(struct magic_set *ms, const c @@ -434,7 +434,7 @@ file_or_fd(struct magic_set *ms, const c
else _setmode(STDIN_FILENO, O_BINARY);
pos = lseek(fd, (off_t)0, SEEK_CUR); #endif
} else { if (inname != NULL) {
- int flags = O_RDONLY|O_BINARY; - int flags = O_RDONLY|O_BINARY|O_NONBLOCK;
+ int flags = O_RDONLY|O_BINARY|O_CLOEXEC; + int flags = O_RDONLY|O_BINARY|O_NONBLOCK|O_CLOEXEC;
int okstat = stat(inname, &sb) == 0; errno = 0;
if ((fd = open(inname, flags)) < 0) {
if (okstat && S_ISFIFO(sb.st_mode)) { int okstat = stat(inname, &sb) == 0;

8
file-5.17-option.dif
View File

@ -4,7 +4,7 @@
--- src/file.c --- src/file.c
+++ src/file.c 2018-06-12 14:16:45.847489541 +0000 +++ src/file.c 2018-06-12 14:16:45.847489541 +0000
@@ -242,6 +242,8 @@ main(int argc, char *argv[]) @@ -244,6 +244,8 @@ main(int argc, char *argv[])
flags |= MAGIC_ERROR; flags |= MAGIC_ERROR;
break; break;
case 'e': case 'e':
@ -13,7 +13,7 @@
for (i = 0; i < sizeof(nv) / sizeof(nv[0]); i++) for (i = 0; i < sizeof(nv) / sizeof(nv[0]); i++)
if (strcmp(nv[i].name, optarg) == 0) if (strcmp(nv[i].name, optarg) == 0)
break; break;
@@ -253,7 +255,7 @@ main(int argc, char *argv[]) @@ -255,7 +257,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)
@@ -263,6 +265,8 @@ main(int argc, char *argv[]) @@ -265,6 +267,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':
@@ -275,6 +279,8 @@ main(int argc, char *argv[]) @@ -277,6 +281,8 @@ main(int argc, char *argv[])
action = FILE_LIST; action = FILE_LIST;
break; break;
case 'm': case 'm':

2
file-5.19-biorad.dif
View File

@ -4,7 +4,7 @@
--- magic/Magdir/images --- magic/Magdir/images
+++ magic/Magdir/images 2018-06-12 14:20:39.967297749 +0000 +++ magic/Magdir/images 2018-06-12 14:20:39.967297749 +0000
@@ -1023,6 +1023,8 @@ @@ -1026,6 +1026,8 @@
# http://web.archive.org/web/20050317223257/www.cs.ubc.ca/spider/ladic/text/biorad.txt # http://web.archive.org/web/20050317223257/www.cs.ubc.ca/spider/ladic/text/biorad.txt
# Samples: http://www.loci.wisc.edu/software/sample-data # Samples: http://www.loci.wisc.edu/software/sample-data
14 leshort <2 14 leshort <2

2
file-5.19-printf.dif
View File

@ -4,7 +4,7 @@
--- src/apprentice.c --- src/apprentice.c
+++ src/apprentice.c 2018-06-12 14:15:19.109042630 +0000 +++ src/apprentice.c 2018-06-12 14:15:19.109042630 +0000
@@ -2417,6 +2417,12 @@ check_format_type(const char *ptr, int t @@ -2427,6 +2427,12 @@ check_format_type(const char *ptr, int t
ptr++; ptr++;
if (*ptr == '#') if (*ptr == '#')
ptr++; ptr++;

4
file-5.22-elf.dif
View File

@ -4,7 +4,7 @@
--- src/readelf.c --- src/readelf.c
+++ src/readelf.c 2018-06-12 14:14:14.054207494 +0000 +++ src/readelf.c 2018-06-12 14:14:14.054207494 +0000
@@ -767,7 +767,7 @@ do_core_note(struct magic_set *ms, unsig @@ -796,7 +796,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
@@ -779,7 +779,9 @@ do_core_note(struct magic_set *ms, unsig @@ -808,7 +808,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.
*/ */

43
file-5.23-endian.patch
View File

@ -1,19 +1,20 @@
--- ---
src/apprentice.c | 70 ++++--------------------------------------------------- src/apprentice.c | 71 ++++---------------------------------------------------
src/cdf.c | 53 +++-------------------------------------- src/cdf.c | 53 +++--------------------------------------
2 files changed, 10 insertions(+), 113 deletions(-) 2 files changed, 10 insertions(+), 114 deletions(-)
--- src/apprentice.c --- src/apprentice.c
+++ src/apprentice.c 2017-09-13 10:32:39.981204996 +0000 +++ src/apprentice.c 2018-10-22 07:53:29.562977637 +0000
@@ -54,6 +54,7 @@ FILE_RCSID("@(#)$File: apprentice.c,v 1. @@ -50,7 +50,7 @@ FILE_RCSID("@(#)$File: apprentice.c,v 1.
#if defined(HAVE_LIMITS_H)
#include <limits.h>
#endif #endif
#include <dirent.h>
#include <limits.h>
-
+#include <byteswap.h> +#include <byteswap.h>
#ifndef SSIZE_MAX #define EATAB {while (isascii((unsigned char) *l) && \
#define MAXMAGIC_SIZE ((ssize_t)0x7fffffff) isspace((unsigned char) *l)) ++l;}
@@ -132,9 +133,11 @@ private struct mlist *mlist_alloc(void); @@ -123,9 +123,11 @@ private struct mlist *mlist_alloc(void);
private void mlist_free(struct mlist *); private void mlist_free(struct mlist *);
private void byteswap(struct magic *, uint32_t); private void byteswap(struct magic *, uint32_t);
private void bs1(struct magic *); private void bs1(struct magic *);
@ -28,7 +29,7 @@
private char *mkdbname(struct magic_set *, const char *, int); private char *mkdbname(struct magic_set *, const char *, int);
private struct magic_map *apprentice_buf(struct magic_set *, struct magic *, private struct magic_map *apprentice_buf(struct magic_set *, struct magic *,
size_t); size_t);
@@ -3280,67 +3280,6 @@ byteswap(struct magic *magic, uint32_t n @@ -3290,67 +3292,6 @@ byteswap(struct magic *magic, uint32_t n
} }
/* /*
@ -38,8 +39,8 @@
-swap2(uint16_t sv) -swap2(uint16_t sv)
-{ -{
- uint16_t rv; - uint16_t rv;
- uint8_t *s = (uint8_t *)(void *)&sv; - uint8_t *s = (uint8_t *)(void *)&sv;
- uint8_t *d = (uint8_t *)(void *)&rv; - uint8_t *d = (uint8_t *)(void *)&rv;
- d[0] = s[1]; - d[0] = s[1];
- d[1] = s[0]; - d[1] = s[0];
- return rv; - return rv;
@ -52,8 +53,8 @@
-swap4(uint32_t sv) -swap4(uint32_t sv)
-{ -{
- uint32_t rv; - uint32_t rv;
- uint8_t *s = (uint8_t *)(void *)&sv; - uint8_t *s = (uint8_t *)(void *)&sv;
- uint8_t *d = (uint8_t *)(void *)&rv; - uint8_t *d = (uint8_t *)(void *)&rv;
- d[0] = s[3]; - d[0] = s[3];
- d[1] = s[2]; - d[1] = s[2];
- d[2] = s[1]; - d[2] = s[1];
@ -68,8 +69,8 @@
-swap8(uint64_t sv) -swap8(uint64_t sv)
-{ -{
- uint64_t rv; - uint64_t rv;
- uint8_t *s = (uint8_t *)(void *)&sv; - uint8_t *s = (uint8_t *)(void *)&sv;
- uint8_t *d = (uint8_t *)(void *)&rv; - uint8_t *d = (uint8_t *)(void *)&rv;
-#if 0 -#if 0
- d[0] = s[3]; - d[0] = s[3];
- d[1] = s[2]; - d[1] = s[2];
@ -97,16 +98,16 @@
*/ */
private void private void
--- src/cdf.c --- src/cdf.c
+++ src/cdf.c 2017-09-13 10:32:39.981204996 +0000 +++ src/cdf.c 2018-10-22 07:54:09.366231573 +0000
@@ -50,6 +50,7 @@ FILE_RCSID("@(#)$File: cdf.c,v 1.106 201 @@ -48,6 +48,7 @@ FILE_RCSID("@(#)$File: cdf.c,v 1.113 201
#ifdef HAVE_LIMITS_H #include <time.h>
#include <ctype.h>
#include <limits.h> #include <limits.h>
#endif
+#include <byteswap.h> +#include <byteswap.h>
#ifndef EFTYPE #ifndef EFTYPE
#define EFTYPE EINVAL #define EFTYPE EINVAL
@@ -112,55 +112,9 @@ cdf_calloc(const char *file __attribute_ @@ -113,55 +114,9 @@ cdf_calloc(const char *file __attribute_
return calloc(n, u); return calloc(n, u);
} }

10
file-5.24-nitpick.dif
View File

@ -4,7 +4,7 @@
2 files changed, 10 insertions(+), 2 deletions(-) 2 files changed, 10 insertions(+), 2 deletions(-)
--- src/file.c --- src/file.c
+++ src/file.c 2018-06-12 14:32:11.918707401 +0000 +++ src/file.c 2018-10-22 07:56:59.735038350 +0000
@@ -108,10 +108,12 @@ private const struct option long_options @@ -108,10 +108,12 @@ private const struct option long_options
#define OPT_MIME_ENCODING 5 #define OPT_MIME_ENCODING 5
#define OPT(shortname, longname, opt, def, doc) \ #define OPT(shortname, longname, opt, def, doc) \
@ -18,7 +18,7 @@
#undef OPT_LONGONLY #undef OPT_LONGONLY
{0, 0, NULL, 0} {0, 0, NULL, 0}
}; };
@@ -646,6 +648,7 @@ docprint(const char *opts, int def) @@ -649,6 +651,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"
@@ -653,11 +656,16 @@ help(void) @@ -656,11 +659,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);
@ -41,10 +41,10 @@
#undef OPT #undef OPT
+#undef OPT_POSIX +#undef OPT_POSIX
#undef OPT_LONGONLY #undef OPT_LONGONLY
fprintf(stdout, "\nReport bugs to http://bugs.gw.com/\n"); fprintf(stdout, "\nReport bugs to https://bugs.astron.com/\n");
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
--- src/file_opts.h --- src/file_opts.h
+++ src/file_opts.h 2018-06-12 14:23:04.096699503 +0000 +++ src/file_opts.h 2018-10-22 07:55:03.281221021 +0000
@@ -36,8 +36,8 @@ OPT_LONGONLY("mime-encoding", 0, 0, " @@ -36,8 +36,8 @@ OPT_LONGONLY("mime-encoding", 0, 0, "
OPT('k', "keep-going", 0, 0, " don't stop at the first match\n") OPT('k', "keep-going", 0, 0, " don't stop at the first match\n")
OPT('l', "list", 0, 0, " list magic strength\n") OPT('l', "list", 0, 0, " list magic strength\n")

3
file-5.34.tar.gz
View File

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

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

@ -1,6 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iEYEABECAAYFAltYEXYACgkQcREqsWyzOzpnxwCfXZkGLqYAncdftwkXdBzWNGeM
bEkAoLHe7Q7/a0vgs1QI4ChwOnJbMkJA
=F+1u
-----END PGP SIGNATURE-----

60
file-5.34.dif → file-5.35.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 2018-10-15 10:57:39.702000661 +0000 +++ magic/Magdir/elf 2018-10-22 07:59:13.300535081 +0000
@@ -133,7 +133,7 @@ @@ -133,7 +133,7 @@
>18 leshort 47 Renesas H8/300H, >18 leshort 47 Renesas H8/300H,
>18 leshort 48 Renesas H8S, >18 leshort 48 Renesas H8S,
@ -21,7 +21,7 @@
>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 2018-10-15 10:57:39.702000661 +0000 +++ magic/Magdir/linux 2018-10-22 07:59:13.300535081 +0000
@@ -111,23 +111,27 @@ @@ -111,23 +111,27 @@
# and Nicolas Lichtmaier <nick@debian.org> # 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
@ -67,7 +67,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 2018-10-15 10:57:39.706000588 +0000 +++ magic/Magdir/msad 2018-10-22 07:59:13.300535081 +0000
@@ -0,0 +1,5 @@ @@ -0,0 +1,5 @@
+#------------------------------------------------------------------------------ +#------------------------------------------------------------------------------
+# msad: file(1) magic for msad +# msad: file(1) magic for msad
@ -75,8 +75,8 @@
+# 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 2018-10-15 10:57:39.706000588 +0000 +++ magic/Magdir/msdos 2018-10-22 07:59:13.300535081 +0000
@@ -104,9 +104,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
>>>(0x3c.l+24) leshort 0x010b >>>(0x3c.l+24) leshort 0x010b
@ -88,7 +88,7 @@
# hooray, there's a DOS extender using the PE format, with a valid PE # 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) # executable inside (which just prints a message and exits if run in win)
@@ -473,7 +473,7 @@ @@ -520,7 +520,7 @@
# negative offset, must not lead into PSP # negative offset, must not lead into PSP
>1 short <-259 >1 short <-259
# that offset must be accessible # that offset must be accessible
@ -98,7 +98,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 2018-10-15 10:57:39.706000588 +0000 +++ magic/Makefile.am 2018-10-22 08:03:21.007892910 +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 +116,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 \
@@ -90,7 +89,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \ @@ -91,7 +90,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \
$(MAGIC_FRAGMENT_DIR)/erlang \ $(MAGIC_FRAGMENT_DIR)/erlang \
$(MAGIC_FRAGMENT_DIR)/esri \ $(MAGIC_FRAGMENT_DIR)/esri \
$(MAGIC_FRAGMENT_DIR)/fcs \ $(MAGIC_FRAGMENT_DIR)/fcs \
@ -124,7 +124,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 \
@@ -132,6 +130,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \ @@ -135,6 +133,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 +133,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 \
@@ -140,7 +140,6 @@ $(MAGIC_FRAGMENT_DIR)/kml \ @@ -144,7 +144,6 @@ $(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,7 +141,7 @@
$(MAGIC_FRAGMENT_DIR)/lisp \ $(MAGIC_FRAGMENT_DIR)/lisp \
$(MAGIC_FRAGMENT_DIR)/llvm \ $(MAGIC_FRAGMENT_DIR)/llvm \
$(MAGIC_FRAGMENT_DIR)/lua \ $(MAGIC_FRAGMENT_DIR)/lua \
@@ -148,7 +147,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \ @@ -152,7 +151,6 @@ $(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)/macos \
@ -149,7 +149,7 @@
$(MAGIC_FRAGMENT_DIR)/magic \ $(MAGIC_FRAGMENT_DIR)/magic \
$(MAGIC_FRAGMENT_DIR)/mail.news \ $(MAGIC_FRAGMENT_DIR)/mail.news \
$(MAGIC_FRAGMENT_DIR)/make \ $(MAGIC_FRAGMENT_DIR)/make \
@@ -171,10 +169,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \ @@ -175,10 +173,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 \
@ -161,7 +161,7 @@
$(MAGIC_FRAGMENT_DIR)/msooxml \ $(MAGIC_FRAGMENT_DIR)/msooxml \
$(MAGIC_FRAGMENT_DIR)/msx \ $(MAGIC_FRAGMENT_DIR)/msx \
$(MAGIC_FRAGMENT_DIR)/msvc \ $(MAGIC_FRAGMENT_DIR)/msvc \
@@ -226,6 +224,8 @@ $(MAGIC_FRAGMENT_DIR)/python \ @@ -230,6 +228,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 \
@ -170,14 +170,14 @@
$(MAGIC_FRAGMENT_DIR)/rpi \ $(MAGIC_FRAGMENT_DIR)/rpi \
$(MAGIC_FRAGMENT_DIR)/rpm \ $(MAGIC_FRAGMENT_DIR)/rpm \
$(MAGIC_FRAGMENT_DIR)/rtf \ $(MAGIC_FRAGMENT_DIR)/rtf \
@@ -302,8 +302,20 @@ $(MAGIC_FRAGMENT_DIR)/zilog \ @@ -306,8 +306,20 @@ $(MAGIC_FRAGMENT_DIR)/zilog \
$(MAGIC_FRAGMENT_DIR)/zip \ $(MAGIC_FRAGMENT_DIR)/zip \
$(MAGIC_FRAGMENT_DIR)/zyxel $(MAGIC_FRAGMENT_DIR)/zyxel
+RAW = magic +RAW = magic
MAGIC = magic.mgc MAGIC = magic.mgc
-CLEANFILES = ${MAGIC} $(MAGIC_FRAGMENT_DIR)/Localstuff -CLEANFILES = ${MAGIC} $(MAGIC_FRAGMENT_DIR)/Localstuff
+CLEANFILES = ${MAGIC} $(MAGIC_DIR)/Localstuff ${RAW} +CLEANFILES = ${MAGIC} $(MAGIC_FRAGMENT_DIR)/Localstuff ${RAW}
+ +
+${RAW}: $(MAGIC_DIR)/Header $(MAGIC_DIR)/Localstuff $(EXTRA_DIST) +${RAW}: $(MAGIC_DIR)/Header $(MAGIC_DIR)/Localstuff $(EXTRA_DIST)
+ cat /dev/null > $@ + cat /dev/null > $@
@ -192,7 +192,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
@@ -315,19 +327,22 @@ FILE_COMPILE = $(top_builddir)/src/file$ @@ -319,19 +331,22 @@ FILE_COMPILE = $(top_builddir)/src/file$
FILE_COMPILE_DEP = $(FILE_COMPILE) FILE_COMPILE_DEP = $(FILE_COMPILE)
endif endif
@ -232,7 +232,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 2018-10-15 10:59:39.151808275 +0000 +++ magic/Makefile.in 2018-10-22 08:05:13.073792870 +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 +250,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 \
@@ -362,7 +361,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \ @@ -363,7 +362,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \
$(MAGIC_FRAGMENT_DIR)/erlang \ $(MAGIC_FRAGMENT_DIR)/erlang \
$(MAGIC_FRAGMENT_DIR)/esri \ $(MAGIC_FRAGMENT_DIR)/esri \
$(MAGIC_FRAGMENT_DIR)/fcs \ $(MAGIC_FRAGMENT_DIR)/fcs \
@ -258,7 +258,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 \
@@ -404,6 +402,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \ @@ -407,6 +405,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 +267,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 \
@@ -412,7 +412,6 @@ $(MAGIC_FRAGMENT_DIR)/kml \ @@ -416,7 +416,6 @@ $(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,7 +275,7 @@
$(MAGIC_FRAGMENT_DIR)/lisp \ $(MAGIC_FRAGMENT_DIR)/lisp \
$(MAGIC_FRAGMENT_DIR)/llvm \ $(MAGIC_FRAGMENT_DIR)/llvm \
$(MAGIC_FRAGMENT_DIR)/lua \ $(MAGIC_FRAGMENT_DIR)/lua \
@@ -420,7 +419,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \ @@ -424,7 +423,6 @@ $(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)/macos \
@ -283,7 +283,7 @@
$(MAGIC_FRAGMENT_DIR)/magic \ $(MAGIC_FRAGMENT_DIR)/magic \
$(MAGIC_FRAGMENT_DIR)/mail.news \ $(MAGIC_FRAGMENT_DIR)/mail.news \
$(MAGIC_FRAGMENT_DIR)/make \ $(MAGIC_FRAGMENT_DIR)/make \
@@ -443,10 +441,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \ @@ -447,10 +445,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 \
@ -295,7 +295,7 @@
$(MAGIC_FRAGMENT_DIR)/msooxml \ $(MAGIC_FRAGMENT_DIR)/msooxml \
$(MAGIC_FRAGMENT_DIR)/msx \ $(MAGIC_FRAGMENT_DIR)/msx \
$(MAGIC_FRAGMENT_DIR)/msvc \ $(MAGIC_FRAGMENT_DIR)/msvc \
@@ -498,6 +496,8 @@ $(MAGIC_FRAGMENT_DIR)/python \ @@ -502,6 +500,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 \
@ -304,14 +304,14 @@
$(MAGIC_FRAGMENT_DIR)/rpi \ $(MAGIC_FRAGMENT_DIR)/rpi \
$(MAGIC_FRAGMENT_DIR)/rpm \ $(MAGIC_FRAGMENT_DIR)/rpm \
$(MAGIC_FRAGMENT_DIR)/rtf \ $(MAGIC_FRAGMENT_DIR)/rtf \
@@ -574,10 +574,22 @@ $(MAGIC_FRAGMENT_DIR)/zilog \ @@ -578,10 +578,22 @@ $(MAGIC_FRAGMENT_DIR)/zilog \
$(MAGIC_FRAGMENT_DIR)/zip \ $(MAGIC_FRAGMENT_DIR)/zip \
$(MAGIC_FRAGMENT_DIR)/zyxel $(MAGIC_FRAGMENT_DIR)/zyxel
+RAW = magic +RAW = magic
MAGIC = magic.mgc MAGIC = magic.mgc
-CLEANFILES = ${MAGIC} $(MAGIC_FRAGMENT_DIR)/Localstuff -CLEANFILES = ${MAGIC} $(MAGIC_FRAGMENT_DIR)/Localstuff
+CLEANFILES = ${MAGIC} $(MAGIC_DIR)/Localstuff ${RAW} +CLEANFILES = ${MAGIC} $(MAGIC_FRAGMENT_DIR)/Localstuff ${RAW}
@IS_CROSS_COMPILE_FALSE@FILE_COMPILE = $(top_builddir)/src/file${EXEEXT} @IS_CROSS_COMPILE_FALSE@FILE_COMPILE = $(top_builddir)/src/file${EXEEXT}
+${RAW}: $(MAGIC_DIR)/Header $(MAGIC_DIR)/Localstuff $(EXTRA_DIST) +${RAW}: $(MAGIC_DIR)/Header $(MAGIC_DIR)/Localstuff $(EXTRA_DIST)
@ -328,7 +328,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}
@@ -799,23 +811,25 @@ uninstall-am: uninstall-pkgdataDATA @@ -803,23 +815,25 @@ uninstall-am: uninstall-pkgdataDATA
.PRECIOUS: Makefile .PRECIOUS: Makefile
@ -371,7 +371,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 2018-10-15 10:57:39.706000588 +0000 +++ src/Makefile.am 2018-10-22 07:59:13.328534557 +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 +379,7 @@
nodist_include_HEADERS = magic.h nodist_include_HEADERS = magic.h
--- src/dcore.c --- src/dcore.c
+++ src/dcore.c 2018-10-15 10:57:39.706000588 +0000 +++ src/dcore.c 2018-10-22 07:59:13.344534255 +0000
@@ -0,0 +1,207 @@ @@ -0,0 +1,207 @@
+/* +/*
+ * Show goo about ELF core files + * Show goo about ELF core files

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

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

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

@ -0,0 +1,6 @@
-----BEGIN PGP SIGNATURE-----
iEYEABECAAYFAlvJGcMACgkQcREqsWyzOzpYYQCgsAWYc53UEoPl3kkJpFPn7wzX
IAQAnjfEPZBlmALT0+8OOy1jvP1Xgswb
=wYfS
-----END PGP SIGNATURE-----

40
file-secure_getenv.patch
View File

@ -1,24 +1,24 @@
--- ---
file-5.29/configure.ac | 2 ++ file-5.35/configure.ac | 2 ++
file-5.29/src/file.c | 2 +- file-5.35/src/file.c | 2 +-
file-5.29/src/file.h | 8 ++++++++ file-5.35/src/file.h | 8 ++++++++
file-5.29/src/magic.c | 10 +++++----- file-5.35/src/magic.c | 10 +++++-----
4 files changed, 16 insertions(+), 6 deletions(-) 4 files changed, 16 insertions(+), 6 deletions(-)
--- file-5.29/configure.ac --- file-5.35/configure.ac
+++ file-5.29/configure.ac 2016-11-24 09:13:33.451612426 +0000 +++ file-5.35/configure.ac 2018-10-22 07:58:32.773294624 +0000
@@ -102,6 +102,8 @@ AC_CHECK_TYPE([sig_t],[AC_DEFINE([HAVE_S @@ -99,6 +99,8 @@ if test "$enable_zlib" != "no"; then
#include <signal.h> fi
#endif]) AC_CHECK_TYPE([sig_t],[AC_DEFINE([HAVE_SIG_T],1,[Have sig_t type])],,[#include <signal.h>])
+AC_CHECK_FUNCS([__secure_getenv secure_getenv]) +AC_CHECK_FUNCS([__secure_getenv secure_getenv])
+ +
dnl Checks for typedefs, structures, and compiler characteristics. dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST AC_C_CONST
AC_TYPE_OFF_T AC_TYPE_OFF_T
--- file-5.29/src/file.c --- file-5.35/src/file.c
+++ file-5.29/src/file.c 2016-11-24 09:13:33.451612426 +0000 +++ file-5.35/src/file.c 2018-10-22 07:57:43.206223603 +0000
@@ -648,7 +648,7 @@ docprint(const char *opts, int def) @@ -651,7 +651,7 @@ docprint(const char *opts, int def)
private void private void
help(void) help(void)
{ {
@ -27,9 +27,9 @@
(void)fputs( (void)fputs(
"Usage: file [OPTION...] [FILE...]\n" "Usage: file [OPTION...] [FILE...]\n"
"Determine type of FILEs.\n" "Determine type of FILEs.\n"
--- file-5.29/src/file.h --- file-5.35/src/file.h
+++ file-5.29/src/file.h 2016-11-24 09:13:33.451612426 +0000 +++ file-5.35/src/file.h 2018-10-22 07:57:43.206223603 +0000
@@ -652,4 +652,12 @@ static const char *rcsid(const char *p) @@ -658,4 +658,12 @@ static const char *rcsid(const char *p)
#define __RCSID(a) #define __RCSID(a)
#endif #endif
@ -42,9 +42,9 @@
+#endif +#endif
+ +
#endif /* __file_h__ */ #endif /* __file_h__ */
--- file-5.29/src/magic.c --- file-5.35/src/magic.c
+++ file-5.29/src/magic.c 2016-11-24 09:13:33.451612426 +0000 +++ file-5.35/src/magic.c 2018-10-22 07:57:43.206223603 +0000
@@ -185,7 +185,7 @@ get_default_magic(void) @@ -183,7 +183,7 @@ get_default_magic(void)
free(default_magic); free(default_magic);
default_magic = NULL; default_magic = NULL;
} }
@ -53,7 +53,7 @@
return MAGIC; return MAGIC;
if (asprintf(&hmagicpath, "%s/.magic.mgc", home) < 0) if (asprintf(&hmagicpath, "%s/.magic.mgc", home) < 0)
@@ -222,16 +222,16 @@ out: @@ -220,16 +220,16 @@ out:
} }
/* First, try to get a magic file from user-application data */ /* First, try to get a magic file from user-application data */
@ -73,7 +73,7 @@
_w32_append_path(&hmagicpath, "%s%s", home, hmagic); _w32_append_path(&hmagicpath, "%s%s", home, hmagic);
/* Fourth, try to get magic file relative to exe location */ /* Fourth, try to get magic file relative to exe location */
@@ -252,7 +252,7 @@ magic_getpath(const char *magicfile, int @@ -250,7 +250,7 @@ magic_getpath(const char *magicfile, int
if (magicfile != NULL) if (magicfile != NULL)
return magicfile; return magicfile;

21
file.changes
View File

@ -1,3 +1,24 @@
-------------------------------------------------------------------
Mon Oct 22 08:07:33 UTC 2018 - Dr. Werner Fink <werner@suse.de>
- Update to file version 5.35
* Add FreeBSD ELF core file support (John Baldwin)
* PR/30: Allow all parameter values to be set (don't treat 0 specially)
* handle default annotations on the softmagic match instead at the
end.
* PR/23: Recognize JSON files
* PR/18: file --mime-encoding should not print mime-type
- Modify the patches
* file-5.16-ocloexec.patch
* file-5.17-option.dif
* file-5.19-biorad.dif
* file-5.19-printf.dif
* file-5.22-elf.dif
* file-5.23-endian.patch
* file-5.24-nitpick.dif
* file-secure_getenv.patch
- Modify and rename patch file-5.34.dif which becomes file-5.35.dif
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Oct 15 11:08:06 UTC 2018 - Dr. Werner Fink <werner@suse.de> Mon Oct 15 11:08:06 UTC 2018 - 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 https://bugs.opensuse.org/ # Please submit bugfixes or comments via http://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.34 Version: 5.35
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.34.dif Patch: file-5.35.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 https://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #