diff --git a/sleuthkit-4.2.0-system-sqlite.patch b/sleuthkit-4.2.0-system-sqlite.patch deleted file mode 100644 index 443f99a..0000000 --- a/sleuthkit-4.2.0-system-sqlite.patch +++ /dev/null @@ -1,83 +0,0 @@ -diff -up sleuthkit-4.2.0/framework/tsk/framework/services/TskImgDBSqlite.h.system-sqlite sleuthkit-4.2.0/framework/tsk/framework/services/TskImgDBSqlite.h ---- sleuthkit-4.2.0/framework/tsk/framework/services/TskImgDBSqlite.h.system-sqlite 2015-09-16 19:07:12.000000000 +0200 -+++ sleuthkit-4.2.0/framework/tsk/framework/services/TskImgDBSqlite.h 2015-09-16 19:07:12.000000000 +0200 -@@ -27,7 +27,7 @@ using namespace std; - #include "TskBlackboardAttribute.h" - - #include "tsk/libtsk.h" --#include "tsk/auto/sqlite3.h" -+#include - - /** - * Implementation of TskImgDB that uses SQLite to store the data. -diff -up sleuthkit-4.2.0/Makefile.am.system-sqlite sleuthkit-4.2.0/Makefile.am ---- sleuthkit-4.2.0/Makefile.am.system-sqlite 2015-09-16 19:07:11.000000000 +0200 -+++ sleuthkit-4.2.0/Makefile.am 2015-09-16 19:07:11.000000000 +0200 -@@ -79,7 +79,7 @@ nobase_include_HEADERS = tsk/libtsk.h ts - tsk/fs/tsk_fs.h tsk/fs/tsk_ffs.h tsk/fs/tsk_ext2fs.h tsk/fs/tsk_fatfs.h \ - tsk/fs/tsk_ntfs.h tsk/fs/tsk_iso9660.h tsk/fs/tsk_hfs.h tsk/fs/tsk_yaffs.h \ - tsk/fs/tsk_exfatfs.h tsk/fs/tsk_fatxxfs.h \ -- tsk/hashdb/tsk_hashdb.h tsk/auto/tsk_auto.h tsk/auto/sqlite3.h -+ tsk/hashdb/tsk_hashdb.h tsk/auto/tsk_auto.h - - nobase_dist_data_DATA = tsk/sorter/default.sort tsk/sorter/freebsd.sort \ - tsk/sorter/images.sort tsk/sorter/linux.sort tsk/sorter/openbsd.sort \ -diff -up sleuthkit-4.2.0/Makefile.in.system-sqlite sleuthkit-4.2.0/Makefile.in ---- sleuthkit-4.2.0/Makefile.in.system-sqlite 2015-09-16 19:54:06.000000000 +0200 -+++ sleuthkit-4.2.0/Makefile.in 2015-09-16 19:54:06.000000000 +0200 -@@ -457,7 +457,7 @@ nobase_include_HEADERS = tsk/libtsk.h ts - tsk/fs/tsk_fs.h tsk/fs/tsk_ffs.h tsk/fs/tsk_ext2fs.h tsk/fs/tsk_fatfs.h \ - tsk/fs/tsk_ntfs.h tsk/fs/tsk_iso9660.h tsk/fs/tsk_hfs.h tsk/fs/tsk_yaffs.h \ - tsk/fs/tsk_exfatfs.h tsk/fs/tsk_fatxxfs.h \ -- tsk/hashdb/tsk_hashdb.h tsk/auto/tsk_auto.h tsk/auto/sqlite3.h -+ tsk/hashdb/tsk_hashdb.h tsk/auto/tsk_auto.h - - nobase_dist_data_DATA = tsk/sorter/default.sort tsk/sorter/freebsd.sort \ - tsk/sorter/images.sort tsk/sorter/linux.sort tsk/sorter/openbsd.sort \ -diff -up sleuthkit-4.2.0/tsk/auto/Makefile.am.system-sqlite sleuthkit-4.2.0/tsk/auto/Makefile.am ---- sleuthkit-4.2.0/tsk/auto/Makefile.am.system-sqlite 2015-09-16 19:07:12.000000000 +0200 -+++ sleuthkit-4.2.0/tsk/auto/Makefile.am 2015-09-16 19:07:12.000000000 +0200 -@@ -3,7 +3,8 @@ EXTRA_DIST = .indent.pro - - noinst_LTLIBRARIES = libtskauto.la - # Note that the .h files are in the top-level Makefile --libtskauto_la_SOURCES = auto.cpp tsk_auto_i.h auto_db.cpp sqlite3.c sqlite3.h db_sqlite.cpp tsk_db_sqlite.h case_db.cpp tsk_case_db.h -+libtskauto_la_SOURCES = auto.cpp tsk_auto_i.h auto_db.cpp db_sqlite.cpp tsk_db_sqlite.h case_db.cpp tsk_case_db.h -+libtskauto_la_LIBADD = -lsqlite3 - - indent: - indent *.cpp *.h -diff -up sleuthkit-4.2.0/tsk/auto/Makefile.in.system-sqlite sleuthkit-4.2.0/tsk/auto/Makefile.in ---- sleuthkit-4.2.0/tsk/auto/Makefile.in.system-sqlite 2015-09-16 19:54:08.000000000 +0200 -+++ sleuthkit-4.2.0/tsk/auto/Makefile.in 2015-09-16 19:54:08.000000000 +0200 -@@ -106,7 +106,7 @@ CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = - LTLIBRARIES = $(noinst_LTLIBRARIES) - libtskauto_la_LIBADD = --am_libtskauto_la_OBJECTS = auto.lo auto_db.lo sqlite3.lo db_sqlite.lo \ -+am_libtskauto_la_OBJECTS = auto.lo auto_db.lo db_sqlite.lo \ - case_db.lo - libtskauto_la_OBJECTS = $(am_libtskauto_la_OBJECTS) - AM_V_lt = $(am__v_lt_@AM_V@) -@@ -335,7 +335,8 @@ AM_CPPFLAGS = -I../.. -I$(srcdir)/../.. - EXTRA_DIST = .indent.pro - noinst_LTLIBRARIES = libtskauto.la - # Note that the .h files are in the top-level Makefile --libtskauto_la_SOURCES = auto.cpp tsk_auto_i.h auto_db.cpp sqlite3.c sqlite3.h db_sqlite.cpp tsk_db_sqlite.h case_db.cpp tsk_case_db.h -+libtskauto_la_SOURCES = auto.cpp tsk_auto_i.h auto_db.cpp db_sqlite.cpp tsk_db_sqlite.h case_db.cpp tsk_case_db.h -+libtskauto_la_LIBADD = -lsqlite3 - all: all-am - - .SUFFIXES: -diff -up sleuthkit-4.2.0/tsk/hashdb/tsk_hashdb.h.system-sqlite sleuthkit-4.2.0/tsk/hashdb/tsk_hashdb.h ---- sleuthkit-4.2.0/tsk/hashdb/tsk_hashdb.h.system-sqlite 2015-09-16 19:07:12.000000000 +0200 -+++ sleuthkit-4.2.0/tsk/hashdb/tsk_hashdb.h 2015-09-16 19:07:12.000000000 +0200 -@@ -17,7 +17,7 @@ - * \defgroup hashdblib_cpp C++ Hash Database Classes - */ - --#include "tsk/auto/sqlite3.h" -+#include - - #ifndef _TSK_HDB_H - #define _TSK_HDB_H diff --git a/sleuthkit.spec b/sleuthkit.spec index 7935c55..bd289bc 100644 --- a/sleuthkit.spec +++ b/sleuthkit.spec @@ -1,14 +1,13 @@ # Could be part of http://fedoraproject.org/wiki/LukeMacken/SecurityLiveCD Name: sleuthkit -Version: 4.3.0 -Release: 5%{?dist} +Version: 4.5.0 +Release: 1%{?dist} Summary: The Sleuth Kit (TSK) License: CPL and IBM and GPLv2+ URL: http://www.sleuthkit.org Source0: https://github.com/sleuthkit/sleuthkit/releases/download/sleuthkit-%{version}/sleuthkit-%{version}.tar.gz -Patch0: %{name}-4.3.0-system-sqlite.patch #BuildRequires: libtool @@ -55,28 +54,12 @@ The %{name}-devel package contains libraries and header files for developing applications that use %{name}. - %prep %setup -q -n %{name}-%{version} -%patch0 -p1 -b .system-sqlite -for file in $(find . -name "*.system-sqlite"); do - touch -r $file ${file%.system-sqlite} -done -rm tsk/auto/sqlite3.[hc] - - -# re-run autotools -%if 0 -libtoolize --force -aclocal -autoheader -autoconf -automake -%endif %build -export LIBS='-lpthread -ldl' +#export LIBS='-lpthread -ldl' %configure --disable-static \ %{!?_with_java:--disable-java} @@ -84,9 +67,6 @@ export LIBS='-lpthread -ldl' sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -# clean unused-direct-shlib-dependencies -#sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool - %make_build @@ -95,13 +75,11 @@ sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool find %{buildroot} -name '*.la' -exec rm -f {} ';' - %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig - %files %doc ChangeLog.txt NEWS.txt %license licenses/* @@ -143,6 +121,7 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %{_bindir}/tsk_gettimes %{_bindir}/tsk_loaddb %{_bindir}/tsk_recover +%{_bindir}/usnjls # %{_mandir}/man1/blkcalc.1* %{_mandir}/man1/blkcat.1* @@ -173,6 +152,7 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %{_mandir}/man1/tsk_gettimes.1* %{_mandir}/man1/tsk_loaddb.1* %{_mandir}/man1/tsk_recover.1* +%{_mandir}/man1/usnjls.1.* %dir %{_datadir}/tsk %{_datadir}/tsk/sorter/ @@ -187,6 +167,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %changelog +* Mon Jan 08 2018 Nicolas Chauvet - 4.5.0-1 +- Update to 4.5.0 + * Thu Aug 03 2017 Fedora Release Engineering - 4.3.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index 0c6f787..dca8b74 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1e8e4b92e0e08ee0c29b4f9c7d184c98 sleuthkit-4.3.0.tar.gz +SHA512 (sleuthkit-4.5.0.tar.gz) = 911890cacca739f121681514197104cb2dc3bd219f3e068c4ce61264498c56989359976fc75172e1f456c94e4e25c6206413b0234c36e55736a577b8e664e4b3