[Forensics-changes] [shed] 01/01: Imported Debian patch 1.15-3

Joao Eriberto Mota Filho eriberto at moszumanska.debian.org
Tue Jun 23 21:11:18 UTC 2015


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

eriberto pushed a commit to branch debian
in repository shed.

commit dc25a76c6af10b1d72bfd4ab73b2b2a0fe5020d6
Merge: abf4c3c 5e63b82
Author: Joao Eriberto Mota Filho <eriberto at debian.org>
Date:   Tue Jun 23 16:59:29 2015 -0300

    Imported Debian patch 1.15-3

 debian/changelog                 | 28 ++++++++++++++++++++++-
 debian/compat                    |  2 +-
 debian/control                   | 28 +++++++++++++++--------
 debian/copyright                 | 48 ++++++++++++++++++++++------------------
 debian/{shed.docs => docs}       |  0
 debian/manpages/shed.1           | 27 ----------------------
 debian/patches/add-GCC-hardening | 16 ++++++++++++++
 debian/patches/fix-manpage       | 25 +++++++++++++++++++++
 debian/patches/series            |  2 ++
 debian/rules                     | 15 +++----------
 debian/shed.manpages             |  1 -
 debian/source.lintian-overrides  |  3 ---
 debian/source/format             |  1 +
 debian/watch                     |  2 +-
 14 files changed, 121 insertions(+), 77 deletions(-)

diff --cc debian/changelog
index 8e81a85,0000000..aaa1f9c
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,41 -1,0 +1,67 @@@
++shed (1.15-3) unstable; urgency=medium
++
++  * Team upload.
++  * Migrations:
++      - DebSrc to 3.0 format.
++      - DH level to 9.
++      - debian/changelog to 1.0 format.
++      - debian/rules to new (reduced) format.
++      - Using dh-autoreconf.
++  * Removed the old and very incomplete manpage from debian/. The upstream is
++      providing a manpage.
++  * debian/changelog: updated all information.
++  * debian/control:
++      - Bumped Standards-Version to 3.9.6.
++      - Improved the long description.
++      - Removed the leading article from short description.
++      - Updated the Vcs-* fields.
++  * debian/patches/:
++      - add-GCC-hardening: added to fix configure.in, allowing GCC hardening.
++      - fix-manpage: added to fix some issues in upstream manpage.
++  * debian/shed.docs: renamed to docs.
++  * debian/source.lintian-overrides: removed. Using 'Team upload' now.
++  * debian/watch: improved.
++
++ -- Joao Eriberto Mota Filho <eriberto at debian.org>  Tue, 23 Jun 2015 16:59:29 -0300
++
 +shed (1.15-2) 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:40:16 +0200
 +
 +shed (1.15-1) unstable; urgency=low
 +
 +  * Merging upstream version 1.15.
 +
 + -- Daniel Baumann <daniel at debian.org>  Thu, 28 May 2009 23:16:55 +0200
 +
 +shed (1.14-2) unstable; urgency=low
 +
 +  * Adding myself to copyright.
 +  * Updating to standards 3.8.1.
 +  * Tidy rules file.
 +  * Improving package long description (Closes: #520207).
 +
 + -- Daniel Baumann <daniel at debian.org>  Thu, 28 May 2009 22:32:58 +0200
 +
 +shed (1.14-1) unstable; urgency=low
 +
 +  [ Juan Angulo Moreno ]
 +  * Initial release (Closes: #512125).
 +
 +  [ Daniel Baumann ]
 +  * Removing useless whitespaces at EOF and EOL.
 +  * Correcting wrong ncurses build-depends.
 +  * Updating vcs fields in control.
 +  * Rewrapping package long description to 80 chars a line in control.
-   * Crorrecting copyright file.
++  * Correcting copyright file.
 +  * Removing useless dirs debhelper file.
 +  * Removing empty NEWS from docs.
 +  * Removing AUTHORS from docs, contains no new information over copyright file.
 +  * Prefixing debhelper files with package name.
 +  * Moving out manpage of debian directory to subdirectory.
 +  * Reordering rules file.
 +
 + -- Daniel Baumann <daniel at debian.org>  Tue, 20 Jan 2009 21:24:44 +0100
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 69b2d45,0000000..f726f49
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,18 -1,0 +1,28 @@@
 +Source: shed
 +Section: admin
 +Priority: optional
 +Maintainer: Debian Forensics <forensics-devel at lists.alioth.debian.org>
 +Uploaders: Juan Angulo Moreno <juan at apuntale.com>
- Build-Depends: debhelper (>= 7), autotools-dev, libncurses5-dev
- Standards-Version: 3.8.2
- Homepage: http://shed.sourceforge.net
- Vcs-Browser: http://git.debian.net/?p=debian-forensics/shed.git
- Vcs-Git: git://git.debian.net/git/debian-forensics/shed.git
++Build-Depends: debhelper (>= 9), dh-autoreconf, libncurses5-dev
++Standards-Version: 3.9.6
++Homepage: http://shed.sf.net
++Vcs-Browser: http://anonscm.debian.org/cgit/forensics/shed.git
++Vcs-Git: git://anonscm.debian.org/forensics/shed.git
 +
 +Package: shed
 +Architecture: any
 +Depends: ${shlibs:Depends}, ${misc:Depends}
- Description: A simple hex editor with a pico-style interface
-  shed is an easy application for viewing and editing files in hex, octal,
-  binary, or ascii text using ncurses. The interface is inspired by pico, another
-  ncurses based text editor.
++Description: simple hex editor with a pico-style interface
++ shed (Simple Hex Editor) is an easy application for viewing and editing
++ files in text mode, using ncurses. The main features are:
++ .
++   - Displays each byte as ascii, hex, decimal, octal and binary;
++   - Allows changes to be input in all of the above displayed modes,
++     with bit toggling in the binary column;
++   - Simple Pico-style interface;
++   - Search resource;
++   - Can dump information to file;
++   - Small memory requirements because file is not loaded into memory;
++   - Large file support.
++ .
++ shed is useful in forensics investigations.
diff --cc debian/copyright
index a0bab07,0000000..f6fcde6
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,43 -1,0 +1,47 @@@
- Author: Alex Sisson <alexs at cyberspace.org>
- Download: http://shed.sourceforge.net/
++Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
++Upstream-Name: shed
++Source: http://shed.sf.net
 +
 +Files: *
- Copyright: (C) 2002-2008 Alex Sisson <alexs at cyberspace.org>
++Copyright: 2002-2009 Alex Sisson <alexsisson at gmail.com>
 +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.
++
++Files: debian/*
++Copyright: 2008-2009 Juan Angulo Moreno <juan at apuntale.com>
++           2008-2009 Daniel Baumann <daniel at debian.org>
++           2015      Joao Eriberto Mota Filho <eriberto at debian.org>
++License: GPL-3+
++
++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
++ (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".
 +
- Files: debian/*
- Copyright:
-  (C) 2008-2009 Juan Angulo Moreno <juan at apuntale.com>
-  (C) 2008-2009 Daniel Baumann <daniel at debian.org>
 +License: GPL-3+
 + 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 3 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, see <http://www.gnu.org/licenses/>.
++ 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-3 file.
++ On Debian systems, the complete text of the GNU General
++ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
diff --cc debian/docs
index d5aaf52,0000000..d5aaf52
mode 100644,000000..100644
--- a/debian/docs
+++ b/debian/docs
diff --cc debian/patches/add-GCC-hardening
index 0000000,0000000..93444cb
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-06-23
++Index: shed-1.15/configure.in
++===================================================================
++--- shed-1.15.orig/configure.in
+++++ shed-1.15/configure.in
++@@ -2,7 +2,7 @@ AC_INIT(shed.c)
++ AM_INIT_AUTOMAKE(shed,1.15)
++ AC_PROG_CC
++ AC_PROG_INSTALL
++-CFLAGS="-Wall"
+++CFLAGS="$CFLAGS -Wall"
++ AC_SUBST(CFLAGS)
++ 
++ AC_ARG_ENABLE(debug,   [  --enable-debug          gcc -g],enable_debug=yes)
diff --cc debian/patches/fix-manpage
index 0000000,0000000..612700a
new file mode 100644
--- /dev/null
+++ b/debian/patches/fix-manpage
@@@ -1,0 -1,0 +1,25 @@@
++Description: fix some issues in manpage.
++Author: Joao Eriberto Mota Filho <eriberto at debian.org>
++Last-Update: 2015-06-23
++Index: shed-1.15/shed.1
++===================================================================
++--- shed-1.15.orig/shed.1
+++++ shed-1.15/shed.1
++@@ -2,7 +2,7 @@
++ .\"(C) Alex Sisson, 2002-2009
++ .TH shed 1 "24-MAR-2009" shed-1.15
++ .SH NAME
++-shed (Simple Hex EDitor)
+++shed - simple hex editor with a pico-style interface
++ .SH SYNOPSIS
++ .B shed
++ .I [OPTIONS] [FILE]
++@@ -77,7 +77,7 @@ toggle the endianness of multi-byte valu
++ .TP
++ .B s / w / ^w / f / F3
++ search. Search string is asked for in the format of the current cursor column.
++-In ascii, just enter the string in ascii. In the others, enter the values  seperated by spaces.
+++In ascii, just enter the string in ascii. In the others, enter the values  separated by spaces.
++ eg to search for ABC from the decimal column you would enter "65 66 67" (without the quotes).
++ .TP
++ .B ^f / ^b
diff --cc debian/patches/series
index 0000000,0000000..b892d80
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,2 @@@
++fix-manpage
++add-GCC-hardening
diff --cc debian/rules
index 9162658,0000000..63844c9
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,15 -1,0 +1,6 @@@
 +#!/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_auto_configure -- LDFLAGS="-Wl,-z,defs"
++%:
++	dh $@ --with autoreconf
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 1a1a28e,0000000..db8d481
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,2 -1,0 +1,2 @@@
 +version=3
- http://sf.net/shed/shed-(.*)\.tar\.gz
++http://sf.net/shed/shed-(\d\S+)\.tar\.(?:bz2|gz|xz)

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



More information about the forensics-changes mailing list