Merge pull request #2860 from sleuthkit/develop

Merge develop

NEWS.txt

+---------------- VERSION 4.12.1 --------------
+C/C++:
+- Bug fixes from Luis Nassif and Joachim Metz
+- Added check to stop for very large folders to prevent memory exhausion
+
+Java:
+- Added File Repository concept for files to be stored in another location
+- Schema updated to 9.4
+- Fixed OS Account merge bug and now fire events when accounts are merged
+
+
 ---------------- VERSION 4.12.0 --------------
 - There was a 1-year gap since 4.11.1 and the git log has 441 commits in that timeframe. 
 - Many for small fixes.  

bindings/java/build.xml

@@ -11,7 +11,7 @@
 	<import file="build-${os.family}.xml"/>
 
     <!-- Careful changing this because release-windows.pl updates it by pattern -->
-<property name="VERSION" value="4.12.0"/>
+<property name="VERSION" value="4.12.1"/>
 
 	<!-- set global properties for this build -->
 	<property name="default-jar-location" location="/usr/share/java"/>

bindings/java/doxygen/Doxyfile

@@ -39,7 +39,7 @@ PROJECT_NAME           = "Sleuth Kit Java Bindings (JNI)"
 # control system is used.
 
 # NOTE: This is updated by the release-unix.pl script
-PROJECT_NUMBER = 4.12.0
+PROJECT_NUMBER = 4.12.1
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
@@ -1056,7 +1056,7 @@ GENERATE_HTML          = YES
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 # NOTE: This is updated by the release-unix.pl script
-HTML_OUTPUT = jni-docs/4.12.0/
+HTML_OUTPUT = jni-docs/4.12.1/
 
 # The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
 # generated HTML page (for example: .htm, .php, .asp).

case-uco/java/nbproject/project.properties

@@ -35,7 +35,7 @@ dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
 file.reference.gson-2.8.5.jar=lib/gson-2.8.5.jar
-file.reference.sleuthkit-4.12.0.jar=lib/sleuthkit-4.12.0.jar
+file.reference.sleuthkit-4.12.1.jar=lib/sleuthkit-4.12.1.jar
 file.reference.junit-4.12.jar=lib/junit-4.12.jar
 file.reference.hamcrest-core-1.3.jar=lib/hamcrest-core-1.3.jar
 includes=**
@@ -44,7 +44,7 @@ jar.compress=false
 jar.index=${jnlp.enabled}
 javac.classpath=\
     ${file.reference.gson-2.8.5.jar}:\
-${file.reference.sleuthkit-4.12.0.jar}
+${file.reference.sleuthkit-4.12.1.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=-Xlint
 javac.deprecation=false

configure.ac

@@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
 
-AC_INIT(sleuthkit, 4.12.0)
+AC_INIT(sleuthkit, 4.12.1)
 m4_include([m4/ax_pthread.m4])
 dnl include the version from 1.12.1. This will work for
 m4_include([m4/cppunit.m4])

debian/changelog

-sleuthkit-java (4.12.0-1) unstable; urgency=medium
+sleuthkit-java (4.12.1-1) unstable; urgency=medium
 
   * Initial release (Closes: #nnnn)  <nnnn is the bug number of your ITP>
 

debian/sleuthkit-java.install

 bindings/java/lib/sqlite-jdbc-3.42.0.0.jar /usr/share/java
-bindings/java/dist/sleuthkit-4.12.0.jar /usr/share/java
-case-uco/java/dist/sleuthkit-caseuco-4.12.0.jar /usr/share/java
+bindings/java/dist/sleuthkit-4.12.1.jar /usr/share/java
+case-uco/java/dist/sleuthkit-caseuco-4.12.1.jar /usr/share/java
 

packages/sleuthkit.spec

 Name:		sleuthkit	
-Version:	4.12.0
+Version:	4.12.1
 Release:	1%{?dist}
 Summary:	The Sleuth Kit (TSK) is a library and collection of command line tools that allow you to investigate volume and file system data.	
 

tsk/Makefile.am

@@ -8,7 +8,7 @@ libtsk_la_LIBADD = base/libtskbase.la img/libtskimg.la \
     vs/libtskvs.la fs/libtskfs.la hashdb/libtskhashdb.la \
     auto/libtskauto.la pool/libtskpool.la util/libtskutil.la
 # current:revision:age
-libtsk_la_LDFLAGS = -version-info 21:0:2 $(LIBTSK_LDFLAGS)
+libtsk_la_LDFLAGS = -version-info 21:1:2 $(LIBTSK_LDFLAGS)
 
 EXTRA_DIST = tsk_tools_i.h docs/Doxyfile docs/*.dox docs/*.html \
    tsk.pc.in

tsk/base/tsk_base.h

@@ -39,11 +39,11 @@
  * 3.1.2b1 would be 0x03010201.  Snapshot from Jan 2, 2003 would be
  * 0xFF030102.
  * See TSK_VERSION_STR for string form. */
-#define TSK_VERSION_NUM 0x041200ff
+#define TSK_VERSION_NUM 0x041201ff
 
 /** Version of code in string form. See TSK_VERSION_NUM for
  * integer form. */
-#define TSK_VERSION_STR "4.12.0"
+#define TSK_VERSION_STR "4.12.1"
 
 
 /* include the TSK-specific header file that we created in autoconf

tsk/docs/Doxyfile

@@ -33,7 +33,7 @@ PROJECT_NAME           = "The Sleuth Kit"
 # if some version control system is used.
 
 # This is automatically updated  at release time. 
-PROJECT_NUMBER = 4.12.0
+PROJECT_NUMBER = 4.12.1
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer
@@ -884,7 +884,7 @@ GENERATE_HTML          = YES
 # put in front of it. If left blank `html' will be used as the default path.
 
 # NOTE: This is automatically updated at release time. 
-HTML_OUTPUT = api-docs/4.12.0/
+HTML_OUTPUT = api-docs/4.12.1/
 
 # The HTML_FILE_EXTENSION tag can be used to specify the file extension for
 # each generated HTML page (for example: .htm,.php,.asp). If it is left blank