Imported Debian patch 1.60-2

parent 2b283ed8
scalpel (1.60-2) experimental; urgency=medium
* New maintainer and co-maintainer. Thanks a lot to Danny van der Meeren for
your nice work over this package.
* Migrations:
- debian/copyright to 1.0 format.
- debian/rules to new (reduced) format.
- DebSrc to 3.0 version.
- DH level to 9.
- Standards-Version to 3.9.6.
* debian/control:
- Added the Homepage field.
- Added the ${misc:Depends} to Depends field.
- Added the VCS-* fields to control the changes in packaging.
- Improved the short and long descriptions.
* debian/copyright: updated.
* debian/manpages: added to install the upstream manpage.
* debian/patches/:
- fix-config-patch: added to avoid direct changes in upstream source code.
- improve_error_message: improve error message about conf file.
- Makefile: added to implement the GCC hardening.
* debian/watch: added a fake site to explain about the current status of the
original upstream homepage.
-- Joao Eriberto Mota Filho <eriberto@debian.org> Sun, 01 Feb 2015 20:26:23 -0200
scalpel (1.60-1) unstable; urgency=low
* Changed scalpel.h and scalpel.c to take default config from /etc/scalpel
......
Source: scalpel
Section: utils
Priority: optional
Maintainer: Danny van der Meeren <danny@illogic.nl>
Build-Depends: debhelper (>= 5)
Standards-Version: 3.7.2
Maintainer: Debian Forensics <forensics-devel@lists.alioth.debian.org>
Uploaders: Joao Eriberto Mota Filho <eriberto@debian.org>
Build-Depends: debhelper (>= 9)
Standards-Version: 3.9.6
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
Package: scalpel
Architecture: any
Depends: ${shlibs:Depends}
Description: A Frugal, High Performance File Carver
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 device files.
Scalpel is filesystem-independent and will carve files from FATx, NTFS, ext2/3,
or raw partitions. It is useful for both digital forensics investigation and
file recovery.
Depends: ${shlibs:Depends}, ${misc: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
device files.
.
scalpel is filesystem-independent and will carve files from FAT16, FAT32,
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.
This package was debianized by Danny van der Meeren <danny@illogic.nl> on
Sat, 9 Dec 2006 18:20:32 +0100.
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: scalpel
Source: http://www.digitalforensicssolutions.com/Scalpel
Comment: dead upstream link in current homepage.
It was downloaded from <http://www.digitalforensicssolutions.com/Scalpel>
Files: *
Copyright: 2005-2006 by Golden G. Richard III <golden@digitalforensicssolutions.com, golden@cs.uno.edu>
License: GPL-2.0+
Upstream Author: Golden G. Richards III <golden@digitalforensicssolutions.com>
Files: base_name.c
dirname.h
Copyright: 1990, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
License: GPL-2.0+
Copyright: (C) 2005-6 by Golden G. Richard III
<golden@digitalforensicssolutions.com>
Files: debian/*
Copyright: 2006 Danny van der Meeren <danny@illogic.nl>
2015 Joao Eriberto Mota Filho <eriberto@debian.org>
License: GPL-2.0+
License:
This program 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
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
The Debian packaging is (C) 2006, Danny van der Meeren <danny@illogic.nl> and
is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
License: GPL-2.0+
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
(at your option) any later version.
.
This package is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>
.
On Debian systems, the complete text of the GNU General
Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
Description: add GCC hardening to Makefile.
Author: Joao Eriberto Mota Filho <eriberto@debian.org>
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)
Description: make /etc/scalpel the default path to config file.
Author: Danny van der Meeren <danny@illogic.nl>
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"
Description: improve the error message about the configuration file.
Author: Joao Eriberto Mota Filho <eriberto@debian.org>
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);
Makefile
fix-config-path
improve_error_message
#!/usr/bin/make -f
# export DH_VERBOSE=1
build: build-stamp
build-stamp:
$(MAKE)
touch $@
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
install: build
dh_clean -k
clean:
rm -f build-stamp
dh_clean
-$(MAKE) clean
binary-indep:
binary-arch binary: build install
dh_install
dh_installchangelogs
dh_installdocs
dh_installman scalpel.1
dh_installchangelogs changelog
dh_installdeb
dh_compress
dh_fixperms
dh_strip
dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
.PHONY: build binary binary-arch binary-indep clean install
%:
dh $@
version=3
# Currently, no releases available at original upstream homepage.
opts=dversionmangle=s/.*/0.No-Release/ \
https://people.debian.org/~eriberto/ FakeWatchNoUpstreamReleaseForThisPackage-(\d\S+)\.gz
......@@ -500,8 +500,8 @@ void convertFileNames(struct scalpelState *state) {
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);
}
......
......@@ -189,7 +189,7 @@ extern int errno;
#define SCALPEL_NOEXTENSION '\xFF'
#define SCALPEL_DEFAULT_WILDCARD '?'
#define SCALPEL_DEFAULT_CONFIG_FILE "/etc/scalpel/scalpel.conf"
#define SCALPEL_DEFAULT_CONFIG_FILE "scalpel.conf"
#define SCALPEL_DEFAULT_OUTPUT_DIR "scalpel-output"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment