diff options
| author | delphij <delphij@FreeBSD.org> | 2016-05-02 05:46:47 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2016-05-02 05:46:47 +0000 |
| commit | 8b0d0aa157352d8605d3aafe9a5ccc61e4859dd5 (patch) | |
| tree | 1f94604626bee5b4b127def37e34edb0c2bc250b /lib | |
| parent | aeea68e0cff52be10208981137fc8ef073c2a02b (diff) | |
| download | FreeBSD-src-8b0d0aa157352d8605d3aafe9a5ccc61e4859dd5.zip FreeBSD-src-8b0d0aa157352d8605d3aafe9a5ccc61e4859dd5.tar.gz | |
MFC r298192: MFV r298178:
Update file to 5.26.
Relnotes: yes
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libmagic/Makefile | 2 | ||||
| -rw-r--r-- | lib/libmagic/config.h | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/lib/libmagic/Makefile b/lib/libmagic/Makefile index 14f1702..0ddecc8 100644 --- a/lib/libmagic/Makefile +++ b/lib/libmagic/Makefile @@ -12,7 +12,7 @@ LDADD= -lz MAN= libmagic.3 magic.5 SRCS= apprentice.c apptype.c ascmagic.c cdf.c cdf_time.c compress.c \ - encoding.c fsmagic.c funcs.c \ + der.c encoding.c fsmagic.c funcs.c \ is_tar.c magic.c print.c readcdf.c readelf.c softmagic.c INCS= magic.h diff --git a/lib/libmagic/config.h b/lib/libmagic/config.h index 752b82b..2650445 100644 --- a/lib/libmagic/config.h +++ b/lib/libmagic/config.h @@ -43,6 +43,9 @@ /* Define to 1 if you have the <dlfcn.h> header file. */ #define HAVE_DLFCN_H 1 +/* Define to 1 if you have the `dprintf' function. */ +#define HAVE_DPRINTF 1 + /* Define to 1 if you have the <err.h> header file. */ #define HAVE_ERR_H 1 @@ -290,7 +293,7 @@ #define PACKAGE_NAME "file" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "file 5.25" +#define PACKAGE_STRING "file 5.26" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "file" @@ -299,7 +302,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "5.25" +#define PACKAGE_VERSION "5.26" /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 @@ -330,7 +333,7 @@ /* Version number of package */ -#define VERSION "5.25" +#define VERSION "5.26" /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ |
