From 41ed4f0a121e6fb6fe6b1fb533710249bb4d16bd Mon Sep 17 00:00:00 2001 From: Greg DiCristofaro Date: Tue, 28 May 2024 15:19:08 -0400 Subject: [PATCH 1/7] app name used in tempdir --- Core/src/org/sleuthkit/autopsy/core/Installer.java | 5 +++-- thirdparty/pasco2/.project | 11 +++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) 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/thirdparty/pasco2/.project b/thirdparty/pasco2/.project index 454c782dbe..17a0007916 100644 --- a/thirdparty/pasco2/.project +++ b/thirdparty/pasco2/.project @@ -21,6 +21,17 @@ C:/Development/42six/trunk/thirdparty/pasco2/lib + + + 1715884364848 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + BIN_DIR From 2e2bd209bdb905ebbff68b99629dc661b4cf2547 Mon Sep 17 00:00:00 2001 From: Greg DiCristofaro Date: Tue, 28 May 2024 15:21:07 -0400 Subject: [PATCH 2/7] revert unnecessary change --- thirdparty/pasco2/.project | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/thirdparty/pasco2/.project b/thirdparty/pasco2/.project index 17a0007916..454c782dbe 100644 --- a/thirdparty/pasco2/.project +++ b/thirdparty/pasco2/.project @@ -21,17 +21,6 @@ C:/Development/42six/trunk/thirdparty/pasco2/lib - - - 1715884364848 - - 30 - - org.eclipse.core.resources.regexFilterMatcher - node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ - - - BIN_DIR From 9d46c310b046563cbabe70c1cb75948aa810c5d0 Mon Sep 17 00:00:00 2001 From: "eugene.livis" Date: Tue, 2 Jul 2024 12:51:27 -0400 Subject: [PATCH 3/7] Upgraded SQLite version --- Core/build.xml | 4 ++-- Core/nbproject/project.xml | 4 ++-- ImageGallery/nbproject/project.xml | 4 ++-- RecentActivity/nbproject/project.xml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) 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/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.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 From 841ab81cb1422ecf79328f713ab67f84c667a454 Mon Sep 17 00:00:00 2001 From: Greg DiCristofaro Date: Fri, 5 Jul 2024 06:56:22 -0400 Subject: [PATCH 4/7] upgrade for sqlite --- Core/nbproject/project.properties | 2 +- ImageGallery/nbproject/project.properties | 2 +- RecentActivity/nbproject/project.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Core/nbproject/project.properties b/Core/nbproject/project.properties index 1109aa35f7..984105254c 100644 --- a/Core/nbproject/project.properties +++ b/Core/nbproject/project.properties @@ -91,7 +91,7 @@ file.reference.slf4j-api-1.7.36.jar=release/modules/ext/slf4j-api-1.7.36.jar file.reference.snakeyaml-2.0.jar=release/modules/ext/snakeyaml-2.0.jar file.reference.SparseBitSet-1.1.jar=release/modules/ext/SparseBitSet-1.1.jar file.reference.spotbugs-annotations-4.6.0.jar=release/modules/ext/spotbugs-annotations-4.6.0.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 file.reference.txw2-2.3.3.jar=release/modules/ext/txw2-2.3.3.jar file.reference.xalan-2.7.2.jar=release/modules/ext/xalan-2.7.2.jar file.reference.xml-apis-1.4.01.jar=release/modules/ext/xml-apis-1.4.01.jar 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/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/ From 0a62fbbaca48e3bae177bf57745451f331eebffd Mon Sep 17 00:00:00 2001 From: Brian Carrier Date: Mon, 8 Jul 2024 17:12:36 -0400 Subject: [PATCH 5/7] Update footer.html --- docs/doxygen-user/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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.

From 4eeeb5c1af82889cfcb6bf0be67265a679a236ee Mon Sep 17 00:00:00 2001 From: Brian Carrier Date: Mon, 8 Jul 2024 17:13:07 -0400 Subject: [PATCH 6/7] Update footer.html --- docs/doxygen-dev/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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.

From f996320a1c54d5d444b91dfcb1657009756130d7 Mon Sep 17 00:00:00 2001 From: Brian Carrier Date: Mon, 8 Jul 2024 17:13:34 -0400 Subject: [PATCH 7/7] Update footer.html --- docs/doxygen/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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.