--- hivex-1.2.7.orig/configure
+++ hivex-1.2.7/configure
@@ -23344,6 +23344,7 @@
+
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
@@ -23472,6 +23473,7 @@
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LIBXML2_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -23488,6 +23490,7 @@
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LIBXML2_LIBS=`$PKG_CONFIG --libs "libxml-2.0" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -23507,9 +23510,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBXML2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libxml-2.0" 2>&1`
+ LIBXML2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libxml-2.0" 2>&1`
else
- LIBXML2_PKG_ERRORS=`$PKG_CONFIG --print-errors "libxml-2.0" 2>&1`
+ LIBXML2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libxml-2.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBXML2_PKG_ERRORS" >&5
@@ -23524,7 +23527,6 @@
Alternatively, you may set the environment variables LIBXML2_CFLAGS
and LIBXML2_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
-
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
@@ -23540,7 +23542,6 @@
To get pkg-config, see .
See \`config.log' for more details" "$LINENO" 5; }
-
else
LIBXML2_CFLAGS=$pkg_cv_LIBXML2_CFLAGS
LIBXML2_LIBS=$pkg_cv_LIBXML2_LIBS
--- hivex-1.2.7.orig/aclocal.m4
+++ hivex-1.2.7/aclocal.m4
@@ -47,7 +47,8 @@
# ----------------------------------
AC_DEFUN([PKG_PROG_PKG_CONFIG],
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
@@ -93,7 +94,8 @@
pkg_cv_[]$1="$$1"
elif test -n "$PKG_CONFIG"; then
PKG_CHECK_EXISTS([$3],
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes ],
[pkg_failed=yes])
else
pkg_failed=untried
@@ -141,9 +143,9 @@
AC_MSG_RESULT([no])
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
else
- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
@@ -156,7 +158,7 @@
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
-_PKG_TEXT])
+_PKG_TEXT])[]dnl
])
elif test $pkg_failed = untried; then
AC_MSG_RESULT([no])
@@ -167,7 +169,7 @@
_PKG_TEXT
-To get pkg-config, see .])
+To get pkg-config, see .])[]dnl
])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
--- hivex-1.2.7.orig/ocaml/Makefile.am
+++ hivex-1.2.7/ocaml/Makefile.am
@@ -88,18 +88,19 @@
SUFFIXES = .cmo .cmi .cmx .ml .mli .mll .mly
# Do the installation by hand, because we want to run ocamlfind.
+install_files = META *.so *.a *.cma *.cmi *.mli
+
+if HAVE_OCAMLOPT
+install_files += *.cmx *.cmxa
+endif
+
install-data-hook:
mkdir -p $(DESTDIR)$(OCAMLLIB)
mkdir -p $(DESTDIR)$(OCAMLLIB)/stublibs
$(OCAMLFIND) install \
-ldconf ignore -destdir $(DESTDIR)$(OCAMLLIB) \
- hivex \
- META *.so *.a *.cma *.cmi *.mli
-if HAVE_OCAMLOPT
- $(OCAMLFIND) install \
- -ldconf ignore -destdir $(DESTDIR)$(OCAMLLIB) \
- *.cmx *.cmxa
-endif
+ $(PACKAGE_NAME) \
+ $(install_files)
CLEANFILES += $(noinst_DATA)
--- hivex-1.2.7.orig/ocaml/Makefile.in
+++ hivex-1.2.7/ocaml/Makefile.in
@@ -54,7 +54,8 @@
@HAVE_OCAMLOPT_TRUE@@HAVE_OCAML_TRUE@am__append_1 = mlhivex.cmxa
DIST_COMMON = $(srcdir)/.depend $(srcdir)/META.in \
$(srcdir)/Makefile.am $(srcdir)/Makefile.in
-@HAVE_OCAML_TRUE@am__append_2 = $(noinst_DATA)
+@HAVE_OCAMLOPT_TRUE@@HAVE_OCAML_TRUE@am__append_2 = *.cmx *.cmxa
+@HAVE_OCAML_TRUE@am__append_3 = $(noinst_DATA)
subdir = ocaml
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
@@ -870,7 +871,7 @@
t/*.ml
CLEANFILES = *.cmi *.cmo *.cmx *.cma *.cmxa *.o *.a *.so t/*.cmi \
- t/*.cmo t/*.cmx t/*.o t/*.a t/*.so $(am__append_2)
+ t/*.cmo t/*.cmx t/*.o t/*.a t/*.so $(am__append_3)
AM_CPPFLAGS = \
-I$(top_builddir) -I$(OCAMLLIB) -I$(top_srcdir)/ocaml \
-I$(top_srcdir)/lib \
@@ -894,6 +895,10 @@
@HAVE_OCAML_TRUE@ t/hivex_300_fold
@HAVE_OCAML_TRUE@SUFFIXES = .cmo .cmi .cmx .ml .mli .mll .mly
+
+# Do the installation by hand, because we want to run ocamlfind.
+@HAVE_OCAML_TRUE@install_files = META *.so *.a *.cma *.cmi *.mli \
+@HAVE_OCAML_TRUE@ $(am__append_2)
all: all-am
.SUFFIXES:
@@ -1211,17 +1216,13 @@
@HAVE_OCAML_TRUE@hivex.cmo: hivex.cmi
@HAVE_OCAML_TRUE@hivex.cmx: hivex.cmi
-# Do the installation by hand, because we want to run ocamlfind.
@HAVE_OCAML_TRUE@install-data-hook:
@HAVE_OCAML_TRUE@ mkdir -p $(DESTDIR)$(OCAMLLIB)
@HAVE_OCAML_TRUE@ mkdir -p $(DESTDIR)$(OCAMLLIB)/stublibs
@HAVE_OCAML_TRUE@ $(OCAMLFIND) install \
@HAVE_OCAML_TRUE@ -ldconf ignore -destdir $(DESTDIR)$(OCAMLLIB) \
-@HAVE_OCAML_TRUE@ hivex \
-@HAVE_OCAML_TRUE@ META *.so *.a *.cma *.cmi *.mli
-@HAVE_OCAMLOPT_TRUE@@HAVE_OCAML_TRUE@ $(OCAMLFIND) install \
-@HAVE_OCAMLOPT_TRUE@@HAVE_OCAML_TRUE@ -ldconf ignore -destdir $(DESTDIR)$(OCAMLLIB) \
-@HAVE_OCAMLOPT_TRUE@@HAVE_OCAML_TRUE@ *.cmx *.cmxa
+@HAVE_OCAML_TRUE@ $(PACKAGE_NAME) \
+@HAVE_OCAML_TRUE@ $(install_files)
# Tell version 3.79 and up of GNU make to not build goals in this
# directory in parallel. (See RHBZ#502309).
--- hivex-1.2.7.orig/debian/libhivex-ocaml.install
+++ hivex-1.2.7/debian/libhivex-ocaml.install
@@ -0,0 +1 @@
+usr/lib/ocaml/stublibs/dllmlhivex.so
--- hivex-1.2.7.orig/debian/libwin-hivex-perl.install
+++ hivex-1.2.7/debian/libwin-hivex-perl.install
@@ -0,0 +1,7 @@
+usr/lib/perl5
+
+usr/share/man/man3/Win::Hivex.3pm
+usr/share/man/man3/Win::Hivex::Regedit.3pm
+
+usr/bin/hivexregedit
+usr/share/man/man1/hivexregedit.1
--- hivex-1.2.7.orig/debian/python-hivex.install
+++ hivex-1.2.7/debian/python-hivex.install
@@ -0,0 +1 @@
+/usr/lib/python*/dist-packages
--- hivex-1.2.7.orig/debian/libhivex-bin.install
+++ hivex-1.2.7/debian/libhivex-bin.install
@@ -0,0 +1,10 @@
+usr/bin/hivexsh
+usr/share/man/man1/hivexsh.1
+
+usr/bin/hivexml
+usr/share/man/man1/hivexml.1
+
+usr/bin/hivexget
+usr/share/man/man1/hivexget.1
+
+usr/share/locale
--- hivex-1.2.7.orig/debian/libhivex-dev.install
+++ hivex-1.2.7/debian/libhivex-dev.install
@@ -0,0 +1,6 @@
+usr/include/*
+usr/lib/lib*.a
+usr/lib/lib*.so
+usr/lib/pkgconfig/*
+
+usr/share/man/man3/hivex.3
--- hivex-1.2.7.orig/debian/copyright
+++ hivex-1.2.7/debian/copyright
@@ -0,0 +1,63 @@
+This work was packaged for Debian by:
+
+ Hilko Bengen
+
+It was downloaded from:
+
+ ,
+
+Upstream Author:
+
+ Richard W.M. Jones
+
+Copyright:
+
+ Copyright (C) 2009-2010 Red Hat Inc.
+
+License (libhivex):
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation;
+ version 2.1 of the License.
+
+License (Perl modules, OCaml bindings):
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+License (hivexget, hivexsh, hivexregedit, hivexml):
+
+ 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.
+
+The files in the gnulib directory are:
+
+ Copyright (C) Free Software Foundation, Inc.
+
+License (gnulib):
+
+ 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 any later version.
+
+The Debian packaging is:
+
+ Copyright (C) 2010 Hilko Bengen
+
+and is licensed under the GNU General Public License version 2 or
+later.
+
+On Debian systems, the complete text of the GNU Lesser General Public
+License can be found in "/usr/share/common-licenses/LGPL-2".
+
+On Debian systems, the complete text of the GNU General Public License
+version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+On Debian systems, the complete text of the GNU General Public License
+version 3 can be found in "/usr/share/common-licenses/GPL-3".
--- hivex-1.2.7.orig/debian/compat
+++ hivex-1.2.7/debian/compat
@@ -0,0 +1 @@
+7
--- hivex-1.2.7.orig/debian/control
+++ hivex-1.2.7/debian/control
@@ -0,0 +1,106 @@
+Source: hivex
+Section: libs
+Priority: extra
+Maintainer: Hilko Bengen
+Build-Depends: debhelper (>= 7.0.50~),
+ autotools-dev,
+ pkg-config,
+ libxml2-dev,
+ libreadline-dev,
+ libio-stringy-perl,
+ ocaml-findlib, dh-ocaml (>= 0.9~), ocaml-nox (>= 3.11.1-3~),
+ python-all-dev, python-all-dbg, python-support
+Standards-Version: 3.9.2
+Homepage: http://libguestfs.org/
+
+Package: libhivex0
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libguestfs0 (<= 1.0.84-4)
+Description: library for reading and writing Windows Registry hives
+ libhivex is a self-contained library for reading and writing Windows
+ Registry "hive" binary files.
+ .
+ Unlike many other tools in this area, it doesn't use the textual .REG
+ format for output, because parsing that is as much trouble as parsing
+ the original binary format. Instead it makes the file available
+ through a C API, or there is a separate program to export the hive as
+ XML.
+
+Package: libhivex-dev
+Section: libdevel
+Architecture: any
+Depends: ${misc:Depends}, libhivex0 (= ${binary:Version})
+Description: library for reading and writing Windows Registry hives
+ libhivex is a self-contained library for reading and writing Windows
+ Registry "hive" binary files.
+ .
+ This package provides static libraries and header files.
+
+Package: libhivex0-dbg
+Section: debug
+Architecture: any
+Depends: libhivex0, ${shlibs:Depends}, ${misc:Depends}
+Description: library for reading and writing Windows Registry hives
+ libhivex is a self-contained library for reading and writing Windows
+ Registry "hive" binary files.
+ .
+ This package contains debug symbols for libhivex.
+
+Package: libhivex-bin
+Section: otherosfs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: utilities for reading and writing Windows Registry hives
+ libhivex is a self-contained library for reading and writing Windows
+ Registry "hive" binary files.
+ .
+ This package contains a few command line programs that utilize libhivex.
+
+Package: libwin-hivex-perl
+Section: perl
+Architecture: any
+Depends: ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Description: Perl bindings to hivex
+ Perl bindings for libhivex, a library for reading and writing
+ Windows Registry "hive" binary files.
+ .
+ This package also contains hivexregedit, a low-level command-line
+ tool for manipulating and dumping registry hives.
+
+Package: libhivex-ocaml
+Architecture: any
+Section: ocaml
+Depends: ${ocaml:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Provides: ${ocaml:Provides}
+Description: OCaml bindings for hivex -- runtime files
+ OCaml bindings for libhivex, a library for reading and writing
+ Windows Registry "hive" binary files.
+ .
+ This package include only the shared runtime stub libraries.
+
+Package: libhivex-ocaml-dev
+Architecture: any
+Section: ocaml
+Depends: ${ocaml:Depends}, libhivex-dev, ${shlibs:Depends}, ${misc:Depends}
+Provides: ${ocaml:Provides}
+Description: OCaml bindings for hivex -- developtment files
+ OCaml bindings for libhivex, a library for reading and writing
+ Windows Registry "hive" binary files.
+ .
+ This package contains all the files needed to develop OCaml programs
+ wich use OCaml bindings to libhivex.
+
+Package: python-hivex
+Architecture: any
+Section: python
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Description: Python bindings for hivex
+ Python bindings for libhivex, a library for reading and writing
+ Windows Registry "hive" binary files.
+
+# Package: libhivex-doc
+# Architecture: all
+# Description: documentation for hivex
+#
--- hivex-1.2.7.orig/debian/watch
+++ hivex-1.2.7/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://www.libguestfs.org/download/hivex hivex-(.*)\.tar\.gz
--- hivex-1.2.7.orig/debian/changelog
+++ hivex-1.2.7/debian/changelog
@@ -0,0 +1,55 @@
+hivex (1.2.7-1build1) oneiric; urgency=low
+
+ * Rebuild to pick up ocaml fixes on armel.
+
+ -- Adam Conrad Wed, 24 Aug 2011 16:26:50 -0600
+
+hivex (1.2.7-1) unstable; urgency=low
+
+ * New upstream version
+ * A different approach was chosen for fixing the FTBFS issue on FreeBSD
+ and other systems.
+
+ -- Hilko Bengen Sat, 21 May 2011 21:10:13 +0200
+
+hivex (1.2.6-3) unstable; urgency=low
+
+ * Replaced ENOKEY constant so hivex should compile on the kfreebsd
+ architectures.
+ * Fixed install target for systems without native OCaml compiler.
+
+ -- Hilko Bengen Fri, 13 May 2011 01:29:14 +0200
+
+hivex (1.2.6-2) unstable; urgency=low
+
+ * Added missing build-dependency.
+
+ -- Hilko Bengen Fri, 13 May 2011 00:41:41 +0200
+
+hivex (1.2.6-1) unstable; urgency=low
+
+ * New upstream version
+ * Python bindings
+ * Switched source format to 1.0.
+ * Provided patches to upstream that allow building on big-endian
+ architectures and on arhitectures where no native OCaml compilers are
+ available. (Closes: #589809)
+ * No longer include .la files in libhivex-dev. (Closes: #621653)
+ * Made libhivex conflict against old unofficial libguestfs package
+ (Closes: #602443)
+
+ -- Hilko Bengen Thu, 12 May 2011 22:54:29 +0200
+
+hivex (1.2.2+git20100712-2) unstable; urgency=low
+
+ * Added missing build dependencies. How embarrassing. Closes: #589546
+ * Reverted unnecessary patch to perl/run-perl-tests script
+ * Added gnulib to debian/copyright
+
+ -- Hilko Bengen Mon, 19 Jul 2010 12:47:34 +0200
+
+hivex (1.2.2+git20100712-1) unstable; urgency=low
+
+ * Initial release (Closes: #573070)
+
+ -- Hilko Bengen Sat, 17 Jul 2010 16:12:37 +0200
--- hivex-1.2.7.orig/debian/libhivex-ocaml-dev.install
+++ hivex-1.2.7/debian/libhivex-ocaml-dev.install
@@ -0,0 +1,4 @@
+usr/lib/ocaml/hivex/META
+usr/lib/ocaml/hivex/*.a
+usr/lib/ocaml/hivex/*.cm*
+usr/lib/ocaml/hivex/*.ml*
--- hivex-1.2.7.orig/debian/rules
+++ hivex-1.2.7/debian/rules
@@ -0,0 +1,27 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+ dh --with autotools-dev,ocaml,python-support $@
+
+override_dh_strip:
+ dh_strip --dbg-package=libhivex0-dbg
+ mv $(CURDIR)/debian/libhivex0-dbg/usr/lib/debug/usr/lib/pyshared \
+ $(CURDIR)/debian/libhivex0-dbg/usr/lib/debug/usr/lib/pymodules
+
+override_dh_makeshlibs:
+ dh_makeshlibs -Xlibhivexmod.so
+
+override_dh_auto_build:
+ $(MAKE) INSTALLDIRS=vendor LD_RUN_PATH=""
+
+override_dh_auto_clean:
+ [ ! -f Makefile ] || $(MAKE) distclean
--- hivex-1.2.7.orig/debian/libhivex0.install
+++ hivex-1.2.7/debian/libhivex0.install
@@ -0,0 +1 @@
+usr/lib/lib*.so.*
--- hivex-1.2.7.orig/debian/docs
+++ hivex-1.2.7/debian/docs
@@ -0,0 +1 @@
+README
--- hivex-1.2.7.orig/debian/source/format
+++ hivex-1.2.7/debian/source/format
@@ -0,0 +1 @@
+1.0