[Forensics-changes] [SCM] debian-forensics/sleuthkit branch, debian, updated. debian/3.1.3-1-28-g7aa2454

Julien Valroff julien at kirya.net
Thu Jun 2 21:02:08 UTC 2011 

The following commit has been merged in the debian branch:
commit 067698f4305dd373296e52d8f949beb609487e0b
Author: Julien Valroff <julien at kirya.net>
Date:   Thu Jun 2 22:12:13 2011 +0200

    Add patch to dynamically link against libsqlite3

diff --git a/debian/changelog b/debian/changelog
index f4b46d2..3953214 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,8 +19,9 @@ sleuthkit (3.2.1-1) unstable; urgency=low
   * Add patch to fix formatting error in the manpages 
   * Update libtsk3-3 symbols file 
   * Suggests Autopsy 
+  * Add patch to dynamically link against libsqlite3 
 
- -- Julien Valroff <julien at debian.org>  Thu, 02 Jun 2011 10:19:06 +0200
+ -- Julien Valroff <julien at debian.org>  Thu, 02 Jun 2011 22:11:24 +0200
 
 sleuthkit (3.1.3-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index feb4c87..b5ceb38 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: admin
 Priority: optional
 Maintainer: Debian Forensics <forensics-devel at lists.alioth.debian.org>
 Uploaders: Christophe Monniez <christophe.monniez at fccu.be>, Julien Valroff <julien at debian.org>
-Build-Depends: debhelper (>= 8.0.0), autoconf, automake, libtool, autotools-dev (>= 20100122.1), libewf-dev (>= 20100226)
+Build-Depends: debhelper (>= 8.0.0), autoconf, automake, libtool, autotools-dev (>= 20100122.1), libewf-dev (>= 20100226), libsqlite3-dev
 Standards-Version: 3.9.2
 Homepage: http://www.sleuthkit.org/sleuthkit/
 Vcs-Browser: http://git.debian.org/?p=forensics/sleuthkit.git
diff --git a/debian/libtsk3-3.symbols b/debian/libtsk3-3.symbols
index fbb27ca..2cb1404 100644
--- a/debian/libtsk3-3.symbols
+++ b/debian/libtsk3-3.symbols
@@ -112,184 +112,6 @@ libtsk3.so.3 libtsk3-3 #MINVER#
  rawfs_open at Base 3.0.1
  raw_open at Base 3.0.1
  split_open at Base 3.0.1
- sqlite3_aggregate_context at Base 3.2.1
- sqlite3_aggregate_count at Base 3.2.1
- sqlite3_auto_extension at Base 3.2.1
- sqlite3_backup_finish at Base 3.2.1
- sqlite3_backup_init at Base 3.2.1
- sqlite3_backup_pagecount at Base 3.2.1
- sqlite3_backup_remaining at Base 3.2.1
- sqlite3_backup_step at Base 3.2.1
- sqlite3_bind_blob at Base 3.2.1
- sqlite3_bind_double at Base 3.2.1
- sqlite3_bind_int64 at Base 3.2.1
- sqlite3_bind_int at Base 3.2.1
- sqlite3_bind_null at Base 3.2.1
- sqlite3_bind_parameter_count at Base 3.2.1
- sqlite3_bind_parameter_index at Base 3.2.1
- sqlite3_bind_parameter_name at Base 3.2.1
- sqlite3_bind_text16 at Base 3.2.1
- sqlite3_bind_text at Base 3.2.1
- sqlite3_bind_value at Base 3.2.1
- sqlite3_bind_zeroblob at Base 3.2.1
- sqlite3_blob_bytes at Base 3.2.1
- sqlite3_blob_close at Base 3.2.1
- sqlite3_blob_open at Base 3.2.1
- sqlite3_blob_read at Base 3.2.1
- sqlite3_blob_write at Base 3.2.1
- sqlite3_busy_handler at Base 3.2.1
- sqlite3_busy_timeout at Base 3.2.1
- sqlite3_changes at Base 3.2.1
- sqlite3_clear_bindings at Base 3.2.1
- sqlite3_close at Base 3.2.1
- sqlite3_collation_needed16 at Base 3.2.1
- sqlite3_collation_needed at Base 3.2.1
- sqlite3_column_blob at Base 3.2.1
- sqlite3_column_bytes16 at Base 3.2.1
- sqlite3_column_bytes at Base 3.2.1
- sqlite3_column_count at Base 3.2.1
- sqlite3_column_decltype16 at Base 3.2.1
- sqlite3_column_decltype at Base 3.2.1
- sqlite3_column_double at Base 3.2.1
- sqlite3_column_int64 at Base 3.2.1
- sqlite3_column_int at Base 3.2.1
- sqlite3_column_name16 at Base 3.2.1
- sqlite3_column_name at Base 3.2.1
- sqlite3_column_text16 at Base 3.2.1
- sqlite3_column_text at Base 3.2.1
- sqlite3_column_type at Base 3.2.1
- sqlite3_column_value at Base 3.2.1
- sqlite3_commit_hook at Base 3.2.1
- sqlite3_compileoption_get at Base 3.2.1
- sqlite3_compileoption_used at Base 3.2.1
- sqlite3_complete16 at Base 3.2.1
- sqlite3_complete at Base 3.2.1
- sqlite3_config at Base 3.2.1
- sqlite3_context_db_handle at Base 3.2.1
- sqlite3_create_collation16 at Base 3.2.1
- sqlite3_create_collation at Base 3.2.1
- sqlite3_create_collation_v2 at Base 3.2.1
- sqlite3_create_function16 at Base 3.2.1
- sqlite3_create_function at Base 3.2.1
- sqlite3_create_module at Base 3.2.1
- sqlite3_create_module_v2 at Base 3.2.1
- sqlite3_data_count at Base 3.2.1
- sqlite3_db_config at Base 3.2.1
- sqlite3_db_handle at Base 3.2.1
- sqlite3_db_mutex at Base 3.2.1
- sqlite3_db_status at Base 3.2.1
- sqlite3_declare_vtab at Base 3.2.1
- sqlite3_enable_load_extension at Base 3.2.1
- sqlite3_enable_shared_cache at Base 3.2.1
- sqlite3_errcode at Base 3.2.1
- sqlite3_errmsg16 at Base 3.2.1
- sqlite3_errmsg at Base 3.2.1
- sqlite3_exec at Base 3.2.1
- sqlite3_expired at Base 3.2.1
- sqlite3_extended_errcode at Base 3.2.1
- sqlite3_extended_result_codes at Base 3.2.1
- sqlite3_file_control at Base 3.2.1
- sqlite3_finalize at Base 3.2.1
- sqlite3_free at Base 3.2.1
- sqlite3_free_table at Base 3.2.1
- sqlite3_get_autocommit at Base 3.2.1
- sqlite3_get_auxdata at Base 3.2.1
- sqlite3_get_table at Base 3.2.1
- sqlite3_global_recover at Base 3.2.1
- sqlite3_initialize at Base 3.2.1
- sqlite3_interrupt at Base 3.2.1
- sqlite3_last_insert_rowid at Base 3.2.1
- sqlite3_libversion at Base 3.2.1
- sqlite3_libversion_number at Base 3.2.1
- sqlite3_limit at Base 3.2.1
- sqlite3_load_extension at Base 3.2.1
- sqlite3_log at Base 3.2.1
- sqlite3_malloc at Base 3.2.1
- sqlite3_memory_alarm at Base 3.2.1
- sqlite3_memory_highwater at Base 3.2.1
- sqlite3_memory_used at Base 3.2.1
- sqlite3_mprintf at Base 3.2.1
- sqlite3_mutex_alloc at Base 3.2.1
- sqlite3_mutex_enter at Base 3.2.1
- sqlite3_mutex_free at Base 3.2.1
- sqlite3_mutex_leave at Base 3.2.1
- sqlite3_mutex_try at Base 3.2.1
- sqlite3_next_stmt at Base 3.2.1
- sqlite3_open16 at Base 3.2.1
- sqlite3_open at Base 3.2.1
- sqlite3_open_v2 at Base 3.2.1
- sqlite3_os_end at Base 3.2.1
- sqlite3_os_init at Base 3.2.1
- sqlite3_overload_function at Base 3.2.1
- sqlite3_prepare16 at Base 3.2.1
- sqlite3_prepare16_v2 at Base 3.2.1
- sqlite3_prepare at Base 3.2.1
- sqlite3_prepare_v2 at Base 3.2.1
- sqlite3_profile at Base 3.2.1
- sqlite3_progress_handler at Base 3.2.1
- sqlite3_randomness at Base 3.2.1
- sqlite3_realloc at Base 3.2.1
- sqlite3_release_memory at Base 3.2.1
- sqlite3_reset at Base 3.2.1
- sqlite3_reset_auto_extension at Base 3.2.1
- sqlite3_result_blob at Base 3.2.1
- sqlite3_result_double at Base 3.2.1
- sqlite3_result_error16 at Base 3.2.1
- sqlite3_result_error at Base 3.2.1
- sqlite3_result_error_code at Base 3.2.1
- sqlite3_result_error_nomem at Base 3.2.1
- sqlite3_result_error_toobig at Base 3.2.1
- sqlite3_result_int64 at Base 3.2.1
- sqlite3_result_int at Base 3.2.1
- sqlite3_result_null at Base 3.2.1
- sqlite3_result_text16 at Base 3.2.1
- sqlite3_result_text16be at Base 3.2.1
- sqlite3_result_text16le at Base 3.2.1
- sqlite3_result_text at Base 3.2.1
- sqlite3_result_value at Base 3.2.1
- sqlite3_result_zeroblob at Base 3.2.1
- sqlite3_rollback_hook at Base 3.2.1
- sqlite3_set_authorizer at Base 3.2.1
- sqlite3_set_auxdata at Base 3.2.1
- sqlite3_shutdown at Base 3.2.1
- sqlite3_sleep at Base 3.2.1
- sqlite3_snprintf at Base 3.2.1
- sqlite3_soft_heap_limit at Base 3.2.1
- sqlite3_sourceid at Base 3.2.1
- sqlite3_sql at Base 3.2.1
- sqlite3_status at Base 3.2.1
- sqlite3_step at Base 3.2.1
- sqlite3_stmt_status at Base 3.2.1
- sqlite3_strnicmp at Base 3.2.1
- sqlite3_temp_directory at Base 3.2.1
- sqlite3_test_control at Base 3.2.1
- sqlite3_thread_cleanup at Base 3.2.1
- sqlite3_threadsafe at Base 3.2.1
- sqlite3_total_changes at Base 3.2.1
- sqlite3_trace at Base 3.2.1
- sqlite3_transfer_bindings at Base 3.2.1
- sqlite3_update_hook at Base 3.2.1
- sqlite3_user_data at Base 3.2.1
- sqlite3_value_blob at Base 3.2.1
- sqlite3_value_bytes16 at Base 3.2.1
- sqlite3_value_bytes at Base 3.2.1
- sqlite3_value_double at Base 3.2.1
- sqlite3_value_int64 at Base 3.2.1
- sqlite3_value_int at Base 3.2.1
- sqlite3_value_numeric_type at Base 3.2.1
- sqlite3_value_text16 at Base 3.2.1
- sqlite3_value_text16be at Base 3.2.1
- sqlite3_value_text16le at Base 3.2.1
- sqlite3_value_text at Base 3.2.1
- sqlite3_value_type at Base 3.2.1
- sqlite3_version at Base 3.2.1
- sqlite3_vfs_find at Base 3.2.1
- sqlite3_vfs_register at Base 3.2.1
- sqlite3_vfs_unregister at Base 3.2.1
- sqlite3_vmprintf at Base 3.2.1
- sqlite3_wal_autocheckpoint at Base 3.2.1
- sqlite3_wal_checkpoint at Base 3.2.1
- sqlite3_wal_hook at Base 3.2.1
  swapfs_open at Base 3.0.1
  tsk_errno at Base 3.0.1
  tsk_error_get at Base 3.0.1
diff --git a/debian/patches/10_link-to-sqlite.diff b/debian/patches/10_link-to-sqlite.diff
new file mode 100644
index 0000000..cb5230b
--- /dev/null
+++ b/debian/patches/10_link-to-sqlite.diff
@@ -0,0 +1,56 @@
+Description: link against libsqlite3 rather than statically linking
+ against the embedded library
+Author: Julien Valroff <julien at debian.org>
+Last-Updated: 2011-06-02
+Forwarded: not-needed
+
+--- a/tsk3/auto/Makefile.am
++++ b/tsk3/auto/Makefile.am
+@@ -3,7 +3,7 @@
+ 
+ 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
++libtskauto_la_SOURCES = auto.cpp tsk_auto_i.h auto_db.cpp
+ 
+ indent:
+ 	indent *.cpp *.h
+--- a/tsk3/auto/Makefile.in
++++ b/tsk3/auto/Makefile.in
+@@ -43,7 +43,7 @@
+ CONFIG_CLEAN_FILES =
+ LTLIBRARIES = $(noinst_LTLIBRARIES)
+ libtskauto_la_LIBADD =
+-am_libtskauto_la_OBJECTS = auto.lo auto_db.lo sqlite3.lo
++am_libtskauto_la_OBJECTS = auto.lo auto_db.lo
+ libtskauto_la_OBJECTS = $(am_libtskauto_la_OBJECTS)
+ DEFAULT_INCLUDES = -I. -I$(top_builddir)/tsk3 at am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+@@ -191,7 +191,7 @@
+ 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
++libtskauto_la_SOURCES = auto.cpp tsk_auto_i.h auto_db.cpp
+ all: all-am
+ 
+ .SUFFIXES:
+@@ -245,7 +245,6 @@
+ 
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/auto.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/auto_db.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/sqlite3.Plo at am__quote@
+ 
+ .c.o:
+ @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+--- a/configure.ac
++++ b/configure.ac
+@@ -129,6 +129,8 @@
+ AC_SEARCH_LIBS(pthread_create, pthread)
+ AC_SEARCH_LIBS(dlopen, dl)
+ 
++LDFLAGS="$LDFLAGS -lsqlite3"
++
+ AC_CONFIG_COMMANDS([tsk3/tsk_incs.h],
+         [
+           echo "#ifndef _TSK_INCS_H" > tsk3/tsk_incs.h
diff --git a/debian/patches/series b/debian/patches/series
index ff68636..7318d01 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+10_link-to-sqlite.diff
 30_fix-manpages.diff
 90_fix_ldflags.diff
 99_no_static_ldflags.diff

-- 
debian-forensics/sleuthkit

More information about the forensics-changes mailing list