Accepting request 926661 from Base:System
- Remove file-5.38-allow-readlinkat.dif as already doen in latest file 5.41 - Update to 5.41: * Avinash Sonawane: Fix tzname detection * Fix relationship tests with "search" magic, don't short circuit logic * Fix memory leak in compile mode * PR/272: kiefermat: Only set returnval = 1 when we printed something (in all cases print or !print). This simplifies the logic and fixes the issue in the PR with -k and --mime-type there was no continuation printed before the default case. * PR/270: Don't translate unprintable characters in %s magic formats when -r * PR/269: Avoid undefined behavior with clang (adding offset to NULL) * Add a new flag (f) that requires that the match is a full word, not a partial word match. * Add varint types (unused) * PR/256: mutableVoid: If the file is less than 3 bytes, use the file length to determine type * PR/259: aleksandr.v.novichkov: mime printing through indirect magic is not taken into account, use match directly so that it does. - Remove patches now upstream * file-5.40-1c677c04.patch * file-5.40-3096f87f.patch * file-5.40-4c5fe1ad.patch * file-5.40-6b34436a.patch * file-5.40-749e1ecf.patch * file-5.40-9b0459af.patch * file-5.40-9e2becec.patch OBS-URL: https://build.opensuse.org/request/show/926661 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/file?expand=0&rev=123
This commit is contained in:
commit
e34945fc57
@ -4,7 +4,7 @@
|
||||
|
||||
--- magic/Magdir/images
|
||||
+++ magic/Magdir/images 2019-05-27 08:52:51.674238380 +0000
|
||||
@@ -1348,6 +1348,8 @@
|
||||
@@ -1566,6 +1566,8 @@
|
||||
# https://web.archive.org/web/20050317223257/www.cs.ubc.ca/spider/ladic/text/biorad.txt
|
||||
# Samples: https://www.loci.wisc.edu/software/sample-data
|
||||
14 leshort <2
|
||||
|
@ -1,19 +1,15 @@
|
||||
---
|
||||
src/apprentice.c | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
src/apprentice.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- src/apprentice.c
|
||||
+++ src/apprentice.c 2019-02-21 06:39:25.249091320 +0000
|
||||
@@ -2476,6 +2476,12 @@ check_format_type(const char *ptr, int t
|
||||
+++ src/apprentice.c 2021-10-19 08:52:01.991343421 +0000
|
||||
@@ -2489,7 +2489,7 @@ check_format_type(const char *ptr, int t
|
||||
}
|
||||
} else
|
||||
h = 0;
|
||||
- while (*ptr && strchr("-.#", *ptr) != NULL)
|
||||
+ while (*ptr && strchr("-.# +'", *ptr) != NULL)
|
||||
ptr++;
|
||||
if (*ptr == '#')
|
||||
ptr++;
|
||||
+ if (*ptr == ' ')
|
||||
+ ptr++;
|
||||
+ if (*ptr == '+')
|
||||
+ ptr++;
|
||||
+ if (*ptr == '\'')
|
||||
+ ptr++;
|
||||
#define CHECKLEN() do { \
|
||||
for (len = cnt = 0; isdigit(CAST(unsigned char, *ptr)); ptr++, cnt++) \
|
||||
len = len * 10 + (*ptr - '0'); \
|
||||
|
@ -4,7 +4,7 @@
|
||||
|
||||
--- magic/Magdir/archive
|
||||
+++ magic/Magdir/archive 2019-02-21 06:49:05.298138025 +0000
|
||||
@@ -1117,6 +1117,11 @@
|
||||
@@ -1200,6 +1200,11 @@
|
||||
0 string PK\x07\x08PK\x03\x04 Zip multi-volume archive data, at least PKZIP v2.50 to extract
|
||||
!:mime application/zip
|
||||
!:ext zip/cbz
|
||||
|
@ -4,7 +4,7 @@
|
||||
2 files changed, 10 insertions(+), 114 deletions(-)
|
||||
|
||||
--- src/apprentice.c
|
||||
+++ src/apprentice.c 2019-02-21 07:03:30.961751563 +0000
|
||||
+++ src/apprentice.c 2021-10-19 08:56:33.418646912 +0000
|
||||
@@ -50,7 +50,7 @@ FILE_RCSID("@(#)$File: apprentice.c,v 1.
|
||||
#endif
|
||||
#include <dirent.h>
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
#define EATAB {while (isascii(CAST(unsigned char, *l)) && \
|
||||
isspace(CAST(unsigned char, *l))) ++l;}
|
||||
@@ -124,9 +124,11 @@ private struct mlist *mlist_alloc(void);
|
||||
@@ -124,9 +124,11 @@ private void mlist_free_all(struct magic
|
||||
private void mlist_free(struct mlist *);
|
||||
private void byteswap(struct magic *, uint32_t);
|
||||
private void bs1(struct magic *);
|
||||
@ -29,10 +29,11 @@
|
||||
private char *mkdbname(struct magic_set *, const char *, int);
|
||||
private struct magic_map *apprentice_buf(struct magic_set *, struct magic *,
|
||||
size_t);
|
||||
@@ -3347,67 +3349,6 @@ byteswap(struct magic *magic, uint32_t n
|
||||
@@ -3355,67 +3357,6 @@ byteswap(struct magic *magic, uint32_t n
|
||||
bs1(&magic[i]);
|
||||
}
|
||||
|
||||
/*
|
||||
-/*
|
||||
- * swap a short
|
||||
- */
|
||||
-private uint16_t
|
||||
@ -93,13 +94,12 @@
|
||||
- return rv;
|
||||
-}
|
||||
-
|
||||
-/*
|
||||
* byteswap a single magic entry
|
||||
*/
|
||||
private void
|
||||
protected uintmax_t
|
||||
file_varint2uintmax_t(const unsigned char *us, int t, size_t *l)
|
||||
{
|
||||
--- src/cdf.c
|
||||
+++ src/cdf.c 2019-02-21 07:05:15.503772161 +0000
|
||||
@@ -48,6 +48,7 @@ FILE_RCSID("@(#)$File: cdf.c,v 1.114 201
|
||||
+++ src/cdf.c 2021-10-19 08:53:37.577690786 +0000
|
||||
@@ -48,6 +48,7 @@ FILE_RCSID("@(#)$File: cdf.c,v 1.120 202
|
||||
#include <time.h>
|
||||
#include <ctype.h>
|
||||
#include <limits.h>
|
||||
@ -107,7 +107,7 @@
|
||||
|
||||
#ifndef EFTYPE
|
||||
#define EFTYPE EINVAL
|
||||
@@ -120,55 +121,9 @@ cdf_calloc(const char *file __attribute_
|
||||
@@ -124,55 +125,9 @@ cdf_calloc(const char *file __attribute_
|
||||
return calloc(n, u);
|
||||
}
|
||||
|
||||
|
@ -16,7 +16,7 @@ contained within the image.
|
||||
diff --git a/magic/Magdir/filesystems b/magic/Magdir/filesystems
|
||||
--- a/magic/Magdir/filesystems
|
||||
+++ b/magic/Magdir/filesystems
|
||||
@@ -2296,20 +2296,29 @@
|
||||
@@ -2302,20 +2302,29 @@
|
||||
>>0x10060 string >\0 lockproto %s)
|
||||
|
||||
# Russell Coker <russell@coker.com.au>
|
||||
|
@ -1,14 +0,0 @@
|
||||
Index: file-5.38/src/seccomp.c
|
||||
===================================================================
|
||||
--- file-5.38.orig/src/seccomp.c
|
||||
+++ file-5.38/src/seccomp.c
|
||||
@@ -205,6 +205,9 @@ enable_sandbox_full(void)
|
||||
#ifdef __NR_newfstatat
|
||||
ALLOW_RULE(newfstatat);
|
||||
#endif
|
||||
+#ifdef __NR_readlinkat
|
||||
+ ALLOW_RULE(readlinkat);
|
||||
+#endif
|
||||
ALLOW_RULE(open);
|
||||
ALLOW_RULE(openat);
|
||||
ALLOW_RULE(pread64);
|
@ -1,36 +0,0 @@
|
||||
From 1c677c04c0fa43ecfeccdb9705dbbd19fb356891 Mon Sep 17 00:00:00 2001
|
||||
From: Christos Zoulas <christos@zoulas.com>
|
||||
Date: Sun, 4 Apr 2021 21:02:19 +0000
|
||||
Subject: [PATCH] Don't count each byte encounter as 1, count the total number
|
||||
of bytes found (Anatol Belski). This makes it behave like 5.39.
|
||||
|
||||
---
|
||||
src/encoding.c | 5 ++---
|
||||
1 file changed, 2 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git src/encoding.c src/encoding.c
|
||||
index c8b40439..c66703bb 100644
|
||||
--- src/encoding.c
|
||||
+++ src/encoding.c
|
||||
@@ -35,7 +35,7 @@
|
||||
#include "file.h"
|
||||
|
||||
#ifndef lint
|
||||
-FILE_RCSID("@(#)$File: encoding.c,v 1.27 2021/02/05 21:33:49 christos Exp $")
|
||||
+FILE_RCSID("@(#)$File: encoding.c,v 1.28 2021/04/04 21:02:19 christos Exp $")
|
||||
#endif /* lint */
|
||||
|
||||
#include "magic.h"
|
||||
@@ -282,8 +282,7 @@ looks_ ## NAME(const unsigned char *buf, size_t nbytes, file_unichar_t *ubuf, \
|
||||
} \
|
||||
u = 0; \
|
||||
for (i = 0; i < __arraycount(dist); i++) { \
|
||||
- if (dist[i]) \
|
||||
- u++; \
|
||||
+ u+= dist[i]; \
|
||||
} \
|
||||
if (u < 3) \
|
||||
return 0; \
|
||||
--
|
||||
2.26.2
|
||||
|
@ -1,105 +0,0 @@
|
||||
From 3096f87f823e1e936139e48d6a3bae9a95557861 Mon Sep 17 00:00:00 2001
|
||||
From: Christos Zoulas <christos@zoulas.com>
|
||||
Date: Fri, 9 Apr 2021 19:16:19 +0000
|
||||
Subject: [PATCH] No point returning 0 twice, also don't return -1 as an error
|
||||
where 0 is expected.
|
||||
|
||||
---
|
||||
src/encoding.c | 14 +++++++++++---
|
||||
src/readelf.c | 19 ++++++++-----------
|
||||
2 files changed, 19 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git src/encoding.c src/encoding.c
|
||||
index c66703bb..691e3e16 100644
|
||||
--- src/encoding.c
|
||||
+++ src/encoding.c
|
||||
@@ -1,3 +1,5 @@
|
||||
+/* $NetBSD: encoding.c,v 1.1.1.13 2021/04/09 18:58:01 christos Exp $ */
|
||||
+
|
||||
/*
|
||||
* Copyright (c) Ian F. Darwin 1986-1995.
|
||||
* Software written by Ian F. Darwin and others;
|
||||
@@ -35,7 +37,11 @@
|
||||
#include "file.h"
|
||||
|
||||
#ifndef lint
|
||||
-FILE_RCSID("@(#)$File: encoding.c,v 1.28 2021/04/04 21:02:19 christos Exp $")
|
||||
+#if 0
|
||||
+FILE_RCSID("@(#)$File: encoding.c,v 1.29 2021/04/09 19:16:19 christos Exp $")
|
||||
+#else
|
||||
+__RCSID("$NetBSD: encoding.c,v 1.1.1.13 2021/04/09 18:58:01 christos Exp $");
|
||||
+#endif
|
||||
#endif /* lint */
|
||||
|
||||
#include "magic.h"
|
||||
@@ -282,7 +288,8 @@ looks_ ## NAME(const unsigned char *buf, size_t nbytes, file_unichar_t *ubuf, \
|
||||
} \
|
||||
u = 0; \
|
||||
for (i = 0; i < __arraycount(dist); i++) { \
|
||||
- u+= dist[i]; \
|
||||
+ if (dist[i]) \
|
||||
+ u++; \
|
||||
} \
|
||||
if (u < 3) \
|
||||
return 0; \
|
||||
@@ -386,7 +393,8 @@ file_looks_utf8(const unsigned char *buf, size_t nbytes, file_unichar_t *ubuf,
|
||||
} else { /* 11xxxxxx begins UTF-8 */
|
||||
int following;
|
||||
uint8_t x = first[buf[i]];
|
||||
- const struct accept_range *ar = &accept_ranges[x >> 4];
|
||||
+ const struct accept_range *ar =
|
||||
+ &accept_ranges[(unsigned int)x >> 4];
|
||||
if (x == XX)
|
||||
return -1;
|
||||
|
||||
diff --git src/readelf.c src/readelf.c
|
||||
index 0cd119a6..633fd2e8 100644
|
||||
--- src/readelf.c
|
||||
+++ src/readelf.c
|
||||
@@ -27,7 +27,7 @@
|
||||
#include "file.h"
|
||||
|
||||
#ifndef lint
|
||||
-FILE_RCSID("@(#)$File: readelf.c,v 1.175 2020/12/17 20:43:37 christos Exp $")
|
||||
+FILE_RCSID("@(#)$File: readelf.c,v 1.176 2021/04/09 19:16:19 christos Exp $")
|
||||
#endif
|
||||
|
||||
#ifdef BUILTIN_ELF
|
||||
@@ -982,9 +982,8 @@ get_string_on_virtaddr(struct magic_set *ms,
|
||||
fsize, virtaddr);
|
||||
if (offset < 0 ||
|
||||
(buflen = pread(fd, buf, CAST(size_t, buflen), offset)) <= 0) {
|
||||
- if (file_printf(ms, ", can't read elf string at %jd",
|
||||
- (intmax_t)offset) == -1)
|
||||
- return -1;
|
||||
+ (void)file_printf(ms, ", can't read elf string at %jd",
|
||||
+ (intmax_t)offset);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -1185,17 +1184,15 @@ donote(struct magic_set *ms, void *vbuf, size_t offset, size_t size,
|
||||
}
|
||||
|
||||
if (namesz & 0x80000000) {
|
||||
- if (file_printf(ms, ", bad note name size %#lx",
|
||||
- CAST(unsigned long, namesz)) == -1)
|
||||
- return -1;
|
||||
+ (void)file_printf(ms, ", bad note name size %#lx",
|
||||
+ CAST(unsigned long, namesz);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (descsz & 0x80000000) {
|
||||
- if (file_printf(ms, ", bad note description size %#lx",
|
||||
- CAST(unsigned long, descsz)) == -1)
|
||||
- return -1;
|
||||
- return 0;
|
||||
+ (void)file_printf(ms, ", bad note description size %#lx",
|
||||
+ CAST(unsigned long, descsz);
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
noff = offset;
|
||||
--
|
||||
2.28.0
|
||||
|
@ -1,50 +0,0 @@
|
||||
From 4c5fe1ad1daa798eda3265e09a382d4ede548981 Mon Sep 17 00:00:00 2001
|
||||
From: Christos Zoulas <christos@zoulas.com>
|
||||
Date: Fri, 9 Apr 2021 20:40:56 +0000
|
||||
Subject: [PATCH] Add missing parens, use reinterpret-casr
|
||||
|
||||
---
|
||||
src/readelf.c | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git src/readelf.c src/readelf.c
|
||||
index 633fd2e8..10902f09 100644
|
||||
--- src/readelf.c
|
||||
+++ src/readelf.c
|
||||
@@ -27,7 +27,7 @@
|
||||
#include "file.h"
|
||||
|
||||
#ifndef lint
|
||||
-FILE_RCSID("@(#)$File: readelf.c,v 1.176 2021/04/09 19:16:19 christos Exp $")
|
||||
+FILE_RCSID("@(#)$File: readelf.c,v 1.177 2021/04/09 20:40:56 christos Exp $")
|
||||
#endif
|
||||
|
||||
#ifdef BUILTIN_ELF
|
||||
@@ -918,7 +918,7 @@ do_core_note(struct magic_set *ms, unsigned char *nbuf, uint32_t type,
|
||||
if (file_printf(ms, ", from '%s'",
|
||||
file_copystr(buf, sizeof(buf),
|
||||
CAST(size_t, cp - cname),
|
||||
- CAST(const char *, cname))) == -1)
|
||||
+ RCAST(char *, cname))) == -1)
|
||||
return -1;
|
||||
*flags |= FLAGS_DID_CORE;
|
||||
return 1;
|
||||
@@ -1185,13 +1185,13 @@ donote(struct magic_set *ms, void *vbuf, size_t offset, size_t size,
|
||||
|
||||
if (namesz & 0x80000000) {
|
||||
(void)file_printf(ms, ", bad note name size %#lx",
|
||||
- CAST(unsigned long, namesz);
|
||||
+ CAST(unsigned long, namesz));
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (descsz & 0x80000000) {
|
||||
(void)file_printf(ms, ", bad note description size %#lx",
|
||||
- CAST(unsigned long, descsz);
|
||||
+ CAST(unsigned long, descsz));
|
||||
return 0;
|
||||
}
|
||||
|
||||
--
|
||||
2.28.0
|
||||
|
@ -1,29 +0,0 @@
|
||||
From 6b34436ac766dae64749b8d14f18c6910be40131 Mon Sep 17 00:00:00 2001
|
||||
From: Christos Zoulas <christos@zoulas.com>
|
||||
Date: Mon, 5 Apr 2021 16:36:14 +0000
|
||||
Subject: [PATCH] remove "u" from the pattern (Joerg Jenderek)
|
||||
|
||||
---
|
||||
magic/Magdir/mail.news | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git magic/Magdir/mail.news magic/Magdir/mail.news
|
||||
index 3a2eeb96..6a222910 100644
|
||||
--- magic/Magdir/mail.news
|
||||
+++ magic/Magdir/mail.news
|
||||
@@ -1,5 +1,5 @@
|
||||
#------------------------------------------------------------------------------
|
||||
-# $File: mail.news,v 1.26 2021/03/21 14:37:03 christos Exp $
|
||||
+# $File: mail.news,v 1.27 2021/04/05 16:36:14 christos Exp $
|
||||
# mail.news: file(1) magic for mail and news
|
||||
#
|
||||
# Unfortunately, saved netnews also has From line added in some news software.
|
||||
@@ -81,4 +81,4 @@
|
||||
# File format spec: https://wiki.dovecot.org/Design/Dcrypt/#File_format
|
||||
# From: Stephen Gildea
|
||||
0 string CRYPTED\003\007 Dovecot encrypted message
|
||||
->9 byte xu \b, dcrypt version %d
|
||||
+>9 byte x \b, dcrypt version %d
|
||||
--
|
||||
2.26.2
|
||||
|
@ -1,35 +0,0 @@
|
||||
From 749e1ecfc3d333e5ec8b1a2e639da7ccb2498c34 Mon Sep 17 00:00:00 2001
|
||||
From: Christos Zoulas <christos@zoulas.com>
|
||||
Date: Mon, 19 Apr 2021 18:38:04 +0000
|
||||
Subject: [PATCH] PR/256: mutableVoid: If the file is less than 3 bytes, use
|
||||
the file length to determine type
|
||||
|
||||
---
|
||||
src/encoding.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git src/encoding.c src/encoding.c
|
||||
index 0fb1f47b..31d4d125 100644
|
||||
--- src/encoding.c
|
||||
+++ src/encoding.c
|
||||
@@ -35,7 +35,7 @@
|
||||
#include "file.h"
|
||||
|
||||
#ifndef lint
|
||||
-FILE_RCSID("@(#)$File: encoding.c,v 1.30 2021/04/09 19:16:51 christos Exp $")
|
||||
+FILE_RCSID("@(#)$File: encoding.c,v 1.31 2021/04/19 18:38:04 christos Exp $")
|
||||
#endif /* lint */
|
||||
|
||||
#include "magic.h"
|
||||
@@ -285,7 +285,7 @@ looks_ ## NAME(const unsigned char *buf, size_t nbytes, file_unichar_t *ubuf, \
|
||||
if (dist[i]) \
|
||||
u++; \
|
||||
} \
|
||||
- if (u < 3) \
|
||||
+ if (u < MIN(nbytes, 3)) \
|
||||
return 0; \
|
||||
\
|
||||
return 1; \
|
||||
--
|
||||
2.28.0
|
||||
|
@ -1,40 +0,0 @@
|
||||
From 9b0459afab309a82aa4e46f73a4e50dd641f3d39 Mon Sep 17 00:00:00 2001
|
||||
From: Christos Zoulas <christos@zoulas.com>
|
||||
Date: Mon, 19 Apr 2021 17:01:45 +0000
|
||||
Subject: [PATCH] PR/257: cuihao: put attributes inside the xz magic.
|
||||
|
||||
---
|
||||
magic/Magdir/compress | 7 +++----
|
||||
1 file changed, 3 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git magic/Magdir/compress magic/Magdir/compress
|
||||
index 64d11a73..41a65738 100644
|
||||
--- magic/Magdir/compress
|
||||
+++ magic/Magdir/compress
|
||||
@@ -1,5 +1,5 @@
|
||||
#------------------------------------------------------------------------------
|
||||
-# $File: compress,v 1.80 2021/03/15 17:49:24 christos Exp $
|
||||
+# $File: compress,v 1.81 2021/04/19 17:01:45 christos Exp $
|
||||
# compress: file(1) magic for pure-compression formats (no archives)
|
||||
#
|
||||
# compress, gzip, pack, compact, huf, squeeze, crunch, freeze, yabba, etc.
|
||||
@@ -265,14 +265,13 @@
|
||||
|
||||
# http://tukaani.org/xz/xz-file-format.txt
|
||||
0 ustring \xFD7zXZ\x00 XZ compressed data, checksum
|
||||
+!:strength * 2
|
||||
+!:mime application/x-xz
|
||||
>7 byte&0xf 0x0 NONE
|
||||
>7 byte&0xf 0x1 CRC32
|
||||
>7 byte&0xf 0x4 CRC64
|
||||
>7 byte&0xf 0xa SHA-256
|
||||
|
||||
-!:strength * 2
|
||||
-!:mime application/x-xz
|
||||
-
|
||||
# https://github.com/ckolivas/lrzip/blob/master/doc/magic.header.txt
|
||||
0 string LRZI LRZIP compressed data
|
||||
>4 byte x - version %d
|
||||
--
|
||||
2.28.0
|
||||
|
@ -1,25 +0,0 @@
|
||||
From 9e2becec20d023409a1671bf10a682f699350e85 Mon Sep 17 00:00:00 2001
|
||||
From: Christos Zoulas <christos@zoulas.com>
|
||||
Date: Sun, 4 Apr 2021 21:03:43 +0000
|
||||
Subject: [PATCH] Encoding bug fix.
|
||||
|
||||
---
|
||||
ChangeLog | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git ChangeLog ChangeLog
|
||||
index 23a93cf4..2238ba6f 100644
|
||||
--- ChangeLog
|
||||
+++ ChangeLog
|
||||
@@ -1,3 +1,8 @@
|
||||
+2021-04-04 17:02 Christos Zoulas <christos@zoulas.com>
|
||||
+
|
||||
+ * count the total bytes found not the total byte positions
|
||||
+ in order to determine encoding (Anatol Belski)
|
||||
+
|
||||
2021-03-30 20:21 Christos Zoulas <christos@zoulas.com>
|
||||
|
||||
* release 5.40
|
||||
--
|
||||
2.26.2
|
||||
|
@ -1,27 +0,0 @@
|
||||
From a806b7c99870f76c5fcf3d34f9d91f37685e1a1c Mon Sep 17 00:00:00 2001
|
||||
From: Werner Fink <werner@suse.de>
|
||||
Date: Fri, 23 Apr 2021 09:32:09 +0200
|
||||
Subject: [PATCH] Count every ASCII character
|
||||
|
||||
Signed-off-by: Werner Fink <werner@suse.de>
|
||||
---
|
||||
src/encoding.c | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git src/encoding.c src/encoding.c
|
||||
index 31d4d125..686be210 100644
|
||||
--- src/encoding.c
|
||||
+++ src/encoding.c
|
||||
@@ -282,8 +282,7 @@ looks_ ## NAME(const unsigned char *buf, size_t nbytes, file_unichar_t *ubuf, \
|
||||
} \
|
||||
u = 0; \
|
||||
for (i = 0; i < __arraycount(dist); i++) { \
|
||||
- if (dist[i]) \
|
||||
- u++; \
|
||||
+ u += dist[i]; \
|
||||
} \
|
||||
if (u < MIN(nbytes, 3)) \
|
||||
return 0; \
|
||||
--
|
||||
2.28.0
|
||||
|
Binary file not shown.
@ -1,35 +0,0 @@
|
||||
From f7705dca0be7aacc8ce96d842860c419f755c26e Mon Sep 17 00:00:00 2001
|
||||
From: Christos Zoulas <christos@zoulas.com>
|
||||
Date: Fri, 9 Apr 2021 19:16:51 +0000
|
||||
Subject: [PATCH] fix previous (cast >>)
|
||||
|
||||
---
|
||||
src/encoding.c | 8 +-------
|
||||
1 file changed, 1 insertion(+), 7 deletions(-)
|
||||
|
||||
diff --git src/encoding.c src/encoding.c
|
||||
index 691e3e16..0fb1f47b 100644
|
||||
--- src/encoding.c
|
||||
+++ src/encoding.c
|
||||
@@ -1,5 +1,3 @@
|
||||
-/* $NetBSD: encoding.c,v 1.1.1.13 2021/04/09 18:58:01 christos Exp $ */
|
||||
-
|
||||
/*
|
||||
* Copyright (c) Ian F. Darwin 1986-1995.
|
||||
* Software written by Ian F. Darwin and others;
|
||||
@@ -37,11 +35,7 @@
|
||||
#include "file.h"
|
||||
|
||||
#ifndef lint
|
||||
-#if 0
|
||||
-FILE_RCSID("@(#)$File: encoding.c,v 1.29 2021/04/09 19:16:19 christos Exp $")
|
||||
-#else
|
||||
-__RCSID("$NetBSD: encoding.c,v 1.1.1.13 2021/04/09 18:58:01 christos Exp $");
|
||||
-#endif
|
||||
+FILE_RCSID("@(#)$File: encoding.c,v 1.30 2021/04/09 19:16:51 christos Exp $")
|
||||
#endif /* lint */
|
||||
|
||||
#include "magic.h"
|
||||
--
|
||||
2.28.0
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:167321f43c148a553f68a0ea7f579821ef3b11c27b8cbe158e4df897e4a5dd57
|
||||
size 1004214
|
@ -1,6 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iEYEABECAAYFAmBjwi8ACgkQcREqsWyzOzqPZACg3n6WHlN341UvKicQmlHzHH4k
|
||||
pAEAoM0y5+X+eyLF2gMhUpFMI5CCvZZG
|
||||
=5WpY
|
||||
-----END PGP SIGNATURE-----
|
@ -3,16 +3,14 @@
|
||||
magic/Magdir/linux | 36 +++++----
|
||||
magic/Magdir/msad | 5 +
|
||||
magic/Magdir/msdos | 6 -
|
||||
magic/Makefile.am | 61 +++++++++------
|
||||
magic/Makefile.am | 63 +++++++++-------
|
||||
magic/Makefile.in | 60 +++++++++------
|
||||
src/Makefile.am | 2
|
||||
src/dcore.c | 207 +++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
8 files changed, 312 insertions(+), 67 deletions(-)
|
||||
8 files changed, 313 insertions(+), 68 deletions(-)
|
||||
|
||||
Index: magic/Magdir/elf
|
||||
===================================================================
|
||||
--- magic/Magdir/elf.orig
|
||||
+++ magic/Magdir/elf
|
||||
--- magic/Magdir/elf
|
||||
+++ magic/Magdir/elf 2021-10-19 09:27:23.638685060 +0000
|
||||
@@ -152,7 +152,7 @@
|
||||
>18 leshort 47 Renesas H8/300H,
|
||||
>18 leshort 48 Renesas H8S,
|
||||
@ -22,10 +20,8 @@ Index: magic/Magdir/elf
|
||||
>18 leshort 51 Stanford MIPS-X,
|
||||
>18 leshort 52 Motorola Coldfire,
|
||||
>18 leshort 53 Motorola M68HC12,
|
||||
Index: magic/Magdir/linux
|
||||
===================================================================
|
||||
--- magic/Magdir/linux.orig
|
||||
+++ magic/Magdir/linux
|
||||
--- magic/Magdir/linux
|
||||
+++ magic/Magdir/linux 2021-10-19 09:27:23.638685060 +0000
|
||||
@@ -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)
|
||||
@ -45,8 +41,8 @@ Index: magic/Magdir/linux
|
||||
->>>>(526.s+0x200) string >\0 version %s,
|
||||
->>498 leshort 1 RO-rootFS,
|
||||
->>498 leshort 0 RW-rootFS,
|
||||
->>508 leshort >0 root_dev 0x%X,
|
||||
->>502 leshort >0 swap_dev 0x%X,
|
||||
->>508 leshort >0 root_dev %#X,
|
||||
->>502 leshort >0 swap_dev %#X,
|
||||
->>504 leshort >0 RAMdisksize %u KB,
|
||||
->>506 leshort 0xFFFF Normal VGA
|
||||
->>506 leshort 0xFFFE Extended VGA
|
||||
@ -64,8 +60,8 @@ Index: magic/Magdir/linux
|
||||
+>>>(526.s+0x200) string >\0 \b, Version %s
|
||||
+>>498 leshort 1 \b, RO-rootFS
|
||||
+>>498 leshort 0 \b, RW-rootFS
|
||||
+>>508 leshort >0 \b, root_dev 0x%X
|
||||
+>>502 leshort >0 \b, swap_dev 0x%X
|
||||
+>>508 leshort >0 \b, root_dev %#X
|
||||
+>>502 leshort >0 \b, swap_dev %#X
|
||||
+>>504 leshort >0 \b, RAMdisksize %u KB
|
||||
+>>506 leshort 0xFFFF \b, Normal VGA
|
||||
+>>506 leshort 0xFFFE \b, Extended VGA
|
||||
@ -74,20 +70,16 @@ Index: magic/Magdir/linux
|
||||
# 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
|
||||
Index: magic/Magdir/msad
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ magic/Magdir/msad
|
||||
--- magic/Magdir/msad
|
||||
+++ magic/Magdir/msad 2021-10-19 09:27:23.638685060 +0000
|
||||
@@ -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
|
||||
Index: magic/Magdir/msdos
|
||||
===================================================================
|
||||
--- magic/Magdir/msdos.orig
|
||||
+++ magic/Magdir/msdos
|
||||
--- magic/Magdir/msdos
|
||||
+++ magic/Magdir/msdos 2021-10-19 09:27:23.638685060 +0000
|
||||
@@ -145,9 +145,9 @@
|
||||
>>(0x3c.l+22) leshort&0x0200 >0 (stripped to external PDB)
|
||||
>>(0x3c.l+22) leshort&0x1000 >0 system file
|
||||
@ -100,7 +92,7 @@ Index: magic/Magdir/msdos
|
||||
|
||||
# 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)
|
||||
@@ -554,7 +554,7 @@
|
||||
@@ -635,7 +635,7 @@
|
||||
# negative offset, must not lead into PSP
|
||||
>1 short <-259
|
||||
# that offset must be accessible
|
||||
@ -109,10 +101,8 @@ Index: magic/Magdir/msdos
|
||||
>>>0 use msdos-com
|
||||
|
||||
# updated by Joerg Jenderek at Oct 2008,2015
|
||||
Index: magic/Makefile.am
|
||||
===================================================================
|
||||
--- magic/Makefile.am.orig
|
||||
+++ magic/Makefile.am
|
||||
--- magic/Makefile.am
|
||||
+++ magic/Makefile.am 2021-10-19 09:31:45.610115482 +0000
|
||||
@@ -5,7 +5,7 @@ MAGIC_FRAGMENT_BASE = Magdir
|
||||
MAGIC_DIR = $(top_srcdir)/magic
|
||||
MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE)
|
||||
@ -120,7 +110,7 @@ Index: magic/Makefile.am
|
||||
-pkgdata_DATA = magic.mgc
|
||||
+pkgdata_DATA = magic.mgc magic
|
||||
|
||||
EXTRA_DIST = \
|
||||
MAGIC_FRAGMENTS = \
|
||||
$(MAGIC_DIR)/Header \
|
||||
@@ -24,7 +24,6 @@ $(MAGIC_FRAGMENT_DIR)/animation \
|
||||
$(MAGIC_FRAGMENT_DIR)/aout \
|
||||
@ -130,7 +120,7 @@ Index: magic/Makefile.am
|
||||
$(MAGIC_FRAGMENT_DIR)/application \
|
||||
$(MAGIC_FRAGMENT_DIR)/applix \
|
||||
$(MAGIC_FRAGMENT_DIR)/apt \
|
||||
@@ -100,7 +99,6 @@ $(MAGIC_FRAGMENT_DIR)/erlang \
|
||||
@@ -102,7 +101,6 @@ $(MAGIC_FRAGMENT_DIR)/erlang \
|
||||
$(MAGIC_FRAGMENT_DIR)/espressif \
|
||||
$(MAGIC_FRAGMENT_DIR)/esri \
|
||||
$(MAGIC_FRAGMENT_DIR)/fcs \
|
||||
@ -138,7 +128,7 @@ Index: magic/Makefile.am
|
||||
$(MAGIC_FRAGMENT_DIR)/finger \
|
||||
$(MAGIC_FRAGMENT_DIR)/flash \
|
||||
$(MAGIC_FRAGMENT_DIR)/flif \
|
||||
@@ -146,6 +144,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \
|
||||
@@ -147,6 +145,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \
|
||||
$(MAGIC_FRAGMENT_DIR)/java \
|
||||
$(MAGIC_FRAGMENT_DIR)/javascript \
|
||||
$(MAGIC_FRAGMENT_DIR)/jpeg \
|
||||
@ -147,7 +137,7 @@ Index: magic/Makefile.am
|
||||
$(MAGIC_FRAGMENT_DIR)/karma \
|
||||
$(MAGIC_FRAGMENT_DIR)/kde \
|
||||
$(MAGIC_FRAGMENT_DIR)/keepass \
|
||||
@@ -156,7 +156,6 @@ $(MAGIC_FRAGMENT_DIR)/lammps \
|
||||
@@ -157,7 +157,6 @@ $(MAGIC_FRAGMENT_DIR)/lammps \
|
||||
$(MAGIC_FRAGMENT_DIR)/lecter \
|
||||
$(MAGIC_FRAGMENT_DIR)/lex \
|
||||
$(MAGIC_FRAGMENT_DIR)/lif \
|
||||
@ -155,7 +145,7 @@ Index: magic/Makefile.am
|
||||
$(MAGIC_FRAGMENT_DIR)/lisp \
|
||||
$(MAGIC_FRAGMENT_DIR)/llvm \
|
||||
$(MAGIC_FRAGMENT_DIR)/locoscript \
|
||||
@@ -164,7 +163,6 @@ $(MAGIC_FRAGMENT_DIR)/lua \
|
||||
@@ -165,7 +164,6 @@ $(MAGIC_FRAGMENT_DIR)/lua \
|
||||
$(MAGIC_FRAGMENT_DIR)/luks \
|
||||
$(MAGIC_FRAGMENT_DIR)/m4 \
|
||||
$(MAGIC_FRAGMENT_DIR)/mach \
|
||||
@ -163,7 +153,7 @@ Index: magic/Makefile.am
|
||||
$(MAGIC_FRAGMENT_DIR)/macos \
|
||||
$(MAGIC_FRAGMENT_DIR)/magic \
|
||||
$(MAGIC_FRAGMENT_DIR)/mail.news \
|
||||
@@ -188,11 +186,11 @@ $(MAGIC_FRAGMENT_DIR)/misctools \
|
||||
@@ -189,11 +187,11 @@ $(MAGIC_FRAGMENT_DIR)/misctools \
|
||||
$(MAGIC_FRAGMENT_DIR)/mkid \
|
||||
$(MAGIC_FRAGMENT_DIR)/mlssa \
|
||||
$(MAGIC_FRAGMENT_DIR)/mmdf \
|
||||
@ -176,7 +166,7 @@ Index: magic/Makefile.am
|
||||
$(MAGIC_FRAGMENT_DIR)/msooxml \
|
||||
$(MAGIC_FRAGMENT_DIR)/msvc \
|
||||
$(MAGIC_FRAGMENT_DIR)/msx \
|
||||
@@ -250,6 +248,8 @@ $(MAGIC_FRAGMENT_DIR)/python \
|
||||
@@ -252,6 +250,8 @@ $(MAGIC_FRAGMENT_DIR)/python \
|
||||
$(MAGIC_FRAGMENT_DIR)/qt \
|
||||
$(MAGIC_FRAGMENT_DIR)/revision \
|
||||
$(MAGIC_FRAGMENT_DIR)/riff \
|
||||
@ -185,35 +175,37 @@ Index: magic/Makefile.am
|
||||
$(MAGIC_FRAGMENT_DIR)/rpi \
|
||||
$(MAGIC_FRAGMENT_DIR)/rpm \
|
||||
$(MAGIC_FRAGMENT_DIR)/rpmsg \
|
||||
@@ -334,8 +334,20 @@ $(MAGIC_FRAGMENT_DIR)/zilog \
|
||||
$(MAGIC_FRAGMENT_DIR)/zip \
|
||||
$(MAGIC_FRAGMENT_DIR)/zyxel
|
||||
@@ -341,9 +341,21 @@ EXTRA_DIST = \
|
||||
$(MAGIC_DIR)/scripts/create_filemagic_flac \
|
||||
$(MAGIC_FRAGMENTS)
|
||||
|
||||
+RAW = magic
|
||||
-
|
||||
+RAW = magic
|
||||
MAGIC = magic.mgc
|
||||
-CLEANFILES = ${MAGIC} $(MAGIC_FRAGMENT_DIR)/Localstuff
|
||||
+CLEANFILES = ${MAGIC} $(MAGIC_FRAGMENT_DIR)/Localstuff ${RAW}
|
||||
+
|
||||
+${RAW}: $(MAGIC_DIR)/Header $(MAGIC_DIR)/Localstuff $(EXTRA_DIST)
|
||||
+${RAW}: $(MAGIC_DIR)/Header $(MAGIC_DIR)/Localstuff $(MAGIC_FRAGMENTS)
|
||||
+ cat /dev/null > $@
|
||||
+ for frag in $(EXTRA_DIST); do \
|
||||
+ for frag in $(MAGIC_FRAGMENTS); do \
|
||||
+ if test -f $(srcdir)/$$frag; then \
|
||||
+ f=$(srcdir)/$$frag; \
|
||||
+ f=$(srcdir)/$$frag; \
|
||||
+ else \
|
||||
+ f=$$frag; \
|
||||
+ f=$$frag; \
|
||||
+ fi; \
|
||||
+ cat $$f; \
|
||||
+ done >> $@
|
||||
+
|
||||
|
||||
# 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
|
||||
@@ -347,19 +359,22 @@ FILE_COMPILE = $(top_builddir)/src/file$
|
||||
@@ -355,19 +367,22 @@ FILE_COMPILE = $(top_builddir)/src/file$
|
||||
FILE_COMPILE_DEP = $(FILE_COMPILE)
|
||||
endif
|
||||
|
||||
-${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP)
|
||||
-${MAGIC}: $(MAGIC_FRAGMENTS) $(FILE_COMPILE_DEP)
|
||||
- @rm -fr magic
|
||||
- @mkdir magic && cp -p $(EXTRA_DIST) magic
|
||||
- @mkdir magic && cp -p $(MAGIC_FRAGMENTS) magic
|
||||
- @(if expr "${FILE_COMPILE}" : '.*/.*' > /dev/null; then \
|
||||
- echo "Using ${FILE_COMPILE} to generate ${MAGIC}" > /dev/null; \
|
||||
- else \
|
||||
@ -227,12 +219,12 @@ Index: magic/Makefile.am
|
||||
- fi)
|
||||
- $(FILE_COMPILE) -C -m magic
|
||||
- @rm -fr magic
|
||||
+${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP) $(RAW)
|
||||
+${MAGIC}: $(MAGIC_FRAGMENTS) $(FILE_COMPILE_DEP) $(RAW)
|
||||
+ $(FILE_COMPILE) -C -m $(RAW)
|
||||
+
|
||||
+#${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP)
|
||||
+#${MAGIC}: $(MAGIC_FRAGMENTS) $(FILE_COMPILE_DEP)
|
||||
+# @rm -fr magic
|
||||
+# @mkdir magic && cp -p $(EXTRA_DIST) magic
|
||||
+# @mkdir magic && cp -p $(MAGIC_FRAGMENTS) magic
|
||||
+# @(if expr "${FILE_COMPILE}" : '.*/.*' > /dev/null; then \
|
||||
+# echo "Using ${FILE_COMPILE} to generate ${MAGIC}" > /dev/null; \
|
||||
+# else \
|
||||
@ -246,20 +238,18 @@ Index: magic/Makefile.am
|
||||
+# fi)
|
||||
+# $(FILE_COMPILE) -C -m magic
|
||||
+# @rm -fr magic
|
||||
Index: magic/Makefile.in
|
||||
===================================================================
|
||||
--- magic/Makefile.in.orig
|
||||
+++ magic/Makefile.in
|
||||
@@ -279,7 +279,7 @@ top_srcdir = @top_srcdir@
|
||||
--- magic/Makefile.in
|
||||
+++ magic/Makefile.in 2021-10-19 09:34:04.535688599 +0000
|
||||
@@ -280,7 +280,7 @@ top_srcdir = @top_srcdir@
|
||||
MAGIC_FRAGMENT_BASE = Magdir
|
||||
MAGIC_DIR = $(top_srcdir)/magic
|
||||
MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE)
|
||||
-pkgdata_DATA = magic.mgc
|
||||
+pkgdata_DATA = magic.mgc magic
|
||||
EXTRA_DIST = \
|
||||
MAGIC_FRAGMENTS = \
|
||||
$(MAGIC_DIR)/Header \
|
||||
$(MAGIC_DIR)/Localstuff \
|
||||
@@ -297,7 +297,6 @@ $(MAGIC_FRAGMENT_DIR)/animation \
|
||||
@@ -298,7 +298,6 @@ $(MAGIC_FRAGMENT_DIR)/animation \
|
||||
$(MAGIC_FRAGMENT_DIR)/aout \
|
||||
$(MAGIC_FRAGMENT_DIR)/apache \
|
||||
$(MAGIC_FRAGMENT_DIR)/apl \
|
||||
@ -267,7 +257,7 @@ Index: magic/Makefile.in
|
||||
$(MAGIC_FRAGMENT_DIR)/application \
|
||||
$(MAGIC_FRAGMENT_DIR)/applix \
|
||||
$(MAGIC_FRAGMENT_DIR)/apt \
|
||||
@@ -373,7 +372,6 @@ $(MAGIC_FRAGMENT_DIR)/erlang \
|
||||
@@ -376,7 +375,6 @@ $(MAGIC_FRAGMENT_DIR)/erlang \
|
||||
$(MAGIC_FRAGMENT_DIR)/espressif \
|
||||
$(MAGIC_FRAGMENT_DIR)/esri \
|
||||
$(MAGIC_FRAGMENT_DIR)/fcs \
|
||||
@ -275,7 +265,7 @@ Index: magic/Makefile.in
|
||||
$(MAGIC_FRAGMENT_DIR)/finger \
|
||||
$(MAGIC_FRAGMENT_DIR)/flash \
|
||||
$(MAGIC_FRAGMENT_DIR)/flif \
|
||||
@@ -419,6 +417,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \
|
||||
@@ -421,6 +419,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \
|
||||
$(MAGIC_FRAGMENT_DIR)/java \
|
||||
$(MAGIC_FRAGMENT_DIR)/javascript \
|
||||
$(MAGIC_FRAGMENT_DIR)/jpeg \
|
||||
@ -284,7 +274,7 @@ Index: magic/Makefile.in
|
||||
$(MAGIC_FRAGMENT_DIR)/karma \
|
||||
$(MAGIC_FRAGMENT_DIR)/kde \
|
||||
$(MAGIC_FRAGMENT_DIR)/keepass \
|
||||
@@ -429,7 +429,6 @@ $(MAGIC_FRAGMENT_DIR)/lammps \
|
||||
@@ -431,7 +431,6 @@ $(MAGIC_FRAGMENT_DIR)/lammps \
|
||||
$(MAGIC_FRAGMENT_DIR)/lecter \
|
||||
$(MAGIC_FRAGMENT_DIR)/lex \
|
||||
$(MAGIC_FRAGMENT_DIR)/lif \
|
||||
@ -292,7 +282,7 @@ Index: magic/Makefile.in
|
||||
$(MAGIC_FRAGMENT_DIR)/lisp \
|
||||
$(MAGIC_FRAGMENT_DIR)/llvm \
|
||||
$(MAGIC_FRAGMENT_DIR)/locoscript \
|
||||
@@ -437,7 +436,6 @@ $(MAGIC_FRAGMENT_DIR)/lua \
|
||||
@@ -439,7 +438,6 @@ $(MAGIC_FRAGMENT_DIR)/lua \
|
||||
$(MAGIC_FRAGMENT_DIR)/luks \
|
||||
$(MAGIC_FRAGMENT_DIR)/m4 \
|
||||
$(MAGIC_FRAGMENT_DIR)/mach \
|
||||
@ -300,7 +290,7 @@ Index: magic/Makefile.in
|
||||
$(MAGIC_FRAGMENT_DIR)/macos \
|
||||
$(MAGIC_FRAGMENT_DIR)/magic \
|
||||
$(MAGIC_FRAGMENT_DIR)/mail.news \
|
||||
@@ -461,11 +459,11 @@ $(MAGIC_FRAGMENT_DIR)/misctools \
|
||||
@@ -463,11 +461,11 @@ $(MAGIC_FRAGMENT_DIR)/misctools \
|
||||
$(MAGIC_FRAGMENT_DIR)/mkid \
|
||||
$(MAGIC_FRAGMENT_DIR)/mlssa \
|
||||
$(MAGIC_FRAGMENT_DIR)/mmdf \
|
||||
@ -313,7 +303,7 @@ Index: magic/Makefile.in
|
||||
$(MAGIC_FRAGMENT_DIR)/msooxml \
|
||||
$(MAGIC_FRAGMENT_DIR)/msvc \
|
||||
$(MAGIC_FRAGMENT_DIR)/msx \
|
||||
@@ -523,6 +521,8 @@ $(MAGIC_FRAGMENT_DIR)/python \
|
||||
@@ -526,6 +524,8 @@ $(MAGIC_FRAGMENT_DIR)/python \
|
||||
$(MAGIC_FRAGMENT_DIR)/qt \
|
||||
$(MAGIC_FRAGMENT_DIR)/revision \
|
||||
$(MAGIC_FRAGMENT_DIR)/riff \
|
||||
@ -322,9 +312,9 @@ Index: magic/Makefile.in
|
||||
$(MAGIC_FRAGMENT_DIR)/rpi \
|
||||
$(MAGIC_FRAGMENT_DIR)/rpm \
|
||||
$(MAGIC_FRAGMENT_DIR)/rpmsg \
|
||||
@@ -607,10 +607,22 @@ $(MAGIC_FRAGMENT_DIR)/zilog \
|
||||
$(MAGIC_FRAGMENT_DIR)/zip \
|
||||
$(MAGIC_FRAGMENT_DIR)/zyxel
|
||||
@@ -615,10 +615,22 @@ EXTRA_DIST = \
|
||||
$(MAGIC_DIR)/scripts/create_filemagic_flac \
|
||||
$(MAGIC_FRAGMENTS)
|
||||
|
||||
+RAW = magic
|
||||
MAGIC = magic.mgc
|
||||
@ -332,13 +322,13 @@ Index: magic/Makefile.in
|
||||
+CLEANFILES = ${MAGIC} $(MAGIC_FRAGMENT_DIR)/Localstuff ${RAW}
|
||||
@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 $(MAGIC_FRAGMENTS)
|
||||
+ cat /dev/null > $@
|
||||
+ for frag in $(EXTRA_DIST); do \
|
||||
+ for frag in $(MAGIC_FRAGMENTS); do \
|
||||
+ if test -f $(srcdir)/$$frag; then \
|
||||
+ f=$(srcdir)/$$frag; \
|
||||
+ f=$(srcdir)/$$frag; \
|
||||
+ else \
|
||||
+ f=$$frag; \
|
||||
+ f=$$frag; \
|
||||
+ fi; \
|
||||
+ cat $$f; \
|
||||
+ done >> $@
|
||||
@ -346,16 +336,16 @@ Index: magic/Makefile.in
|
||||
# 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}
|
||||
@@ -835,23 +847,25 @@ uninstall-am: uninstall-pkgdataDATA
|
||||
@@ -843,23 +855,25 @@ uninstall-am: uninstall-pkgdataDATA
|
||||
|
||||
.PRECIOUS: Makefile
|
||||
|
||||
+${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP) $(RAW)
|
||||
+${MAGIC}: $(MAGIC_FRAGMENTS) $(FILE_COMPILE_DEP) $(RAW)
|
||||
+ $(FILE_COMPILE) -C -m $(RAW)
|
||||
|
||||
-${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP)
|
||||
-${MAGIC}: $(MAGIC_FRAGMENTS) $(FILE_COMPILE_DEP)
|
||||
- @rm -fr magic
|
||||
- @mkdir magic && cp -p $(EXTRA_DIST) magic
|
||||
- @mkdir magic && cp -p $(MAGIC_FRAGMENTS) magic
|
||||
- @(if expr "${FILE_COMPILE}" : '.*/.*' > /dev/null; then \
|
||||
- echo "Using ${FILE_COMPILE} to generate ${MAGIC}" > /dev/null; \
|
||||
- else \
|
||||
@ -369,9 +359,9 @@ Index: magic/Makefile.in
|
||||
- fi)
|
||||
- $(FILE_COMPILE) -C -m magic
|
||||
- @rm -fr magic
|
||||
+#${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP)
|
||||
+#${MAGIC}: $(MAGIC_FRAGMENTS) $(FILE_COMPILE_DEP)
|
||||
+# @rm -fr magic
|
||||
+# @mkdir magic && cp -p $(EXTRA_DIST) magic
|
||||
+# @mkdir magic && cp -p $(MAGIC_FRAGMENTS) magic
|
||||
+# @(if expr "${FILE_COMPILE}" : '.*/.*' > /dev/null; then \
|
||||
+# echo "Using ${FILE_COMPILE} to generate ${MAGIC}" > /dev/null; \
|
||||
+# else \
|
||||
@ -388,20 +378,16 @@ Index: magic/Makefile.in
|
||||
|
||||
# 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.
|
||||
Index: src/Makefile.am
|
||||
===================================================================
|
||||
--- src/Makefile.am.orig
|
||||
+++ src/Makefile.am
|
||||
--- src/Makefile.am
|
||||
+++ src/Makefile.am 2021-10-19 09:27:23.654684781 +0000
|
||||
@@ -1,4 +1,4 @@
|
||||
-MAGIC = $(pkgdatadir)/magic
|
||||
+MAGIC = $(sysconfdir)/magic:$(pkgdatadir)/magic
|
||||
lib_LTLIBRARIES = libmagic.la
|
||||
nodist_include_HEADERS = magic.h
|
||||
|
||||
Index: src/dcore.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ src/dcore.c
|
||||
--- src/dcore.c
|
||||
+++ src/dcore.c 2021-10-19 09:27:23.654684781 +0000
|
||||
@@ -0,0 +1,207 @@
|
||||
+/*
|
||||
+ * Show goo about ELF core files
|
3
file-5.41.tar.gz
Normal file
3
file-5.41.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:13e532c7b364f7d57e23dfeea3147103150cb90593a57af86c10e4f6e411603f
|
||||
size 1064097
|
6
file-5.41.tar.gz.asc
Normal file
6
file-5.41.tar.gz.asc
Normal file
@ -0,0 +1,6 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iEYEABECAAYFAmFtpa0ACgkQcREqsWyzOzowtQCglMaWOWrYrD5d3V/GK7gmlEQ0
|
||||
7CMAoO0c9XQwyuR0XbNIQc/+Mz7jwmdC
|
||||
=Th7A
|
||||
-----END PGP SIGNATURE-----
|
@ -1,4 +1,3 @@
|
||||
addFilter(".*Warning:.*using.*regular.*magic.*file.*/usr/share/misc/magic.*")
|
||||
addFilter(".*W:.*no-dependency-on file.*/file-libs/libfile.*")
|
||||
addFilter(".*W:.*name-repeated-in-summary.*")
|
||||
addFilter(".*E:.*shlib-fixed-dependency.*")
|
||||
addFilter(".*:.*shlib-fixed-dependency.*")
|
||||
|
@ -9,7 +9,7 @@ Index: file-5.38/configure.ac
|
||||
===================================================================
|
||||
--- file-5.38.orig/configure.ac
|
||||
+++ file-5.38/configure.ac
|
||||
@@ -115,6 +115,8 @@ if test "$enable_xzlib" != "no"; then
|
||||
@@ -114,6 +114,8 @@ if test "$enable_xzlib" != "no"; then
|
||||
fi
|
||||
AC_CHECK_TYPE([sig_t],[AC_DEFINE([HAVE_SIG_T],1,[Have sig_t type])],,[#include <signal.h>])
|
||||
|
||||
@ -22,7 +22,7 @@ Index: file-5.38/src/file.h
|
||||
===================================================================
|
||||
--- file-5.38.orig/src/file.h
|
||||
+++ file-5.38/src/file.h
|
||||
@@ -691,4 +691,12 @@ static const char *rcsid(const char *p)
|
||||
@@ -700,4 +700,12 @@ static const char *rcsid(const char *p)
|
||||
#define __RCSID(a)
|
||||
#endif
|
||||
|
||||
@ -39,7 +39,7 @@ Index: file-5.38/src/magic.c
|
||||
===================================================================
|
||||
--- file-5.38.orig/src/magic.c
|
||||
+++ file-5.38/src/magic.c
|
||||
@@ -183,7 +183,7 @@ get_default_magic(void)
|
||||
@@ -185,7 +185,7 @@ get_default_magic(void)
|
||||
free(default_magic);
|
||||
default_magic = NULL;
|
||||
}
|
||||
@ -48,7 +48,7 @@ Index: file-5.38/src/magic.c
|
||||
return MAGIC;
|
||||
|
||||
if (asprintf(&hmagicpath, "%s/.magic.mgc", home) < 0)
|
||||
@@ -220,16 +220,16 @@ out:
|
||||
@@ -222,16 +222,16 @@ out:
|
||||
}
|
||||
|
||||
/* First, try to get a magic file from user-application data */
|
||||
@ -68,7 +68,7 @@ Index: file-5.38/src/magic.c
|
||||
_w32_append_path(&hmagicpath, "%s%s", home, hmagic);
|
||||
|
||||
/* Fourth, try to get magic file relative to exe location */
|
||||
@@ -250,7 +250,7 @@ magic_getpath(const char *magicfile, int
|
||||
@@ -252,7 +252,7 @@ magic_getpath(const char *magicfile, int
|
||||
if (magicfile != NULL)
|
||||
return magicfile;
|
||||
|
||||
|
49
file.changes
49
file.changes
@ -1,3 +1,52 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 21 06:24:35 UTC 2021 - Dr. Werner Fink <werner@suse.de>
|
||||
|
||||
- Remove file-5.38-allow-readlinkat.dif as already doen in latest
|
||||
file 5.41
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 19 09:52:12 UTC 2021 - Dr. Werner Fink <werner@suse.de>
|
||||
|
||||
- Update to 5.41:
|
||||
* Avinash Sonawane: Fix tzname detection
|
||||
* Fix relationship tests with "search" magic, don't short circuit
|
||||
logic
|
||||
* Fix memory leak in compile mode
|
||||
* PR/272: kiefermat: Only set returnval = 1 when we printed something
|
||||
(in all cases print or !print). This simplifies the logic and fixes
|
||||
the issue in the PR with -k and --mime-type there was no continuation
|
||||
printed before the default case.
|
||||
* PR/270: Don't translate unprintable characters in %s magic formats
|
||||
when -r
|
||||
* PR/269: Avoid undefined behavior with clang (adding offset to NULL)
|
||||
* Add a new flag (f) that requires that the match is a full word,
|
||||
not a partial word match.
|
||||
* Add varint types (unused)
|
||||
* PR/256: mutableVoid: If the file is less than 3 bytes, use the file
|
||||
length to determine type
|
||||
* PR/259: aleksandr.v.novichkov: mime printing through indirect magic
|
||||
is not taken into account, use match directly so that it does.
|
||||
- Remove patches now upstream
|
||||
* file-5.40-1c677c04.patch
|
||||
* file-5.40-3096f87f.patch
|
||||
* file-5.40-4c5fe1ad.patch
|
||||
* file-5.40-6b34436a.patch
|
||||
* file-5.40-749e1ecf.patch
|
||||
* file-5.40-9b0459af.patch
|
||||
* file-5.40-9e2becec.patch
|
||||
* file-5.40-ascii.patch
|
||||
* file-5.40-f0601504.patch
|
||||
* file-5.40-f7705dca.patch
|
||||
- Port patches
|
||||
* file-5.19-biorad.dif
|
||||
* file-5.19-printf.dif
|
||||
* file-5.19-zip2.0.dif
|
||||
* file-5.23-endian.patch
|
||||
* file-5.28-btrfs-image.dif
|
||||
* file-5.38-allow-readlinkat.dif
|
||||
* file-secure_getenv.patch
|
||||
- Port and rename patch file-5.39.dif which is now file-5.41.dif
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 23 10:26:49 UTC 2021 - Dr. Werner Fink <werner@suse.de>
|
||||
|
||||
|
29
file.spec
29
file.spec
@ -33,7 +33,7 @@ Obsoletes: file-64bit
|
||||
%endif
|
||||
#
|
||||
# Set Version also in python-magic.spec
|
||||
Version: 5.40
|
||||
Version: 5.41
|
||||
Release: 0
|
||||
Summary: A Tool to Determine File Types
|
||||
License: BSD-2-Clause
|
||||
@ -43,7 +43,7 @@ Source2: baselibs.conf
|
||||
Source3: file-rpmlintrc
|
||||
Source4: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz.asc
|
||||
Source5: file.keyring
|
||||
Patch: file-5.39.dif
|
||||
Patch: file-5.41.dif
|
||||
Patch1: file-5.19-misc.dif
|
||||
Patch4: file-4.24-autoconf.dif
|
||||
Patch5: file-5.14-tex.dif
|
||||
@ -63,19 +63,7 @@ Patch32: file-5.19-clicfs.dif
|
||||
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
|
||||
# Upstream commits as patches
|
||||
Patch41: file-5.40-1c677c04.patch
|
||||
Patch42: file-5.40-9e2becec.patch
|
||||
Patch43: file-5.40-6b34436a.patch
|
||||
Patch44: file-5.40-9b0459af.patch
|
||||
Patch45: file-5.40-f0601504.patch
|
||||
Patch46: file-5.40-3096f87f.patch
|
||||
Patch47: file-5.40-f7705dca.patch
|
||||
Patch48: file-5.40-749e1ecf.patch
|
||||
Patch49: file-5.40-4c5fe1ad.patch
|
||||
# My fix of the ASCII count bug
|
||||
Patch60: file-5.40-ascii.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%global _sysconfdir /etc
|
||||
%global _miscdir %{_datadir}/misc
|
||||
@ -119,16 +107,6 @@ to develop applications that require the magic "file" interface.
|
||||
|
||||
%prep
|
||||
%setup -q -n file-%{version}
|
||||
%patch41 -p0
|
||||
%patch42 -p0
|
||||
%patch43 -p0
|
||||
%patch44 -p0
|
||||
%patch45 -p0
|
||||
%patch46 -p0
|
||||
%patch47 -p0
|
||||
%patch48 -p0
|
||||
%patch49 -p0
|
||||
%patch60 -p0
|
||||
%patch1 -p0 -b .misc
|
||||
%patch4 -p0 -b .conf
|
||||
%patch5 -p0 -b .tex
|
||||
@ -148,7 +126,6 @@ to develop applications that require the magic "file" interface.
|
||||
%patch34 -p0 -b .endian
|
||||
%patch37 -p1 -b .getenv
|
||||
%patch39 -p1 -b .btrfs
|
||||
%patch40 -p1 -b .readlinkat
|
||||
%patch -b .0
|
||||
test -s src/magic.h.in || cp -p src/magic.h src/magic.h.in
|
||||
rm -fv src/magic.h
|
||||
@ -223,6 +200,6 @@ rm -f %{buildroot}%{_libdir}/*.la
|
||||
%{_libdir}/pkgconfig/libmagic.pc
|
||||
%doc %{_mandir}/man3/libmagic.3.gz
|
||||
%license COPYING
|
||||
%doc README AUTHORS NEWS ChangeLog
|
||||
%doc README.DEVELOPER AUTHORS NEWS ChangeLog
|
||||
|
||||
%changelog
|
||||
|
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 19 09:55:47 UTC 2021 - Dr. Werner Fink <werner@suse.de>
|
||||
|
||||
- Update to 5.41
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Apr 3 07:32:11 UTC 2021 - Andreas Stieger <andreas.stieger@gmx.de>
|
||||
|
||||
|
@ -27,7 +27,7 @@ BuildRequires: libtool
|
||||
BuildRequires: python-rpm-macros
|
||||
BuildRequires: zlib-devel
|
||||
URL: http://www.darwinsys.com/file/
|
||||
Version: 5.40
|
||||
Version: 5.41
|
||||
Release: 0
|
||||
Summary: Python module to use libmagic
|
||||
License: BSD-3-Clause AND BSD-4-Clause
|
||||
|
Loading…
Reference in New Issue
Block a user