commit: 1136d2d2415f002de36625add6566b8d64ae91fe
parent c5f325acecccaa239512d12e36ba37c12500566c
Author: Michael Forney <mforney@mforney.org>
Date: Tue, 16 Jun 2020 01:01:11 -0700
file: Update to 5.39
Diffstat:
6 files changed, 13 insertions(+), 105 deletions(-)
diff --git a/.gitmodules b/.gitmodules
@@ -76,7 +76,6 @@
[submodule "pkg/file/src"]
path = pkg/file/src
url = https://github.com/file/file
- ignore = all
[submodule "pkg/freetype/src"]
path = pkg/freetype/src
url = git://git.sv.nongnu.org/freetype/freetype2.git
diff --git a/pkg/file/config.h b/pkg/file/config.h
@@ -74,6 +74,7 @@
#define HAVE_VASPRINTF 1
#define HAVE_VFORK 1
/* #undef HAVE_VFORK_H */
+#define HAVE_VISIBILITY 1
#define HAVE_WCHAR_H 1
#define HAVE_WCTYPE_H 1
#define HAVE_WCWIDTH 1
@@ -87,10 +88,10 @@
#define PACKAGE "file"
#define PACKAGE_BUGREPORT "christos@astron.com"
#define PACKAGE_NAME "file"
-#define PACKAGE_STRING "file 5.38"
+#define PACKAGE_STRING "file 5.39"
#define PACKAGE_TARNAME "file"
#define PACKAGE_URL ""
-#define PACKAGE_VERSION "5.38"
+#define PACKAGE_VERSION "5.39"
#define STDC_HEADERS 1
/* #undef TM_IN_SYS_TIME */
#ifndef _ALL_SOURCE
@@ -108,7 +109,7 @@
#ifndef __EXTENSIONS__
# define __EXTENSIONS__ 1
#endif
-#define VERSION "5.38"
+#define VERSION "5.39"
#if defined AC_APPLE_UNIVERSAL_BUILD
# if defined __BIG_ENDIAN__
# define WORDS_BIGENDIAN 1
diff --git a/pkg/file/gen.lua b/pkg/file/gen.lua
@@ -1,8 +1,8 @@
-local version = '5.37'
+local version = '5.39'
cflags{
'-Wall',
'-D HAVE_CONFIG_H',
- string.format([[-D 'MAGIC="%s/share/file/magic"']], config.prefix),
+ ([[-D 'MAGIC="%s/share/file/magic"']]):format(config.prefix),
'-D _GNU_SOURCE',
'-I $dir',
'-I $outdir/include',
diff --git a/pkg/file/magic.txt b/pkg/file/magic.txt
@@ -18,6 +18,7 @@ application
applix
apt
archive
+asf
assembler
asterix
att3b
@@ -68,6 +69,7 @@ dataone
dbpf
der
diamond
+dif
diff
digital
dolby
@@ -263,6 +265,7 @@ sql
ssh
ssl
sun
+sylk
symbos
sysex
tcl
@@ -277,7 +280,9 @@ troff
tuxedo
typeset
unicode
+unisig
unknown
+usd
uterus
uuencode
vacuum-cleaner
@@ -294,6 +299,7 @@ vorbis
vxl
warc
weak
+web
webassembly
windows
wireless
diff --git a/pkg/file/patch/0001-Avoid-cast-of-address-constant-to-integer-constant-i.patch b/pkg/file/patch/0001-Avoid-cast-of-address-constant-to-integer-constant-i.patch
@@ -1,98 +0,0 @@
-From 349dc7a8e768c5c81e9b88131828ee168e66344a Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Mon, 17 Jun 2019 23:54:24 -0700
-Subject: [PATCH] Avoid cast of address constant to integer constant in
- initalizer
-Upstream: https://mailman.astron.com/pipermail/file/2019-December/000247.html
-
-RCAST converts an address constant to an integer, and then to pointer. An
-integer constant cast to a pointer type is a valid address constant,
-however, a pointer cast to a integer is not an integer constant:
-
-> Cast operators in an integer constant expression shall only convert
-> arithmetic types to integer types, except as part of an operand to the
-> sizeof operator.
-
-So the result of RCAST(const void *, zlibcmp) is not technically a
-constant expression, and might be rejected by some compilers when it is
-used in an initializer for an object with static storage.
-
-Instead, just use a union so no casts are necessary.
----
- src/compress.c | 40 +++++++++++++++++++++-------------------
- 1 file changed, 21 insertions(+), 19 deletions(-)
-
-diff --git a/src/compress.c b/src/compress.c
-index 33ce2bc9..569c87e8 100644
---- a/src/compress.c
-+++ b/src/compress.c
-@@ -161,7 +161,10 @@ static const char *zstd_args[] = {
- #define do_bzlib NULL
-
- private const struct {
-- const void *magic;
-+ union {
-+ const void *magic;
-+ int (*func)(const unsigned char *);
-+ } u;
- int maglen;
- const char **argv;
- void *unused;
-@@ -171,26 +174,26 @@ private const struct {
- #define METH_XZ 9
- #define METH_LZMA 13
- #define METH_ZLIB 14
-- { "\037\235", 2, gzip_args, NULL }, /* 0, compressed */
-+ { { "\037\235" }, 2, gzip_args, NULL }, /* 0, compressed */
- /* Uncompress can get stuck; so use gzip first if we have it
- * Idea from Damien Clark, thanks! */
-- { "\037\235", 2, uncompress_args, NULL }, /* 1, compressed */
-- { "\037\213", 2, gzip_args, do_zlib }, /* 2, gzipped */
-- { "\037\236", 2, gzip_args, NULL }, /* 3, frozen */
-- { "\037\240", 2, gzip_args, NULL }, /* 4, SCO LZH */
-+ { { "\037\235" }, 2, uncompress_args, NULL }, /* 1, compressed */
-+ { { "\037\213" }, 2, gzip_args, do_zlib }, /* 2, gzipped */
-+ { { "\037\236" }, 2, gzip_args, NULL }, /* 3, frozen */
-+ { { "\037\240" }, 2, gzip_args, NULL }, /* 4, SCO LZH */
- /* the standard pack utilities do not accept standard input */
-- { "\037\036", 2, gzip_args, NULL }, /* 5, packed */
-- { "PK\3\4", 4, gzip_args, NULL }, /* 6, pkzipped, */
-+ { { "\037\036" }, 2, gzip_args, NULL }, /* 5, packed */
-+ { { "PK\3\4" }, 4, gzip_args, NULL }, /* 6, pkzipped, */
- /* ...only first file examined */
-- { "BZh", 3, bzip2_args, do_bzlib }, /* 7, bzip2-ed */
-- { "LZIP", 4, lzip_args, NULL }, /* 8, lzip-ed */
-- { "\3757zXZ\0", 6, xz_args, NULL }, /* 9, XZ Utils */
-- { "LRZI", 4, lrzip_args, NULL }, /* 10, LRZIP */
-- { "\004\"M\030",4, lz4_args, NULL }, /* 11, LZ4 */
-- { "\x28\xB5\x2F\xFD", 4, zstd_args, NULL }, /* 12, zstd */
-- { RCAST(const void *, lzmacmp), -13, xz_args, NULL }, /* 13, lzma */
-+ { { "BZh" }, 3, bzip2_args, do_bzlib }, /* 7, bzip2-ed */
-+ { { "LZIP" }, 4, lzip_args, NULL }, /* 8, lzip-ed */
-+ { { "\3757zXZ\0" }, 6, xz_args, NULL }, /* 9, XZ Utils */
-+ { { "LRZI" }, 4, lrzip_args, NULL }, /* 10, LRZIP */
-+ { { "\004\"M\030" }, 4, lz4_args, NULL }, /* 11, LZ4 */
-+ { { "\x28\xB5\x2F\xFD" }, 4, zstd_args, NULL }, /* 12, zstd */
-+ { { .func = lzmacmp }, -13, xz_args, NULL }, /* 13, lzma */
- #ifdef ZLIBSUPPORT
-- { RCAST(const void *, zlibcmp), -2, zlib_args, NULL }, /* 14, zlib */
-+ { { .func = zlibcmp }, -2, zlib_args, NULL }, /* 14, zlib */
- #endif
- };
-
-@@ -262,10 +265,9 @@ file_zmagic(struct magic_set *ms, const struct buffer *b, const char *name)
- if (nbytes < CAST(size_t, abs(compr[i].maglen)))
- continue;
- if (compr[i].maglen < 0) {
-- zm = (RCAST(int (*)(const unsigned char *),
-- CCAST(void *, compr[i].magic)))(buf);
-+ zm = compr[i].u.func(buf);
- } else {
-- zm = memcmp(buf, compr[i].magic,
-+ zm = memcmp(buf, compr[i].u.magic,
- CAST(size_t, compr[i].maglen)) == 0;
- }
-
---
-2.24.1
-
diff --git a/pkg/file/ver b/pkg/file/ver
@@ -1 +1 @@
-5.38 r0
+5.39 r0
