diff --git a/Core/build.xml b/Core/build.xml index df8bf56464..7429307d43 100644 --- a/Core/build.xml +++ b/Core/build.xml @@ -134,8 +134,8 @@ - + release/modules/ext/spotbugs-annotations-4.6.0.jar - ext/sqlite-jdbc-3.42.0.1.jar - release/modules/ext/sqlite-jdbc-3.42.0.1.jar + ext/sqlite-jdbc-3.46.0.0.jar + release/modules/ext/sqlite-jdbc-3.46.0.0.jar ext/txw2-2.3.3.jar diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/GeneralFilter.java b/Core/src/org/sleuthkit/autopsy/casemodule/GeneralFilter.java index 7d06ae23c3..d831e449c3 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/GeneralFilter.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/GeneralFilter.java @@ -38,8 +38,8 @@ public class GeneralFilter extends FileFilter { @NbBundle.Messages("GeneralFilter.encaseImageDesc.text=Encase Images (*.e01)") public static final String ENCASE_IMAGE_DESC = Bundle.GeneralFilter_encaseImageDesc_text(); - public static final List VIRTUAL_MACHINE_EXTS = Arrays.asList(".vmdk", ".vhd"); //NON-NLS - @NbBundle.Messages("GeneralFilter.virtualMachineImageDesc.text=Virtual Machines (*.vmdk, *.vhd)") + public static final List VIRTUAL_MACHINE_EXTS = Arrays.asList(".vmdk", ".vhd", ".vhdx"); //NON-NLS + @NbBundle.Messages("GeneralFilter.virtualMachineImageDesc.text=Virtual Machines (*.vmdk, *.vhd, *.vhdx)") public static final String VIRTUAL_MACHINE_DESC = Bundle.GeneralFilter_virtualMachineImageDesc_text(); public static final List EXECUTABLE_EXTS = Arrays.asList(".exe"); //NON-NLS diff --git a/Core/src/org/sleuthkit/autopsy/core/Installer.java b/Core/src/org/sleuthkit/autopsy/core/Installer.java index e8b1c79196..374d5b8ccb 100644 --- a/Core/src/org/sleuthkit/autopsy/core/Installer.java +++ b/Core/src/org/sleuthkit/autopsy/core/Installer.java @@ -67,7 +67,7 @@ public class Installer extends ModuleInstall { private static final long serialVersionUID = 1L; private static final String JAVA_TEMP = "java.io.tmpdir"; - private static final String AUTOPSY_TEMP_DIR = "autopsy_temp"; + private static final String AUTOPSY_TEMP_DIR_SUFFIX = "_temp"; private static final String TSK_TEMP = "tsk.tmpdir"; private final List packageInstallers; @@ -93,7 +93,8 @@ public class Installer extends ModuleInstall { private static void setTskTemp() { try { String curTemp = System.getProperty(JAVA_TEMP, ""); - String tskTemp = curTemp + (curTemp.endsWith(File.separator) ? "" : File.separator) + AUTOPSY_TEMP_DIR; + String autopsyTempDir = StringUtils.defaultIfBlank(UserPreferences.getAppName(), "autopsy").replaceAll("[^a-zA-Z0-9_\\-]", "_") + AUTOPSY_TEMP_DIR_SUFFIX; + String tskTemp = Paths.get(StringUtils.defaultString(curTemp), autopsyTempDir).toString(); System.setProperty(TSK_TEMP, tskTemp); File tskTempDir = new File(tskTemp); tskTempDir.mkdirs(); diff --git a/ImageGallery/nbproject/project.properties b/ImageGallery/nbproject/project.properties index d69f7d273a..2ea0f24c23 100644 --- a/ImageGallery/nbproject/project.properties +++ b/ImageGallery/nbproject/project.properties @@ -1,4 +1,4 @@ -file.reference.sqlite-jdbc-3.42.0.1.jar=release/modules/ext/sqlite-jdbc-3.42.0.1.jar +file.reference.sqlite-jdbc-3.46.0.0.jar=release/modules/ext/sqlite-jdbc-3.46.0.0.jar javac.source=17 javac.compilerargs=-Xlint -Xlint:-serial license.file=LICENSE-2.0.txt diff --git a/ImageGallery/nbproject/project.xml b/ImageGallery/nbproject/project.xml index 49221290cd..6941e4b187 100644 --- a/ImageGallery/nbproject/project.xml +++ b/ImageGallery/nbproject/project.xml @@ -142,8 +142,8 @@ - ext/sqlite-jdbc-3.42.0.1.jar - release/modules/ext/sqlite-jdbc-3.42.0.1.jar + ext/sqlite-jdbc-3.46.0.0.jar + release/modules/ext/sqlite-jdbc-3.46.0.0.jar diff --git a/RecentActivity/nbproject/project.properties b/RecentActivity/nbproject/project.properties index 430436bea9..8c106492c6 100644 --- a/RecentActivity/nbproject/project.properties +++ b/RecentActivity/nbproject/project.properties @@ -1,6 +1,6 @@ javac.source=17 file.reference.Rejistry-1.1-SNAPSHOT.jar=release/modules/ext/Rejistry-1.1-SNAPSHOT.jar -file.reference.sqlite-jdbc-3.42.0.1.jar=release/modules/ext/sqlite-jdbc-3.42.0.1.jar +file.reference.sqlite-jdbc-3.46.0.0.jar=release/modules/ext/sqlite-jdbc-3.46.0.0.jar javac.compilerargs=-Xlint -Xlint:-serial license.file=../LICENSE-2.0.txt nbm.homepage=http://www.sleuthkit.org/autopsy/ diff --git a/RecentActivity/nbproject/project.xml b/RecentActivity/nbproject/project.xml index 05745bb79a..bc1dd53aa8 100644 --- a/RecentActivity/nbproject/project.xml +++ b/RecentActivity/nbproject/project.xml @@ -88,8 +88,8 @@ release/modules/ext/Rejistry-1.1-SNAPSHOT.jar - ext/sqlite-jdbc-3.42.0.1.jar - release/modules/ext/sqlite-jdbc-3.42.0.1.jar + ext/sqlite-jdbc-3.46.0.0.jar + release/modules/ext/sqlite-jdbc-3.46.0.0.jar diff --git a/docs/doxygen-dev/footer.html b/docs/doxygen-dev/footer.html index d648961fdc..fe4f9e42d1 100755 --- a/docs/doxygen-dev/footer.html +++ b/docs/doxygen-dev/footer.html @@ -1,5 +1,5 @@
-

Copyright © 2012-2022 Basis Technology. Generated on $date
+

Copyright © 2012-2024 Sleuth Kit Labs. Generated on $date
This work is licensed under a Creative Commons Attribution-Share Alike 3.0 United States License.

diff --git a/docs/doxygen-user/footer.html b/docs/doxygen-user/footer.html index cfedffe82c..fe4f9e42d1 100644 --- a/docs/doxygen-user/footer.html +++ b/docs/doxygen-user/footer.html @@ -1,5 +1,5 @@
-

Copyright © 2012-2023 BasisTech. Generated on $date
+

Copyright © 2012-2024 Sleuth Kit Labs. Generated on $date
This work is licensed under a Creative Commons Attribution-Share Alike 3.0 United States License.

diff --git a/docs/doxygen/footer.html b/docs/doxygen/footer.html index f9eb00590e..6d97889cc8 100644 --- a/docs/doxygen/footer.html +++ b/docs/doxygen/footer.html @@ -1,5 +1,5 @@
-

Copyright © 2012-2022 Basis Technology. Generated on: $date
+

Copyright © 2012-2024 Sleuth Kit Labs. Generated on: $date
This work is licensed under a Creative Commons Attribution-Share Alike 3.0 United States License.

diff --git a/linux_macos_install_scripts/install_tsk_from_src.sh b/linux_macos_install_scripts/install_tsk_from_src.sh index 83e1a4ae3e..6e5c7a320b 100644 --- a/linux_macos_install_scripts/install_tsk_from_src.sh +++ b/linux_macos_install_scripts/install_tsk_from_src.sh @@ -34,7 +34,7 @@ if [[ -z "${SLEUTHKIT_SRC_DIR}" ]]; then exit 1 fi -if [[ ! -d $SLEUTHKIT_SRC_DIR ]]; then +if [[ ! -d $SLEUTHKIT_SRC_DIR/.git ]]; then TSK_REPO_PATH=$(dirname "$SLEUTHKIT_SRC_DIR") echo "Cloning Sleuthkit to $TSK_REPO_PATH..." mkdir -p $TSK_REPO_PATH &&