upgrading package: sleuthkit 1.68 -> 1.69

sleuthkit/sleuthkit.patch

@@ -0,0 +1,45 @@
+--- src/file/config.h.in.orig    2004-03-24 08:47:38.000000000 +0100
++++ src/file/config.h.in 2004-03-24 08:51:39.000000000 +0100
+@@ -200,3 +200,9 @@
+ 
+ /* Define to `unsigned' if <sys/types.h> does not define. */
+ #undef size_t
++
++/* Define to 1 if you have the `mbrtowc' function. */
++#undef HAVE_MBRTOWC
++
++/* Define to 1 if you have the `wcwidth' function. */
++#undef HAVE_WCWIDTH
+--- src/file/configure.in.orig   2004-03-24 08:35:36.000000000 +0100
++++ src/file/configure.in        2004-03-24 08:36:13.000000000 +0100
+@@ -97,7 +97,7 @@
+ AC_CHECK_SIZEOF_STDC_HEADERS(uint64_t, 0)
+ 
+ dnl Checks for functions
+-AC_CHECK_FUNCS(mmap strerror strtoul mkstemp getopt_long utimes utime)
++AC_CHECK_FUNCS(mmap strerror strtoul mkstemp getopt_long utimes utime mbrtowc wcwidth)
+ 
+ dnl Checks for libraries
+ AC_CHECK_LIB(z,gzopen)
+--- src/file/configure.orig	2004-03-24 09:42:17.000000000 +0100
++++ src/file/configure	2004-03-24 09:42:44.000000000 +0100
+@@ -7612,7 +7612,7 @@
+ 
+ 
+ 
+-for ac_func in mmap strerror strtoul mkstemp getopt_long utimes utime
++for ac_func in mmap strerror strtoul mkstemp getopt_long utimes utime mbrtowc wcwidth
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ echo "$as_me:$LINENO: checking for $ac_func" >&5
+--- src/file/src/file.c.orig	2004-03-24 09:22:13.000000000 +0100
++++ src/file/src/file.c	2004-03-24 09:22:48.000000000 +0100
+@@ -453,7 +453,7 @@
+ size_t
+ file_mbswidth(const char *s)
+ {
+-#ifdef HAVE_WCHAR_H
++#if (defined(HAVE_WCHAR_H) && defined (HAVE_MBRTOWC) && defined (HAVE_WCWIDTH))
+ 	size_t bytesconsumed, old_n, n, width = 0;
+ 	mbstate_t state;
+ 	wchar_t nextchar;

sleuthkit/sleuthkit.spec

@@ -33,11 +33,12 @@ Distribution: OpenPKG
 Class:        PLUS
 Group:        System
 License:      GPL
-Version:      1.68
-Release:      20040301
+Version:      1.69
+Release:      20040421
 
 #   list of sources
 Source0:      http://osdn.dl.sourceforge.net/sleuthkit/sleuthkit-%{version}.tar.gz
+Patch0:       sleuthkit.patch
 
 #   build information
 Prefix:       %{l_prefix}
@@ -72,10 +73,17 @@ AutoReqProv:  no
 
 %prep
     %setup -q
+    %patch -p0
     %{l_shtool} subst \
         -e 's;/usr/local/bin/;%{l_prefix}/bin/;' \
         -e 's;read perlexe;exit 1;' \
         src/sorter/install src/timeline/config-perl
+    %{l_shtool} subst \
+        -e 's;ACLOCAL=aclocal;ACLOCAL=true;' \
+        -e 's;AUTOCONF=autoconf;AUTOCONF=true;' \
+        -e 's;AUTOMAKE=automake;AUTOMAKE=true;' \
+        -e 's;AUTOHEADER=autoheader;AUTOHEADER=true;' \
+        src/file/configure
 
 %build
     #   build programs