commit: aa86f4ffb5cc44fdf7277f87421c5b8013053093
parent 62ec8af993cdd8a8dab5b6ba3d47d792ce29a70b
Author: Michael Forney <mforney@mforney.org>
Date: Tue, 17 Apr 2018 14:22:20 -0700
file: Update to 5.33
Diffstat:
4 files changed, 69 insertions(+), 25 deletions(-)
diff --git a/pkg/file/config.h b/pkg/file/config.h
@@ -1,47 +1,98 @@
-#include <config-posix.h>
-
/* #undef AC_APPLE_UNIVERSAL_BUILD */
#define BUILTIN_ELF 1
#define ELFCORE 1
+#define HAVE_ASCTIME_R 1
#define HAVE_ASPRINTF 1
+#define HAVE_CTIME_R 1
+#define HAVE_DAYLIGHT 1
#define HAVE_DECL_DAYLIGHT 1
#define HAVE_DECL_TZNAME 1
+#define HAVE_DLFCN_H 1
+#define HAVE_DPRINTF 1
#define HAVE_ERR_H 1
+#define HAVE_FCNTL_H 1
/* #undef HAVE_FMTCHECK */
+#define HAVE_FORK 1
+#define HAVE_FREELOCALE 1
+#define HAVE_FSEEKO 1
+#define HAVE_GETLINE 1
#define HAVE_GETOPT_H 1
#define HAVE_GETOPT_LONG 1
#define HAVE_GETPAGESIZE 1
+#define HAVE_GMTIME_R 1
#define HAVE_INTPTR_T 1
+#define HAVE_INTTYPES_H 1
/* #undef HAVE_LIBGNURX */
+/* #undef HAVE_LIBSECCOMP */
#define HAVE_LIBZ 1
+#define HAVE_LIMITS_H 1
+#define HAVE_LOCALE_H 1
+#define HAVE_LOCALTIME_R 1
+#define HAVE_MBRTOWC 1
#define HAVE_MBSTATE_T 1
#define HAVE_MEMORY_H 1
#define HAVE_MKOSTEMP 1
+#define HAVE_MKSTEMP 1
+#define HAVE_MMAP 1
+#define HAVE_NEWLOCALE 1
+#define HAVE_PREAD 1
+#define HAVE_SETLOCALE 1
+#define HAVE_SIGNAL_H 1
#define HAVE_SIG_T 1
+#define HAVE_STDDEF_H 1
+#define HAVE_STDINT_H 1
+#define HAVE_STDLIB_H 1
#define HAVE_STRCASESTR 1
+#define HAVE_STRERROR 1
+#define HAVE_STRINGS_H 1
+#define HAVE_STRING_H 1
#define HAVE_STRLCAT 1
#define HAVE_STRLCPY 1
+#define HAVE_STRNDUP 1
+#define HAVE_STRTOF 1
+#define HAVE_STRTOUL 1
#define HAVE_STRUCT_OPTION 1
+#define HAVE_STRUCT_STAT_ST_RDEV 1
/* #undef HAVE_STRUCT_TM_TM_GMTOFF */
#define HAVE_STRUCT_TM_TM_ZONE 1
+#define HAVE_SYS_MMAN_H 1
#define HAVE_SYS_PARAM_H 1
+#define HAVE_SYS_STAT_H 1
+#define HAVE_SYS_TIME_H 1
+#define HAVE_SYS_TYPES_H 1
/* #undef HAVE_SYS_UTIME_H */
+#define HAVE_SYS_WAIT_H 1
#define HAVE_TM_ISDST 1
#define HAVE_TM_ZONE 1
+#define HAVE_TZNAME 1
+#define HAVE_UINTPTR_T 1
+#define HAVE_UNISTD_H 1
+#define HAVE_USELOCALE 1
+#define HAVE_UTIME 1
+#define HAVE_UTIMES 1
+#define HAVE_UTIME_H 1
#define HAVE_VASPRINTF 1
+#define HAVE_VFORK 1
/* #undef HAVE_VFORK_H */
+#define HAVE_WCHAR_H 1
+#define HAVE_WCTYPE_H 1
+#define HAVE_WCWIDTH 1
+#define HAVE_WORKING_FORK 1
+#define HAVE_WORKING_VFORK 1
/* #undef HAVE_XLOCALE_H */
#define HAVE_ZLIB_H 1
#define LT_OBJDIR ".libs/"
/* #undef MAJOR_IN_MKDEV */
/* #undef MAJOR_IN_SYSMACROS */
+/* #undef NO_MINUS_C_MINUS_O */
#define PACKAGE "file"
#define PACKAGE_BUGREPORT "christos@astron.com"
#define PACKAGE_NAME "file"
-#define PACKAGE_STRING "file 5.32"
+#define PACKAGE_STRING "file 5.33"
#define PACKAGE_TARNAME "file"
#define PACKAGE_URL ""
-#define PACKAGE_VERSION "5.32"
+#define PACKAGE_VERSION "5.33"
+#define STDC_HEADERS 1
/* #undef TM_IN_SYS_TIME */
#ifndef _ALL_SOURCE
# define _ALL_SOURCE 1
@@ -58,7 +109,7 @@
#ifndef __EXTENSIONS__
# define __EXTENSIONS__ 1
#endif
-#define VERSION "5.32"
+#define VERSION "5.33"
#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,10 +1,9 @@
-local version = '5.32'
+local version = '5.33'
cflags{
'-Wall',
'-D HAVE_CONFIG_H',
[[-D 'MAGIC="/share/file/magic"']],
'-D _GNU_SOURCE',
- '-I include',
'-I $dir',
'-I $outdir/include',
'-I $builddir/pkg/zlib/include',
@@ -27,27 +26,15 @@ pkg.hdrs = {'$outdir/include/magic.h'}
pkg.deps = {'$dir/headers', 'pkg/zlib/headers'}
lib('libmagic.a', [[src/(
- magic.c
- apprentice.c
- softmagic.c
- ascmagic.c
- encoding.c
- compress.c
- is_tar.c
- readelf.c
- print.c
- fsmagic.c
- funcs.c
- apptype.c
- der.c
- cdf.c
- cdf_time.c
- readcdf.c
+ buffer.c magic.c apprentice.c softmagic.c ascmagic.c
+ encoding.c compress.c is_tar.c readelf.c print.c fsmagic.c
+ funcs.c apptype.c der.c
+ cdf.c cdf_time.c readcdf.c
fmtcheck.c
)]])
-exe('file', {'src/file.c', 'libmagic.a', '$builddir/pkg/zlib/libz.a'})
+exe('file', {'src/file.c', 'src/seccomp.c', 'libmagic.a', '$builddir/pkg/zlib/libz.a'})
file('bin/file', '755', '$outdir/file')
man{'$outdir/file.1'}
diff --git a/pkg/file/magic.txt b/pkg/file/magic.txt
@@ -23,6 +23,7 @@ asterix
att3b
audio
basis
+beetle
ber
bflt
bhl
@@ -61,6 +62,7 @@ cubemap
cups
dact
database
+dbpf
der
diamond
diff
@@ -147,6 +149,7 @@ mathcad
mathematica
matroska
mcrypt
+measure
mercurial
metastore
meteorological
@@ -214,6 +217,7 @@ qt
revision
riff
rinex
+rpi
rpm
rtf
ruby
@@ -250,6 +254,7 @@ tex
tgif
ti-8x
timezone
+tplink
troff
tuxedo
typeset
@@ -285,4 +290,5 @@ xwindows
yara
zfs
zilog
+zip
zyxel
diff --git a/pkg/file/rev b/pkg/file/rev
@@ -1 +1 @@
-5
+6
