[Forensics-changes] [reglookup] 02/02: Import Debian patch 1.0.1+svn287-4

Giovani Augusto Ferreira giovani-guest at moszumanska.debian.org
Tue Oct 18 11:35:11 UTC 2016


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

giovani-guest pushed a commit to branch debian
in repository reglookup.

commit 4ba25394f478b9f3ab19d7ff41177aa1f8f5d907
Merge: 6da27da 0e9b1a9
Author: Giovani Augusto Ferreira <giovani at riseup.net>
Date:   Thu Oct 13 23:54:06 2016 -0300

    Import Debian patch 1.0.1+svn287-4

 .gitignore                              |   1 -
 .sconsign.dblite                        | Bin 2343 -> 0 bytes
 SConstruct                              |  65 +++++++++-----
 bin/reglookup-timeline                  |   2 +-
 debian/changelog                        |  91 +++++++++++++++++--
 debian/clean                            |  18 ++++
 debian/compat                           |   2 +-
 debian/control                          | 121 ++++++++++++++++++++++---
 debian/copyright                        | 155 ++++++++++----------------------
 debian/libregfi-dev.install             |   1 +
 debian/libregfi-dev.links               |   1 +
 debian/libregfi1.dirs                   |   1 +
 debian/libregfi1.links                  |   1 +
 debian/libregfi1.symbols                | 117 ++++++++++++++++++++++++
 debian/patches/01_pyregfi_install.patch |  27 ------
 debian/patches/02_ldconfig_call.patch   |  12 ---
 debian/patches/03_fix_man_path.patch    |  19 ----
 debian/patches/fix-install.patch        |  61 +++++++++++++
 debian/patches/fix-spelling.patch       |  16 ++++
 debian/patches/fix-version.patch        |  12 +++
 debian/patches/series                   |   6 +-
 debian/reglookup-doc.doc-base           |   9 ++
 debian/reglookup-doc.install            |   1 +
 debian/reglookup-doc.links              |   1 +
 debian/rules                            |  46 ++++++----
 debian/source.lintian-overrides         |   3 -
 debian/watch                            |   6 +-
 doc/devel/TODO                          |   2 +-
 doc/reglookup-recover.1.docbook         |   2 +-
 doc/reglookup-recover.1.gz              | Bin 1567 -> 0 bytes
 doc/reglookup-timeline.1.docbook        |   2 +-
 doc/reglookup-timeline.1.gz             | Bin 1413 -> 0 bytes
 doc/reglookup.1.docbook                 |   2 +-
 doc/reglookup.1.gz                      | Bin 3480 -> 0 bytes
 include/byteorder.h                     |   2 +-
 include/lru_cache.h                     |   2 +-
 include/range_list.h                    |   2 +-
 include/regfi.h                         |   2 +-
 include/void_stack.h                    |   2 +-
 include/winsec.h                        |   2 +-
 lib/lru_cache.c                         |   5 +-
 lib/range_list.c                        |   2 +-
 lib/regfi.c                             |  24 ++---
 lib/void_stack.c                        |   2 +-
 lib/winsec.c                            |  15 ++--
 pyregfi-distutils.py                    |   4 -
 regfi_version.py                        |   4 +-
 setup.py                                |   8 ++
 src/common.c                            |   2 +-
 src/reglookup-recover.c                 |   2 +-
 src/reglookup.c                         |   2 +-
 51 files changed, 606 insertions(+), 279 deletions(-)

diff --cc debian/changelog
index bd7b0d3,0000000..4af5000
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,97 -1,0 +1,170 @@@
- reglookup (1.0.1-1) unstable; urgency=low
- 
-   [ Elías Alejandro ]
-   * Imported Upstream version 1.0.1
-   * Updated debian/watch
- 
-  -- Elías Alejandro Año Mendoza <ealmdz at gmail.com>  Sat, 08 Oct 2011 16:54:25 -0500
++reglookup (1.0.1+svn287-4) unstable; urgency=medium
++
++  * Upload to unstable.
++
++ -- Giovani Augusto Ferreira <giovani at riseup.net>  Thu, 13 Oct 2016 23:54:06 -0300
++
++reglookup (1.0.1+svn287-3) experimental; urgency=medium
++
++  * debian/rules: adjusted the building sequence in dh_install_indep.
++
++ -- Giovani Augusto Ferreira <giovani at riseup.net>  Mon, 10 Oct 2016 20:49:57 -0300
++
++reglookup (1.0.1+svn287-2) experimental; urgency=medium
++
++  * debian/rules: variables changed to build reglookup-doc package.
++
++ -- Giovani Augusto Ferreira <giovani at riseup.net>  Mon, 10 Oct 2016 15:33:01 -0300
++
++reglookup (1.0.1+svn287-1) experimental; urgency=medium
++
++  * New upstream release. (Closes: #644019)
++  * New co-maintainer.
++  * Update DH level to 10.
++  * debian/clean: create to clean before build.
++  * debian/control:
++      - Added dependencies required by new release to build and install.
++      - Added entries for new binaries and libraries.
++      - Bumped Standards Version to 3.9.8.
++      - Improved all descriptions.
++      - Updated the Vcs-* fields to use https instead of http and git.
++  * debian/copyright:
++      - Removed entries of unused files.
++      - Updated licenses and copyright years.
++  * debian/libregfi1*: files created to build the library package.
++  * debian/patches:
++      - fix-FTBFS-with-ld removed, the new release do not use the Makefile.
++      - fix-install.patch added, patch to fix the install paths and add
++                          GCC Hardening.
++      - fix-spelling.patch added, fix a typo in manpage.
++      - fix-string-error removed, the upstream provides in new release.
++      - fix-version.patch added, fix package version.
++  * debian/reglookup-doc.*: files created to build the documentation package.
++  * debian/rules: updated to new build method.
++  * debian/watch:
++      - Bumped to version 4.
++      - Added a mangle rule to handle the '+svn287' suffix.
++      - Removed the useless entry.
++
++ -- Giovani Augusto Ferreira <giovani at riseup.net>  Wed, 28 Sep 2016 21:00:32 -0300
++
++reglookup (0.12.0-3) unstable; urgency=medium
++
++  * Team upload.
++  * Upload to unstable.
++  * debian/control: added the word 'forensics' in long description.
++  * debian/copyright:
++      - Migrated to 1.0 format.
++      - Updated all information.
++  * debian/patches/fix-FTBFS-with-ld: added to fix a FTBFS with ld --as-needed.
++      Thanks to Matthias Klose <doko at ubuntu.com>. (Closes: #641558)
++  * debian/source.lintian-overrides: removed. Using 'Team upload'.
++  * debian/rules: added DEB_BUILD_MAINT_OPTIONS to improve the GCC hardening.
++
++ -- Joao Eriberto Mota Filho <eriberto at debian.org>  Tue, 23 Jun 2015 14:55:50 -0300
++
++reglookup (0.12.0-2) experimental; urgency=medium
++
++  * Team upload.
++  * Bumped Standards-Version to 3.9.6.
++  * Migrated the packaging to DebSrc3.0 format.
++  * Updated DH level to 9 to allow GCC hardening.
++  * debian/patches/: added the fix-string-error, that fix an
++      elementary error that causes a FTBFS with DH9.
++  * debian/rules: added the flags to make command to provide
++      GCC hardening.
++  * debian/watch:
++      - Added new tracking rules.
++      - Removed the old (not working) rule.
++
++ -- Joao Eriberto Mota Filho <eriberto at debian.org>  Mon, 17 Nov 2014 15:39:30 -0200
 +
 +reglookup (0.12.0-1) unstable; urgency=low
 +
 +  [ Daniel Baumann ]
 +  * Minimizing rules file.
 +
 +  [ Christophe Monniez ]
 +  * Merging upstream version 0.12.0.
 +  * Fixing license problem, bumping to GPL-3 (Closes: #574638).
 +
 +  [ Michael Prokop ]
 +  * Bump Standards-Version to 3.8.4 (no further changes).
 +
 + -- Michael Prokop <mika at debian.org>  Tue, 30 Mar 2010 12:43:10 +0200
 +
 +reglookup (0.11.0-2) unstable; urgency=low
 +
 +  [ Daniel Baumann ]
 +  * Using $CURDIR instead of $PWD in rules file.
 +
 +  [ Christophe Monniez ]
 +  * Fixing the rule that prevented the package to build.
 +
 + -- Daniel Baumann <daniel at debian.org>  Wed, 15 Jul 2009 01:09:03 +0200
 +
 +reglookup (0.11.0-1) unstable; urgency=low
 +
 +  [ Christophe Monniez ]
 +  * Merging upstream version 0.11.0 (Closes: #531784):
 +    - Workarounds docbook2x bugs (Closes: #524983).
 +  * Refactoring build rule to better fit the upstream Makefile.
 +
 +  [ Daniel Baumann ]
 +  * Updating package to standards version 3.8.2.
 +  * Adding lintian overrides.
 +
 + -- Daniel Baumann <daniel at debian.org>  Thu, 09 Jul 2009 12:24:36 +0200
 +
 +reglookup (0.9.0-2) unstable; urgency=low
 +
 +  * Updating year in copyright file.
 +  * Updating to standards 3.8.1.
 +  * Tidy rules file.
 +
 + -- Daniel Baumann <daniel at debian.org>  Thu, 28 May 2009 22:16:36 +0200
 +
 +reglookup (0.9.0-1) unstable; urgency=low
 +
 +  [ Christophe Monniez ]
 +  * Merging upstream version 0.9.0.
 +  * Fixing the math library issue in rules.
 +
 +  [ Daniel Baumann ]
 +  * Updating vcs fields.
 +  * Adding myself to copyright file.
 +  * Replacing obsolete dh_clean -k with dh_prep.
 +
 + -- Daniel Baumann <daniel at debian.org>  Tue, 23 Dec 2008 09:59:00 +0100
 +
 +reglookup (0.4.0-1) unstable; urgency=low
 +
 +  [ David Paleino ]
 +  * Initial release (Closes: #403244).
 +  * Changing copyright on packaging.
 +  * Fixed copyright information.
 +
 +  [ Christophe Monniez ]
 +  * New maintainer.
 +
 +  [ Daniel Baumann ]
 +  * Cleaning up rules file.
 +  * Adding full license headers to copyright file.
 +  * Sorting vcs fields in control file.
 +  * Upgrading package to debhelper 7.
 +  * Updating to standards 3.8.0.
 +  * Moving -Wall to CFLAGS for consistency.
 +  * Not using copyright symbols.
 +  * Fixing my incomplete commit from transforming the quilt patch to rules.
 +  * Reordering rules.
-   * Removing unneded debhelper calls from rules.
++  * Removing unneeded debhelper calls from rules.
 +  * Overwriting variables in make call of rules rather than patching upstream
 +    makefile.
 +  * Rewriting copyright in machine readable form.
-   * Don't use abbrebriations for Windows version in package description.
++  * Don't use abbreviations for Windows version in package description.
 +  * Don't use (R) symbols in package description.
 +  * Correcting url to gitweb in control.
 +  * Setting maintainer address to Debian Forensics.
 +  * Bumping package to debhelper 6.
 +
 + -- Daniel Baumann <daniel at debian.org>  Mon, 16 Jun 2008 12:20:00 +0200
diff --cc debian/clean
index 0000000,0000000..061e83b
new file mode 100644
--- /dev/null
+++ b/debian/clean
@@@ -1,0 -1,0 +1,18 @@@
++build/*/pyregfi/*
++doc/devel/pyregfi/*.*
++doc/devel/pyregfi/search/*
++doc/devel/regfi/*.*
++doc/devel/regfi/search/*
++doc/*.gz
++*-install.log
++lib/*.a
++lib/*.o
++lib/*.os
++lib/*.so
++lib/*.so.*
++.sconsign.dblite
++src/*.o
++src/reglookup
++src/reglookup-recover
++.pybuild/
++results.txt
diff --cc debian/compat
index 7f8f011,0000000..f599e28
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 7
++10
diff --cc debian/control
index 6a519db,0000000..f8b2679
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,23 -1,0 +1,116 @@@
 +Source: reglookup
 +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 (>= 8.0.0), libtalloc-dev, scons, libtalloc2,
-  doxygen, docbook2x, python-all
- X-Python-Version: >=2.6
- Standards-Version: 3.9.2
++Uploaders: Giovani Augusto Ferreira <giovani at riseup.net>
++Build-Depends: debhelper (>= 10),
++               dh-python,
++               docbook2x,
++               doxygen,
++               graphviz,
++               libtalloc-dev,
++               libtalloc2,
++               python-all,
++               python3-all,
++               rdfind,
++               scons (>= 2.3),
++               symlinks
++Standards-Version: 3.9.8
 +Homepage: http://projects.sentinelchicken.org/reglookup/
- Vcs-Browser: http://git.debian.org/?p=forensics/reglookup.git
- Vcs-Git: git://git.debian.org/forensics/reglookup.git
++Vcs-Browser: https://anonscm.debian.org/git/forensics/reglookup.git
++Vcs-Git: https://anonscm.debian.org/git/forensics/reglookup.git
++
++Package: libregfi1
++Section: libs
++Architecture: any
++Depends: ${misc:Depends}, ${shlibs:Depends}
++Description: utility to analysis for Windows NT-based registry (shared library)
++ RegLookup is a system to direct analysis of Windows NT-based registry
++ files providing command line tools, a C API, and a Python module for
++ accessing registry data structures. The project has a focus on providing
++ tools for digital forensics investigations (though is useful for many
++ purposes), and includes algorithms for retrieving deleted data structures
++ from registry hives.
++ .
++ Currently the program allows one to read an entire registry and output it
++ in a (mostly) standardized, quoted format. It also provides features for
++ filtering of results based on registry path and data type.
++ .
++ This package provides the runtime library.
++
++Package: libregfi-dev
++Architecture: any
++Section: libdevel
++Depends: libregfi1 (= ${binary:Version}), ${misc:Depends}
++Description: utility to analysis for Windows NT-based registry (develop. files)
++ RegLookup is a system to direct analysis of Windows NT-based registry
++ files providing command line tools, a C API, and a Python module for
++ accessing registry data structures. The project has a focus on providing
++ tools for digital forensics investigations (though is useful for many
++ purposes), and includes algorithms for retrieving deleted data structures
++ from registry hives.
++ .
++ Currently the program allows one to read an entire registry and output it
++ in a (mostly) standardized, quoted format. It also provides features for
++ filtering of results based on registry path and data type.
++ .
++ This package provides the development files.
 +
 +Package: reglookup
 +Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
- Description: utility to read and query Windows NT/2000/XP registry
-  RegLookup is an small command line utility for reading and querying Microsoft
-  Windows NT/2000/XP registries.
++Depends: ${misc:Depends}, ${shlibs:Depends}
++Description: utility to analysis for Windows NT-based registry
++ RegLookup is a system to direct analysis of Windows NT-based registry
++ files providing command line tools, a C API, and a Python module for
++ accessing registry data structures. The project has a focus on providing
++ tools for digital forensics investigations (though is useful for many
++ purposes), and includes algorithms for retrieving deleted data structures
++ from registry hives.
++ .
++ Currently the program allows one to read an entire registry and output it
++ in a (mostly) standardized, quoted format. It also provides features for
++ filtering of results based on registry path and data type. The package
++ provides the following commands: reglookup, reglookup-recover and
++ reglookup-timeline.
++
++Package: python-pyregfi
++Architecture: all
++Section: python
++Depends: libregfi1 (>= ${binary:Version}), ${misc:Depends}, ${python:Depends}
++Recommends: reglookup-doc
++Description: Python Bindings for reglookup
++ This package contains Python bindings to libregfi. There are the low-level
++ data structures for winsec library and C API mappings for  accessing
++ registry data structures.
++
++Package: python3-pyregfi
++Architecture: all
++Section: python
++Depends: libregfi1 (>= ${binary:Version}), ${misc:Depends}, ${python3:Depends}
++Recommends: reglookup-doc
++Description: Python 3 Bindings for reglookup
++ This package contains Python 3 bindings to libregfi. There are the low-level
++ data structures for winsec library and C API mappings for  accessing
++ registry data structures.
++
++Package: reglookup-doc
++Architecture: all
++Section: doc
++Depends: libjs-jquery, firefox-esr | x-www-browser, ${misc:Depends}
++Suggests: libregfi-dev, python-pyregfi
++Description: developer documentation for libregfi and python-pyregfi
++ RegLookup is a system to direct analysis of Windows NT-based registry
++ files providing command line tools, a C API, and a Python module for
++ accessing registry data structures. The project has a focus on providing
++ tools for digital forensics investigations (though is useful for many
++ purposes), and includes algorithms for retrieving deleted data structures
++ from registry hives.
++ .
++ Currently the program allows one to read an entire registry and output it
++ in a (mostly) standardized, quoted format. It also provides features for
++ filtering of results based on registry path and data type. The package
++ provides the following commands: reglookup, reglookup-recover and
++ reglookup-timeline.
 + .
-  Currently the program allows one to read an entire registry and output it in a
-  (mostly) standardized, quoted format. It also provides features for filtering
-  of results based on registry path and data type.
++ This package contains the all developer documentation for libraries libregfi
++ and python-pyregfi.
diff --cc debian/copyright
index 9a5219e,0000000..ad860c3
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,131 -1,0 +1,66 @@@
- Author: Timothy D. Morgan
- Download: http://projects.sentinelchicken.org/reglookup/
++Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
++Upstream-Name: RegLookup
++Upstream-Contact:  Timothy D. Morgan <tim-debian at sentinelchicken.org, get.secure at blindspotsecurity.com>
++Source: http://projects.sentinelchicken.org/reglookup
 +
 +Files: *
- Copyright: (C) 2005-2010 Timothy D. Morgan
++Copyright: 1992-1998 Andrew Tridgell
++           1992-2005 Samba development team
++           2002      Richard Sharpe <rsharpe at richardsharpe.com>
++           2005      Gerald (Jerry) Carter
++           2005-2011 Timothy D. Morgan <tim-debian at sentinelchicken.org>
++           2010      Michael Cohen <scudette at users.sourceforge.net>
++           2010      Tobias Mueller
 +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; version 3
-  of the License.
-  .
-  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 Street, 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-3 file.
 +
- Files: src/reglookup.c
- Copyright:
-  (C) 2005-2010 Timothy D. Morgan
-  (C) 2010 Tobias Mueller (portions of '-i' code)
-  (C) 2002 Richard Sharpe <rsharpe at richardsharpe.com>
- 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; version 3
-  of the License.
-  .
-  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 Street, 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-3 file.
++Files: bin/reglookup-timeline
++Copyright: 2005-2010 Timothy D. Morgan
++License: GPL-2
 +
- Files: lib/regfi.*
- Copyright:
-  (C) 2005-2007 Timothy D. Morgan
-  (C) 2005 Gerald (Jerry) Carter
- 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; version 3
-  of the License.
-  .
-  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 Street, 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-3 file.
++Files: python/experimental/include/class.h
++       python/experimental/regfi/class.c
++Copyright: 2004 Commonwealth of Australia
++           2004 Michael Cohen <scudette at users.sourceforge.net>
++License: GPL-2+
 +
- Files: lib/void_stack.*
- Copyright: (C) 2005-2007, 2009-2010 Timothy D. Morgan
- 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; version 3
-  of the License.
-  .
-  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 Street, 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-3 file.
++Files: debian/*
++Copyright: 2008      David Paleino <d.paleino at gmail.com>
++           2008-2010 Christophe Monniez <christophe.monniez at fccu.be>
++           2008-2010 Daniel Baumann <daniel at debian.org>
++           2010      Michael Prokop <mika at debian.org>
++           2014-2015 Joao Eriberto Mota Filho <eriberto at debian.org>
++           2016      Giovani Augusto Ferreira <giovani at riseup.net>
++License: GPL-2+
 +
- Files: include/byteorder.h
- Copyright:
-  (C) 2005 Timothy D. Morgan
-  (C) 1992-1998 Andrew Tridgell
 +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; version 3
-  of the 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, version 3 of the License.
 + .
-  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-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
 +
- Files: debian/*
- Copyright:
-  (C) 2008 David Paleino <d.paleino at gmail.com>
-  (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; version 2
-  of the License.
++License: GPL-2 or 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".
diff --cc debian/libregfi-dev.install
index 0000000,0000000..ebfce4b
new file mode 100644
--- /dev/null
+++ b/debian/libregfi-dev.install
@@@ -1,0 -1,0 +1,1 @@@
++include/* usr/include
diff --cc debian/libregfi-dev.links
index 0000000,0000000..17eddc5
new file mode 100644
--- /dev/null
+++ b/debian/libregfi-dev.links
@@@ -1,0 -1,0 +1,1 @@@
++usr/lib/libregfi.so.1.0.1 usr/lib/libregfi.so
diff --cc debian/libregfi1.dirs
index 0000000,0000000..6845771
new file mode 100644
--- /dev/null
+++ b/debian/libregfi1.dirs
@@@ -1,0 -1,0 +1,1 @@@
++usr/lib
diff --cc debian/libregfi1.links
index 0000000,0000000..6cecf60
new file mode 100644
--- /dev/null
+++ b/debian/libregfi1.links
@@@ -1,0 -1,0 +1,1 @@@
++usr/lib/libregfi.so.1.0.1 usr/lib/libregfi.so.1
diff --cc debian/libregfi1.symbols
index 0000000,0000000..c97240f
new file mode 100644
--- /dev/null
+++ b/debian/libregfi1.symbols
@@@ -1,0 -1,0 +1,117 @@@
++libregfi.so.1 libregfi1 #MINVER#
++ lru_cache_create at Base 1.0.1
++ lru_cache_create_ctx at Base 1.0.1
++ lru_cache_destroy at Base 1.0.1
++ lru_cache_find at Base 1.0.1
++ lru_cache_remove at Base 1.0.1
++ lru_cache_update at Base 1.0.1
++ range_list_add at Base 1.0.1
++ range_list_find at Base 1.0.1
++ range_list_find_data at Base 1.0.1
++ range_list_free at Base 1.0.1
++ range_list_get at Base 1.0.1
++ range_list_has_range at Base 1.0.1
++ range_list_new at Base 1.0.1
++ range_list_remove at Base 1.0.1
++ range_list_size at Base 1.0.1
++ range_list_split_element at Base 1.0.1
++ regfi_alloc at Base 1.0.1
++ regfi_alloc_cb at Base 1.0.1
++ regfi_buffer_to_data at Base 1.0.1
++ regfi_calc_maxsize at Base 1.0.1
++ regfi_fetch_classname at Base 1.0.1
++ regfi_fetch_data at Base 1.0.1
++ regfi_fetch_num_subkeys at Base 1.0.1
++ regfi_fetch_num_values at Base 1.0.1
++ regfi_fetch_sk at Base 1.0.1
++ regfi_find_subkey at Base 1.0.1
++ regfi_find_value at Base 1.0.1
++ regfi_free at Base 1.0.1
++ regfi_free_record at Base 1.0.1
++ regfi_get_dacl at Base 1.0.1
++ regfi_get_group at Base 1.0.1
++ regfi_get_owner at Base 1.0.1
++ regfi_get_parentkey at Base 1.0.1
++ regfi_get_rootkey at Base 1.0.1
++ regfi_get_sacl at Base 1.0.1
++ regfi_get_subkey at Base 1.0.1
++ regfi_get_value at Base 1.0.1
++ regfi_init at Base 1.0.1
++ regfi_interpret_data at Base 1.0.1
++ regfi_interpret_keyname at Base 1.0.1
++ regfi_interpret_valuename at Base 1.0.1
++ regfi_iterator_ancestry at Base 1.0.1
++ regfi_iterator_cur_key at Base 1.0.1
++ regfi_iterator_cur_subkey at Base 1.0.1
++ regfi_iterator_cur_value at Base 1.0.1
++ regfi_iterator_descend at Base 1.0.1
++ regfi_iterator_down at Base 1.0.1
++ regfi_iterator_find_subkey at Base 1.0.1
++ regfi_iterator_find_value at Base 1.0.1
++ regfi_iterator_first_subkey at Base 1.0.1
++ regfi_iterator_first_value at Base 1.0.1
++ regfi_iterator_free at Base 1.0.1
++ regfi_iterator_new at Base 1.0.1
++ regfi_iterator_next_subkey at Base 1.0.1
++ regfi_iterator_next_value at Base 1.0.1
++ regfi_iterator_to_root at Base 1.0.1
++ regfi_iterator_up at Base 1.0.1
++ regfi_load_big_data at Base 1.0.1
++ regfi_load_data at Base 1.0.1
++ regfi_load_key at Base 1.0.1
++ regfi_load_sk at Base 1.0.1
++ regfi_load_subkeylist at Base 1.0.1
++ regfi_load_value at Base 1.0.1
++ regfi_load_valuelist at Base 1.0.1
++ regfi_log_get_str at Base 1.0.1
++ regfi_log_set_mask at Base 1.0.1
++ regfi_lookup_hbin at Base 1.0.1
++ regfi_next_sk at Base 1.0.1
++ regfi_nt2unix_time at Base 1.0.1
++ regfi_parse_cell at Base 1.0.1
++ regfi_parse_classname at Base 1.0.1
++ regfi_parse_data at Base 1.0.1
++ regfi_parse_hbin at Base 1.0.1
++ regfi_parse_little_data at Base 1.0.1
++ regfi_parse_nk at Base 1.0.1
++ regfi_parse_regf at Base 1.0.1
++ regfi_parse_sk at Base 1.0.1
++ regfi_parse_subkeylist at Base 1.0.1
++ regfi_parse_unalloc_cells at Base 1.0.1
++ regfi_parse_vk at Base 1.0.1
++ regfi_prev_sk at Base 1.0.1
++ regfi_read at Base 1.0.1
++ regfi_reference_record at Base 1.0.1
++ regfi_seek at Base 1.0.1
++ regfi_type_str2val at Base 1.0.1
++ regfi_type_val2str at Base 1.0.1
++ regfi_unix2nt_time at Base 1.0.1
++ regfi_version at Base 1.0.1
++ void_stack_copy at Base 1.0.1
++ void_stack_copy_reverse at Base 1.0.1
++ void_stack_cur at Base 1.0.1
++ void_stack_free at Base 1.0.1
++ void_stack_free_deep at Base 1.0.1
++ void_stack_iterator_free at Base 1.0.1
++ void_stack_iterator_new at Base 1.0.1
++ void_stack_iterator_next at Base 1.0.1
++ void_stack_new at Base 1.0.1
++ void_stack_pop at Base 1.0.1
++ void_stack_push at Base 1.0.1
++ void_stack_size at Base 1.0.1
++ winsec_ace_equal at Base 1.0.1
++ winsec_ace_object at Base 1.0.1
++ winsec_acl_equal at Base 1.0.1
++ winsec_desc_equal at Base 1.0.1
++ winsec_free_descriptor at Base 1.0.1
++ winsec_parse_ace at Base 1.0.1
++ winsec_parse_acl at Base 1.0.1
++ winsec_parse_desc at Base 1.0.1
++ winsec_parse_descriptor at Base 1.0.1
++ winsec_parse_dom_sid at Base 1.0.1
++ winsec_parse_uuid at Base 1.0.1
++ winsec_sid2str at Base 1.0.1
++ winsec_sid_compare at Base 1.0.1
++ winsec_sid_compare_auth at Base 1.0.1
++ winsec_sid_equal at Base 1.0.1
++ winsec_sid_size at Base 1.0.1
diff --cc debian/patches/fix-install.patch
index 0000000,0000000..38bebc1
new file mode 100644
--- /dev/null
+++ b/debian/patches/fix-install.patch
@@@ -1,0 -1,0 +1,61 @@@
++Description: Fix upstream SConstruct to install correctly the files
++             and add GCC hardening.
++Author: Giovani Augusto Ferreira <giovani at riseup.net>
++Last-Update: 2016-09-28
++Index: reglookup-1.0.1+svn287/SConstruct
++===================================================================
++--- reglookup-1.0.1+svn287.orig/SConstruct
+++++ reglookup-1.0.1+svn287/SConstruct
++@@ -8,11 +8,13 @@ ABI_VERSION=REGFI_VERSION.rsplit('.',1)[
++ 
++ # Package Maintainers: should any of these options in the first line be omitted during
++ # package build, instead relying on CFLAGS/LDFLAGS to specify them when appropriate?
++-cflags = '-std=gnu99 -pedantic -Wall -D_FILE_OFFSET_BITS=64 -fvisibility=hidden'
+++cflags = '-g -O2 -fstack-protector-strong -Wformat -Werror=format-security -std=gnu99 -pedantic -Wall -D_FILE_OFFSET_BITS=64 -fvisibility=hidden'
++ cflags += ' -DREGFI_VERSION=\'"%s"\' ' % REGFI_VERSION
++-cflags += os.environ.get('CFLAGS','-fPIE -pie -fstack-protector -D_FORTIFY_SOURCE=2')
+++cflags += ' -ggdb'
+++cflags += ' -D_FORTIFY_SOURCE=2'
+++cflags += ' -fPIE'
++ 
++-linkflags = "-fPIC " + os.environ.get('LDFLAGS',"-Wl,-z,relro,-z,now")
+++linkflags = "-fPIE -pie " + os.environ.get('LDFLAGS','-z relro -z now')
++ 
++ lib_src = ['lib/regfi.c',
++            'lib/winsec.c',
++@@ -25,8 +27,8 @@ env = Environment(ENV=os.environ,
++                   CC=cc,
++                   CFLAGS=cflags,
++                   LINKFLAGS=linkflags,
++-                  CPPPATH=['include', '/usr/local/include'],
++-                  LIBPATH=['lib', '/usr/local/lib'],
+++                  CPPPATH=['include', '/usr/include'],
+++                  LIBPATH=['lib', '/usr/lib'],
++                   LIBS=['m', 'pthread', 'regfi', 'talloc'])
++ 
++ 
++@@ -63,7 +65,6 @@ includedir = os.environ.get('INCLUDEDIR'
++ mandir     = os.environ.get('MANDIR', prefix + 'man')
++ 
++ install_bin = [destdir + bindir, destdir + mandir]
++-install_lib = [destdir + libdir, destdir + includedir + '/regfi']
++ 
++ env.Install(destdir+bindir, [reglookup, reglookup_recover, 'bin/reglookup-timeline'])
++ libinstall = env.InstallVersionedLib(destdir+libdir, [libregfi, libregfi_static], SHLIBVERSION=ABI_VERSION)
++@@ -99,7 +100,7 @@ pyregfi_doc = env.Command('doc/devel/pyr
++                           Glob('python/pyregfi/*.py')+['doc/devel/Doxyfile.pyregfi', regfi_doc],
++                           'doxygen doc/devel/Doxyfile.pyregfi')
++ 
++-install_items = install_bin + install_lib + install_pyregfi
+++install_items = install_bin + install_pyregfi
++ 
++ # User Friendly Targets
++ env.Alias('libregfi', libregfi)
++@@ -109,7 +110,6 @@ env.Alias('bin', [reglookup_recover, reg
++ env.Alias('doc', [man_reglookup,man_reglookup_recover,man_reglookup_timeline])
++ env.Alias('doc-devel', [regfi_doc, pyregfi_doc])
++ env.Alias('install_bin', install_bin)
++-env.Alias('install_lib', install_lib)
++ env.Alias('install_pyregfi', install_pyregfi)
++ env.Alias('install', install_items)
++ 
diff --cc debian/patches/fix-spelling.patch
index 0000000,0000000..e89cdf3
new file mode 100644
--- /dev/null
+++ b/debian/patches/fix-spelling.patch
@@@ -1,0 -1,0 +1,16 @@@
++Description: Fix a typo in Manpage.
++Author: Giovani Augusto Ferreira <giovani at riseup.net>
++Last-Update: 2016-09-28
++Index: reglookup-1.0.1+svn287/doc/reglookup.1.docbook
++===================================================================
++--- reglookup-1.0.1+svn287.orig/doc/reglookup.1.docbook
+++++ reglookup-1.0.1+svn287/doc/reglookup.1.docbook
++@@ -257,7 +257,7 @@
++     <para>
++       Note that some of the bits listed above have either not been allocated by 
++       Microsoft, or simply aren't documented.  If any bits are set in the above 
++-      two fields that aren't recognized, a hexidecimal representation of all of 
+++      two fields that aren't recognized, a hexadecimal representation of all of 
++       these mystery bits will be included in the output.  For instance, if the 
++       lowest bit and third lowest bit were not recognized while being set, 
++       the number "0x5" would be included as an element in the list.
diff --cc debian/patches/fix-version.patch
index 0000000,0000000..2e675b4
new file mode 100644
--- /dev/null
+++ b/debian/patches/fix-version.patch
@@@ -1,0 -1,0 +1,12 @@@
++Description: Fix program version.
++Author: Giovani Augusto Ferreira <giovani at riseup.net>
++Last-Update: 2016-09-28
++Index: reglookup-1.0.1+svn287/regfi_version.py
++===================================================================
++--- reglookup-1.0.1+svn287.orig/regfi_version.py
+++++ reglookup-1.0.1+svn287/regfi_version.py
++@@ -1,3 +1,3 @@
++ SVN_REV = "$Rev$"
++ LATEST='1.0.1'
++-REGFI_VERSION = "%s.%s" % (LATEST, SVN_REV.split(' ')[1])
+++REGFI_VERSION = "%s.%s" % (LATEST, 0)
diff --cc debian/patches/series
index 601523a,0000000..d4901fb
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,3 @@@
- 01_pyregfi_install.patch
- 02_ldconfig_call.patch
- 03_fix_man_path.patch
++fix-spelling.patch
++fix-install.patch
++fix-version.patch
diff --cc debian/reglookup-doc.doc-base
index 0000000,0000000..3fc47fa
new file mode 100644
--- /dev/null
+++ b/debian/reglookup-doc.doc-base
@@@ -1,0 -1,0 +1,9 @@@
++Document: reglookup-doc
++Title: The regfi library Reference Manual.
++Author: Doxygen
++Abstract: Developer documentation for libregfi and python-pyregfi
++Section: Programming
++
++Format: HTML
++Index: /usr/share/doc/reglookup-doc/regfi/index.html
++Files: /usr/share/doc/reglookup-doc/regfi/*.html
diff --cc debian/reglookup-doc.install
index 0000000,0000000..36b5ffc
new file mode 100644
--- /dev/null
+++ b/debian/reglookup-doc.install
@@@ -1,0 -1,0 +1,1 @@@
++doc/devel/* usr/share/doc/reglookup-doc/
diff --cc debian/reglookup-doc.links
index 0000000,0000000..c1a2521
new file mode 100644
--- /dev/null
+++ b/debian/reglookup-doc.links
@@@ -1,0 -1,0 +1,1 @@@
++usr/share/javascript/jquery/jquery.js usr/share/doc/reglookup-doc/pyregfi/jquery.js
diff --cc debian/rules
index ebd8f5a,0000000..d2f86a8
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,22 -1,0 +1,38 @@@
 +#!/usr/bin/make -f
 +
++export PYBUILD_NAME=pyregfi
++LIB_R_VERSION=1.0.1
++
++LIBDIR=$(CURDIR)/debian/libregfi1
++
++export DOCPATH=$(CURDIR)/debian/reglookup-doc/usr/share/doc/reglookup-doc
++export DEB_BUILD_MAINT_OPTIONS = hardening=+all
++export DEB_BUILD_HARDENING=1
++
 +%:
- 	dh $@ --with python2
++	dh $@ --buildsystem=pybuild --with python2,python3
 +
 +override_dh_auto_build:
- 	scons
++	scons bin doc doc-devel
++	dh_auto_build
 +
 +override_dh_auto_install:
- 	PREFIX=$(CURDIR)/debian/reglookup/usr scons install
- 
- override_dh_install:
- 	python pyregfi-distutils.py install --root=debian/reglookup --install-layout=deb
- 
- override_dh_clean:
- 	dh_testdir
- 	dh_testroot
- 	scons -c -C SConstruct
- 	find -name "*.pyc" -delete
- 	rm -f build-stamp configure-stamp
- 	rm -rf config.log .sconf_temp/ build/
- 	dh_clean
++	PREFIX=/usr DESTDIR=debian/reglookup MANDIR=/usr/share/man LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) scons install
++	dh_auto_install
++
++override_dh_install-arch:
++	dh_install
++	cp $(CURDIR)/lib/libregfi.so \
++           $(LIBDIR)/usr/lib/libregfi.so.$(LIB_R_VERSION)
++
++override_dh_install-indep:
++	dh_install
++	# Remove unnecessary hashes
++	find $(DOCPATH) -name '*.md5' -exec rm -f {} \;
++	# Using rdfind and symlinks to transform duplicated files in softlinks
++	rdfind -makesymlinks true $(DOCPATH)
++	symlinks -cr $(DOCPATH)
++	# Avoid an embedded javascript library
++	rm $(DOCPATH)/pyregfi/jquery.js
++
++override_dh_auto_test:
diff --cc debian/watch
index 6e96a57,0000000..6b62a1c
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,3 -1,0 +1,3 @@@
- version=3
- 
- http://googlecode.debian.net/p/reglookup/reglookup-src-(\d+.*)\.tar\.gz
++version=4
++opts=dversionmangle=s/\+svn287// \
++http://projects.sentinelchicken.org/reglookup/download/ .*/(?:downloads|files)/reglookup(?:-src)?-(\d\S+)\.tar\.(?:bz2|gz|xz)

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



More information about the forensics-changes mailing list