diff options
| author | delphij <delphij@FreeBSD.org> | 2016-05-08 18:09:30 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2016-05-08 18:09:30 +0000 |
| commit | 474ac0fbf4af918a4825854649bafccc48949fc1 (patch) | |
| tree | 71e3f513282a26fd8dae12a0f0258b39eff11078 /lib | |
| parent | 1e1c6951b00289b8de42bb7d821861b25d4fc604 (diff) | |
| download | FreeBSD-src-474ac0fbf4af918a4825854649bafccc48949fc1.zip FreeBSD-src-474ac0fbf4af918a4825854649bafccc48949fc1.tar.gz | |
Revert r298920 until we have addressed all known regressions on head/ after
settle. file is now downgraded to 5.25.
PR: bin/209211
Requested by: Tomoaki AOKI
Relnotes: yes
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libmagic/Makefile | 2 | ||||
| -rw-r--r-- | lib/libmagic/config.h | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/lib/libmagic/Makefile b/lib/libmagic/Makefile index 0ddecc8..14f1702 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 \ - der.c encoding.c fsmagic.c funcs.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 2650445..752b82b 100644 --- a/lib/libmagic/config.h +++ b/lib/libmagic/config.h @@ -43,9 +43,6 @@ /* 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 @@ -293,7 +290,7 @@ #define PACKAGE_NAME "file" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "file 5.26" +#define PACKAGE_STRING "file 5.25" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "file" @@ -302,7 +299,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "5.26" +#define PACKAGE_VERSION "5.25" /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 @@ -333,7 +330,7 @@ /* Version number of package */ -#define VERSION "5.26" +#define VERSION "5.25" /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ |
