pool/file
SHA256
5
0
Fork 2
Code Issues Pull Requests Packages Projects Releases Wiki Activity

.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/file?expand=0&rev=140
This commit is contained in:
Dr. Werner Fink 2016-08-16 12:02:27 +00:00 committed by Git OBS Bridge
parent b4efe8613f
commit 090daa0817
13 changed files with 98 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
file-4.24-autoconf.dif
View File

@ -1,5 +1,10 @@
---
doc/Makefile.am | 6 ++++--
src/readelf.h | 4 ++++
2 files changed, 8 insertions(+), 2 deletions(-)
--- doc/Makefile.am --- doc/Makefile.am
+++ doc/Makefile.am 2013-09-30 00:00:00.000000000 +0000 +++ doc/Makefile.am 2016-08-16 11:45:43.001478793 +0000
@@ -5,7 +5,8 @@ else @@ -5,7 +5,8 @@ else
man_MAGIC = magic.4 man_MAGIC = magic.4
endif endif
@ -21,7 +26,7 @@
sed -e s@__CSECTION__@1@g \ sed -e s@__CSECTION__@1@g \
-e s@__FSECTION__@${fsect}@g \ -e s@__FSECTION__@${fsect}@g \
--- src/readelf.h --- src/readelf.h
+++ src/readelf.h 2013-09-30 00:00:00.000000000 +0000 +++ src/readelf.h 2016-08-16 11:45:43.001478793 +0000
@@ -34,7 +34,10 @@ @@ -34,7 +34,10 @@
#ifndef __fake_elf_h__ #ifndef __fake_elf_h__
#define __fake_elf_h__ #define __fake_elf_h__
@ -33,7 +38,7 @@
#include <stdint.h> #include <stdint.h>
#endif #endif
@@ -339,4 +342,5 @@ typedef struct { @@ -398,4 +401,5 @@ typedef struct {
#define AV_386_SSE4_1 0x00800000 #define AV_386_SSE4_1 0x00800000
#define AV_386_SSE4_2 0x01000000 #define AV_386_SSE4_2 0x01000000

10
file-5.15-clear-invalid.patch
View File

@ -8,14 +8,12 @@ fixed build warning:
[ 205s] /usr/share/misc/magic, 5352: Warning: type `clear x' invalid [ 205s] /usr/share/misc/magic, 5352: Warning: type `clear x' invalid
--- ---
magic/Magdir/elf | 1 - file-5.28/magic/Magdir/elf | 1 -
1 file changed, 1 deletion(-) 1 file changed, 1 deletion(-)
Index: file-5.15/magic/Magdir/elf --- file-5.28/magic/Magdir/elf
=================================================================== +++ file-5.28/magic/Magdir/elf 2016-08-16 11:50:06.748513191 +0000
--- file-5.15.orig/magic/Magdir/elf 2013-09-29 01:42:19.000000000 +0100 @@ -56,7 +56,6 @@
+++ file-5.15/magic/Magdir/elf 2013-09-29 01:43:25.000000000 +0100
@@ -30,7 +30,6 @@
#>>>(0x38+0xcc) string >\0 of '%s' #>>>(0x38+0xcc) string >\0 of '%s'
#>>>(0x38+0x10) lelong >0 (signal %d), #>>>(0x38+0x10) lelong >0 (signal %d),
>16 leshort &0xff00 processor-specific, >16 leshort &0xff00 processor-specific,

12
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 2016-04-18 11:41:01.798059916 +0000 +++ src/apprentice.c 2016-08-16 11:47:57.766941986 +0000
@@ -1106,7 +1106,7 @@ load_1(struct magic_set *ms, int action, @@ -1106,7 +1106,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 2016-04-18 11:41:01.798059916 +0000 +++ src/compress.c 2016-08-16 11:47:57.766941986 +0000
@@ -382,7 +382,7 @@ file_pipe2file(struct magic_set *ms, int @@ -389,7 +389,7 @@ file_pipe2file(struct magic_set *ms, int
#else #else
{ {
int te; int te;
@ -46,8 +46,8 @@
(void)unlink(buf); (void)unlink(buf);
errno = te; errno = te;
--- src/file.c --- src/file.c
+++ src/file.c 2016-04-18 11:41:01.798059916 +0000 +++ src/file.c 2016-08-16 11:47:57.766941986 +0000
@@ -465,7 +465,7 @@ unwrap(struct magic_set *ms, const char @@ -467,7 +467,7 @@ unwrap(struct magic_set *ms, const char
f = stdin; f = stdin;
wid = 1; wid = 1;
} else { } else {
@ -57,7 +57,7 @@
progname, fn, strerror(errno)); progname, fn, strerror(errno));
return 1; return 1;
--- src/magic.c --- src/magic.c
+++ src/magic.c 2016-04-18 11:41:01.798059916 +0000 +++ src/magic.c 2016-08-16 11:47:57.766941986 +0000
@@ -442,7 +442,7 @@ file_or_fd(struct magic_set *ms, const c @@ -442,7 +442,7 @@ file_or_fd(struct magic_set *ms, const c
else else
pos = lseek(fd, (off_t)0, SEEK_CUR); pos = lseek(fd, (off_t)0, SEEK_CUR);

8
file-5.19-biorad.dif
View File

@ -1,6 +1,10 @@
---
magic/Magdir/images | 2 ++
1 file changed, 2 insertions(+)
--- magic/Magdir/images --- magic/Magdir/images
+++ magic/Magdir/images 2014-06-24 16:36:26.658235329 +0000 +++ magic/Magdir/images 2016-08-16 11:46:27.356644029 +0000
@@ -655,6 +655,8 @@ @@ -996,6 +996,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

8
file-5.23-endian.patch
View File

@ -4,7 +4,7 @@
2 files changed, 10 insertions(+), 114 deletions(-) 2 files changed, 10 insertions(+), 114 deletions(-)
--- src/apprentice.c --- src/apprentice.c
+++ src/apprentice.c 2016-04-18 11:44:13.254519084 +0000 +++ src/apprentice.c 2016-08-16 11:48:47.694001873 +0000
@@ -54,6 +54,7 @@ FILE_RCSID("@(#)$File: apprentice.c,v 1. @@ -54,6 +54,7 @@ FILE_RCSID("@(#)$File: apprentice.c,v 1.
#if defined(HAVE_LIMITS_H) #if defined(HAVE_LIMITS_H)
#include <limits.h> #include <limits.h>
@ -28,7 +28,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);
@@ -3175,67 +3178,6 @@ byteswap(struct magic *magic, uint32_t n @@ -3176,67 +3179,6 @@ byteswap(struct magic *magic, uint32_t n
} }
/* /*
@ -97,8 +97,8 @@
*/ */
private void private void
--- src/cdf.c --- src/cdf.c
+++ src/cdf.c 2016-04-18 11:44:13.254519084 +0000 +++ src/cdf.c 2016-08-16 11:48:47.694001873 +0000
@@ -50,6 +50,7 @@ FILE_RCSID("@(#)$File: cdf.c,v 1.76 2015 @@ -50,6 +50,7 @@ FILE_RCSID("@(#)$File: cdf.c,v 1.82 2016
#ifdef HAVE_LIMITS_H #ifdef HAVE_LIMITS_H
#include <limits.h> #include <limits.h>
#endif #endif

8
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 2016-04-18 12:12:46.470850980 +0000 +++ src/file.c 2016-08-16 11:49:23.481327975 +0000
@@ -96,10 +96,12 @@ private const struct option long_options @@ -96,10 +96,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}
}; };
@@ -615,6 +617,7 @@ docprint(const char *opts, int def) @@ -617,6 +619,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"
@@ -622,11 +625,16 @@ help(void) @@ -624,11 +627,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);
@ -44,7 +44,7 @@
fprintf(stdout, "\nReport bugs to http://bugs.gw.com/\n"); fprintf(stdout, "\nReport bugs to http://bugs.gw.com/\n");
exit(0); exit(0);
--- src/file_opts.h --- src/file_opts.h
+++ src/file_opts.h 2016-04-18 12:11:21.024431447 +0000 +++ src/file_opts.h 2016-08-16 11:49:23.481327975 +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")

25
file-5.26-revert-close.patch
View File

@ -1,25 +0,0 @@
From c8581da4c79cfc3fe52bb6c398497ff3a9986abd Mon Sep 17 00:00:00 2001
From: Christos Zoulas <christos@zoulas.com>
Date: Mon, 8 Feb 2016 02:20:36 +0000
Subject: [PATCH] doesn't matter if it is stdin; if we opened it, we close it.
---
magic.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git src/magic.c src/magic.c
index 30faa8a..c3ceb50 100644
--- src/magic.c
+++ src/magic.c
@@ -346,7 +346,7 @@ private void
close_and_restore(const struct magic_set *ms, const char *name, int fd,
const struct stat *sb)
{
- if (fd == STDIN_FILENO || name == NULL)
+ if (name == NULL)
return;
(void) close(fd);
--
2.6.6

3
file-5.27.tar.gz
View File

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

50
file-5.26.dif → file-5.28.dif
View File

@ -10,7 +10,7 @@
8 files changed, 311 insertions(+), 66 deletions(-) 8 files changed, 311 insertions(+), 66 deletions(-)
--- magic/Magdir/elf --- magic/Magdir/elf
+++ magic/Magdir/elf 2016-04-18 11:59:52.349157805 +0000 +++ magic/Magdir/elf 2016-08-16 11:53:22.408828154 +0000
@@ -128,7 +128,7 @@ @@ -128,7 +128,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 2016-04-18 11:59:52.349157805 +0000 +++ magic/Magdir/linux 2016-08-16 11:53:22.408828154 +0000
@@ -101,23 +101,27 @@ @@ -101,23 +101,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 2016-04-18 11:59:52.349157805 +0000 +++ magic/Magdir/msad 2016-08-16 11:53:22.408828154 +0000
@@ -0,0 +1,5 @@ @@ -0,0 +1,5 @@
+#------------------------------------------------------------------------------ +#------------------------------------------------------------------------------
+# msad: file(1) magic for msad +# msad: file(1) magic for msad
@ -75,7 +75,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 2016-04-18 11:59:52.349157805 +0000 +++ magic/Magdir/msdos 2016-08-16 11:53:22.408828154 +0000
@@ -104,9 +104,9 @@ @@ -104,9 +104,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
@ -89,7 +89,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)
--- magic/Makefile.am --- magic/Makefile.am
+++ magic/Makefile.am 2016-04-18 12:02:09.262627467 +0000 +++ magic/Makefile.am 2016-08-16 11:53:22.408828154 +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)
@ -107,7 +107,7 @@
$(MAGIC_FRAGMENT_DIR)/applix \ $(MAGIC_FRAGMENT_DIR)/applix \
$(MAGIC_FRAGMENT_DIR)/archive \ $(MAGIC_FRAGMENT_DIR)/archive \
$(MAGIC_FRAGMENT_DIR)/assembler \ $(MAGIC_FRAGMENT_DIR)/assembler \
@@ -80,7 +79,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \ @@ -82,7 +81,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 \
@ -115,7 +115,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 \
@@ -120,6 +118,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \ @@ -122,6 +120,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 \
@ -124,7 +124,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 \
@@ -128,7 +128,6 @@ $(MAGIC_FRAGMENT_DIR)/kml \ @@ -130,7 +130,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 \
@ -132,7 +132,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 \
@@ -136,7 +135,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \ @@ -138,7 +137,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 \
@ -140,7 +140,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 \
@@ -158,10 +156,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \ @@ -160,10 +158,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 \
@ -152,7 +152,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 \
@@ -210,6 +208,8 @@ $(MAGIC_FRAGMENT_DIR)/python \ @@ -214,6 +212,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 \
@ -161,7 +161,7 @@
$(MAGIC_FRAGMENT_DIR)/rpm \ $(MAGIC_FRAGMENT_DIR)/rpm \
$(MAGIC_FRAGMENT_DIR)/rtf \ $(MAGIC_FRAGMENT_DIR)/rtf \
$(MAGIC_FRAGMENT_DIR)/ruby \ $(MAGIC_FRAGMENT_DIR)/ruby \
@@ -280,8 +280,20 @@ $(MAGIC_FRAGMENT_DIR)/zfs \ @@ -285,8 +285,20 @@ $(MAGIC_FRAGMENT_DIR)/zfs \
$(MAGIC_FRAGMENT_DIR)/zilog \ $(MAGIC_FRAGMENT_DIR)/zilog \
$(MAGIC_FRAGMENT_DIR)/zyxel $(MAGIC_FRAGMENT_DIR)/zyxel
@ -183,7 +183,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
@@ -293,19 +305,22 @@ FILE_COMPILE = $(top_builddir)/src/file$ @@ -298,19 +310,22 @@ FILE_COMPILE = $(top_builddir)/src/file$
FILE_COMPILE_DEP = $(FILE_COMPILE) FILE_COMPILE_DEP = $(FILE_COMPILE)
endif endif
@ -223,7 +223,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 2016-04-18 12:03:07.113558364 +0000 +++ magic/Makefile.in 2016-08-16 11:53:22.408828154 +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
@ -241,7 +241,7 @@
$(MAGIC_FRAGMENT_DIR)/applix \ $(MAGIC_FRAGMENT_DIR)/applix \
$(MAGIC_FRAGMENT_DIR)/archive \ $(MAGIC_FRAGMENT_DIR)/archive \
$(MAGIC_FRAGMENT_DIR)/assembler \ $(MAGIC_FRAGMENT_DIR)/assembler \
@@ -352,7 +351,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \ @@ -354,7 +353,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 \
@ -249,7 +249,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 \
@@ -392,6 +390,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \ @@ -394,6 +392,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 \
@ -258,7 +258,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 \
@@ -400,7 +400,6 @@ $(MAGIC_FRAGMENT_DIR)/kml \ @@ -402,7 +402,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 \
@ -266,7 +266,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 \
@@ -408,7 +407,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \ @@ -410,7 +409,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 \
@ -274,7 +274,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 \
@@ -430,10 +428,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \ @@ -432,10 +430,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 \
@ -286,7 +286,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 \
@@ -482,6 +480,8 @@ $(MAGIC_FRAGMENT_DIR)/python \ @@ -486,6 +484,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 \
@ -295,7 +295,7 @@
$(MAGIC_FRAGMENT_DIR)/rpm \ $(MAGIC_FRAGMENT_DIR)/rpm \
$(MAGIC_FRAGMENT_DIR)/rtf \ $(MAGIC_FRAGMENT_DIR)/rtf \
$(MAGIC_FRAGMENT_DIR)/ruby \ $(MAGIC_FRAGMENT_DIR)/ruby \
@@ -552,10 +552,22 @@ $(MAGIC_FRAGMENT_DIR)/zfs \ @@ -557,10 +557,22 @@ $(MAGIC_FRAGMENT_DIR)/zfs \
$(MAGIC_FRAGMENT_DIR)/zilog \ $(MAGIC_FRAGMENT_DIR)/zilog \
$(MAGIC_FRAGMENT_DIR)/zyxel $(MAGIC_FRAGMENT_DIR)/zyxel
@ -319,7 +319,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}
@@ -777,23 +789,25 @@ uninstall-am: uninstall-pkgdataDATA @@ -782,23 +794,25 @@ uninstall-am: uninstall-pkgdataDATA
.PRECIOUS: Makefile .PRECIOUS: Makefile
@ -362,15 +362,15 @@
# 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 2016-04-18 11:59:52.381157214 +0000 +++ src/Makefile.am 2016-08-16 11:54:33.947480617 +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
lib_LTLIBRARIES = libmagic.la lib_LTLIBRARIES = libmagic.la
include_HEADERS = magic.h nodist_include_HEADERS = magic.h
--- src/dcore.c --- src/dcore.c
+++ src/dcore.c 2016-04-18 11:59:52.381157214 +0000 +++ src/dcore.c 2016-08-16 11:53:22.424827851 +0000
@@ -0,0 +1,207 @@ @@ -0,0 +1,207 @@
+/* +/*
+ * Show goo about ELF core files + * Show goo about ELF core files

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

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

28
file-secure_getenv.patch
View File

@ -1,13 +1,13 @@
--- ---
file-5.26/configure.ac | 2 ++ file-5.28/configure.ac | 2 ++
file-5.26/src/file.c | 2 +- file-5.28/src/file.c | 2 +-
file-5.26/src/file.h | 8 ++++++++ file-5.28/src/file.h | 8 ++++++++
file-5.26/src/magic.c | 10 +++++----- file-5.28/src/magic.c | 10 +++++-----
4 files changed, 16 insertions(+), 6 deletions(-) 4 files changed, 16 insertions(+), 6 deletions(-)
--- file-5.26/configure.ac --- file-5.28/configure.ac
+++ file-5.26/configure.ac 2016-04-18 11:57:58.275266186 +0000 +++ file-5.28/configure.ac 2016-08-16 11:51:12.795269362 +0000
@@ -90,6 +90,8 @@ AC_CHECK_TYPE([sig_t],[AC_DEFINE([HAVE_S @@ -97,6 +97,8 @@ AC_CHECK_TYPE([sig_t],[AC_DEFINE([HAVE_S
#include <signal.h> #include <signal.h>
#endif]) #endif])
@ -16,9 +16,9 @@
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.26/src/file.c --- file-5.28/src/file.c
+++ file-5.26/src/file.c 2016-04-18 11:57:58.275266186 +0000 +++ file-5.28/src/file.c 2016-08-16 11:51:12.795269362 +0000
@@ -617,7 +617,7 @@ docprint(const char *opts, int def) @@ -619,7 +619,7 @@ docprint(const char *opts, int def)
private void private void
help(void) help(void)
{ {
@ -27,8 +27,8 @@
(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.26/src/file.h --- file-5.28/src/file.h
+++ file-5.26/src/file.h 2016-04-18 11:57:58.275266186 +0000 +++ file-5.28/src/file.h 2016-08-16 11:51:12.795269362 +0000
@@ -615,4 +615,12 @@ static const char *rcsid(const char *p) @@ -615,4 +615,12 @@ static const char *rcsid(const char *p)
#define __RCSID(a) #define __RCSID(a)
#endif #endif
@ -42,8 +42,8 @@
+#endif +#endif
+ +
#endif /* __file_h__ */ #endif /* __file_h__ */
--- file-5.26/src/magic.c --- file-5.28/src/magic.c
+++ file-5.26/src/magic.c 2016-04-18 11:57:58.275266186 +0000 +++ file-5.28/src/magic.c 2016-08-16 11:51:12.795269362 +0000
@@ -185,7 +185,7 @@ get_default_magic(void) @@ -185,7 +185,7 @@ get_default_magic(void)
free(default_magic); free(default_magic);
default_magic = NULL; default_magic = NULL;

22
file.changes
View File

@ -1,3 +1,25 @@
-------------------------------------------------------------------
Tue Aug 16 11:59:36 UTC 2016 - werner@suse.de
- Update to file version 5.28
* fix leak on allocation failure
* PR/555: Avoid overflow for offset > nbytes
* PR/550: Segv on DER parsing:
- use the correct variable for length
- set offset to 0 on failure.
- Port patches to 5.28
file-4.24-autoconf.dif
file-5.15-clear-invalid.patch
file-5.16-ocloexec.patch
file-5.19-biorad.dif
file-5.23-endian.patch
file-5.24-nitpick.dif
file-secure_getenv.patch
- Remove patches now upstream
file-5.26-revert-close.patch
- Rename patches
file-5.26.dif becomes file-5.28.dif
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 1 10:17:08 UTC 2016 - werner@suse.de Wed Jun 1 10:17:08 UTC 2016 - werner@suse.de

7
file.spec
View File

@ -32,7 +32,7 @@ Obsoletes: file-64bit
%endif %endif
# #
# Set Version also in python-magic.spec # Set Version also in python-magic.spec
Version: 5.27 Version: 5.28
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 @@ Group: Productivity/File utilities
Source: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz Source: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
Source2: baselibs.conf Source2: baselibs.conf
Source3: file-rpmlintrc Source3: file-rpmlintrc
Patch: file-5.26.dif Patch: file-5.28.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
@ -63,8 +63,6 @@ Patch34: file-5.23-endian.patch
Patch35: file-5.24-nitpick.dif Patch35: file-5.24-nitpick.dif
Patch36: file-5.15-clear-invalid.patch Patch36: file-5.15-clear-invalid.patch
Patch37: file-secure_getenv.patch Patch37: file-secure_getenv.patch
## Currently disabled for 5.27 to test without
Patch42: file-5.26-revert-close.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%global _sysconfdir /etc %global _sysconfdir /etc
%global _miscdir %{_datadir}/misc %global _miscdir %{_datadir}/misc
@ -129,7 +127,6 @@ to develop applications that require the magic "file" interface.
%patch35 -p0 -b .nitpick %patch35 -p0 -b .nitpick
%patch36 -p1 -b .clear %patch36 -p1 -b .clear
%patch37 -p1 -b .getenv %patch37 -p1 -b .getenv
##%patch42 -p0 -b .stdin -R
%patch -b .0 %patch -b .0
test -s src/magic.h.in || cp -p src/magic.h src/magic.h.in test -s src/magic.h.in || cp -p src/magic.h src/magic.h.in
rm -fv src/magic.h rm -fv src/magic.h