[Forensics-changes] [galleta] 01/01: Imported Debian patch 1.0+20040505-6
Joao Eriberto Mota Filho
eriberto at moszumanska.debian.org
Sun Mar 8 02:08:20 UTC 2015
This is an automated email from the git hooks/post-receive script.
eriberto pushed a commit to branch debian
in repository galleta.
commit cfe0752a9a675c65b4eb1ad8ddf2bdaa77297046
Merge: d67d899 2d7e0be
Author: Joao Eriberto Mota Filho <eriberto at debian.org>
Date: Sat Mar 7 14:54:55 2015 -0300
Imported Debian patch 1.0+20040505-6
debian/changelog | 34 +++++++++++++++++++++++++++++
debian/compat | 2 +-
debian/control | 20 ++++++++---------
debian/copyright | 40 +++++++++++++++++++---------------
debian/dirs | 1 +
debian/galleta.install | 1 -
debian/galleta.manpages | 1 -
debian/{manpages => manpage}/galleta.1 | 8 +++----
debian/manpages | 1 +
debian/patches/fix-gcc-warnings | 18 +++++++++++++++
debian/patches/fix-makefile | 16 ++++++++++++++
debian/patches/series | 2 ++
debian/rules | 18 +++++----------
debian/source.lintian-overrides | 3 ---
debian/source/format | 1 +
debian/watch | 4 ++++
16 files changed, 120 insertions(+), 50 deletions(-)
diff --cc debian/changelog
index 742d951,d1ba1ab..5aa969c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,47 -1,3 +1,81 @@@
++galleta (1.0+20040505-6) experimental; urgency=medium
++
++ * Team upload.
++ * Migrations:
++ - debian/rules to new (reduced) format.
++ - DebSrc to 3.0 format.
++ - Updated the DH level to 9.
++ * debian/control:
++ - Little adjustments in long description.
++ - Removed the leading article from short description.
++ - Updated Standards-Version to 3.9.6.
++ - Updated the Homepage field.
++ - Updated the Vcs-* fields.
++ * debian/copyright:
++ - Fixed the file header.
++ - Reorganized the file.
++ - Updated all years and names for maintainers.
++ - Updated the GPL-2+ license text.
++ * debian/dirs: added to create a directory.
++ * debian/galleta.install: removed.
++ * debian/galleta.manpages: renamed to manpages.
++ * debian/manpages/:
++ - Renamed to debian/manpage.
++ - galleta.1: little adjustments.
++ * debian/patches/:
++ - fix-gcc-warnings: added to fix some GCC warnings.
++ - fix-makefile: added to make Makefile compliant with Debian and add
++ GCC hardening.
++ * debian/source.lintian-overrides: removed because this file is useless
++ in nowadays.
++ * debian/watch: added. Thanks to Bart Martens <bartm at debian.org>.
++
++ -- Joao Eriberto Mota Filho <eriberto at debian.org> Sat, 07 Mar 2015 14:54:55 -0300
++
+galleta (1.0+20040505-5) unstable; urgency=low
+
+ * Updating package to standards version 3.8.2.
+ * Adding lintian overrides.
+
+ -- Daniel Baumann <daniel at debian.org> Thu, 09 Jul 2009 11:53:39 +0200
+
+galleta (1.0+20040505-4) unstable; urgency=low
+
+ * Updating vcs fields.
+ * Adding myself to copyright file.
+ * Prefixing debhelper files with package name.
+ * Updating year in copyright.
+ * Upgrading package to standards 3.8.1.
+ * Using correct rfc-2822 date formats in changelog.
+
+ -- Daniel Baumann <daniel at debian.org> Thu, 28 May 2009 21:13:48 +0200
+
+galleta (1.0+20040505-3) unstable; urgency=low
+
+ [ Christophe Monniez ]
+ * Fix rules to build on alpha and mipsel, thanks to Thiemo Seufer for
+ the patch (Closes: #495117).
+
+ [ Daniel Baumann ]
+ * Updating to standards 3.8.0.
+ * Upgrading package to debhelper 7.
+ * Sorting vcs fields in control.
+ * Updating copyright file.
+ * Using tab instead of whitespace in debhelper install file.
+
+ -- Daniel Baumann <daniel at debian.org> Sun, 14 Sep 2008 09:39:00 +0200
+
+galleta (1.0+20040505-2) unstable; urgency=medium
+
+ [ Daniel Baumann ]
+ * Removing and recreating bin directory, really fixes the FTBFS now
+ (Closes: #474412).
+
+ [ Christophe Monniez ]
+ * Removing a dangerous rule (Closes #474412).
+
+ -- Daniel Baumann <daniel at debian.org> Fri, 09 May 2008 09:34:00 +0200
+
galleta (1.0+20040505-1) unstable; urgency=low
[ Christophe Monniez ]
diff --cc debian/compat
index 7f8f011,1e8b314..ec63514
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,1 +1,1 @@@
- 7
-6
++9
diff --cc debian/control
index 92237fb,9c07097..2c25b23
--- a/debian/control
+++ b/debian/control
@@@ -3,18 -3,18 +3,18 @@@ Section: util
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.2
-Build-Depends: debhelper (>= 6)
-Standards-Version: 3.7.3
--Homepage: http://sourceforge.net/project/showfiles.php?group_id=78332
- Vcs-Browser: http://git.debian.org/?p=forensics/galleta.git
--Vcs-Git: git://git.debian.org/git/forensics/galleta.git
-Vcs-Browser: http://git.debian.org/?p=forensics/galleta.git
++Build-Depends: debhelper (>= 9)
++Standards-Version: 3.9.6
++Homepage: http://odessa.sf.net
++Vcs-Browser: http://anonscm.debian.org/cgit/forensics/galleta.git
++Vcs-Git: git://anonscm.debian.org/forensics/galleta.git
Package: galleta
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
--Description: An Internet Explorer cookie forensic analysis tool
-- Galleta is a forensic tool that examines the content of cookie files produced
-- by Microsofts Internet Explorer.
++Description: Internet Explorer cookie forensic analysis tool
++ Galleta is a forensics tool that examines the content of cookie files
++ produced by Microsoft Internet Explorer (MSIE).
.
-- It parses the file and outputs a field separated that can be loaded in a
-- spreadsheet.
++ It parses the file and outputs a field separated that can be loaded in
++ a spreadsheet.
diff --cc debian/copyright
index eb83544,a17ec7d..3df3d4e
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,54 -1,50 +1,58 @@@
--Author: Keith J. Jones <keith.jones at foundstone.com>
--Download: http://sourceforge.net/project/showfiles.php?group_id=78332
++Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
++Upstream-Name: Galleta
++Source: http://sourceforge.net/projects/odessa/files/Galleta/
Files: *
--Copyright: (C) 2003 Keith J. Jones <keith.jones at foundstone.com>
--License: BSD-3
++Copyright: 2003-2004 Keith J. Jones <keith.jones at foundstone.com>
++License: BSD-3-clause
++
++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-clause
Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
+ 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.
+ 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.
+ 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.
+ 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.
+ 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 Christophe Monniez <christophe.monniez at fccu.be>
- (C) 2008-2009 Daniel Baumann <daniel at debian.org>
-Copyright: (C) 2008 Christophe Monniez <christophe.monniez at fccu.be>
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 program is free software; you can redistribute it and/or modify
++ 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.
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-On Debian systems, the complete text of the GNU General Public License
-can be found in /usr/share/common-licenses/GPL-2 file.
++ along with this program. If not, see <http://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/dirs
index 0000000,0000000..e772481
new file mode 100644
--- /dev/null
+++ b/debian/dirs
@@@ -1,0 -1,0 +1,1 @@@
++usr/bin
diff --cc debian/manpage/galleta.1
index 7ca4e10,7ca4e10..338138b
--- a/debian/manpage/galleta.1
+++ b/debian/manpage/galleta.1
@@@ -1,15 -1,15 +1,15 @@@
--.TH GALLETA 1 "2008-03-10" "1.0+20040505" "extract informations from MS IE cookie files"
++.TH GALLETA 1 "2008-03-10" "1.0+20040505" "extract information from MSIE cookie files"
.SH NAME
--galleta \- tool to extract informations from MS IE cookie files
++galleta \- tool to extract information from MSIE cookie files
.SH SYNOPSIS
.B galleta
.BR [ \-t ]\ \fIFILE\fR
.SH DESCRIPTION
--galleta is a tool to extract valuable informations (from a forensics
--investigator point of view) from MS IE cookie files.
++galleta is a tool to extract valuable information (from a forensics
++investigator point of view) from MSIE cookie files.
.PP
It will extract the website name, the variables names and values.
The creation and expire time for these variables and also flags.
diff --cc debian/manpages
index 0000000,31eb23e..a003233
mode 000000,100644..100644
--- a/debian/manpages
+++ b/debian/manpages
@@@ -1,0 -1,1 +1,1 @@@
-debian/manpage/*
++debian/manpage/galleta.1
diff --cc debian/patches/fix-gcc-warnings
index 0000000,0000000..5077130
new file mode 100644
--- /dev/null
+++ b/debian/patches/fix-gcc-warnings
@@@ -1,0 -1,0 +1,18 @@@
++Description: fix some GCC warnings
++Author: Joao Eriberto Mota Filho <eriberto at debian.org>
++Last-Update: 2015-03-07
++Index: galleta-1.0+20040505/src/galleta.c
++===================================================================
++--- galleta-1.0+20040505.orig/src/galleta.c
+++++ galleta-1.0+20040505/src/galleta.c
++@@ -35,6 +35,10 @@
++ #include <stdio.h>
++ #include <time.h>
++ #include <math.h>
+++// [FIX] galleta.c:119:3: warning: incompatible implicit declaration of built-in function ‘strcpy’
+++#include <string.h>
+++// [FIX] galleta.c:116:5: warning: incompatible implicit declaration of built-in function ‘exit’
+++#include <stdlib.h>
++
++ #define STRSIZE 1000
++
diff --cc debian/patches/fix-makefile
index 0000000,0000000..8834118
new file mode 100644
--- /dev/null
+++ b/debian/patches/fix-makefile
@@@ -1,0 -1,0 +1,16 @@@
++Description: make Makefile compliant with Debian and add GCC hardening.
++Author: Joao Eriberto Mota Filho <eriberto at debian.org>
++Last-Update: 2015-03-07
++Index: galleta-1.0+20040505/src/Makefile
++===================================================================
++--- galleta-1.0+20040505.orig/src/Makefile
+++++ galleta-1.0+20040505/src/Makefile
++@@ -1,7 +1,7 @@
++ all: install
++
++ install: galleta.c
++- gcc -o galleta galleta.c -lm -lc;cp galleta ../bin
+++ gcc $(CFLAGS) $(LDFLAGS) $(CPPFLAGS) -o galleta galleta.c -lm -lc; cp galleta $(DESTDIR)/usr/bin
++
++ installwin: galleta.c
++ gcc -DCYGWIN -o galleta.exe galleta.c -lm -lc;cp galleta.exe ../bin
diff --cc debian/patches/series
index 0000000,0000000..c974851
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,2 @@@
++fix-gcc-warnings
++fix-makefile
diff --cc debian/rules
index 804e627,7ac3ffa..0546a10
--- a/debian/rules
+++ b/debian/rules
@@@ -1,17 -1,43 +1,11 @@@
#!/usr/bin/make -f
++# export DH_VERBOSE=1
- %:
- dh ${@} --sourcedirectory=src
-
- override_dh_auto_clean:
- dh_auto_clean
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
++export DEB_BUILD_MAINT_OPTIONS = hardening=+all
++export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
- rm -rf bin
- $(MAKE) -C src clean
- rm -f bin
++%:
++ dh $@ --sourcedirectory=src
- dh_clean
-
-build: build-stamp
-build-stamp:
- dh_testdir
-
- $(MAKE) -C src
-
- touch build-stamp
-
-install:
-
-binary: binary-arch
-
-binary-arch: build
- dh_testdir
- dh_testroot
- dh_installchangelogs CHANGES
- dh_installdocs
- dh_install
- dh_installman
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary-indep:
-
-.PHONY: clean build install binary binary-arch binary-indep
++# To avoid a double build and a first install in a wrong place.
+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..ba68cfb
new file mode 100644
--- /dev/null
+++ b/debian/watch
@@@ -1,0 -1,0 +1,4 @@@
++version=3
++opts=uversionmangle=s/_/./g,dversionmangle=s/^1\.0\+(20040505)$/$1.1/,filenamemangle=s/\S*download=//g \
++ https://qa.debian.org/cgi-bin/fakeupstream.cgi?upstream=sf/odessa/Galleta \
++ .*=galleta(?:[_\-]v?|)(\d[^\s/]*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/galleta.git
More information about the forensics-changes
mailing list