summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristos Zoulas <christos@zoulas.com>2003-03-23 22:23:30 +0000
committerChristos Zoulas <christos@zoulas.com>2003-03-23 22:23:30 +0000
commit5777df987a6c2c4b037912358cb618b83305a4fe (patch)
tree17b74d66e10d1c30bcce5f268f40bfb6b08f8098
parent758964db45885715f2e050aa4423563a36290f18 (diff)
downloadfile-git-5777df987a6c2c4b037912358cb618b83305a4fe.tar.gz
finish librarification.
-rw-r--r--LEGAL.NOTICE4
-rwxr-xr-xconfigure2
-rw-r--r--configure.in2
-rw-r--r--doc/Makefile.in2
-rw-r--r--src/patchlevel.h33
5 files changed, 32 insertions, 11 deletions
diff --git a/LEGAL.NOTICE b/LEGAL.NOTICE
index c2c76f9b..dd8b90a5 100644
--- a/LEGAL.NOTICE
+++ b/LEGAL.NOTICE
@@ -1,7 +1,7 @@
-$Id: LEGAL.NOTICE,v 1.12 2003/03/23 04:36:37 christos Exp $
+$Id: LEGAL.NOTICE,v 1.13 2003/03/23 22:23:30 christos Exp $
Copyright (c) Ian F. Darwin 1986, 1987, 1989, 1990, 1991, 1992, 1994, 1995.
Software written by Ian F. Darwin and others;
-maintained 1994-1999 Christos Zoulas.
+maintained 1994-2003 Christos Zoulas.
This software is not subject to any export provision of the United States
Department of Commerce, and may be exported to any country or planet.
diff --git a/configure b/configure
index 8a1c7bf0..cf564c12 100755
--- a/configure
+++ b/configure
@@ -1553,7 +1553,7 @@ fi
# Define the identity of the package.
PACKAGE=file
- VERSION=3.38
+ VERSION=4.00
cat >>confdefs.h <<_ACEOF
diff --git a/configure.in b/configure.in
index 4aa4e02b..7c6056ea 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(src/file.c)
-AM_INIT_AUTOMAKE(file, 3.38)
+AM_INIT_AUTOMAKE(file, 4.00)
AM_CONFIG_HEADER(config.h)
AC_MSG_CHECKING(for builtin ELF support)
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 84cc20a2..8c693853 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -119,6 +119,8 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+
+MAGIC = $(datadir)/magic
@FSECT5_TRUE@man_MAGIC = magic.5
@FSECT5_FALSE@man_MAGIC = magic.4
man_MANS = file.1 $(man_MAGIC) libmagic.3
diff --git a/src/patchlevel.h b/src/patchlevel.h
index 1f65ea2c..679dea92 100644
--- a/src/patchlevel.h
+++ b/src/patchlevel.h
@@ -1,19 +1,39 @@
-#define FILE_VERSION_MAJOR 3
-#define patchlevel 42
+#define FILE_VERSION_MAJOR 4
+#define patchlevel 0
/*
* Patchlevel file for Ian Darwin's MAGIC command.
- * $Id: patchlevel.h,v 1.43 2003/03/23 21:16:26 christos Exp $
+ * $Id: patchlevel.h,v 1.44 2003/03/23 22:23:31 christos Exp $
*
* $Log: patchlevel.h,v $
+ * Revision 1.44 2003/03/23 22:23:31 christos
+ * finish librarification.
+ *
* Revision 1.43 2003/03/23 21:16:26 christos
* update copyrights.
*
* Revision 1.42 2003/03/23 04:06:05 christos
- * reorg
+ * Library re-organization
+ *
+ * Revision 1.41 2003/02/27 20:53:45 christos
+ * - fix memory allocation problem (Jeff Johnson)
+ * - fix stack overflow corruption (David Endler)
+ * - fixes from NetBSD source (Antti Kantee)
+ * - magic fixes
*
- * Revision 1.1.1.1 2003/02/07 18:50:31 mru
- * Initial librarification.
+ * Revision 1.40 2003/02/08 18:33:53 christos
+ * - detect inttypes.h too (Dave Love <d.love@dl.ac.uk>)
+ * - eliminate unsigned char warnings (Petter Reinholdtsen <pere@hungry.com>)
+ * - better elf PT_NOTE handling (Nalin Dahyabhai <nalin@redhat.com>)
+ * - add options to format the output differently
+ * - much more magic.
+ *
+ * Revision 1.39 2002/07/03 18:57:52 christos
+ * - ansify/c99ize
+ * - more magic
+ * - better COMPILE_ONLY support.
+ * - new magic files.
+ * - fix solaris compilation problems.
*
* Revision 1.38 2002/05/16 18:45:56 christos
* - pt_note elf additions from NetBSD
@@ -233,4 +253,3 @@
* Fix a tiny null-pointer bug in previous fix for tar archive + uncompress.
*
*/
-