Commit c6ce30ef authored by Hilko Bengen's avatar Hilko Bengen

Merge tag 'upstream/20170121'

Upstream version 20170121
parents 04d14327 02c4a8a7
Acknowledgements: libesedb Acknowledgements: libesedb
Copyright (C) 2009-2015, Joachim Metz <joachim.metz@gmail.com> Copyright (C) 2009-2017, Joachim Metz <joachim.metz@gmail.com>
...@@ -157,6 +157,18 @@ Notes ...@@ -157,6 +157,18 @@ Notes
* read catalog data type defintions and convert them into column definitions? * read catalog data type defintions and convert them into column definitions?
- no - no
20160902
* worked on tests
20160110
* worked on Python 3 support
20160107
* 2016 update
20151219
* changes for deployment
20151213 20151213
* worked on support for newly discovered unknown page flag * worked on support for newly discovered unknown page flag
* removed LIBESEDB_FLAG_READ and LIBESEDB_FLAG_WRITE * removed LIBESEDB_FLAG_READ and LIBESEDB_FLAG_WRITE
......
...@@ -3,7 +3,6 @@ ACLOCAL_AMFLAGS = -I m4 ...@@ -3,7 +3,6 @@ ACLOCAL_AMFLAGS = -I m4
SUBDIRS = \ SUBDIRS = \
include \ include \
common \ common \
libcstring \
libcerror \ libcerror \
libcthreads \ libcthreads \
libcdata \ libcdata \
...@@ -23,9 +22,10 @@ SUBDIRS = \ ...@@ -23,9 +22,10 @@ SUBDIRS = \
libesedb \ libesedb \
libfmapi \ libfmapi \
libmapidb \ libmapidb \
libcsystem \
esedbtools \ esedbtools \
pyesedb \ pyesedb \
pyesedb-python2 \
pyesedb-python3 \
po \ po \
manuals \ manuals \
tests \ tests \
...@@ -39,8 +39,10 @@ DPKG_FILES = \ ...@@ -39,8 +39,10 @@ DPKG_FILES = \
dpkg/copyright \ dpkg/copyright \
dpkg/copyright.in \ dpkg/copyright.in \
dpkg/rules \ dpkg/rules \
dpkg/libesedb-dev.docs \
dpkg/libesedb.docs \ dpkg/libesedb.docs \
dpkg/libesedb-dev.docs \
dpkg/libesedb-python.docs \
dpkg/libesedb-python3.docs \
dpkg/libesedb-tools.docs \ dpkg/libesedb-tools.docs \
dpkg/source/format dpkg/source/format
...@@ -81,7 +83,6 @@ lib: library ...@@ -81,7 +83,6 @@ lib: library
library: library:
(cd $(srcdir)/common && $(MAKE) $(AM_MAKEFLAGS)) (cd $(srcdir)/common && $(MAKE) $(AM_MAKEFLAGS))
(cd $(srcdir)/libcstring && $(MAKE) $(AM_MAKEFLAGS))
(cd $(srcdir)/libcerror && $(MAKE) $(AM_MAKEFLAGS)) (cd $(srcdir)/libcerror && $(MAKE) $(AM_MAKEFLAGS))
(cd $(srcdir)/libcthreads && $(MAKE) $(AM_MAKEFLAGS)) (cd $(srcdir)/libcthreads && $(MAKE) $(AM_MAKEFLAGS))
(cd $(srcdir)/libcdata && $(MAKE) $(AM_MAKEFLAGS)) (cd $(srcdir)/libcdata && $(MAKE) $(AM_MAKEFLAGS))
...@@ -114,7 +115,6 @@ distclean: clean ...@@ -114,7 +115,6 @@ distclean: clean
done && test -z "$$fail" done && test -z "$$fail"
splint: splint:
(cd $(srcdir)/libcstring && $(MAKE) splint $(AM_MAKEFLAGS))
(cd $(srcdir)/libcerror && $(MAKE) splint $(AM_MAKEFLAGS)) (cd $(srcdir)/libcerror && $(MAKE) splint $(AM_MAKEFLAGS))
(cd $(srcdir)/libcthreads && $(MAKE) splint $(AM_MAKEFLAGS)) (cd $(srcdir)/libcthreads && $(MAKE) splint $(AM_MAKEFLAGS))
(cd $(srcdir)/libcdata && $(MAKE) splint $(AM_MAKEFLAGS)) (cd $(srcdir)/libcdata && $(MAKE) splint $(AM_MAKEFLAGS))
...@@ -134,7 +134,6 @@ splint: ...@@ -134,7 +134,6 @@ splint:
(cd $(srcdir)/libesedb && $(MAKE) splint $(AM_MAKEFLAGS)) (cd $(srcdir)/libesedb && $(MAKE) splint $(AM_MAKEFLAGS))
(cd $(srcdir)/libfmapi && $(MAKE) splint $(AM_MAKEFLAGS)) (cd $(srcdir)/libfmapi && $(MAKE) splint $(AM_MAKEFLAGS))
(cd $(srcdir)/libmapidb && $(MAKE) splint $(AM_MAKEFLAGS)) (cd $(srcdir)/libmapidb && $(MAKE) splint $(AM_MAKEFLAGS))
(cd $(srcdir)/libcsystem && $(MAKE) splint $(AM_MAKEFLAGS))
(cd $(srcdir)/esedbtools && $(MAKE) splint $(AM_MAKEFLAGS)) (cd $(srcdir)/esedbtools && $(MAKE) splint $(AM_MAKEFLAGS))
(cd $(srcdir)/pyesedb && $(MAKE) splint $(AM_MAKEFLAGS)) (cd $(srcdir)/pyesedb && $(MAKE) splint $(AM_MAKEFLAGS))
(cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS)) (cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS))
......
...@@ -98,7 +98,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/common.m4 \ ...@@ -98,7 +98,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/common.m4 \
$(top_srcdir)/m4/libcerror.m4 $(top_srcdir)/m4/libcfile.m4 \ $(top_srcdir)/m4/libcerror.m4 $(top_srcdir)/m4/libcfile.m4 \
$(top_srcdir)/m4/libclocale.m4 $(top_srcdir)/m4/libcnotify.m4 \ $(top_srcdir)/m4/libclocale.m4 $(top_srcdir)/m4/libcnotify.m4 \
$(top_srcdir)/m4/libcpath.m4 $(top_srcdir)/m4/libcsplit.m4 \ $(top_srcdir)/m4/libcpath.m4 $(top_srcdir)/m4/libcsplit.m4 \
$(top_srcdir)/m4/libcstring.m4 $(top_srcdir)/m4/libcsystem.m4 \
$(top_srcdir)/m4/libcthreads.m4 $(top_srcdir)/m4/libfcache.m4 \ $(top_srcdir)/m4/libcthreads.m4 $(top_srcdir)/m4/libfcache.m4 \
$(top_srcdir)/m4/libfdata.m4 $(top_srcdir)/m4/libfdatetime.m4 \ $(top_srcdir)/m4/libfdata.m4 $(top_srcdir)/m4/libfdatetime.m4 \
$(top_srcdir)/m4/libfguid.m4 $(top_srcdir)/m4/libfmapi.m4 \ $(top_srcdir)/m4/libfguid.m4 $(top_srcdir)/m4/libfmapi.m4 \
...@@ -109,8 +108,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/common.m4 \ ...@@ -109,8 +108,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/common.m4 \
$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
$(top_srcdir)/m4/pthread.m4 $(top_srcdir)/m4/python.m4 \ $(top_srcdir)/m4/pthread.m4 $(top_srcdir)/m4/python.m4 \
$(top_srcdir)/m4/types.m4 $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/m4/tests.m4 $(top_srcdir)/m4/types.m4 \
$(top_srcdir)/configure.ac $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4) $(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
...@@ -215,7 +214,7 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/libesedb.pc.in \ ...@@ -215,7 +214,7 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/libesedb.pc.in \
$(top_srcdir)/include/libesedb/features.h.in \ $(top_srcdir)/include/libesedb/features.h.in \
$(top_srcdir)/include/libesedb/types.h.in ABOUT-NLS AUTHORS \ $(top_srcdir)/include/libesedb/types.h.in ABOUT-NLS AUTHORS \
COPYING ChangeLog INSTALL NEWS README compile config.guess \ COPYING ChangeLog INSTALL NEWS README compile config.guess \
config.rpath config.sub depcomp install-sh ltmain.sh missing config.rpath config.sub install-sh ltmain.sh missing
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION) distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir) top_distdir = $(distdir)
...@@ -299,8 +298,6 @@ HAVE_LIBCLOCALE = @HAVE_LIBCLOCALE@ ...@@ -299,8 +298,6 @@ HAVE_LIBCLOCALE = @HAVE_LIBCLOCALE@
HAVE_LIBCNOTIFY = @HAVE_LIBCNOTIFY@ HAVE_LIBCNOTIFY = @HAVE_LIBCNOTIFY@
HAVE_LIBCPATH = @HAVE_LIBCPATH@ HAVE_LIBCPATH = @HAVE_LIBCPATH@
HAVE_LIBCSPLIT = @HAVE_LIBCSPLIT@ HAVE_LIBCSPLIT = @HAVE_LIBCSPLIT@
HAVE_LIBCSTRING = @HAVE_LIBCSTRING@
HAVE_LIBCSYSTEM = @HAVE_LIBCSYSTEM@
HAVE_LIBCTHREADS = @HAVE_LIBCTHREADS@ HAVE_LIBCTHREADS = @HAVE_LIBCTHREADS@
HAVE_LIBFCACHE = @HAVE_LIBFCACHE@ HAVE_LIBFCACHE = @HAVE_LIBFCACHE@
HAVE_LIBFDATA = @HAVE_LIBFDATA@ HAVE_LIBFDATA = @HAVE_LIBFDATA@
...@@ -319,8 +316,6 @@ HAVE_LOCAL_LIBCLOCALE = @HAVE_LOCAL_LIBCLOCALE@ ...@@ -319,8 +316,6 @@ HAVE_LOCAL_LIBCLOCALE = @HAVE_LOCAL_LIBCLOCALE@
HAVE_LOCAL_LIBCNOTIFY = @HAVE_LOCAL_LIBCNOTIFY@ HAVE_LOCAL_LIBCNOTIFY = @HAVE_LOCAL_LIBCNOTIFY@
HAVE_LOCAL_LIBCPATH = @HAVE_LOCAL_LIBCPATH@ HAVE_LOCAL_LIBCPATH = @HAVE_LOCAL_LIBCPATH@
HAVE_LOCAL_LIBCSPLIT = @HAVE_LOCAL_LIBCSPLIT@ HAVE_LOCAL_LIBCSPLIT = @HAVE_LOCAL_LIBCSPLIT@
HAVE_LOCAL_LIBCSTRING = @HAVE_LOCAL_LIBCSTRING@
HAVE_LOCAL_LIBCSYSTEM = @HAVE_LOCAL_LIBCSYSTEM@
HAVE_LOCAL_LIBCTHREADS = @HAVE_LOCAL_LIBCTHREADS@ HAVE_LOCAL_LIBCTHREADS = @HAVE_LOCAL_LIBCTHREADS@
HAVE_LOCAL_LIBFCACHE = @HAVE_LOCAL_LIBFCACHE@ HAVE_LOCAL_LIBFCACHE = @HAVE_LOCAL_LIBFCACHE@
HAVE_LOCAL_LIBFDATA = @HAVE_LOCAL_LIBFDATA@ HAVE_LOCAL_LIBFDATA = @HAVE_LOCAL_LIBFDATA@
...@@ -367,10 +362,6 @@ LIBCPATH_CPPFLAGS = @LIBCPATH_CPPFLAGS@ ...@@ -367,10 +362,6 @@ LIBCPATH_CPPFLAGS = @LIBCPATH_CPPFLAGS@
LIBCPATH_LIBADD = @LIBCPATH_LIBADD@ LIBCPATH_LIBADD = @LIBCPATH_LIBADD@
LIBCSPLIT_CPPFLAGS = @LIBCSPLIT_CPPFLAGS@ LIBCSPLIT_CPPFLAGS = @LIBCSPLIT_CPPFLAGS@
LIBCSPLIT_LIBADD = @LIBCSPLIT_LIBADD@ LIBCSPLIT_LIBADD = @LIBCSPLIT_LIBADD@
LIBCSTRING_CPPFLAGS = @LIBCSTRING_CPPFLAGS@
LIBCSTRING_LIBADD = @LIBCSTRING_LIBADD@
LIBCSYSTEM_CPPFLAGS = @LIBCSYSTEM_CPPFLAGS@
LIBCSYSTEM_LIBADD = @LIBCSYSTEM_LIBADD@
LIBCTHREADS_CPPFLAGS = @LIBCTHREADS_CPPFLAGS@ LIBCTHREADS_CPPFLAGS = @LIBCTHREADS_CPPFLAGS@
LIBCTHREADS_LIBADD = @LIBCTHREADS_LIBADD@ LIBCTHREADS_LIBADD = @LIBCTHREADS_LIBADD@
LIBESEDB_DLL_IMPORT = @LIBESEDB_DLL_IMPORT@ LIBESEDB_DLL_IMPORT = @LIBESEDB_DLL_IMPORT@
...@@ -403,6 +394,7 @@ LN_S = @LN_S@ ...@@ -403,6 +394,7 @@ LN_S = @LN_S@
LTLIBICONV = @LTLIBICONV@ LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@ LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@ LTLIBOBJS = @LTLIBOBJS@
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@ MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@ MKDIR_P = @MKDIR_P@
...@@ -432,6 +424,26 @@ PTHREAD_CPPFLAGS = @PTHREAD_CPPFLAGS@ ...@@ -432,6 +424,26 @@ PTHREAD_CPPFLAGS = @PTHREAD_CPPFLAGS@
PTHREAD_LIBADD = @PTHREAD_LIBADD@ PTHREAD_LIBADD = @PTHREAD_LIBADD@
PWD = @PWD@ PWD = @PWD@
PYTHON = @PYTHON@ PYTHON = @PYTHON@
PYTHON2 = @PYTHON2@
PYTHON2_CONFIG = @PYTHON2_CONFIG@
PYTHON2_CPPFLAGS = @PYTHON2_CPPFLAGS@
PYTHON2_EXEC_PREFIX = @PYTHON2_EXEC_PREFIX@
PYTHON2_LDFLAGS = @PYTHON2_LDFLAGS@
PYTHON2_LIBRARY_DIR = @PYTHON2_LIBRARY_DIR@
PYTHON2_PACKAGE_DIR = @PYTHON2_PACKAGE_DIR@
PYTHON2_PLATFORM = @PYTHON2_PLATFORM@
PYTHON2_PREFIX = @PYTHON2_PREFIX@
PYTHON2_VERSION = @PYTHON2_VERSION@
PYTHON3 = @PYTHON3@
PYTHON3_CONFIG = @PYTHON3_CONFIG@
PYTHON3_CPPFLAGS = @PYTHON3_CPPFLAGS@
PYTHON3_EXEC_PREFIX = @PYTHON3_EXEC_PREFIX@
PYTHON3_LDFLAGS = @PYTHON3_LDFLAGS@
PYTHON3_LIBRARY_DIR = @PYTHON3_LIBRARY_DIR@
PYTHON3_PACKAGE_DIR = @PYTHON3_PACKAGE_DIR@
PYTHON3_PLATFORM = @PYTHON3_PLATFORM@
PYTHON3_PREFIX = @PYTHON3_PREFIX@
PYTHON3_VERSION = @PYTHON3_VERSION@
PYTHON_CONFIG = @PYTHON_CONFIG@ PYTHON_CONFIG = @PYTHON_CONFIG@
PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
...@@ -489,12 +501,6 @@ ax_libcpath_spec_requires = @ax_libcpath_spec_requires@ ...@@ -489,12 +501,6 @@ ax_libcpath_spec_requires = @ax_libcpath_spec_requires@
ax_libcsplit_pc_libs_private = @ax_libcsplit_pc_libs_private@ ax_libcsplit_pc_libs_private = @ax_libcsplit_pc_libs_private@
ax_libcsplit_spec_build_requires = @ax_libcsplit_spec_build_requires@ ax_libcsplit_spec_build_requires = @ax_libcsplit_spec_build_requires@
ax_libcsplit_spec_requires = @ax_libcsplit_spec_requires@ ax_libcsplit_spec_requires = @ax_libcsplit_spec_requires@
ax_libcstring_pc_libs_private = @ax_libcstring_pc_libs_private@
ax_libcstring_spec_build_requires = @ax_libcstring_spec_build_requires@
ax_libcstring_spec_requires = @ax_libcstring_spec_requires@
ax_libcsystem_pc_libs_private = @ax_libcsystem_pc_libs_private@
ax_libcsystem_spec_build_requires = @ax_libcsystem_spec_build_requires@
ax_libcsystem_spec_requires = @ax_libcsystem_spec_requires@
ax_libcthreads_pc_libs_private = @ax_libcthreads_pc_libs_private@ ax_libcthreads_pc_libs_private = @ax_libcthreads_pc_libs_private@
ax_libcthreads_spec_build_requires = @ax_libcthreads_spec_build_requires@ ax_libcthreads_spec_build_requires = @ax_libcthreads_spec_build_requires@
ax_libcthreads_spec_requires = @ax_libcthreads_spec_requires@ ax_libcthreads_spec_requires = @ax_libcthreads_spec_requires@
...@@ -563,10 +569,6 @@ libcpath_CFLAGS = @libcpath_CFLAGS@ ...@@ -563,10 +569,6 @@ libcpath_CFLAGS = @libcpath_CFLAGS@
libcpath_LIBS = @libcpath_LIBS@ libcpath_LIBS = @libcpath_LIBS@
libcsplit_CFLAGS = @libcsplit_CFLAGS@ libcsplit_CFLAGS = @libcsplit_CFLAGS@
libcsplit_LIBS = @libcsplit_LIBS@ libcsplit_LIBS = @libcsplit_LIBS@
libcstring_CFLAGS = @libcstring_CFLAGS@
libcstring_LIBS = @libcstring_LIBS@
libcsystem_CFLAGS = @libcsystem_CFLAGS@
libcsystem_LIBS = @libcsystem_LIBS@
libcthreads_CFLAGS = @libcthreads_CFLAGS@ libcthreads_CFLAGS = @libcthreads_CFLAGS@
libcthreads_LIBS = @libcthreads_LIBS@ libcthreads_LIBS = @libcthreads_LIBS@
libdir = @libdir@ libdir = @libdir@
...@@ -602,7 +604,11 @@ prefix = @prefix@ ...@@ -602,7 +604,11 @@ prefix = @prefix@
program_transform_name = @program_transform_name@ program_transform_name = @program_transform_name@
psdir = @psdir@ psdir = @psdir@
pyexecdir = @pyexecdir@ pyexecdir = @pyexecdir@
pyexecdir2 = @pyexecdir2@
pyexecdir3 = @pyexecdir3@
pythondir = @pythondir@ pythondir = @pythondir@
pythondir2 = @pythondir2@
pythondir3 = @pythondir3@
sbindir = @sbindir@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@ srcdir = @srcdir@
...@@ -615,7 +621,6 @@ ACLOCAL_AMFLAGS = -I m4 ...@@ -615,7 +621,6 @@ ACLOCAL_AMFLAGS = -I m4
SUBDIRS = \ SUBDIRS = \
include \ include \
common \ common \
libcstring \
libcerror \ libcerror \
libcthreads \ libcthreads \
libcdata \ libcdata \
...@@ -635,9 +640,10 @@ SUBDIRS = \ ...@@ -635,9 +640,10 @@ SUBDIRS = \
libesedb \ libesedb \
libfmapi \ libfmapi \
libmapidb \ libmapidb \
libcsystem \
esedbtools \ esedbtools \
pyesedb \ pyesedb \
pyesedb-python2 \
pyesedb-python3 \
po \ po \
manuals \ manuals \
tests \ tests \
...@@ -651,8 +657,10 @@ DPKG_FILES = \ ...@@ -651,8 +657,10 @@ DPKG_FILES = \
dpkg/copyright \ dpkg/copyright \
dpkg/copyright.in \ dpkg/copyright.in \
dpkg/rules \ dpkg/rules \
dpkg/libesedb-dev.docs \
dpkg/libesedb.docs \ dpkg/libesedb.docs \
dpkg/libesedb-dev.docs \
dpkg/libesedb-python.docs \
dpkg/libesedb-python3.docs \
dpkg/libesedb-tools.docs \ dpkg/libesedb-tools.docs \
dpkg/source/format dpkg/source/format
...@@ -1195,7 +1203,6 @@ lib: library ...@@ -1195,7 +1203,6 @@ lib: library
library: library:
(cd $(srcdir)/common && $(MAKE) $(AM_MAKEFLAGS)) (cd $(srcdir)/common && $(MAKE) $(AM_MAKEFLAGS))
(cd $(srcdir)/libcstring && $(MAKE) $(AM_MAKEFLAGS))
(cd $(srcdir)/libcerror && $(MAKE) $(AM_MAKEFLAGS))