OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Torsten Homeyer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 27-Oct-2005 15:20:23
Branch: HEAD Handle: 2005102714202300
Modified files:
openpkg-src/sleuthkit sleuthkit.patch sleuthkit.spec
Log:
updated version, fixed linkage of included file program + install of
magic files, fixed dependencies, still work left: file command does
not find its magic file
Summary:
Revision Changes Path
1.11 +28 -19 openpkg-src/sleuthkit/sleuthkit.patch
1.24 +6 -3 openpkg-src/sleuthkit/sleuthkit.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/sleuthkit/sleuthkit.patch
============================================================================
$ cvs diff -u -r1.10 -r1.11 sleuthkit.patch
--- openpkg-src/sleuthkit/sleuthkit.patch 7 Jul 2005 11:46:04 -0000
1.10
+++ openpkg-src/sleuthkit/sleuthkit.patch 27 Oct 2005 13:20:23 -0000
1.11
@@ -5,14 +5,14 @@
compile-static: no-perl-static mactime sorter file test
no-perl:
-- cd src/misc; make "CC=$(CC)" MAKELEVEL=
+- cd src/auxtools; make "CC=$(CC)" MAKELEVEL=
- cd src/imgtools; make "CC=$(CC)" MAKELEVEL=
- cd src/hashtools; make "CC=$(CC)" MAKELEVEL=
- cd src/fstools; make "CC=$(CC)" MAKELEVEL=
- cd src/mmtools; make "CC=$(CC)" MAKELEVEL=
- cd src/srchtools; make "CC=$(CC)" MAKELEVEL=
- cd src/disktools; make "CC=$(CC)" MAKELEVEL=
-+ cd src/misc; make "CC=$(CC)" OPT=-O MAKELEVEL=
++ cd src/auxtools; make "CC=$(CC)" OPT=-O MAKELEVEL=
+ cd src/imgtools; make "CC=$(CC)" OPT=-O MAKELEVEL=
+ cd src/hashtools; make "CC=$(CC)" OPT=-O MAKELEVEL=
+ cd src/fstools; make "CC=$(CC)" OPT=-O MAKELEVEL=
@@ -21,20 +21,29 @@
+ cd src/disktools; make "CC=$(CC)" OPT=-O MAKELEVEL=
no-perl-static:
- cd src/misc; make "CC=$(CC)" OPT=-static MAKELEVEL=
-@@ -40,7 +40,6 @@
- cd src/timeline; make
-
- file:
-- cd src/file; CC="$(CC)" sh ./TSK.install
-
- test:
- sh ./check-install
-Index: src/file/magic/Magdir/msdos
---- src/file/magic/Magdir/msdos.orig 2005-04-08 22:10:03 +0200
-+++ src/file/magic/Magdir/msdos 2005-07-07 13:40:59 +0200
-@@ -403,4 +403,3 @@
- # as below. Unfortunately the following only prints out the first couple
- # of characters instead of all the "description length"
- # number of characters -- indicated by the ulelong at offset 60.
-->>(64.l) lestring16 >0 Description: %15.15s
+ cd src/auxtools; make "CC=$(CC)" OPT=-static MAKELEVEL=
+Index: TSK.install
+--- src/file/TSK.install.orig 2005-10-13 19:26:28 +0200
++++ src/file/TSK.install 2005-10-27 10:51:26 +0200
+@@ -8,17 +8,11 @@
+ if (test -f './Makefile') then
+ true
+ else
+- if [ "x${CC}" = "x" ]; then
+- ./configure \
+- --prefix=`cd ../..; pwd` \
+- --exec-prefix=`cd ../..; pwd` \
++ ./configure \
++ --prefix=`cd ../..; pwd` \
++ --exec-prefix=`cd ../..; pwd` \
++ --disable-shared \
+ || exit $?
+- else
+- CC="${CC}" ./configure \
+- --prefix=`cd ../..; pwd` \
+- --exec-prefix=`cd ../..; pwd` \
+- || exit $?
+- fi
+ fi
+ make
+ make install
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sleuthkit/sleuthkit.spec
============================================================================
$ cvs diff -u -r1.23 -r1.24 sleuthkit.spec
--- openpkg-src/sleuthkit/sleuthkit.spec 9 Jul 2005 06:55:38 -0000
1.23
+++ openpkg-src/sleuthkit/sleuthkit.spec 27 Oct 2005 13:20:23 -0000
1.24
@@ -32,8 +32,8 @@
Class: PLUS
Group: System
License: GPL
-Version: 2.02
-Release: 20050709
+Version: 2.03
+Release: 20051027
# list of sources
Source0:
http://osdn.dl.sourceforge.net/sleuthkit/sleuthkit-%{version}.tar.gz
@@ -43,7 +43,7 @@
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, perl, perl-time
-PreReq: OpenPKG, openpkg >= 20040130, perl, perl-time, file
+PreReq: OpenPKG, openpkg >= 20040130, perl, perl-time
AutoReq: no
AutoReqProv: no
@@ -99,6 +99,7 @@
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/bin \
$RPM_BUILD_ROOT%{l_prefix}/man/man1 \
+ $RPM_BUILD_ROOT%{l_prefix}/share/sleuthkit/file \
$RPM_BUILD_ROOT%{l_prefix}/share/sleuthkit/sorter
%{l_shtool} install -c -m 755 \
bin/* $RPM_BUILD_ROOT%{l_prefix}/bin/
@@ -106,6 +107,8 @@
man/man1/*.1 $RPM_BUILD_ROOT%{l_prefix}/man/man1/
%{l_shtool} install -c -m 644 \
share/sorter/* $RPM_BUILD_ROOT%{l_prefix}/share/sleuthkit/sorter/
+ %{l_shtool} install -c -m 644 \
+ share/file/* $RPM_BUILD_ROOT%{l_prefix}/share/sleuthkit/file/
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
