diff -Nru scalpel-1.60/debian/changelog scalpel-1.60/debian/changelog --- scalpel-1.60/debian/changelog 2015-05-04 02:30:38.000000000 +0000 +++ scalpel-1.60/debian/changelog 2016-11-13 01:21:47.000000000 +0000 @@ -1,3 +1,23 @@ +scalpel (1.60-4) unstable; urgency=medium + + * Bumped DH level to 10. + * debian/control: + - Bumped Standards-Version to 3.9.8. + - Updated the Vcs-* fields to use https instead of http and git. + * debian/copyright: + - Added a new additional email address for upstream. + - Dropped dot-zero from GPL license short name. + - Updated the packaging copyright years. + * debian/patches/: + - Added 40_fix-spelling.patch to fix a spelling error in final binary. + - Changes: + ~ Makefile: renamed to 10_add-GCC-hardening.patch. + ~ fix-config-path: renamed to 20_fix-config.patch. + ~ improve_error_message: renamed to 30_improve-error-message.patch. + * debian/watch: bumped to version 4. + + -- Joao Eriberto Mota Filho Sat, 12 Nov 2016 23:21:47 -0200 + scalpel (1.60-3) unstable; urgency=medium * Upload to unstable. diff -Nru scalpel-1.60/debian/compat scalpel-1.60/debian/compat --- scalpel-1.60/debian/compat 2015-02-01 22:41:50.000000000 +0000 +++ scalpel-1.60/debian/compat 2016-11-13 01:21:47.000000000 +0000 @@ -1 +1 @@ -9 +10 diff -Nru scalpel-1.60/debian/control scalpel-1.60/debian/control --- scalpel-1.60/debian/control 2015-02-02 11:18:17.000000000 +0000 +++ scalpel-1.60/debian/control 2016-11-13 01:21:47.000000000 +0000 @@ -3,15 +3,15 @@ Priority: optional Maintainer: Debian Forensics Uploaders: Joao Eriberto Mota Filho -Build-Depends: debhelper (>= 9) -Standards-Version: 3.9.6 +Build-Depends: debhelper (>= 10) +Standards-Version: 3.9.8 Homepage: http://www.digitalforensicssolutions.com/Scalpel -Vcs-Git: git://anonscm.debian.org/forensics/scalpel.git -Vcs-Browser: http://anonscm.debian.org/cgit/forensics/scalpel.git +Vcs-Git: https://anonscm.debian.org/git/forensics/scalpel.git +Vcs-Browser: https://anonscm.debian.org/git/forensics/scalpel.git Package: scalpel Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} Description: fast filesystem-independent file recovery scalpel is a fast file carver that reads a database of header and footer definitions and extracts matching files from a set of image files or raw @@ -21,4 +21,4 @@ exFAT, NTFS, Ext2, Ext3, Ext4, JFS, XFS, ReiserFS, raw partitions, etc. . scalpel is a complete rewrite of the Foremost 0.69 file carver and is - useful for both digital forensics investigation and file recovery. + useful for both digital forensics investigations and file recovery. diff -Nru scalpel-1.60/debian/copyright scalpel-1.60/debian/copyright --- scalpel-1.60/debian/copyright 2015-02-02 11:40:29.000000000 +0000 +++ scalpel-1.60/debian/copyright 2016-11-13 01:21:47.000000000 +0000 @@ -4,20 +4,22 @@ Comment: dead upstream link in current homepage. Files: * -Copyright: 2005-2006 by Golden G. Richard III -License: GPL-2.0+ +Copyright: 2005-2006 Golden G. Richard III +License: GPL-2+ Files: base_name.c dirname.h -Copyright: 1990, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. -License: GPL-2.0+ +Copyright: 1990-2001 Free Software Foundation, Inc. +License: GPL-2+ Files: debian/* -Copyright: 2006 Danny van der Meeren - 2015 Joao Eriberto Mota Filho -License: GPL-2.0+ +Copyright: 2006 Danny van der Meeren + 2015-2016 Joao Eriberto Mota Filho +License: GPL-2+ -License: GPL-2.0+ +License: GPL-2+ This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or diff -Nru scalpel-1.60/debian/patches/10_add-GCC-hardening.patch scalpel-1.60/debian/patches/10_add-GCC-hardening.patch --- scalpel-1.60/debian/patches/10_add-GCC-hardening.patch 1970-01-01 00:00:00.000000000 +0000 +++ scalpel-1.60/debian/patches/10_add-GCC-hardening.patch 2015-02-02 00:23:55.000000000 +0000 @@ -0,0 +1,14 @@ +Description: add GCC hardening to Makefile. +Author: Joao Eriberto Mota Filho +Last-Update: 2015-02-01 +Index: scalpel-1.60/Makefile +=================================================================== +--- scalpel-1.60.orig/Makefile ++++ scalpel-1.60/Makefile +@@ -1,5 +1,5 @@ + CC = gcc +-CC_OPTS = -Wall -O2 ++CC_OPTS = $(CFLAGS) $(LDFLAGS) $(CPPFLAGS) + GOAL = scalpel + + CC += $(CC_OPTS) diff -Nru scalpel-1.60/debian/patches/20_fix-config.patch scalpel-1.60/debian/patches/20_fix-config.patch --- scalpel-1.60/debian/patches/20_fix-config.patch 1970-01-01 00:00:00.000000000 +0000 +++ scalpel-1.60/debian/patches/20_fix-config.patch 2015-02-02 00:39:19.000000000 +0000 @@ -0,0 +1,31 @@ +Description: make /etc/scalpel the default path to config file. +Author: Danny van der Meeren +Last-Update: 2006-12-06 +Index: scalpel-1.60/scalpel.c +=================================================================== +--- scalpel-1.60.orig/scalpel.c ++++ scalpel-1.60/scalpel.c +@@ -500,8 +500,8 @@ void convertFileNames(struct scalpelStat + realpath(state->outputdirectory,fn); + strncpy(state->outputdirectory,fn,MAX_STRING_LENGTH); + +- realpath(state->conffile,fn); +- strncpy(state->conffile,fn,MAX_STRING_LENGTH); ++// realpath(state->conffile,fn); ++// strncpy(state->conffile,fn,MAX_STRING_LENGTH); + } + + +Index: scalpel-1.60/scalpel.h +=================================================================== +--- scalpel-1.60.orig/scalpel.h ++++ scalpel-1.60/scalpel.h +@@ -189,7 +189,7 @@ extern int errno; + #define SCALPEL_NOEXTENSION '\xFF' + + #define SCALPEL_DEFAULT_WILDCARD '?' +-#define SCALPEL_DEFAULT_CONFIG_FILE "scalpel.conf" ++#define SCALPEL_DEFAULT_CONFIG_FILE "/etc/scalpel/scalpel.conf" + + #define SCALPEL_DEFAULT_OUTPUT_DIR "scalpel-output" + diff -Nru scalpel-1.60/debian/patches/30_improve-error-message.patch scalpel-1.60/debian/patches/30_improve-error-message.patch --- scalpel-1.60/debian/patches/30_improve-error-message.patch 1970-01-01 00:00:00.000000000 +0000 +++ scalpel-1.60/debian/patches/30_improve-error-message.patch 2015-02-02 13:05:43.000000000 +0000 @@ -0,0 +1,17 @@ +Description: improve the error message about the configuration file. +Author: Joao Eriberto Mota Filho +Last-Update: 2015-02-01 +Index: scalpel-1.60/helpers.c +=================================================================== +--- scalpel-1.60.orig/helpers.c ++++ scalpel-1.60/helpers.c +@@ -315,7 +315,8 @@ void handleError(struct scalpelState *st + scalpelLog(state, + "ERROR: The configuration file didn't specify any file types to carve.\n"); + scalpelLog(state, "(If you're using the default configuration file, you'll have to\n"); +- scalpelLog(state, "uncomment some of the file types.)\n"); ++ scalpelLog(state, "uncomment some of the file types.)\n\n"); ++ scalpelLog(state, "See /etc/scalpel/scalpel.conf.\n"); + closeFile(state->auditFile); + exit (-1); + diff -Nru scalpel-1.60/debian/patches/40_fix-spelling.patch scalpel-1.60/debian/patches/40_fix-spelling.patch --- scalpel-1.60/debian/patches/40_fix-spelling.patch 1970-01-01 00:00:00.000000000 +0000 +++ scalpel-1.60/debian/patches/40_fix-spelling.patch 2016-11-13 01:21:47.000000000 +0000 @@ -0,0 +1,31 @@ +Description: fix a spelling error in final binary. +Author: Joao Eriberto Mota Filho +Last-Update: 2016-11-12 +Index: scalpel-1.60/files.c +=================================================================== +--- scalpel-1.60.orig/files.c ++++ scalpel-1.60/files.c +@@ -49,20 +49,20 @@ int outputDirectoryOK(char *dir) { + if (mkdir(dir,newDirectoryMode)) { + #endif + +- fprintf (stderr,"An error occured while trying to create %s - %s\n", ++ fprintf (stderr,"An error occurred while trying to create %s - %s\n", + dir,strerror(errno)); + return FALSE; + } + + // try to open directory + if ((temp = opendir(dir)) == NULL) { +- fprintf (stderr,"An error occured while trying to open %s - %s\n", ++ fprintf (stderr,"An error occurred while trying to open %s - %s\n", + dir,strerror(errno)); + return FALSE; + } + } + else { +- fprintf (stderr,"An error occured while trying to open %s - %s\n", ++ fprintf (stderr,"An error occurred while trying to open %s - %s\n", + dir,strerror(errno)); + return FALSE; + } diff -Nru scalpel-1.60/debian/patches/fix-config-path scalpel-1.60/debian/patches/fix-config-path --- scalpel-1.60/debian/patches/fix-config-path 2015-02-02 00:39:19.000000000 +0000 +++ scalpel-1.60/debian/patches/fix-config-path 1970-01-01 00:00:00.000000000 +0000 @@ -1,31 +0,0 @@ -Description: make /etc/scalpel the default path to config file. -Author: Danny van der Meeren -Last-Update: 2006-12-06 -Index: scalpel-1.60/scalpel.c -=================================================================== ---- scalpel-1.60.orig/scalpel.c -+++ scalpel-1.60/scalpel.c -@@ -500,8 +500,8 @@ void convertFileNames(struct scalpelStat - realpath(state->outputdirectory,fn); - strncpy(state->outputdirectory,fn,MAX_STRING_LENGTH); - -- realpath(state->conffile,fn); -- strncpy(state->conffile,fn,MAX_STRING_LENGTH); -+// realpath(state->conffile,fn); -+// strncpy(state->conffile,fn,MAX_STRING_LENGTH); - } - - -Index: scalpel-1.60/scalpel.h -=================================================================== ---- scalpel-1.60.orig/scalpel.h -+++ scalpel-1.60/scalpel.h -@@ -189,7 +189,7 @@ extern int errno; - #define SCALPEL_NOEXTENSION '\xFF' - - #define SCALPEL_DEFAULT_WILDCARD '?' --#define SCALPEL_DEFAULT_CONFIG_FILE "scalpel.conf" -+#define SCALPEL_DEFAULT_CONFIG_FILE "/etc/scalpel/scalpel.conf" - - #define SCALPEL_DEFAULT_OUTPUT_DIR "scalpel-output" - diff -Nru scalpel-1.60/debian/patches/improve_error_message scalpel-1.60/debian/patches/improve_error_message --- scalpel-1.60/debian/patches/improve_error_message 2015-02-02 13:05:43.000000000 +0000 +++ scalpel-1.60/debian/patches/improve_error_message 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -Description: improve the error message about the configuration file. -Author: Joao Eriberto Mota Filho -Last-Update: 2015-02-01 -Index: scalpel-1.60/helpers.c -=================================================================== ---- scalpel-1.60.orig/helpers.c -+++ scalpel-1.60/helpers.c -@@ -315,7 +315,8 @@ void handleError(struct scalpelState *st - scalpelLog(state, - "ERROR: The configuration file didn't specify any file types to carve.\n"); - scalpelLog(state, "(If you're using the default configuration file, you'll have to\n"); -- scalpelLog(state, "uncomment some of the file types.)\n"); -+ scalpelLog(state, "uncomment some of the file types.)\n\n"); -+ scalpelLog(state, "See /etc/scalpel/scalpel.conf.\n"); - closeFile(state->auditFile); - exit (-1); - diff -Nru scalpel-1.60/debian/patches/Makefile scalpel-1.60/debian/patches/Makefile --- scalpel-1.60/debian/patches/Makefile 2015-02-02 00:23:55.000000000 +0000 +++ scalpel-1.60/debian/patches/Makefile 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -Description: add GCC hardening to Makefile. -Author: Joao Eriberto Mota Filho -Last-Update: 2015-02-01 -Index: scalpel-1.60/Makefile -=================================================================== ---- scalpel-1.60.orig/Makefile -+++ scalpel-1.60/Makefile -@@ -1,5 +1,5 @@ - CC = gcc --CC_OPTS = -Wall -O2 -+CC_OPTS = $(CFLAGS) $(LDFLAGS) $(CPPFLAGS) - GOAL = scalpel - - CC += $(CC_OPTS) diff -Nru scalpel-1.60/debian/patches/series scalpel-1.60/debian/patches/series --- scalpel-1.60/debian/patches/series 2015-02-02 11:50:19.000000000 +0000 +++ scalpel-1.60/debian/patches/series 2016-11-13 01:21:47.000000000 +0000 @@ -1,3 +1,4 @@ -Makefile -fix-config-path -improve_error_message +10_add-GCC-hardening.patch +20_fix-config.patch +30_improve-error-message.patch +40_fix-spelling.patch diff -Nru scalpel-1.60/debian/watch scalpel-1.60/debian/watch --- scalpel-1.60/debian/watch 2015-02-02 11:44:26.000000000 +0000 +++ scalpel-1.60/debian/watch 2016-11-13 01:21:47.000000000 +0000 @@ -1,4 +1,3 @@ -version=3 -# Currently, no releases available at original upstream homepage. +version=4 opts=dversionmangle=s/.*/0.No-Release/ \ https://people.debian.org/~eriberto/ FakeWatchNoUpstreamReleaseForThisPackage-(\d\S+)\.gz