Commit 8e189e79 authored by Sophie Brun's avatar Sophie Brun

Merge tag 'upstream/1.5.1'

Upstream version 1.5.1
parents 16eecc39 8a7a885a
*.d
*.dSYM
*.log
*.o
*.so
*.swp
*~
.deps
Makefile
Makefile.in
aclocal.m4
autom4te.cache
config.guess
config.h
config.h.in
config.status
config.sub
configure
depcomp
doc/Makefile
doc/user_manual/Makefile
install-sh
java_gui/BEViewer.jar
java_gui/Makefile
java_gui/classes
man/Makefile
missing
plugins/Makefile
plugins/beconfig.h
plugins/beconfig.h.in
plugins/config.guess
plugins/config.status
plugins/config.sub
plugins/configure
plugins/demo
plugins/depcomp
plugins/install-sh
plugins/missing
plugins/scan_flexdemo.cpp
plugins/stamp-h1
python/Makefile
specfiles/Makefile
specfiles/bulk_extractor.spec.m4
src/Makefile
src/bulk_extractor
src/bulk_extractor.exe
src/scan_accts.cpp
src/scan_base16.cpp
src/scan_email.cpp
src/scan_gps.cpp
src_win/Makefile
src_win/BEViewerLauncher.exe
stamp-h
stamp-h1
tests/Makefile
win32
win64
__pycache__
*.pyc
regress-*-[0-9][0-9]
.DS_Store
out-*/
src/TAGS
src/tags
TAGS
tags
core.*
plugins/plugin_test
specfiles/bulk_extractor.fedora.spec
specfiles/bulk_extractor.opensuse.spec
.dirstamp
java_gui/src/Config.java
src/jpegdump
regress-*
doc/doxygen/html
java_gui/doc/doxygen/html
*.aux
*.bbl
*.blg
*.out
BEProgrammersManual.pdf
*.toc
*.aux
src_win/*.exe
java_gui/temp_generated_source_list
*.tar.gz
src_win/icu-linux
src_win/icu-mingw32
src_win/icu-mingw64
src_win/icu
src_win/*tgz
src_win/liblightgrep
src_win/tre-0.8.0
plugins/plugin_test.exe
src_win/libewf-*
_deps
BEViewer.jar
BEWorkedExamplesStandalone.pdf
BEUsersManual.pdf
build_win32
build_win64
build_java
libtool
src/beapi_demo
BETheoryOfOperation.pdf
bulk_extractor-*.*.*/
test-driver
src_win/liblightgrep-*/
tests/Data-*/
linux/
bulk_extractor_noscanners
[submodule "src/be13_api"]
path = src/be13_api
url = git://github.com/simsong/be13_api.git
[submodule "src/dfxml"]
path = src/dfxml
url = https://github.com/simsong/dfxml.git
[submodule "src/sceadan"]
path = src/sceadan
url = git://github.com/nbeebe/sceadan.git
bulk_extractor is a group effort from many authors and contributors, including:
Simson L. Garfinkel <slgarfin@nps.edu> (overall design)
Bruce Allen <bdallen@nps.edu> (BEViewer, exif analyzer, windows prefetch rewrite)
Bruce Allen <bdallen@nps.edu> (BEViewer, exif analyzer, windows prefetch rewrite, hashdb scanner)
Alex Eubanks <endeavor@rainbowsandpwnies.com> (pe and ELF scanners)
Luis E. Garcia II <legarcia@nps.edu> (Initial windows prefetch implementation)
Michael Shick <mfshick@nps.edu> (odds and ends)
Luis E. Garcia II <legarcia@nps.edu> (Initial windows prefetch implementation)
Michael Shick <mfshick@nps.edu> (odds and ends)
LIFT is developed CMU under contract to the Department of Defense. The team members were:
LIFT was developed by CMU under contract to the Department of Defense. The team members were:
Siddharth Gopal <sgopall@cs.cmu.edu>
Yiming Yang <yiming@cs.cmu.edu>
Konstantin Salomatin <ksalomat@cs.cmu.edu>
......
......@@ -2,11 +2,10 @@ Public Domain Software
Simson L. Garfinkel
Naval Postgraduate School
Release: 1.3 Beta 1
Release Date: June 30, 2012
Last updated December 10, 2012
Where noted noted, bulk_extractor source code files are public domain
software. Because some of the included
Except as otherwise noted, bulk_extractor source code files are public domain
software.
The software provided here is released by the Naval Postgraduate
School, an agency of the U.S. Department of Navy. The software bears
......@@ -19,17 +18,20 @@ Section 105 of the United States Code, Title 17, is not available for
any work of the United States Government and/or for any works created
by United States Government employees.
However, because one of the bulk_extractor source modules (pyxpress.c)
is covered under the GNU Public License, the compiled bulk_extractor
executable is covered under the GPL copyright.
However, because some bulk_extractor source modules (e.g. pyxpress.c)
are covered under the GNU Public License, the compiled bulk_extractor
executable is covered under the GPL copyright. This means that binary
distributions of bulk_extractor must include the full source code (or
have the source code be made easily available.)
...
bulk_extractor uses some SleuthKit 3 include files. There are present
in the directory src/tsk3.
tsk3 includes are Copyright (C) 2010 Brian Carrier and covered under
the Common Public License 1.0
MyFlexLexer.h is (C) 1993 by the Regents of the University of Califronia.
utf8.h is Copyright 2006 Nemanja Trifunovic
base64_forensic.cpp is Copyright (C) 1996-1999 by Internet Software Consortium, with
......
This diff is collapsed.
Installation Instructions
*************************
......
# bulk_extractor Makefile.am
# This file is compiled with automake to create Makefile.in.
# Makefile.in is transformed by "configure" to create Makefile
#
# Bring in the defines from src_win (mostly SRC_WIN_DIST)
SRC_WIN=src_win/
include src_win/Makefile
# These two conditionals are set by configure. If they,
# they cause a "make" in the top-level to automatically run make in the subdirs
if WANT_BE_VIEWER
BE_VIEWER_DIR = java_gui
endif
if WANT_WIN_INSTALLER
SRC_WIN_DIR = src_win
endif
SUBDIRS = doc doc/user_manual src man python specfiles tests $(BE_VIEWER_DIR) $(SRC_WIN_DIR)
EXTRA_DIST = bootstrap.sh \
ROADMAP.txt \
README_DFRWS_2012_CHALLENGE.txt \
m4/ax_pthread.m4
ACLOCAL_AMFLAGS="-I m4"
RELEASE_USER = simsong@
RELEASE_HOST = www.digitalcorpora.org
RELEASE_DIR = digitalcorpora.org/
RELEASE_LOC = $(RELEASE_DIR)/downloads/
VERSION_FN = $(PACKAGE)_version.txt
RELEASE_PATH = $(RELEASE_LOC)/$(VERSION_FN)
RELEASE_SSH = $(RELEASE_USER)$(RELEASE_HOST):$(RELEASE_LOC)
RELEASE = $(PACKAGE)-$(VERSION)
AM_CFLAGS = -Wall
AM_CPPFLAGS = -Wall
AM_CXXFLAGS = -Wall
release:
make check_release_version
make dist
make distcheck
make the_release
check_release_version:
@echo Checking version on server for $(VERSION_FN)
@echo
echo
/bin/rm -f $(VERSION_FN)
wget -q http://$(RELEASE_HOST)/downloads/$(VERSION_FN)
@echo Version `cat $(VERSION_FN)` is on the server.
@sh -c "if [ `cat $(VERSION_FN)` = $(RELEASE).tar.gz ]; then echo ; echo ; echo $(RELEASE) is already on the server; exit 1; fi"
/bin/rm -f $(VERSION_FN)
the_release:
gpg --detach-sign $(RELEASE).tar.gz
scp $(RELEASE).tar.gz{,.sig} $(RELEASE_SSH)
ssh $(RELEASE_HOST) 'cd $(RELEASE_LOC);/bin/rm $(PACKAGE).tar.gz;ln -s $(RELEASE).tar.gz $(PACKAGE).tar.gz'
ssh $(RELEASE_HOST) 'echo $(RELEASE).tar.gz > $(RELEASE_PATH)'
@echo Release $(RELEASE) uploaded to server
# config.h doesn't work right with .flex so run configure before make for win32 and win64
win32:
rm -rf win32
## Note: to build the windows installer you must go into the directory,
## since it is not using automake
## if WANT_WIN_INSTALLER
## SRC_WIN_DIR=src_win
## endif
SUBDIRS = doc doc/latex_manuals src man plugins python specfiles tests $(BE_VIEWER_DIR)
# don't include bootstrap. People run it, and they shoudln't
# It's only for people who check out the git repo
EXTRA_DIST = \
m4/ac_check_classpath.m4 \
m4/ac_check_junit.m4 \
m4/ac_check_rqrd_class.m4 \
m4/ac_java_options.m4 \
m4/ac_prog_jar.m4 \
m4/ac_prog_java.m4 \
m4/ac_prog_java_cc.m4 \
m4/ac_prog_java_works.m4 \
m4/ac_prog_javac.m4 \
m4/ac_prog_javac_works.m4 \
m4/ac_prog_javadoc.m4 \
m4/ac_prog_javah.m4 \
m4/ac_try_compile_java.m4 \
m4/ac_try_run_javac.m4 \
m4/ax_boost_base.m4 \
m4/ax_boost_filesystem.m4 \
m4/ax_boost_system.m4 \
m4/ax_pthread.m4 \
bootstrap.sh \
$(SRC_WIN_DIST)
ACLOCAL_AMFLAGS = -I m4
.PHONY: exels
exels:
/bin/ls -l */*exe
.PHONY: execlean
execlean:
/bin/rm -f */*exe
.PHONY: win32
win32: win32/bulk_extractor32.exe
.PHONY: win64
win64: win64/bulk_extractor64.exe
win32/bulk_extractor32.exe:
@echo '****************************************************'
@echo '*** making win32 with mingw32-configure and make ***'
@echo '****************************************************'
if [ -r Makefile ]; then $(MAKE) distclean ; fi
if [ ! -d win32 ]; then mkdir win32 ; fi
if [ ! -r win32/Makefile ]; then (cd win32;mingw32-configure) ; fi
(cd win32;$(MAKE))
(cp win32/src/bulk_extractor.exe win32/bulk_extractor32.exe)
ls -l win32/bulk_extractor32.exe
win64/bulk_extractor64.exe:
@echo '****************************************************'
@echo '*** making win64 with mingw32-configure and make ***'
@echo '****************************************************'
if [ -r Makefile ]; then $(MAKE) distclean ; fi
if [ ! -d win64 ]; then mkdir win64 ; fi
if [ ! -r win64/Makefile ]; then (cd win64;mingw64-configure) ; fi
(cd win64;$(MAKE))
(cp win64/src/bulk_extractor.exe win64/bulk_extractor64.exe)
ls -l win64/bulk_extractor64.exe
winlibs:
@echo '*****************************************'
@echo '*** making win32 and win64 libraries ***'
@echo '*****************************************'
if [ -r Makefile ]; then $(MAKE) distclean ; fi
if [ ! -d win32 ]; then mkdir win32 ; fi
if [ ! -r win32/Makefile ]; then (cd win32;mingw32-configure --disable-libewf --disable-afflib) ; fi
(cd win32/src;$(MAKE) lib;mv libbulkextractor.so ../../libbulkextractor32.DLL)
if [ ! -d win64 ]; then mkdir win64 ; fi
if [ ! -r win64/Makefile ]; then (cd win64;mingw64-configure --disable-libewf --disable-afflib) ; fi
(cd win64/src;$(MAKE) lib;mv libbulkextractor.so ../../libbulkextractor64.DLL)
ls -l libbulk*.DLL
libs-with-sceadan:
@echo '************************************************'
@echo '*** make all exes and libraries with sceadan ***'
@echo '************************************************'
if [ ! -r ../sceadan ]; then echo sceadan must be installed at ../sceadan ; exit 1 ; fi
/bin/rm -rf linux win32 win64
make distclean
@echo Making Linux
(cd ../sceadan;make clean;sh configure;make)
mkdir linux
(cd linux;../configure --with-sceadan=../../sceadan --disable-afflib --disable-libewf;cd src;make bulk_extractor libbulkextractor.so)
@echo Making win32
(cd ../sceadan;make clean;mingw32-configure;make)
mkdir win32
cp config.status temp_config.status
make distclean;
cd win32; mingw32-configure
cd win32/src && make
cp win32/src/bulk_extractor.exe win32/src/bulk_extractor32.exe
mv temp_config.status config.status
./config.status
win64:
rm -rf win64
(cd win32;mingw32-configure --with-sceadan=../../sceadan --disable-afflib --disable-libewf;cd src;make bulk_extractor.exe libbulkextractor.so)
@echo Making win64
(cd ../sceadan;make clean;mingw64-configure;make)
mkdir win64
cp config.status temp_config.status
make distclean;
cd win64; mingw64-configure
cd win64/src && make
cp win64/src/bulk_extractor.exe win64/src/bulk_extractor64.exe
mv temp_config.status config.status
./config.status
BEREL=bulk_extractor-windows_version.txt
BEZIP=bulk_extractor-windows-$(VERSION).zip
$(distdir).zip:
make windist
# windist makes bulk_extractor32.exe and bulk_extractor64.exe
# and puts them in a zip file
windist: win32 win64
@echo checking to see if there are uncommitted sources
(if (svn status | grep '^Q') ; then exit 1 ; fi)
@echo nope
rm -rf $(distdir).zip $(distdir) src/*.exe
mkdir $(distdir)
mkdir $(distdir)/python
@echo
cp win32/src/bulk_extractor32.exe $(distdir)
cp win64/src/bulk_extractor64.exe $(distdir)
@echo ====================================
@echo
@echo making documentation
make man/bulk_extractor.txt
mv man/bulk_extractor.txt $(distdir)
@echo ====================================
@echo
@echo Creating ZIP archive
@echo
zip -r9 $(distdir).zip $(distdir)
@echo ====================================
@echo
@echo Adding text files to $(distdir).zip
@echo