[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: Bug#482146: sleuthkit: license issues in older versions



On Tue, May 20, 2008 at 17:55:31 -0700, Matt Taggart wrote:

> Package: sleuthkit
> Version: 2.06-3
> 
> The fedora people discovered that sleuthkit had a license compatibility 
> issue
> 
> https://bugzilla.redhat.com/show_bug.cgi?id=401101
> 
> according to that bug report, it was solved upstream in 2.10.
> 
> Can you confirm? Since etch has 2.06 I guess it has it, not sure if 
> anything should be done about that...

Confirmed, patch attached.

Release managers, will you accept this license issue bugfix in stable?

Kind regards,

Martin
diff -u sleuthkit-2.06/debian/changelog sleuthkit-2.06/debian/changelog
--- sleuthkit-2.06/debian/changelog
+++ sleuthkit-2.06/debian/changelog
@@ -1,3 +1,9 @@
+sleuthkit (2.06-3etch1) stable; urgency=low
+
+  * Fixed license issue, closes: #482146.
+
+ -- Martin A. Godisch <godisch@debian.org>  Thu, 22 May 2008 21:47:00 +0200
+
 sleuthkit (2.06-3) unstable; urgency=low
 
   * Removed conflicts with tct, closes: #357622.
only in patch2:
unchanged:
--- sleuthkit-2.06.orig/src/srchtools/srch_strings.c
+++ sleuthkit-2.06/src/srchtools/srch_strings.c
@@ -514,7 +514,12 @@
 print_strings (const char *filename, FILE *stream, uint64_t address,
 	       uint64_t stop_point, int magiccount, char *magic)
 {
-  char *buf = (char *) mymalloc (sizeof (char) * (string_min + 1));
+  /* taken from v2.10 */
+  char *buf = (char *) malloc (sizeof (char) * (string_min + 1));
+  if (malloc == NULL) {
+      fprintf(stderr, "Error allocating memory\n");
+      return;
+  }
 
   while (1)
     {
only in patch2:
unchanged:
--- sleuthkit-2.06.orig/src/srchtools/sigfind.c
+++ sleuthkit-2.06/src/srchtools/sigfind.c
@@ -26,7 +26,7 @@
 
 #include "aux_tools.h"
 
-extern char *progname;
+char *progname;
 
 
 void
@@ -165,7 +165,12 @@
 	    break;
 
 	case 'V':
-	    print_version(stdout);
+	    /* taken from srch_strings.c */
+#ifdef VER
+	    printf("The Sleuth Kit ver %s\n", VER);
+#else
+	    printf("The Sleuth Kit\n");
+#endif
 	    exit(0);
 	default:
 	    usage();
only in patch2:
unchanged:
--- sleuthkit-2.06.orig/src/srchtools/Makefile
+++ sleuthkit-2.06/src/srchtools/Makefile
@@ -8,7 +8,7 @@
 CFLAGS	= $(DEFS) $(INCL) $(OPT) $(DEBUG) -I. -I ../auxtools $(XFLAGS)
 
 LIBOBJ  = srch_strings.o 
-LIBS    = -L../../lib -ltsk
+LIBS    = -L../../lib
 LIB = ../../lib/libtsk.a
 
 defs:

Reply to: