rpms/sleuthkit/F-9 sleuthkit.spec, NONE, 1.1 sleuthkit-2.51-system_perl.patch, NONE, 1.1 sleuthkit-2.52-pkgconfig.patch, NONE, 1.1 sleuthkit-2.52-remove_rpath.patch, NONE, 1.1 sources, 1.1, 1.2

Chauvet Nicolas (kwizart) fedora-extras-commits at redhat.com
Tue Jul 29 12:04:35 UTC 2008


Author: kwizart

Update of /cvs/pkgs/rpms/sleuthkit/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20779

Modified Files:
	sources 
Added Files:
	sleuthkit.spec sleuthkit-2.51-system_perl.patch 
	sleuthkit-2.52-pkgconfig.patch 
	sleuthkit-2.52-remove_rpath.patch 
Log Message:
Initial import for F-9



--- NEW FILE sleuthkit.spec ---
# Could be part of http://fedoraproject.org/wiki/LukeMacken/SecurityLiveCD

Name:           sleuthkit
Version:        2.52
Release:        1%{?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:         sleuthkit-2.52-remove_rpath.patch
Patch2:         sleuthkit-2.51-system_perl.patch
Patch3:         sleuthkit-2.52-pkgconfig.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libtool

# afflib - BSD with advertising, GPL incompatible
BuildRequires:  afflib-devel
# libewf - Newer versions are plain BSD (older are BSD with advertising)
BuildRequires:  libewf-devel

Requires: %{name}-libs = %{version}-%{release}
Requires: file
Requires: mac-robber

%description
The Sleuth Kit (TSK) is a collection of UNIX-based command line tools that
allow you to investigate a computer. The current focus of the tools is the
file and volume systems and TSK supports FAT, Ext2/3, NTFS, UFS,
and ISO 9660 file systems


%package        libs
Summary:        Library for %{name}
Group:          System Environment/Libraries

%description    libs
The %{name}-libs package contains library for %{name}.


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name}-libs = %{version}-%{release}

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.



%prep
%setup -q
%patch0 -p1 -b .rpath
%patch2 -p1 -b .system_perl
%patch3 -p1 -b .pkgconfig


# re-run autotools
libtoolize  --force
aclocal
autoheader
autoconf
automake


%build
%configure --disable-static

# clean unused-direct-shlib-dependencies
sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool

make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'



%clean
rm -rf $RPM_BUILD_ROOT


%post libs -p /sbin/ldconfig

%postun libs -p /sbin/ldconfig



%files
%defattr(-,root,root,-)
%doc CHANGES.txt README.txt TODO.txt licenses/*
%doc docs/nsrl.txt docs/other.txt docs/skins*.txt docs/ref*.txt
# License is CPL 1.0 exept for some files.
%{_bindir}/dcalc
%{_bindir}/dcat
%{_bindir}/disk_sreset
%{_bindir}/disk_stat
%{_bindir}/dls
%{_bindir}/dstat
%{_bindir}/ffind
%{_bindir}/fls
%{_bindir}/fsstat
%{_bindir}/hfind
%{_bindir}/icat
%{_bindir}/ifind
%{_bindir}/ils
%{_bindir}/img_cat
%{_bindir}/img_stat
%{_bindir}/istat
%{_bindir}/jcat
%{_bindir}/jls
# This file is described as GPL in the doc
# But the license remains CPL in the source.
%{_bindir}/mactime
##
%{_bindir}/mmls
%{_bindir}/mmstat
%{_bindir}/sigfind
%{_bindir}/sorter
## This file is GPLv2+
%{_bindir}/srch_strings
#
%{_mandir}/man1/dcalc.1*
%{_mandir}/man1/dcat.1*
%{_mandir}/man1/disk_sreset.1*
%{_mandir}/man1/disk_stat.1*
%{_mandir}/man1/dls.1*
%{_mandir}/man1/dstat.1*
%{_mandir}/man1/ffind.1*
%{_mandir}/man1/fls.1*
%{_mandir}/man1/fsstat.1*
%{_mandir}/man1/hfind.1*
%{_mandir}/man1/icat.1*
%{_mandir}/man1/ifind.1*
%{_mandir}/man1/ils.1*
%{_mandir}/man1/img_cat.1*
%{_mandir}/man1/img_stat.1*
%{_mandir}/man1/istat.1*
%{_mandir}/man1/jcat.1*
%{_mandir}/man1/jls.1*
%{_mandir}/man1/mactime.1*
%{_mandir}/man1/mmls.1*
%{_mandir}/man1/mmstat.1*
%{_mandir}/man1/sigfind.1*
%{_mandir}/man1/sorter.1*
%dir %{_datadir}/tsk
%{_datadir}/tsk/sorter/

%files libs
%defattr(-,root,root,-)
# CPL and IBM
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%doc docs/library-api.txt
# CPL and IBM
%{_includedir}/tsk/
%{_libdir}/*.so

%changelog
* Tue Jun 17 2008 kwizart < kwizart at gmail.com > - 2.52-1
- Update to 2.52
- Remove merged patches
- Remove clean unused-direct-shlib-dependencies 
- Fix rpath at source.
- Sort license within the spec
- Move configure.ac to pkg-config detection
- Remove Perl-Date-Manip installation

* Tue Mar 18 2008 kwizart < kwizart at gmail.com > - 2.51-1
- Update to 2.51
- Add libewf/afflib BR
- Requires mac-robber external package.
- Remove internal perl-Date-Manip.

* Fri Dec 28 2007 kwizart < kwizart at gmail.com > - 2.10-1
- Update to 2.10

* Mon Oct 29 2007 kwizart < kwizart at gmail.com > - 2.09-1
- Initial package for Fedora 
  (inspired from Oden Eriksson mdk spec).



sleuthkit-2.51-system_perl.patch:

--- NEW FILE sleuthkit-2.51-system_perl.patch ---
diff -up sleuthkit-2.51/tools/timeline/Makefile.am.system_perl sleuthkit-2.51/tools/timeline/Makefile.am
--- sleuthkit-2.51/tools/timeline/Makefile.am.system_perl	2007-12-18 23:43:33.000000000 +0100
+++ sleuthkit-2.51/tools/timeline/Makefile.am	2008-03-18 15:14:34.000000000 +0100
@@ -4,7 +4,6 @@ EXTRA_DIST = mactime.base .perltidyrc
 
 mactime: mactime.base Makefile
 	@echo "#!$(PERL) -w" > mactime
-	@echo "use lib '$(datadir)/tsk/lib';" >> mactime
 	@echo "my \$$VER=\"$(VERSION)\";" >> mactime 
 	@cat mactime.base >> mactime
 	@chmod +x mactime 
diff -up sleuthkit-2.52/Makefile.am.rm_Date-Manip sleuthkit-2.52/Makefile.am
--- sleuthkit-2.52/Makefile.am.rm_Date-Manip	2008-06-17 12:02:54.000000000 +0200
+++ sleuthkit-2.52/Makefile.am	2008-06-17 12:03:01.000000000 +0200
@@ -35,8 +35,7 @@ nobase_include_HEADERS = tsk/libtsk.h ts
 
 nobase_dist_data_DATA = tsk/sorter/default.sort tsk/sorter/freebsd.sort \
     tsk/sorter/images.sort tsk/sorter/linux.sort tsk/sorter/openbsd.sort \
-    tsk/sorter/solaris.sort tsk/sorter/windows.sort \
-    tsk/lib/Date/Manip.pm tsk/lib/Date/Manip.pod
+    tsk/sorter/solaris.sort tsk/sorter/windows.sort
 
 api-docs:
 	doxygen config/Doxyfile

sleuthkit-2.52-pkgconfig.patch:

--- NEW FILE sleuthkit-2.52-pkgconfig.patch ---
diff -up sleuthkit-2.52/tsk/img/aff.h.pkgconfig sleuthkit-2.52/tsk/img/aff.h
--- sleuthkit-2.52/tsk/img/aff.h.pkgconfig	2008-03-25 00:05:23.000000000 +0100
+++ sleuthkit-2.52/tsk/img/aff.h	2008-06-17 17:28:15.000000000 +0200
@@ -16,8 +16,9 @@
 
 #if HAVE_LIBAFFLIB
 
-#include <afflib/afflib.h>
-#include <afflib/afflib_i.h>
+#include <afflib.h>
+#include <afflib_i.h>
+
 
 extern TSK_IMG_INFO *aff_open(const char **, TSK_IMG_INFO *);
 
diff -up sleuthkit-2.52/tsk/img/Makefile.am.pkgconfig sleuthkit-2.52/tsk/img/Makefile.am
--- sleuthkit-2.52/tsk/img/Makefile.am.pkgconfig	2008-01-29 05:34:27.000000000 +0100
+++ sleuthkit-2.52/tsk/img/Makefile.am	2008-06-17 17:34:05.000000000 +0200
@@ -4,6 +4,8 @@ EXTRA_DIST = .indent.pro DESIGN.txt
 noinst_LTLIBRARIES = libtskimg.la
 libtskimg_la_SOURCES = img_open.c img_types.c raw.c raw.h \
     split.c split.h aff.c aff.h ewf.c ewf.h tsk_img_i.h
+libtskimg_la_LIBADD = $(LIBEWF_LIBS) $(AFFLIB_LIBS)
+libtskimg_la_CFLAGS = $(AM_CFLAGS) $(LIBEWF_CFLAGS) $(AFFLIB_CFLAGS)
 
 indent:
 	indent *.c *.h
diff -up sleuthkit-2.52/tsk/Makefile.am.pkgconfig sleuthkit-2.52/tsk/Makefile.am
--- sleuthkit-2.52/tsk/Makefile.am.pkgconfig	2008-04-05 20:37:18.000000000 +0200
+++ sleuthkit-2.52/tsk/Makefile.am	2008-06-17 17:28:15.000000000 +0200
@@ -5,8 +5,9 @@ SUBDIRS = base img vs fs hashdb
 lib_LTLIBRARIES = libtsk.la
 libtsk_la_SOURCES =
 libtsk_la_LIBADD = base/libtskbase.la img/libtskimg.la \
-    vs/libtskvs.la fs/libtskfs.la hashdb/libtskhashdb.la
+	vs/libtskvs.la fs/libtskfs.la hashdb/libtskhashdb.la
+
 # current:revision:age
-libtsk_la_LDFLAGS = -version-info 1:2:0
+libtsk_la_LDFLAGS =  -no-undefined -version-info 1:2:0
 
 EXTRA_DIST = tsk_tools_i.h
diff -up sleuthkit-2.52/configure.ac.pkgconfig sleuthkit-2.52/configure.ac
--- sleuthkit-2.52/configure.ac.pkgconfig	2008-06-17 17:28:15.000000000 +0200
+++ sleuthkit-2.52/configure.ac	2008-06-17 17:28:15.000000000 +0200
@@ -74,36 +74,27 @@ AC_CHECK_HEADERS([linux/hdreg.h],
 
 # AC_ARG_ENABLE to see if they disabled it (disable-afflib)
 AC_ARG_ENABLE(afflib, 
-        [  --disable-afflib  Do not use AFFLIB even if it is installed],
-# Action if they gave this argument
-        [ if test "x$enableval" = "xyes" ; then
-            AC_CHECK_LIB([afflib], [af_open])
-          elif test "x$enableval" = "xno" ; then
-            echo "Ignoring AFFLIB."
-          else
-            echo "Error: Unknown enable-afflib argument."
-            exit -1
-          fi
-        ],
-# if they did not specify aff, look for it
-        [AC_CHECK_LIB([afflib], [af_open])]
-        )
+        [  --disable-afflib  Do not use AFFLIB even if it is installed])
+# Check via pkg-config unless explicitely disabled.
+if test "x$enable_afflib" != "xno" ; then
+    PKG_CHECK_MODULES([AFFLIB], [afflib >= 3.0.0],
+        [AC_DEFINE(HAVE_LIBAFFLIB, [1], [Define to 1 if you have the `afflib' library (-lafflib)])]
+    )
+else
+    echo "Ignoring AFFLIB."
+fi
+
 
 AC_ARG_ENABLE(ewf, 
-        [  --disable-ewf  Do not use libewf even if it is installed],
-# Action if they gave this argument
-        [ if test "x$enableval" = "xyes" ; then
-            AC_CHECK_LIB([ewf], [libewf_open])
-          elif test "x$enableval" = "xno" ; then
-            echo "Ignoring LibEWF."
-          else
-            echo "Error: Unknown enable-ewf argument."
-            exit -1
-          fi
-        ],
-# if they did not specify ewf, look for it
-        [AC_CHECK_LIB([ewf], [libewf_open])]
-        )
+        [  --disable-ewf  Do not use libewf even if it is installed])
+# Check via pkg-config unless explicitely disabled.
+if test "x$enable_ewf" != "xno" ; then
+    PKG_CHECK_MODULES([LIBEWF], [libewf >= 20080322],
+        [AC_DEFINE(HAVE_LIBEWF, [1], [Define to 1 if you have the `libewf' library (-lewf)])]
+    )
+else
+    echo "Ignoring LibEWF."
+fi
 
 
 AC_CONFIG_COMMANDS([tsk/tsk_incs.h],

sleuthkit-2.52-remove_rpath.patch:

--- NEW FILE sleuthkit-2.52-remove_rpath.patch ---
diff -up sleuthkit-2.52/configure.ac.rpath sleuthkit-2.52/configure.ac
--- sleuthkit-2.52/configure.ac.rpath	2008-04-10 02:33:59.000000000 +0200
+++ sleuthkit-2.52/configure.ac	2008-06-17 11:17:02.000000000 +0200
@@ -63,12 +63,6 @@ AC_FUNC_UTIME_NULL
 AC_FUNC_VPRINTF
 #AC_CHECK_FUNCS([dup2 gethostname isascii iswprint memset munmap regcomp select setlocale strcasecmp strchr strdup strerror strndup strrchr strtol strtoul strtoull utime wcwidth])
 
-# Not all compilers include /usr/local in the include and link path
-if test -d /usr/local/include; then
-    CFLAGS="$CFLAGS -I/usr/local/include"
-    LDFLAGS="$LDFLAGS -L/usr/local/lib"
-fi
-
 # This is used by disktools
 AC_CHECK_HEADERS([linux/hdreg.h],
         [AC_CHECK_TYPE(ide_task_request_t, 
diff -up sleuthkit-2.52/tools/srchtools/Makefile.am.rpath sleuthkit-2.52/tools/srchtools/Makefile.am
--- sleuthkit-2.52/tools/srchtools/Makefile.am.rpath	2008-03-24 22:44:13.000000000 +0100
+++ sleuthkit-2.52/tools/srchtools/Makefile.am	2008-06-17 11:34:22.000000000 +0200
@@ -3,10 +3,11 @@ EXTRA_DIST = .indent.pro
 AM_CPPFLAGS = -I../.. -Wall
 
 srch_strings_SOURCES = srch_strings.c
+srch_strings_LDADD =
 
 sigfind_SOURCES = sigfind.cpp 
 sigfind_LDADD = ../../tsk/libtsk.la
-sigfind_LDFLAGS = -static
+
 
 indent:
 	indent *.c *.cpp
diff -up sleuthkit-2.52/tools/imgtools/Makefile.am.rpath sleuthkit-2.52/tools/imgtools/Makefile.am
--- sleuthkit-2.52/tools/imgtools/Makefile.am.rpath	2008-03-24 22:29:58.000000000 +0100
+++ sleuthkit-2.52/tools/imgtools/Makefile.am	2008-06-17 11:17:02.000000000 +0200
@@ -1,6 +1,6 @@
 AM_CPPFLAGS = -I../.. -Wall
 LDADD = ../../tsk/libtsk.la
-LDFLAGS = -static
+
 EXTRA_DIST = .indent.pro
 
 bin_PROGRAMS = img_cat img_stat
diff -up sleuthkit-2.52/tools/fstools/Makefile.am.rpath sleuthkit-2.52/tools/fstools/Makefile.am
--- sleuthkit-2.52/tools/fstools/Makefile.am.rpath	2008-03-24 22:29:33.000000000 +0100
+++ sleuthkit-2.52/tools/fstools/Makefile.am	2008-06-17 11:17:02.000000000 +0200
@@ -1,6 +1,6 @@
 AM_CPPFLAGS = -I../.. -Wall 
 LDADD = ../../tsk/libtsk.la
-LDFLAGS = -static
+
 EXTRA_DIST = .indent.pro fscheck.cpp
 
 bin_PROGRAMS = dcalc dcat dls dstat ffind fls fsstat icat ifind ils \
diff -up sleuthkit-2.52/tools/vstools/Makefile.am.rpath sleuthkit-2.52/tools/vstools/Makefile.am
--- sleuthkit-2.52/tools/vstools/Makefile.am.rpath	2008-03-24 22:31:06.000000000 +0100
+++ sleuthkit-2.52/tools/vstools/Makefile.am	2008-06-17 11:17:02.000000000 +0200
@@ -1,6 +1,6 @@
 AM_CPPFLAGS = -I../.. -Wall 
 LDADD = ../../tsk/libtsk.la
-LDFLAGS = -static
+
 EXTRA_DIST = .indent.pro
 
 bin_PROGRAMS = mmls mmstat 
diff -up sleuthkit-2.52/tools/hashtools/Makefile.am.rpath sleuthkit-2.52/tools/hashtools/Makefile.am
--- sleuthkit-2.52/tools/hashtools/Makefile.am.rpath	2008-03-24 22:29:50.000000000 +0100
+++ sleuthkit-2.52/tools/hashtools/Makefile.am	2008-06-17 11:17:02.000000000 +0200
@@ -1,6 +1,6 @@
 AM_CPPFLAGS = -I../.. -Wall 
 LDADD = ../../tsk/libtsk.la
-LDFLAGS = -static
+
 EXTRA_DIST = .indent.pro md5.c sha1.c
 
 bin_PROGRAMS = hfind
diff -up sleuthkit-2.52/tools/disktools/Makefile.am.rpath sleuthkit-2.52/tools/disktools/Makefile.am
--- sleuthkit-2.52/tools/disktools/Makefile.am.rpath	2008-03-24 22:28:49.000000000 +0100
+++ sleuthkit-2.52/tools/disktools/Makefile.am	2008-06-17 11:17:02.000000000 +0200
@@ -1,6 +1,6 @@
 AM_CPPFLAGS = -I../.. -Wall
 LDADD = ../../tsk/libtsk.la
-LDFLAGS = -static
+
 EXTRA_DIST = .indent.pro
 
 bin_PROGRAMS = disk_stat disk_sreset


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sleuthkit/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Jul 2008 19:40:57 -0000	1.1
+++ sources	29 Jul 2008 12:04:05 -0000	1.2
@@ -0,0 +1 @@
+3f93bc77901ef40b8b3f2a7e482214a5  sleuthkit-2.52.tar.gz




More information about the fedora-extras-commits mailing list