[Forensics-changes] [rifiuti] 02/02: Imported Debian patch 20040505-1

Joao Eriberto Mota Filho eriberto at moszumanska.debian.org
Thu Jul 23 11:35:53 UTC 2015


This is an automated email from the git hooks/post-receive script.

eriberto pushed a commit to branch debian
in repository rifiuti.

commit f237358a91b12776beb9942c79ccb3aea180968a
Merge: 3a9d2c3 2a65549
Author: Joao Eriberto Mota Filho <eriberto at debian.org>
Date:   Wed Jul 22 19:15:11 2015 -0300

    Imported Debian patch 20040505-1

 debian/changelog                       | 36 +++++++++++++++++++++++++++++-
 debian/compat                          |  2 +-
 debian/control                         | 19 ++++++++--------
 debian/copyright                       | 40 +++++++++++++++++++---------------
 debian/{rifiuti.install => install}    |  0
 debian/{manpages => manpage}/rifiuti.1 |  6 ++---
 debian/manpages                        |  1 +
 debian/patches/add-GCC-hardening       | 16 ++++++++++++++
 debian/patches/fix-warnings            | 16 ++++++++++++++
 debian/patches/series                  |  2 ++
 debian/rifiuti.manpages                |  1 -
 debian/rules                           | 21 +++++++++---------
 debian/source.lintian-overrides        |  3 ---
 debian/source/format                   |  1 +
 debian/watch                           |  3 +++
 15 files changed, 119 insertions(+), 48 deletions(-)

diff --cc debian/changelog
index 061bafd,0000000..f0705f3
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,43 -1,0 +1,77 @@@
++rifiuti (20040505-1) unstable; urgency=medium
++
++  * Team upload.
++  * Fixed the version number.
++  * Migrations:
++      - debian/copyright to 1.0 format.
++      - debian/rules to new (reduced) format.
++      - DebSrc to 3.0 format.
++      - DH level to 9.
++  * debian/control:
++      - Added the word 'forensics' to long description.
++      - Bumped Standards-Version to 3.9.6.
++      - Removed the leading article from short description.
++      - Updated the Homepage field.
++      - Updated the long description.
++      - Updated the Vcs-* fields.
++  * debian/copyright:
++      - Updated all information.
++      - Updated the Source field in header.
++  * debian/patches/add-GCC-hardening: added to provide GCC hardening.
++  * debian/rifiuti.manpages: renamed to manpage.
++  * debian/rifiuti.install: renamed to install.
++  * debian/rifiuti.manpages:
++      - Renamed to manpages.
++      - Fixed the manpage place to respect the new file names.
++      - Fixed some typos in manpage.
++  * debian/rules:
++      - Added an override to remove a file created by upstream (bin).
++      - Added an override to avoid a double build.
++  * debian/source.lintian-overrides: removed. Using 'Team upload' now.
++  * debian/watch: created.
++
++ -- Joao Eriberto Mota Filho <eriberto at debian.org>  Wed, 22 Jul 2015 19:15:11 -0300
++
 +rifiuti (1.0+20040505-4) unstable; urgency=low
 +
 +  * Updating package to standards version 3.8.2.
 +  * Adding lintian overrides.
 +
 + -- Daniel Baumann <daniel at debian.org>  Thu, 09 Jul 2009 12:30:58 +0200
 +
 +rifiuti (1.0+20040505-3) unstable; urgency=low
 +
 +  * Prefixing debhelper files with package name.
 +  * Updating to standards 3.8.1.
 +  * Updating year in copyright file.
 +
 + -- Daniel Baumann <daniel at debian.org>  Thu, 28 May 2009 22:19:05 +0200
 +
 +rifiuti (1.0+20040505-2) unstable; urgency=low
 +
 +  * Updating vcs fields.
 +  * Adding myself to copyright file.
 +  * Installing rifiuti into /usr/bin instead of /usr/sbin (Closes: #509473).
 +
 + -- Daniel Baumann <daniel at debian.org>  Tue, 23 Dec 2008 09:54:00 +0100
 +
 +rifiuti (1.0+20040505-1) unstable; urgency=low
 +
 +  [ Christophe Monniez ]
 +  * Initial release (Closes: #469963).
 +  * Man page corrections.
 +  * Copyright file corrections.
 +  * Corrections of typos in the package description.
 +  * Closing ITP bug in the changelog.
 +  * Correction of the version number in the changelog.
 +
 +  [ Daniel Baumann ]
 +  * Updating to standards 3.8.0.
 +  * Upgrading package to debhelper 7.
 +  * Rewrapping copyright file.
 +  * Using tabs rather than whitespaces in debhelper install file.
-   * Adding empty line as seperator in clean target of rules.
++  * Adding empty line as separator in clean target of rules.
 +  * Sorting vcs fields in control.
 +  * Correcting rules targets wrt/ bin directory handling.
 +
 + -- Daniel Baumann <daniel at debian.org>  Sun, 14 Sep 2008 10:44:00 +0200
diff --cc debian/compat
index 7f8f011,0000000..ec63514
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 7
++9
diff --cc debian/control
index 17d6113,0000000..38e2f90
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,20 -1,0 +1,19 @@@
 +Source: rifiuti
 +Section: utils
 +Priority: optional
 +Maintainer: Debian Forensics <forensics-devel at lists.alioth.debian.org>
 +Uploaders: Christophe Monniez <christophe.monniez at fccu.be>
- Build-Depends: debhelper (>= 7)
- Standards-Version: 3.8.3
- Homepage: http://sourceforge.net/project/showfiles.php?group_id=78332
- Vcs-Browser: http://git.debian.org/?p=forensics/rifiuti.git
- Vcs-Git: git://git.debian.org/forensics/rifiuti.git
++Build-Depends: debhelper (>= 9)
++Standards-Version: 3.9.6
++Homepage: http://sf.net/projects/odessa
++Vcs-Browser: http://anonscm.debian.org/cgit/forensics/rifiuti.git
++Vcs-Git: git://anonscm.debian.org/forensics/rifiuti.git
 +
 +Package: rifiuti
 +Architecture: any
 +Depends: ${shlibs:Depends}, ${misc:Depends}
- Description: A MS Windows recycle bin analysis tool
-  Rifiuti is a tool to examine the INFO2 files found in the MS Windows
-  recycle bins.
++Description: MS Windows recycle bin analysis tool
++ Rifiuti is a tool to examine the INFO2 files. The INFO2 file gives meta
++ information about the files found in the MS Windows recycle bin.
 + .
-  The INFO2 file gives meta informations about the files found in the
-  recycle bin.
++ This package is useful in forensics investigations.
diff --cc debian/copyright
index ad4b354,0000000..858bad8
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,54 -1,0 +1,58 @@@
- Author: Keith J. Jones <keith.jones at foundstone.com>
- Download: http://sourceforge.net/project/showfiles.php?group_id=78332
++Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
++Upstream-Name: Rifiuti
++Source: http://sf.net/projects/odessa/files/Rifiuti
 +
 +Files: *
- Copyright: (C) 2003 Keith J. Jones <keith.jones at foundstone.com>
++Copyright: 2003-2004 Keith J. Jones <keith.jones at foundstone.com>
++License: BSD-3
++
++Files: debian/*
++Copyright: 2008      Christophe Monniez <christophe.monniez at fccu.be>
++           2008-2009 Daniel Baumann <daniel at debian.org>
++           2015      Joao Eriberto Mota Filho <eriberto at debian.org>
++License: GPL-2+
++
 +License: BSD-3
 + Redistribution and use in source and binary forms, with or without
 + modification, are permitted provided that the following conditions
 + are met:
 + .
 + 1. Redistributions of source code must retain the above copyright
 +    notice, this list of conditions and the following disclaimer.
 + .
 + 2. Redistributions in binary form must reproduce the above copyright
 +    notice, this list of conditions and the following disclaimer in the
 +    documentation and/or other materials provided with the distribution.
 + .
 + 3. Neither the name of the project nor the names of its contributors
 +    may be used to endorse or promote products derived from this software
 +    without specific prior written permission.
 + .
 + THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
 + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
++ ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
 + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 + SUCH DAMAGE.
 +
- Files: debian/*
- Copyright:
-  (C) 2008 Christophe Monniez <christophe.monniez at fccu.be>
-  (C) 2008-2009 Daniel Baumann <daniel at debian.org>
 +License: GPL-2+
-  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 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 program is distributed in the hope that it will be useful,
++ 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
++ 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 Street, Fifth Floor, Boston, MA 02110-1301, USA.
++ along with this program. If not, see <https://www.gnu.org/licenses/>
 + .
-  On Debian systems, the complete text of the GNU General Public License
-  can be found in /usr/share/common-licenses/GPL-2 file.
++ On Debian systems, the complete text of the GNU General
++ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
diff --cc debian/install
index 9243140,0000000..9243140
mode 100644,000000..100644
--- a/debian/install
+++ b/debian/install
diff --cc debian/manpage/rifiuti.1
index 8022f09,0000000..b3c0e50
mode 100644,000000..100644
--- a/debian/manpage/rifiuti.1
+++ b/debian/manpage/rifiuti.1
@@@ -1,26 -1,0 +1,26 @@@
- .TH RIFIUTI 1 "2008-03-14" "1.0+20040505" "extract informations from MS recycle bin INFO2 files"
++.TH RIFIUTI 1 "2008-03-14" "20040505" "extract information from MS recycle bin INFO2 files"
 +
 +.SH NAME
- rifiuti \- tool to extract informations from MS recycle bins info2 files.
++rifiuti \- tool to extract information from MS recycle bins info2 files.
 +
 +.SH SYNOPSIS
 +.B rifiuti
 +.BR [ \-t ]\ \fIFILE\fR
 +
 +.SH DESCRIPTION
- rifiuti is a tool to extract valuable informations (from a forensics
++rifiuti is a tool to extract valuable information (from a forensics
 +investigator point of view) from MS recycle bins info2 files.
 +.PP
 +It will extract the deleted time, original drive number, original path ans size
 +of the deleted files found in the recycle bin.
 +.PP
 +
 +.SH OPTIONS
 +.IP "\fB\-t FD\fR" 4
 +Change the default field delimiter (TAB) to FD.
 +.IP "\fB<file>\fR" 4
 +INFO2 file to parse.
 +
 +.SH AUTHOR
 +This manual page was written by Christophe Monniez <christophe.monniez at fccu.be>
 +for the Debian project (but may be used by others).
diff --cc debian/manpages
index 0000000,0000000..41cae39
new file mode 100644
--- /dev/null
+++ b/debian/manpages
@@@ -1,0 -1,0 +1,1 @@@
++debian/manpage/rifiuti.1
diff --cc debian/patches/add-GCC-hardening
index 0000000,0000000..5c30145
new file mode 100644
--- /dev/null
+++ b/debian/patches/add-GCC-hardening
@@@ -1,0 -1,0 +1,16 @@@
++Description: add GCC hardening.
++Author: Joao Eriberto Mota Filho <eriberto at debian.org>
++Last-Update: 2015-07-22
++Index: rifiuti-20040505/src/Makefile
++===================================================================
++--- rifiuti-20040505.orig/src/Makefile
+++++ rifiuti-20040505/src/Makefile
++@@ -1,7 +1,7 @@
++ all: install
++ 
++ install:  rifiuti.c
++-	gcc -o rifiuti rifiuti.c -lm -lc;cp rifiuti ../bin
+++	gcc $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o rifiuti rifiuti.c -lm -lc;cp rifiuti ../bin
++ 
++ installwin:  rifiuti.c
++ 	gcc -DCYGWIN -o rifiuti.exe rifiuti.c -lm -lc;cp rifiuti.exe ../bin
diff --cc debian/patches/fix-warnings
index 0000000,0000000..baee619
new file mode 100644
--- /dev/null
+++ b/debian/patches/fix-warnings
@@@ -1,0 -1,0 +1,16 @@@
++Description: fix GCC warnings when building.
++Author: Joao Eriberto Mota Filho <eriberto at debian.org>
++Last-Update: 2015-07-22
++Index: rifiuti-20040505/src/rifiuti.c
++===================================================================
++--- rifiuti-20040505.orig/src/rifiuti.c
+++++ rifiuti-20040505/src/rifiuti.c
++@@ -35,6 +35,8 @@
++ #include <stdio.h>
++ #include <time.h>
++ #include <math.h>
+++#include <stdlib.h>
+++#include <string.h>
++ 
++ #ifdef CYGWIN
++ ssize_t pread( int d, void *buf, size_t nbytes, off_t offset) {
diff --cc debian/patches/series
index 0000000,0000000..e9e4d31
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,2 @@@
++add-GCC-hardening
++fix-warnings
diff --cc debian/rules
index 804e627,0000000..7969fc1
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,17 -1,0 +1,16 @@@
 +#!/usr/bin/make -f
++#export DH_VERBOSE=1
 +
- %:
- 	dh ${@} --sourcedirectory=src
++export DEB_BUILD_MAINT_OPTIONS = hardening=+all
++export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 +
- override_dh_auto_clean:
- 	dh_auto_clean
++%:
++	dh $@ --sourcedirectory=src
 +
- 	rm -rf bin
++override_dh_clean:
++	dh_clean
++	if [ -f $(CURDIR)/bin ]; then rm -f $(CURDIR)/bin; fi
++	if [ -d $(CURDIR)/bin ]; then rm -f $(CURDIR)/bin/*; fi
 +
++# Added to avoid a double build.
 +override_dh_auto_build:
- 	mkdir -p bin
- 
- 	dh_auto_build
- 
- override_dh_auto_install:
- 	# nothing to be done
diff --cc debian/source/format
index 0000000,0000000..163aaf8
new file mode 100644
--- /dev/null
+++ b/debian/source/format
@@@ -1,0 -1,0 +1,1 @@@
++3.0 (quilt)
diff --cc debian/watch
index 0000000,0000000..b4cbd42
new file mode 100644
--- /dev/null
+++ b/debian/watch
@@@ -1,0 -1,0 +1,3 @@@
++version=3
++opts=uversionmangle=s/_[0-9]//g \
++http://sf.net/odessa/rifiuti[-_]([\d_]+)\.tar\.(?:bz2|gz|xz)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/rifiuti.git



More information about the forensics-changes mailing list