Attachment 876119 Details for Bug 1077916 – Use system sqlite instead of bundled one

[patch] Use system sqlite instead of bundled one

Use-system-sqlite-instead-of-bundled-one.patch (text/plain), 4.46 KB, created by Ville Skyttä on 2014-03-18 20:05:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Skyttä

Created: 2014-03-18 20:05:19 UTC

Size: 4.46 KB

patch

obsolete

>From 79a5feaf12420059bf2c12cb28e83c3cc779017a Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
>Date: Tue, 18 Mar 2014 22:03:06 +0200
>Subject: [PATCH] Use system sqlite instead of bundled one
>
>https://bugzilla.redhat.com/show_bug.cgi?id=1077916
>---
> sleuthkit-4.1.3-system-sqlite.patch | 43 +++++++++++++++++++++++++++++++++++++
> sleuthkit.spec                      | 12 ++++++++++-
> 2 files changed, 54 insertions(+), 1 deletion(-)
> create mode 100644 sleuthkit-4.1.3-system-sqlite.patch
>
>diff --git a/sleuthkit-4.1.3-system-sqlite.patch b/sleuthkit-4.1.3-system-sqlite.patch
>new file mode 100644
>index 0000000..ab645b4
>--- /dev/null
>+++ b/sleuthkit-4.1.3-system-sqlite.patch
>@@ -0,0 +1,43 @@
>+diff -up sleuthkit-4.1.3/tsk/auto/Makefile.am~ sleuthkit-4.1.3/tsk/auto/Makefile.am
>+--- sleuthkit-4.1.3/tsk/auto/Makefile.am~	2014-01-27 05:27:03.000000000 +0200
>++++ sleuthkit-4.1.3/tsk/auto/Makefile.am	2014-03-18 21:57:46.865459914 +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.1.3/tsk/auto/Makefile.in~ sleuthkit-4.1.3/tsk/auto/Makefile.in
>+--- sleuthkit-4.1.3/tsk/auto/Makefile.in~	2014-01-27 05:27:48.000000000 +0200
>++++ sleuthkit-4.1.3/tsk/auto/Makefile.in	2014-03-18 21:58:00.682745425 +0200
>+@@ -49,7 +49,7 @@ CONFIG_HEADER = $(top_builddir)/tsk/tsk_
>+ CONFIG_CLEAN_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)
>+ DEFAULT_INCLUDES = -I. -I$(top_builddir)/tsk@am__isrc@
>+@@ -211,7 +211,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:
>+@@ -267,7 +268,6 @@ distclean-compile:
>+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auto_db.Plo@am__quote@
>+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/case_db.Plo@am__quote@
>+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/db_sqlite.Plo@am__quote@
>+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sqlite3.Plo@am__quote@
>+ 
>+ .c.o:
>+ @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
>diff --git a/sleuthkit.spec b/sleuthkit.spec
>index 0b32d08..452a639 100644
>--- a/sleuthkit.spec
>+++ b/sleuthkit.spec
>@@ -2,13 +2,14 @@
> 
> Name:           sleuthkit
> Version:        4.1.3
>-Release:        1%{?dist}
>+Release:        2%{?dist}
> Summary:        The Sleuth Kit (TSK)
> 
> Group:          Applications/System
> License:        CPL and IBM and GPLv2+
> URL:            http://www.sleuthkit.org
> Source0:        http://downloads.sourceforge.net/sleuthkit/sleuthkit-%{version}.tar.gz
>+Patch0:         %{name}-4.1.3-system-sqlite.patch
> BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> 
> #BuildRequires:  libtool
>@@ -17,6 +18,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> BuildRequires:  afflib-devel >= 3.3.4
> # libewf - Newer versions are plain BSD (older are BSD with advertising)
> BuildRequires:  libewf-devel
>+BuildRequires:  sqlite-devel
> 
> %{?_with_java:
> BuildRequires:  java-devel >= 1:1.6.0
>@@ -58,6 +60,11 @@ 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 $(basename -s .system-sqlite $file)
>+done
>+rm tsk/auto/sqlite3.[hc]
> 
> 
> # re-run autotools
>@@ -186,6 +193,9 @@ rm -rf $RPM_BUILD_ROOT
> %{_libdir}/*.so
> 
> %changelog
>+* Tue Mar 18 2014 Ville SkyttÃ¤ <ville.skytta@iki.fi> - 4.1.3-2
>+- Use system sqlite instead of bundled one
>+
> * Wed Feb 12 2014 Nicolas Chauvet <kwizart@gmail.com> - 4.1.3-1
> - Update to 4.1.3
> 
>-- 
>1.8.3.1

Actions: View | Diff

Attachments on bug 1077916: 876119