[Forensics-changes] [rifiuti2] 02/02: Imported Debian patch 0.6.1-1
Joao Eriberto Mota Filho
eriberto at moszumanska.debian.org
Sun Jul 26 23:05:15 UTC 2015
This is an automated email from the git hooks/post-receive script.
eriberto pushed a commit to branch debian
in repository rifiuti2.
commit 27099f79dc6f31b3730a169d21864c5c6299096f
Merge: b1c8681 137c196
Author: Joao Eriberto Mota Filho <eriberto at debian.org>
Date: Sun Jul 26 19:15:32 2015 -0300
Imported Debian patch 0.6.1-1
.travis.yml | 12 +
ChangeLog | 167 +-
INSTALL | 236 -
Makefile.am | 25 +-
Makefile.in | 617 --
NEWS | 16 -
NEWS.md | 52 +
README | 50 -
README.md | 85 +
TODO | 4 -
aclocal.m4 | 1488 ----
autogen.sh | 5 +
config.h.in | 85 -
configure | 8685 --------------------
configure.ac | 76 +-
.../Dc1.txt | 1 +
.../INFO2 | Bin 0 -> 820 bytes
.../desktop.ini | 2 +
debian/changelog | 34 +
debian/clean | 3 +
debian/compat | 2 +-
debian/control | 39 +-
debian/copyright | 73 +-
debian/docs | 2 +
debian/examples | 1 +
debian/patches/fix-no-format-arguments | 29 +
debian/patches/series | 1 +
debian/rifiuti2.docs | 3 -
debian/rules | 18 +-
debian/source.lintian-overrides | 3 -
debian/source/format | 1 +
debian/source/include-binaries | 1 +
debian/watch | 2 +-
depcomp | 589 --
dist-win.mk | 49 +
AUTHORS => docs/AUTHORS | 2 +-
ChangeLog => docs/ChangeLog.old | 6 +
docs/Compile.md | 78 +
COPYING => docs/LICENSE | 5 +
THANKS => docs/THANKS | 3 +-
git.mk | 312 +
install-sh | 519 --
missing | 367 -
mkinstalldirs | 111 -
po/LINGUAS | 1 +
po/Makefile.in.in | 271 -
po/POTFILES.in | 1 +
po/rifiuti.pot | 247 -
po/zh_HK.po | 439 +
src/.indent.pro | 38 +
src/Makefile.am | 34 +-
src/Makefile.in | 512 --
src/rifiuti-vista.c | 851 +-
src/rifiuti-vista.h | 52 +-
src/rifiuti.1 | 472 +-
src/rifiuti.c | 912 +-
src/rifiuti.h | 66 +-
src/utils.c | 532 +-
src/utils.h | 137 +-
test/Makefile.am | 91 +
test/atlocal.in | 21 +
test/getcharset.c | 11 +
test/rifiuti.dtd | 15 +
test/samples/INFO2-empty | Bin 0 -> 20 bytes
test/samples/INFO2-empty.txt | 4 +
test/samples/INFO2-sample1 | Bin 0 -> 12820 bytes
test/samples/INFO2-sample1-alt.txt | 20 +
test/samples/INFO2-sample1.txt | 20 +
test/samples/INFO2-sample1.xml | 117 +
test/samples/INFO2-sample2 | Bin 0 -> 1980 bytes
test/samples/INFO2-sample2.txt | 11 +
test/samples/INFO2-sample2.xml | 25 +
test/samples/dir-empty.txt | 4 +
test/samples/dir-empty/desktop.ini | 3 +
test/samples/dir-mixed.txt | 6 +
test/samples/dir-mixed/$IDNLPD4.exe | Bin 0 -> 82 bytes
test/samples/dir-mixed/$IEQWWMF.exe | Bin 0 -> 544 bytes
test/samples/dir-sample1.txt | 19 +
test/samples/dir-sample1.xml | 93 +
test/samples/dir-sample1/$I0JGHX7 | Bin 0 -> 544 bytes
test/samples/dir-sample1/$I1IS2OK.txt | Bin 0 -> 544 bytes
test/samples/dir-sample1/$I1TDH1G.exe | Bin 0 -> 544 bytes
test/samples/dir-sample1/$I7FV8IY.exe | Bin 0 -> 544 bytes
test/samples/dir-sample1/$I95CUKU | Bin 0 -> 544 bytes
test/samples/dir-sample1/$IC6GEAW.exe | Bin 0 -> 543 bytes
test/samples/dir-sample1/$IEQWWMF.exe | Bin 0 -> 544 bytes
test/samples/dir-sample1/$IFRN1CZ.exe | Bin 0 -> 544 bytes
test/samples/dir-sample1/$IHMU3NR.zip | Bin 0 -> 544 bytes
test/samples/dir-sample1/$IMG2SSB | Bin 0 -> 544 bytes
test/samples/dir-sample1/$IUVFB0M.rtf | Bin 0 -> 544 bytes
test/samples/dir-sample1/$IW527XU.exe | Bin 0 -> 544 bytes
test/samples/dir-sample1/$IYAR1YY.exe | Bin 0 -> 543 bytes
test/samples/dir-sample1/$IZK01YL.txt | Bin 0 -> 544 bytes
test/samples/dir-sample1/$IZUFRX4.vmdk | Bin 0 -> 544 bytes
test/samples/dir-sample1/$RUVFB0M.rtf | Bin 0 -> 152 bytes
test/samples/dir-win10-01.txt | 11 +
test/samples/dir-win10-01.xml | 25 +
test/samples/dir-win10-01/$I7R52EG.txt | Bin 0 -> 74 bytes
test/samples/dir-win10-01/$IBBFODN | Bin 0 -> 60 bytes
test/samples/dir-win10-01/$IDNLPD4.exe | Bin 0 -> 82 bytes
test/samples/dir-win10-01/$IHO61YT | Bin 0 -> 76 bytes
test/samples/dir-win10-01/$IKEGS1G | Bin 0 -> 522 bytes
test/samples/dir-win10-01/$IQ7LAXT.png | Bin 0 -> 108 bytes
test/samples/dir-win10-01/$IROMPZ0.exe | Bin 0 -> 82 bytes
test/samples/dir-win10-01/$R7R52EG.txt | 1 +
test/samples/dir-win10-01/$RKEGS1G | 0
test/samples/dir-win10-01/$RQ7LAXT.png | Bin 0 -> 6455 bytes
test/samples/dir-win10-01/desktop.ini | 3 +
test/samples/japanese-path-dir.txt | 4 +
test/samples/japanese-path-file.txt | 4 +
.../INFO2-empty" | Bin 0 -> 20 bytes
.../dir-empty/desktop.ini" | 3 +
test/test_cli_option.at | 60 +
test/test_common.at | 26 +
test/test_encoding.at | 76 +
test/test_faulty_dir.at | 9 +
test/test_parse_dir.at | 27 +
test/test_parse_info2.at | 24 +
test/test_read_write.at | 41 +
test/test_xml.at | 40 +
test/testsuite.at | 31 +
121 files changed, 4341 insertions(+), 14928 deletions(-)
diff --cc debian/RECYCLER/S-1-5-21-436374069-1202660629-854245398-1003/Dc1.txt
index 0000000,0000000..ef465ee
new file mode 100644
--- /dev/null
+++ b/debian/RECYCLER/S-1-5-21-436374069-1202660629-854245398-1003/Dc1.txt
@@@ -1,0 -1,0 +1,1 @@@
++a test...
diff --cc debian/RECYCLER/S-1-5-21-436374069-1202660629-854245398-1003/INFO2
index 0000000,0000000..88d17e2
new file mode 100644
Binary files differ
diff --cc debian/RECYCLER/S-1-5-21-436374069-1202660629-854245398-1003/desktop.ini
index 0000000,0000000..f8a7890
new file mode 100644
--- /dev/null
+++ b/debian/RECYCLER/S-1-5-21-436374069-1202660629-854245398-1003/desktop.ini
@@@ -1,0 -1,0 +1,2 @@@
++[.ShellClassInfo]
++CLSID={645FF040-5081-101B-9F08-00AA002F954E}
diff --cc debian/changelog
index b24aad4,0000000..378308d
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,37 -1,0 +1,71 @@@
++rifiuti2 (0.6.1-1) unstable; urgency=medium
++
++ * Team upload.
++ * New upstream release.
++ * New upstream homepage.
++ * New co-maintainer.
++ * Added a directory as example. Consequently:
++ - debian/examples: added to install the example.
++ - debian/RECYCLE: added. This is the example.
++ - debian/source/include-binaries: added to allow the files used as
++ example.
++ * Migrations:
++ - debian/copyright to 1.0 format.
++ - debian/rules to new (reduced) format.
++ - DebSrc to 3.0.
++ - DH level to 9.
++ - Using autoreconf now.
++ * debian/clean: added to remove files created by upstream.
++ * debian/control:
++ - Bumped Standards-Version to 3.9.6.
++ - Re-written the short and long descriptions.
++ - Updated the Vcs-* fields.
++ * debian/copyright: updated all information.
++ * debian/patches/fix-no-format-arguments: added to fix a FTBFS caused by no
++ format arguments.
++ * debian/rifiuti2.docs:
++ - Renamed to docs.
++ - Added README.md and NEWS.md.
++ - Removed non existent NEWS, THANKS and TODO.
++ * debian/source.lintian-overrides: removed. Using 'Team upload' now.
++ * debian/watch: updated.
++
++ -- Joao Eriberto Mota Filho <eriberto at debian.org> Sun, 26 Jul 2015 19:15:32 -0300
++
+rifiuti2 (0.5.1-3) 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:32:22 +0200
+
+rifiuti2 (0.5.1-2) unstable; urgency=low
+
+ * Updating year in copyright file.
+ * Adding misc-depends in control.
+ * Updating standards to 3.8.1.
+
+ -- Daniel Baumann <daniel at debian.org> Thu, 28 May 2009 22:21:39 +0200
+
+rifiuti2 (0.5.1-1) unstable; urgency=low
+
+ [ Anthony Wong ]
+ * Initial release (Closes: #506952).
+
+ [ Daniel Baumann ]
+ * Adding vcs fields in control.
+ * Rewrapping and improving wording of package long-description in control.
+ * Rewriting copyright file in machine-interpretable format.
+ * Removing AUTHORS from docs, no new information over than what is already in
+ debian/copyright.
+ * Removing README from docs, no new information other than what is already in
+ the package long-description.
+ * Prefixing debhelper files with package name.
+ * Rewriting rules file.
+ * Removing useless empty line at the end of changelog.
+ * Adding wnpp bug number to changelog.
+ * Adding myself to copyright.
+ * Removing unnecessary version in libglib2.0-dev build-depends.
+ * Removing upstream symlink for rifiuti-vista manpage.
+
+ -- Daniel Baumann <daniel at debian.org> Tue, 20 Jan 2009 21:28:17 +0100
diff --cc debian/clean
index 0000000,0000000..63cd82e
new file mode 100644
--- /dev/null
+++ b/debian/clean
@@@ -1,0 -1,0 +1,3 @@@
++po/zh_HK.gmo
++test/package.m4
++test/testsuite
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 8bab13b,0000000..0ac1356
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,23 -1,0 +1,34 @@@
+Source: rifiuti2
+Section: utils
+Priority: optional
+Maintainer: Debian Forensics <forensics-devel at lists.alioth.debian.org>
- Uploaders: Anthony Wong <anthony at ypwong.org>
- Build-Depends: debhelper (>= 7), autotools-dev, libglib2.0-dev
- Standards-Version: 3.8.2
- Homepage: http://code.google.com/p/rifiuti2/
- Vcs-Browser: http://git.debian.net/?p=debian-forensics/rifiuti2.git
- Vcs-Git: git://git.debian.net/git/debian-forensics/rifiuti2.git
++Uploaders: Joao Eriberto Mota Filho <eriberto at debian.org>
++Build-Depends: debhelper (>= 9), dh-autoreconf, libglib2.0-dev
++Standards-Version: 3.9.6
++Homepage: https://abelcheung.github.io/rifiuti2
++Vcs-Browser: http://anonscm.debian.org/cgit/forensics/rifiuti2.git
++Vcs-Git: git://anonscm.debian.org/forensics/rifiuti2.git
+
+Package: rifiuti2
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
- Description: A MS Windows recycle bin analysis tool
- Rifiuti2 is a rewrite of rifiuti, a tool for analyzing Windows Recycle Bin
- INFO2 file.
++Description: replacement for rifiuti, a MS Windows recycle bin analysis tool
++ Rifiuti2 analyses recycle bin files from Windows. Analysis of Windows
++ recycle bin is usually carried out during Windows computer forensics.
+ .
- Analysis of Windows Recycle Bin is usually carried out during Windows computer
- forensics. Rifiuti2 can extract file deletion time, original path and size of
- deleted files and whether the deleted files have been moved out from the
- recycle bin since they are trashed. It supports the INFO2 file format found in
- Windows up to Window XP as well as the new file format found in Vista.
++ Rifiuti2 can extract file deletion time, original path and size of deleted
++ files and whether the deleted files have been moved out from the recycle
++ bin since they are trashed.
++ .
++ Rifiuti2 is a rewrite of rifiuti, which is originally written for identical
++ purpose. Then it was extended to cover more functionalities, such as:
++ .
++ * Handles recycle bin up to Windows 10;
++ * Handles ancient Windows like 95, NT4 and ME;
++ * Supports all localized versions of Windows - both Unicode-based ones
++ and legacy ones (using ANSI code page);
++ * Supports output in XML format as well as original tab-delimited text.
++ .
++ Rifiuti2 is designed to be portable and runs on command line environment. Two
++ programs rifiuti and rifiuti-vista are chosen depending on relevant Windows
++ recycle bin format.
diff --cc debian/copyright
index 2b7f5e1,0000000..5b8855e
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,56 -1,0 +1,69 @@@
- Author: Abel Cheung
- Download: http://code.google.com/p/rifiuti2/
++Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
++Upstream-Name: Rifiuti2
++Upstream-Contact: Abel Cheung <abelcheung at gmail.com>
++Source: https://github.com/abelcheung/rifiuti2
+
+Files: *
- Copyright:
- (C) 2003 Keith J. Jones <keith.jones at foundstone.com>
- (C) 2007-2008 Abel Cheung
- License: BSD-3
++Copyright: 2003 Keith J. Jones <keith.jones at foundstone.com>
++ 2007-2015 Abel Cheung <abelcheung at gmail.com>
++ 2008 Anthony Wong <ypwong at debian.org>
++License: BSD-3-Clause
++
++Files: git.mk
++Copyright: 2009 Red Hat, Inc.
++ 2010-2013 Behdad Esfahbod
++License: Special
++
++Files: debian/*
++Copyright: 2008 Anthony Wong <ypwong at gmail.com>
++ 2008-2009 Daniel Baumann <daniel at debian.org>
++ 2015 Joao Eriberto Mota Filho <eriberto at debian.org>
++License: GPL-2+
++
++License: BSD-3-Clause
+ 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.
++ 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
+ 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 Anthony Wong <ypwong at gmail.com>
- (C) 2008-2009 Daniel Baumann <daniel at debian.org>
++License: Special
++ Copying and distribution of this file, with or without modification,
++ is permitted in any medium without royalty provided the copyright
++ notice and this notice are preserved.
++
+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/docs
index 0000000,0000000..da4bc20
new file mode 100644
--- /dev/null
+++ b/debian/docs
@@@ -1,0 -1,0 +1,2 @@@
++NEWS.md
++README.md
diff --cc debian/examples
index 0000000,0000000..d237d5e
new file mode 100644
--- /dev/null
+++ b/debian/examples
@@@ -1,0 -1,0 +1,1 @@@
++debian/RECYCLER
diff --cc debian/patches/fix-no-format-arguments
index 0000000,0000000..748a043
new file mode 100644
--- /dev/null
+++ b/debian/patches/fix-no-format-arguments
@@@ -1,0 -1,0 +1,29 @@@
++Description: fix a FTBFS caused by no format arguments.
++Author: Joao Eriberto Mota Filho <eriberto at debian.org>
++Last-Update: 2015-07-25
++Index: rifiuti2-0.6.1/src/rifiuti.c
++===================================================================
++--- rifiuti2-0.6.1.orig/src/rifiuti.c
+++++ rifiuti2-0.6.1/src/rifiuti.c
++@@ -443,7 +443,7 @@ main (int argc,
++ g_string_append_printf (str, "\\x%02X", (char) (*i));
++ }
++ while ((char) (* (++i)) != '\0');
++- g_debug (str->str);
+++ g_debug ("%s",str->str);
++ g_string_free (str, TRUE);
++ }
++
++Index: rifiuti2-0.6.1/src/rifiuti-vista.c
++===================================================================
++--- rifiuti2-0.6.1.orig/src/rifiuti-vista.c
+++++ rifiuti2-0.6.1/src/rifiuti-vista.c
++@@ -533,7 +533,7 @@ main (int argc,
++ g_string_append_printf (str, "\\x%02X", (char) (*i));
++ }
++ while ((char) (* (++i)) != '\0');
++- g_debug (str->str);
+++ g_debug ("%s",str->str);
++ g_string_free (str, TRUE);
++ }
++
diff --cc debian/patches/series
index 0000000,0000000..0b2b6c9
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++fix-no-format-arguments
diff --cc debian/rules
index 9c138d9,0000000..88e9d24
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,24 -1,0 +1,16 @@@
+#!/usr/bin/make -f
+
- %:
- dh ${@}
-
- override_dh_auto_clean:
- dh_auto_clean
-
- rm -f config.guess config.sub
++export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
- override_dh_auto_configure:
- [ -r /usr/share/misc/config.guess ] && cp -f /usr/share/misc/config.guess config.guess
- [ -r /usr/share/misc/config.sub ] && cp -f /usr/share/misc/config.sub config.sub
++%:
++ dh $@ --with autoreconf
+
- dh_auto_configure -- LDFLAGS="-Wl,-z,defs"
++override_dh_autoreconf:
++ dh_autoreconf ./autogen.sh
+
+override_dh_auto_install:
+ dh_auto_install
-
+ mv debian/rifiuti2/usr/bin/rifiuti debian/rifiuti2/usr/bin/rifiuti2
+ mv debian/rifiuti2/usr/share/man/man1/rifiuti.1 debian/rifiuti2/usr/share/man/man1/rifiuti2.1
-
+ rm -f debian/rifiuti2/usr/share/man/man1/rifiuti-vista.1
+ ln -s rifiuti2.1.gz debian/rifiuti2/usr/share/man/man1/rifiuti-vista.1.gz
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/source/include-binaries
index 0000000,0000000..ffa99cb
new file mode 100644
--- /dev/null
+++ b/debian/source/include-binaries
@@@ -1,0 -1,0 +1,1 @@@
++debian/RECYCLER/S-1-5-21-436374069-1202660629-854245398-1003/INFO2
diff --cc debian/watch
index 4ce2a92,0000000..0084360
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,2 -1,0 +1,2 @@@
+version=3
- http://googlecode.debian.net/p/rifiuti2/rifiuti2-(\d+.*)\.tar\.gz
++https://github.com/abelcheung/rifiuti2/releases .*/archive/(\d\S+)\.tar\.(?:bz2|gz|xz)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/rifiuti2.git
More information about the forensics-changes
mailing list