Don't leak errno E2BIG to callers.

(cherry picked from commit 4604a1d345)

.gitignore

@@ -1,4 +1,3 @@
 /.build-*
 /clog
 /hivex-*.tar.gz
-/hivex-*.tar.gz.sig

0001-lib-Don-t-leak-errno-from-_hivex_recode-function.patch

@@ -0,0 +1,33 @@
+From 4b3c3cd2b3d8d34601979feeb1390fddd442ab04 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Thu, 20 Nov 2014 21:37:19 +0000
+Subject: [PATCH] lib: Don't leak errno from _hivex_recode function.
+
+If iconv returns E2BIG, that's an internal indication for us, and not
+an error.  Don't leak the errno up to the user, as happened here:
+
+https://www.redhat.com/archives/libguestfs/2014-November/msg00140.html
+
+Thanks Nicolas Ecarnot.
+---
+ lib/utf16.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/lib/utf16.c b/lib/utf16.c
+index fe2c3bd..238f40a 100644
+--- a/lib/utf16.c
++++ b/lib/utf16.c
+@@ -58,6 +58,10 @@ _hivex_recode (const char *input_encoding, const char *input, size_t input_len,
+   if (r == (size_t) -1) {
+     if (errno == E2BIG) {
+       int err = errno;
++      /* Reset errno here because we don't want to accidentally
++       * return E2BIG to a library caller.
++       */
++      errno = 0;
+       size_t prev = outalloc;
+       /* Try again with a larger output buffer. */
+       free (out);
+-- 
+2.1.0
+

0001-lib-Increase-HIVEX_MAX_SUBKEYS-to-25000.patch

@@ -0,0 +1,28 @@
+From bec3f0bb632c4b84a1dfb73eb6333c2ba9834ffb Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Thu, 20 Nov 2014 20:47:50 +0000
+Subject: [PATCH] lib: Increase HIVEX_MAX_SUBKEYS to 25000.
+
+Thanks Nicolas Ecarnot who found a HKLM\SOFTWARE hive from a Windows
+XP machine which had an nk containing 18254 subkeys ( > current limit
+of 15000).
+---
+ lib/hivex-internal.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/hivex-internal.h b/lib/hivex-internal.h
+index 1613013..1643469 100644
+--- a/lib/hivex-internal.h
++++ b/lib/hivex-internal.h
+@@ -323,7 +323,7 @@ extern int _hivex_get_values (hive_h *h, hive_node_h node, hive_value_h **values
+   } while (0)
+ 
+ /* These limits are in place to stop really stupid stuff and/or exploits. */
+-#define HIVEX_MAX_SUBKEYS       15000
++#define HIVEX_MAX_SUBKEYS       25000
+ #define HIVEX_MAX_VALUES        10000
+ #define HIVEX_MAX_VALUE_LEN   8000000
+ #define HIVEX_MAX_ALLOCATION  1000000
+-- 
+2.1.0
+

0001-lib-write-fix-memory-leak.patch

@@ -0,0 +1,33 @@
+From 62b885e5b6239ac925554063dadeff8eeee7f2fc Mon Sep 17 00:00:00 2001
+From: Pino Toscano <ptoscano@redhat.com>
+Date: Tue, 11 Nov 2014 11:36:30 +0100
+Subject: [PATCH 1/2] lib: write: fix memory leak
+
+Free the "blocks" array got from _hivex_get_children.
+
+Thanks: Mahmoud Al-Qudsi
+---
+ lib/write.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/lib/write.c b/lib/write.c
+index abd12c5..33b64e4 100644
+--- a/lib/write.c
++++ b/lib/write.c
+@@ -902,10 +902,13 @@ hivex_node_delete_child (hive_h *h, hive_node_h node)
+         }
+     }
+   }
++  free (blocks);
+   SET_ERRNO (ENOTSUP, "could not find parent to child link");
+   return -1;
+ 
+  found:;
++  free (blocks);
++
+   struct ntreg_nk_record *nk =
+     (struct ntreg_nk_record *) ((char *) h->addr + parent);
+   size_t nr_subkeys_in_nk = le32toh (nk->nr_subkeys);
+-- 
+2.1.0
+

0001-ruby-Replace-MiniTest-with-Minitest.patch

@@ -1,102 +0,0 @@
-From fbcff7fbd8f96214c7f13f36bd7669a9142824ab Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Mon, 7 Aug 2023 10:21:54 +0100
-Subject: [PATCH 1/3] ruby: Replace MiniTest with Minitest
-
-Apparently the old MiniTest module is somewhat ancient.  Use "new"
-Minitest module instead.  This was broken by the following change in
-minitest 5.19:
-
-https://github.com/minitest/minitest/commit/a2c6c18570f6f0a1bf6af70fe3b6d9599a13fdd6
-
-Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2229653
----
- ruby/tests/tc_010_load.rb      | 2 +-
- ruby/tests/tc_021_close.rb     | 2 +-
- ruby/tests/tc_120_rlenvalue.rb | 2 +-
- ruby/tests/tc_130_special.rb   | 2 +-
- ruby/tests/tc_200_write.rb     | 2 +-
- ruby/tests/tc_210_setvalue.rb  | 2 +-
- 6 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/ruby/tests/tc_010_load.rb b/ruby/tests/tc_010_load.rb
-index 76fef60..58fac33 100644
---- a/ruby/tests/tc_010_load.rb
-+++ b/ruby/tests/tc_010_load.rb
-@@ -17,7 +17,7 @@
- 
- require File::join(File::dirname(__FILE__), 'test_helper')
- 
--class TestLoad < MiniTest::Unit::TestCase
-+class TestLoad < Minitest::Test
-   def test_load
-     h = Hivex::open("../images/minimal", {})
-     refute_nil (h)
-diff --git a/ruby/tests/tc_021_close.rb b/ruby/tests/tc_021_close.rb
-index 38b88a9..bc8f79d 100644
---- a/ruby/tests/tc_021_close.rb
-+++ b/ruby/tests/tc_021_close.rb
-@@ -17,7 +17,7 @@
- 
- require File::join(File::dirname(__FILE__), 'test_helper')
- 
--class TestClose < MiniTest::Unit::TestCase
-+class TestClose < Minitest::Test
-   def test_close
-     h = Hivex::open("../images/minimal", {})
-     refute_nil (h)
-diff --git a/ruby/tests/tc_120_rlenvalue.rb b/ruby/tests/tc_120_rlenvalue.rb
-index 6a2fb72..ee881bb 100644
---- a/ruby/tests/tc_120_rlenvalue.rb
-+++ b/ruby/tests/tc_120_rlenvalue.rb
-@@ -23,7 +23,7 @@
- 
- require File::join(File::dirname(__FILE__), 'test_helper')
- 
--class TestRLenValue < MiniTest::Unit::TestCase
-+class TestRLenValue < Minitest::Test
-   def test_RLenValue
-     h = Hivex::open(File::join(ENV['abs_srcdir'], '..', 'images', 'rlenvalue_test_hive'), {})
-     refute_nil(h)
-diff --git a/ruby/tests/tc_130_special.rb b/ruby/tests/tc_130_special.rb
-index 7570824..6179f51 100644
---- a/ruby/tests/tc_130_special.rb
-+++ b/ruby/tests/tc_130_special.rb
-@@ -3,7 +3,7 @@
- 
- require File::join(File::dirname(__FILE__), 'test_helper')
- 
--class TestRLenValue < MiniTest::Unit::TestCase
-+class TestRLenValue < Minitest::Test
-   def test_RLenValue
-     h = Hivex::open(File::join(ENV['abs_srcdir'], '..', 'images', 'special'), {})
-     refute_nil(h)
-diff --git a/ruby/tests/tc_200_write.rb b/ruby/tests/tc_200_write.rb
-index 463283e..a713d77 100644
---- a/ruby/tests/tc_200_write.rb
-+++ b/ruby/tests/tc_200_write.rb
-@@ -17,7 +17,7 @@
- 
- require File::join(File::dirname(__FILE__), 'test_helper')
- 
--class TestWrite < MiniTest::Unit::TestCase
-+class TestWrite < Minitest::Test
-   def test_write
-     h = Hivex::open("../images/minimal", {:write => 1})
-     refute_nil (h)
-diff --git a/ruby/tests/tc_210_setvalue.rb b/ruby/tests/tc_210_setvalue.rb
-index 736b073..2ffd07b 100644
---- a/ruby/tests/tc_210_setvalue.rb
-+++ b/ruby/tests/tc_210_setvalue.rb
-@@ -17,7 +17,7 @@
- 
- require File::join(File::dirname(__FILE__), 'test_helper')
- 
--class TestSetValue < MiniTest::Unit::TestCase
-+class TestSetValue < Minitest::Test
-   def test_set_value
-     h = Hivex::open("../images/minimal", {:write => 1})
-     refute_nil (h)
--- 
-2.41.0
-

0002-lib-Increase-HIVEX_MAX_VALUE_LEN-to-8000000.patch

@@ -0,0 +1,31 @@
+From 99b613b1c1d326702b2bb527f20d555d7c7e4ee7 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Fri, 14 Nov 2014 15:37:37 +0000
+Subject: [PATCH 2/2] lib: Increase HIVEX_MAX_VALUE_LEN to 8000000.
+
+I encountered a hive that contained a key of 3_886_561 bytes length in
+a key called 'HKLM\SYSTEM\ControlSet001\services\mfeavfk' (apparently
+belonging to "McAfee Anti-virus software").
+
+The previous limit was set arbitrarily at 2_000_000 bytes.  Increase
+it to cope with this larger key.
+---
+ lib/hivex-internal.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/hivex-internal.h b/lib/hivex-internal.h
+index e59084d..1613013 100644
+--- a/lib/hivex-internal.h
++++ b/lib/hivex-internal.h
+@@ -325,7 +325,7 @@ extern int _hivex_get_values (hive_h *h, hive_node_h node, hive_value_h **values
+ /* These limits are in place to stop really stupid stuff and/or exploits. */
+ #define HIVEX_MAX_SUBKEYS       15000
+ #define HIVEX_MAX_VALUES        10000
+-#define HIVEX_MAX_VALUE_LEN   2000000
++#define HIVEX_MAX_VALUE_LEN   8000000
+ #define HIVEX_MAX_ALLOCATION  1000000
+ 
+ #endif /* HIVEX_INTERNAL_H_ */
+-- 
+2.1.0
+

0002-ruby-Get-rid-of-old-Test-Unit-compatibility.patch

@@ -1,160 +0,0 @@
-From 6dbbc474d3df5cdfd21ed5e692b3a58136fffc42 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Mon, 7 Aug 2023 10:41:26 +0100
-Subject: [PATCH 2/3] ruby: Get rid of old Test::Unit compatibility
-
-Minitest is now required to run the Ruby unit tests.
-
-This compatibility was added back in commit 3f3bc6af07 ("ruby: tests:
-convert from Test::Unit to MiniTest (RHBZ#1090407)", 2014), but is
-broken by the change from MiniTest to Minitest.
----
- ruby/Makefile.am               |  3 +--
- ruby/tests/tc_010_load.rb      |  3 ++-
- ruby/tests/tc_021_close.rb     |  3 ++-
- ruby/tests/tc_120_rlenvalue.rb |  3 ++-
- ruby/tests/tc_130_special.rb   |  3 ++-
- ruby/tests/tc_200_write.rb     |  3 ++-
- ruby/tests/tc_210_setvalue.rb  |  3 ++-
- ruby/tests/test_helper.rb      | 31 -------------------------------
- 8 files changed, 13 insertions(+), 39 deletions(-)
- delete mode 100644 ruby/tests/test_helper.rb
-
-diff --git a/ruby/Makefile.am b/ruby/Makefile.am
-index 0e9a868..7a5fe42 100644
---- a/ruby/Makefile.am
-+++ b/ruby/Makefile.am
-@@ -23,8 +23,7 @@ EXTRA_DIST = \
- 	ext/hivex/_hivex.c \
- 	lib/hivex.rb \
- 	run-ruby-tests \
--	tests/tc_*.rb \
--	tests/test_helper.rb
-+	tests/tc_*.rb
- 
- CLEANFILES = \
- 	lib/*~ \
-diff --git a/ruby/tests/tc_010_load.rb b/ruby/tests/tc_010_load.rb
-index 58fac33..8efac36 100644
---- a/ruby/tests/tc_010_load.rb
-+++ b/ruby/tests/tc_010_load.rb
-@@ -15,7 +15,8 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- 
--require File::join(File::dirname(__FILE__), 'test_helper')
-+require 'minitest/autorun'
-+require 'hivex'
- 
- class TestLoad < Minitest::Test
-   def test_load
-diff --git a/ruby/tests/tc_021_close.rb b/ruby/tests/tc_021_close.rb
-index bc8f79d..b3aaa10 100644
---- a/ruby/tests/tc_021_close.rb
-+++ b/ruby/tests/tc_021_close.rb
-@@ -15,7 +15,8 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- 
--require File::join(File::dirname(__FILE__), 'test_helper')
-+require 'minitest/autorun'
-+require 'hivex'
- 
- class TestClose < Minitest::Test
-   def test_close
-diff --git a/ruby/tests/tc_120_rlenvalue.rb b/ruby/tests/tc_120_rlenvalue.rb
-index ee881bb..f40735d 100644
---- a/ruby/tests/tc_120_rlenvalue.rb
-+++ b/ruby/tests/tc_120_rlenvalue.rb
-@@ -21,7 +21,8 @@
- # length and offset for this value cell should be 37 bytes, position
- # 8712.
- 
--require File::join(File::dirname(__FILE__), 'test_helper')
-+require 'minitest/autorun'
-+require 'hivex'
- 
- class TestRLenValue < Minitest::Test
-   def test_RLenValue
-diff --git a/ruby/tests/tc_130_special.rb b/ruby/tests/tc_130_special.rb
-index 6179f51..49a635b 100644
---- a/ruby/tests/tc_130_special.rb
-+++ b/ruby/tests/tc_130_special.rb
-@@ -1,7 +1,8 @@
- # -*- coding: utf-8 -*-
- # -*- ruby -*-
- 
--require File::join(File::dirname(__FILE__), 'test_helper')
-+require 'minitest/autorun'
-+require 'hivex'
- 
- class TestRLenValue < Minitest::Test
-   def test_RLenValue
-diff --git a/ruby/tests/tc_200_write.rb b/ruby/tests/tc_200_write.rb
-index a713d77..4ce0586 100644
---- a/ruby/tests/tc_200_write.rb
-+++ b/ruby/tests/tc_200_write.rb
-@@ -15,7 +15,8 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- 
--require File::join(File::dirname(__FILE__), 'test_helper')
-+require 'minitest/autorun'
-+require 'hivex'
- 
- class TestWrite < Minitest::Test
-   def test_write
-diff --git a/ruby/tests/tc_210_setvalue.rb b/ruby/tests/tc_210_setvalue.rb
-index 2ffd07b..c3624ef 100644
---- a/ruby/tests/tc_210_setvalue.rb
-+++ b/ruby/tests/tc_210_setvalue.rb
-@@ -15,7 +15,8 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- 
--require File::join(File::dirname(__FILE__), 'test_helper')
-+require 'minitest/autorun'
-+require 'hivex'
- 
- class TestSetValue < Minitest::Test
-   def test_set_value
-diff --git a/ruby/tests/test_helper.rb b/ruby/tests/test_helper.rb
-deleted file mode 100644
-index f939b94..0000000
---- a/ruby/tests/test_helper.rb
-+++ /dev/null
-@@ -1,31 +0,0 @@
--# hivex Ruby bindings -*- ruby -*-
--# Copyright (C) 2009-2014 Red Hat Inc.
--#
--# 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 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., 675 Mass Ave, Cambridge, MA 02139, USA.
--
--begin
--  require 'minitest/autorun'
--rescue LoadError
--  require 'test/unit'
--  MiniTest = Test
--  module Test
--    Assertions = Unit::Assertions
--    module Assertions
--      alias refute_nil assert_not_nil
--    end
--  end
--end
--
--require 'hivex'
--- 
-2.41.0
-

0003-build-Go-back-to-gettext-0.19.patch

@@ -1,80 +0,0 @@
-From 326399ceef0c904f78cdd5da17f7ca724292b4f8 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Mon, 7 Aug 2023 10:36:46 +0100
-Subject: [PATCH 3/3] build: Go back to gettext 0.19
-
-Commit 850feece ("build: Remove gnulib") unintentionally(?) moved to
-GNU gettext 0.21.  However this is not available in RHEL 8, and
-doesn't contain any new features we need.  Go back to 0.19 from RHEL 8.
-
-Update: commit 850feece47b052e568392e83bff2bcdb2886f14d
----
- configure.ac         |  2 +-
- po/Makevars.template | 29 -----------------------------
- 2 files changed, 1 insertion(+), 30 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 946c261..7a8b664 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -136,7 +136,7 @@ AS_IF([test "x$with_readline" != xno],
- 
- dnl For i18n.
- AM_GNU_GETTEXT([external])
--AM_GNU_GETTEXT_VERSION([0.21])
-+AM_GNU_GETTEXT_VERSION([0.19])
- AM_ICONV
- 
- dnl libxml2 (optional).
-diff --git a/po/Makevars.template b/po/Makevars.template
-index 86a11f1..4a9ff7d 100644
---- a/po/Makevars.template
-+++ b/po/Makevars.template
-@@ -1,8 +1,4 @@
- # Makefile variables for PO directory in any package using GNU gettext.
--#
--# Copyright (C) 2003-2019 Free Software Foundation, Inc.
--# This file is free software; the Free Software Foundation gives
--# unlimited permission to use, copy, distribute, and modify it.
- 
- # Usually the message domain is the same as the package name.
- DOMAIN = $(PACKAGE)
-@@ -24,13 +20,6 @@ XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
- # their copyright.
- COPYRIGHT_HOLDER = Free Software Foundation, Inc.
- 
--# This tells whether or not to prepend "GNU " prefix to the package
--# name that gets inserted into the header of the $(DOMAIN).pot file.
--# Possible values are "yes", "no", or empty.  If it is empty, try to
--# detect it automatically by scanning the files in $(top_srcdir) for
--# "GNU packagename" string.
--PACKAGE_GNU =
--
- # This is the email address or URL to which the translators shall report
- # bugs in the untranslated strings:
- # - Strings which are not entire sentences, see the maintainer guidelines
-@@ -62,21 +51,3 @@ USE_MSGCTXT = no
- #   --previous            to keep previous msgids of translated messages,
- #   --quiet               to reduce the verbosity.
- MSGMERGE_OPTIONS =
--
--# These options get passed to msginit.
--# If you want to disable line wrapping when writing PO files, add
--# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
--# MSGINIT_OPTIONS.
--MSGINIT_OPTIONS =
--
--# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
--# has changed.  Possible values are "yes" and "no".  Set this to no if
--# the POT file is checked in the repository and the version control
--# program ignores timestamps.
--PO_DEPENDS_ON_POT = yes
--
--# This tells whether or not to forcibly update $(DOMAIN).pot and
--# regenerate PO files on "make dist".  Possible values are "yes" and
--# "no".  Set this to no if the POT file and PO files are maintained
--# externally.
--DIST_DEPENDS_ON_UPDATE_PO = yes
--- 
-2.41.0
-

gating.yaml

@@ -1,6 +0,0 @@
---- !Policy
-product_versions:
-  - rhel-9
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: xen-ci.brew-build.tier1.functional}

hivex-1.3.8-dirs.patch

@@ -0,0 +1,12 @@
+diff -ur hivex-1.3.8.old/perl/Makefile.am hivex-1.3.8/perl/Makefile.am
+--- hivex-1.3.8.old/perl/Makefile.am	2013-07-25 15:09:00.000000000 +0100
++++ hivex-1.3.8/perl/Makefile.am	2013-07-25 23:14:10.952149773 +0100
+@@ -43,7 +43,7 @@
+ 
+ TESTS_ENVIRONMENT = ../run
+ 
+-INSTALLDIRS = site
++INSTALLDIRS = vendor
+ 
+ all: Makefile-pl src_deps
+ 	$(MAKE) -f Makefile-pl

hivex.spec

@@ -1,81 +1,54 @@
-# Conditionalize Ocaml support.  This looks ass-backwards, but it's not.
-%ifarch %{ix86}
+# conditionalize Ocaml support
+%ifarch sparc64 s390 s390x
 %bcond_with ocaml
 %else
 %bcond_without ocaml
 %endif
 
-# Verify tarball signature with GPGv2.
-%global verify_tarball_signature 1
-
 Name:           hivex
-Version:        1.3.23
-Release:        13%{?dist}
+Version:        1.3.11
+Release:        4%{?dist}
 Summary:        Read and write Windows Registry binary hive files
 
-License:        LGPL-2.1-only AND LGPL-2.0-or-later AND GPL-2.0-or-later
+License:        LGPLv2
 URL:            http://libguestfs.org/
 
 Source0:        http://libguestfs.org/download/hivex/%{name}-%{version}.tar.gz
-%if 0%{verify_tarball_signature}
-Source1:        http://libguestfs.org/download/hivex/%{name}-%{version}.tar.gz.sig
-%endif
 
-# Keyring used to verify tarball signature.
-%if 0%{verify_tarball_signature}
-Source2:       libguestfs.keyring
-%endif
-
-# Upstream patches to fix Ruby minitest support.
-# https://bugzilla.redhat.com/show_bug.cgi?id=2229653
-Patch:          0001-ruby-Replace-MiniTest-with-Minitest.patch
-Patch:          0002-ruby-Get-rid-of-old-Test-Unit-compatibility.patch
-# Another upstream patch, not required.
-Patch:          0003-build-Go-back-to-gettext-0.19.patch
-
-BuildRequires:  make
+# Fix Perl directory install path.
+Patch0:         %{name}-1.3.8-dirs.patch
 BuildRequires:  autoconf, automake, libtool, gettext-devel
-BuildRequires:  perl-interpreter
-BuildRequires:  perl-devel
-BuildRequires:  perl-generators
-BuildRequires:  %{_bindir}/pod2html
-BuildRequires:  %{_bindir}/pod2man
-BuildRequires:  perl(bytes)
-BuildRequires:  perl(Carp)
-BuildRequires:  perl(Encode)
-BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:  perl(Exporter)
-BuildRequires:  perl(IO::Scalar)
-BuildRequires:  perl(IO::Stringy)
-BuildRequires:  perl(strict)
-BuildRequires:  perl(Test::More)
-BuildRequires:  perl(utf8)
-BuildRequires:  perl(vars)
-BuildRequires:  perl(warnings)
-BuildRequires:  perl(XSLoader)
-BuildRequires:  perl(Test::Pod) >= 1.00
-BuildRequires:  perl(Test::Pod::Coverage) >= 1.00
+
+# Pull in some upstream fixes.
+Patch1:         0001-lib-write-fix-memory-leak.patch
+Patch2:         0002-lib-Increase-HIVEX_MAX_VALUE_LEN-to-8000000.patch
+Patch3:         0001-lib-Increase-HIVEX_MAX_SUBKEYS-to-25000.patch
+Patch4:         0001-lib-Don-t-leak-errno-from-_hivex_recode-function.patch
+
+BuildRequires:  perl
+BuildRequires:  perl-Test-Simple
+BuildRequires:  perl-Test-Pod
+BuildRequires:  perl-Test-Pod-Coverage
+BuildRequires:  perl-ExtUtils-MakeMaker
+BuildRequires:  perl-IO-stringy
+BuildRequires:  perl-libintl
 %if %{with ocaml}
 BuildRequires:  ocaml
 BuildRequires:  ocaml-findlib-devel
 %endif
-BuildRequires:  python3-devel
+BuildRequires:  python-devel
 BuildRequires:  ruby-devel
 BuildRequires:  rubygem-rake
-# see also RHBZ#1325022
-BuildRequires:  rubygem(json)
 BuildRequires:  rubygem(minitest)
-BuildRequires:  rubygem(rdoc)
 BuildRequires:  readline-devel
 BuildRequires:  libxml2-devel
-%if 0%{verify_tarball_signature}
-BuildRequires:  gnupg2
-%endif
 
-Requires:       %{name}-libs = %{version}-%{release}
+# This library used to be part of libguestfs.  It won't install alongside
+# the old version of libguestfs that included this library:
+Conflicts:      libguestfs <= 1:1.0.84
 
-Conflicts:      %{name} < 1.3.20-6
-Obsoletes:      %{name} < 1.3.20-6
+# https://fedoraproject.org/wiki/Packaging:No_Bundled_Libraries#Packages_granted_exceptions
+Provides:      bundled(gnulib)
 
 
 %description
@@ -86,8 +59,8 @@ and write to these files.
 'hivexsh' is a shell you can use to interactively navigate a hive
 binary file.
 
-'hivexregedit' (in perl-hivex) lets you export and merge to the
-textual regedit format.
+'hivexregedit' lets you export and merge to the textual regedit
+format.
 
 'hivexml' can be used to convert a hive file to a more useful XML
 format.
@@ -104,25 +77,14 @@ For OCaml bindings, see 'ocaml-hivex-devel'.
 
 For Perl bindings, see 'perl-hivex'.
 
-For Python 3 bindings, see 'python3-hivex'.
+For Python bindings, see 'python-hivex'.
 
 For Ruby bindings, see 'ruby-hivex'.
 
 
-%package libs
-Summary:        Library for %{name}
-License:        LGPL-2.1-only AND LGPL-2.0-or-later
-Conflicts:      %{name} < 1.3.20-6
-Obsoletes:      %{name} < 1.3.20-6
-
-
-%description libs
-%{name}-libs contains the library for %{name}.
-
-
 %package devel
 Summary:        Development tools and libraries for %{name}
-Requires:       %{name}-libs = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires:       pkgconfig
 
 
@@ -131,24 +93,20 @@ Requires:       pkgconfig
 for %{name}.
 
 
-%if !0%{?rhel}
 %package static
 Summary:        Statically linked library for %{name}
-License:        LGPL-2.1-only AND LGPL-2.0-or-later
-Requires:       %{name}-devel = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 
 %description static
 %{name}-static contains the statically linked library
 for %{name}.
-%endif
 
 
 %if %{with ocaml}
 %package -n ocaml-%{name}
 Summary:       OCaml bindings for %{name}
-License:       LGPL-2.0-or-later
-Requires:      %{name}-libs%{?_isa} = %{version}-%{release}
+Requires:      %{name} = %{version}-%{release}
 
 
 %description -n ocaml-%{name}
@@ -160,9 +118,7 @@ programs which use %{name} you will also need ocaml-%{name}-devel.
 
 %package -n ocaml-%{name}-devel
 Summary:       OCaml bindings for %{name}
-License:       LGPL-2.0-or-later
-Requires:      ocaml-%{name}%{?_isa} = %{version}-%{release}
-Requires:      %{name}-devel%{?_isa} = %{version}-%{release}
+Requires:      ocaml-%{name} = %{version}-%{release}
 
 
 %description -n ocaml-%{name}-devel
@@ -173,27 +129,28 @@ required to use the OCaml bindings for %{name}.
 
 %package -n perl-%{name}
 Summary:       Perl bindings for %{name}
-License:       LGPL-2.0-or-later AND GPL-2.0-or-later
-Requires:      %{name}-libs = %{version}-%{release}
+Requires:      %{name} = %{version}-%{release}
+Requires:      perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 
 %description -n perl-%{name}
 perl-%{name} contains Perl bindings for %{name}.
 
 
-%package -n python3-%{name}
-Summary:       Python 3 bindings for %{name}
-License:       LGPL-2.0-or-later
-Requires:      %{name}-libs = %{version}-%{release}
+%package -n python-%{name}
+Summary:       Python bindings for %{name}
+Requires:      %{name} = %{version}-%{release}
 
-%description -n python3-%{name}
-python3-%{name} contains Python 3 bindings for %{name}.
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
+%description -n python-%{name}
+python-%{name} contains Python bindings for %{name}.
 
 
 %package -n ruby-%{name}
 Summary:       Ruby bindings for %{name}
-License:       LGPL-2.0-or-later
-Requires:      %{name}-libs = %{version}-%{release}
+Requires:      %{name} = %{version}-%{release}
 Requires:      ruby(release)
 Requires:      ruby
 Provides:      ruby(hivex) = %{version}
@@ -203,28 +160,32 @@ ruby-%{name} contains Ruby bindings for %{name}.
 
 
 %prep
-%if 0%{verify_tarball_signature}
-%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
-%endif
 %setup -q
-%autopatch -p1
-
-autoreconf -fi
 
+%patch0 -p1 -b .dirs
+autoreconf -i
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
-%configure \
-    PYTHON=%{__python3} \
-%if !%{with ocaml}
-    --disable-ocaml \
-%endif
-%if 0%{?rhel}
-    --disable-static \
-%endif
-    %{nil}
+%configure
 make V=1 INSTALLDIRS=vendor %{?_smp_mflags}
 
 
+%check
+make check
+
+%if !%{with ocaml}
+# Delete OCaml files, in case the user had OCaml installed and it was
+# picked up by the configure script.
+# XXX Add ./configure --disable-ocaml upstream.
+rm -rf $RPM_BUILD_ROOT%{_libdir}/ocaml/hivex
+rm -f  $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs/*hivex*
+%endif
+
+
 %install
 make install DESTDIR=$RPM_BUILD_ROOT INSTALLDIRS=vendor
 
@@ -237,71 +198,58 @@ find $RPM_BUILD_ROOT -name .packlist -delete
 find $RPM_BUILD_ROOT -name '*.bs' -delete
 
 # Remove unwanted Python files:
-rm $RPM_BUILD_ROOT%{python3_sitearch}/libhivexmod.la
+rm $RPM_BUILD_ROOT%{python_sitearch}/libhivexmod.la
 
 %find_lang %{name}
 
 
-%check
-if ! make check -k; then
-    for f in $( find -name test-suite.log | xargs grep -l ^FAIL: ); do
-        echo
-        echo "***" $f "***"
-        cat $f
-        echo
-    done
-    exit 1
-fi
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
 
 %files -f %{name}.lang
-%doc README.md
-%license LICENSE
+%doc README LICENSE
 %{_bindir}/hivexget
 %{_bindir}/hivexml
+%{_bindir}/hivexregedit
 %{_bindir}/hivexsh
+%{_libdir}/libhivex.so.*
 %{_mandir}/man1/hivexget.1*
 %{_mandir}/man1/hivexml.1*
+%{_mandir}/man1/hivexregedit.1*
 %{_mandir}/man1/hivexsh.1*
 
 
-%files libs
-%doc README.md
-%license LICENSE
-%{_libdir}/libhivex.so.*
-
-
 %files devel
-%license LICENSE
+%doc LICENSE
 %{_libdir}/libhivex.so
 %{_mandir}/man3/hivex.3*
 %{_includedir}/hivex.h
 %{_libdir}/pkgconfig/hivex.pc
 
 
-%if !0%{?rhel}
 %files static
-%license LICENSE
+%doc LICENSE
 %{_libdir}/libhivex.a
-%endif
 
 
 %if %{with ocaml}
 %files -n ocaml-%{name}
-%doc README.md
-%dir %{_libdir}/ocaml/hivex
-%{_libdir}/ocaml/hivex/META
-%{_libdir}/ocaml/hivex/*.cma
-%{_libdir}/ocaml/hivex/*.cmi
+%doc README
+%{_libdir}/ocaml/hivex
+%exclude %{_libdir}/ocaml/hivex/*.a
+%exclude %{_libdir}/ocaml/hivex/*.cmxa
+%exclude %{_libdir}/ocaml/hivex/*.cmx
+%exclude %{_libdir}/ocaml/hivex/*.mli
 %{_libdir}/ocaml/stublibs/*.so
 %{_libdir}/ocaml/stublibs/*.so.owner
 
 
 %files -n ocaml-%{name}-devel
-%ifarch %{ocaml_native_compiler}
+%{_libdir}/ocaml/hivex/*.a
 %{_libdir}/ocaml/hivex/*.cmxa
 %{_libdir}/ocaml/hivex/*.cmx
-%endif
-%{_libdir}/ocaml/hivex/*.a
 %{_libdir}/ocaml/hivex/*.mli
 %endif
 
@@ -310,13 +258,13 @@ fi
 %{perl_vendorarch}/*
 %{_mandir}/man3/Win::Hivex.3pm*
 %{_mandir}/man3/Win::Hivex::Regedit.3pm*
-%{_bindir}/hivexregedit
-%{_mandir}/man1/hivexregedit.1*
 
 
-%files -n python3-%{name}
-%{python3_sitearch}/hivex/
-%{python3_sitearch}/*.so
+%files -n python-%{name}
+%{python_sitearch}/hivex/*.py
+%{python_sitearch}/hivex/*.pyc
+%{python_sitearch}/hivex/*.pyo
+%{python_sitearch}/*.so
 
 
 %files -n ruby-%{name}
@@ -326,396 +274,6 @@ fi
 
 
 %changelog
-* Thu Oct 05 2023 Richard W.M. Jones <rjones@redhat.com> - 1.3.23-13
-- OCaml 5.1 rebuild for Fedora 40
-
-* Mon Aug 07 2023 Richard W.M. Jones <rjones@redhat.com> - 1.3.23-12
-- Fix Ruby minitest support (RHBZ#2229653)
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.23-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Thu Jul 13 2023 Jitka Plesnikova <jplesnik@redhat.com> - 1.3.23-10
-- Perl 5.38 re-rebuild updated packages
-
-* Tue Jul 11 2023 Richard W.M. Jones <rjones@redhat.com> - 1.3.23-9
-- OCaml 5.0 rebuild for Fedora 39
-
-* Tue Jul 11 2023 Jitka Plesnikova <jplesnik@redhat.com> - 1.3.23-8
-- Perl 5.38 rebuild
-
-* Mon Jul 10 2023 Jerry James <loganjerry@gmail.com> - 1.3.23-7
-- OCaml 5.0.0 rebuild
-- Build the OCaml interface on all architectures but i386
-
-* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 1.3.23-6
-- Rebuilt for Python 3.12
-
-* Mon Jun 05 2023 Richard W.M. Jones <rjones@redhat.com> - 1.3.23-5
-- Migrated to SPDX license
-
-* Tue Jan 24 2023 Richard W.M. Jones <rjones@redhat.com> - 1.3.23-4
-- Bump release and rebuild.
-
-* Tue Jan 24 2023 Richard W.M. Jones <rjones@redhat.com> - 1.3.23-3
-- Rebuild OCaml packages for F38
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.23-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Wed Jan 18 2023 Richard W.M. Jones <rjones@redhat.com> - 1.3.23-1
-- New development version 1.3.23
-- Second attempt to fix Python 3.12 removal of distutils (RHBZ#2155013)
-- Remove gnulib since it is no longer bundled by upstream.
-
-* Wed Jan 04 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.3.21-13
-- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.2
-
-* Tue Jan 03 2023 Richard W.M. Jones <rjones@redhat.com> - 1.3.21-12
-- Upstream fix for Python 3.12 removal of distutils (RHBZ#2155013)
-- Unconditionally run autoreconf.
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.21-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Mon Jun 20 2022 Python Maint <python-maint@redhat.com> - 1.3.21-10
-- Rebuilt for Python 3.11
-
-* Sat Jun 18 2022 Richard W.M. Jones <rjones@redhat.com> - 1.3.21-9
-- OCaml 4.14.0 rebuild
-
-* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1.3.21-8
-- Rebuilt for Python 3.11
-
-* Tue May 31 2022 Jitka Plesnikova <jplesnik@redhat.com> - 1.3.21-7
-- Perl 5.36 rebuild
-
-* Fri Feb 04 2022 Richard W.M. Jones <rjones@redhat.com> - 1.3.21-6
-- OCaml 4.13.1 rebuild to remove package notes
-
-* Wed Jan 26 2022 Vít Ondruch <vondruch@redhat.com> - 1.3.21-5
-- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_3.1
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.21-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Mon Oct 04 2021 Richard W.M. Jones <rjones@redhat.com> - 1.3.21-3
-- Bump release and rebuild.
-
-* Mon Oct 04 2021 Richard W.M. Jones <rjones@redhat.com> - 1.3.21-2
-- OCaml 4.13.1 build
-
-* Mon Aug  2 2021 Richard W.M. Jones <rjones@redhat.com> - 1.3.21-1
-- New upstream version 1.3.21.
-- Fixes CVE-2021-3622 limit recursion in ri-records.
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.20-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Mon Jun 14 2021 Matt Coleman <matt@datto.com> - 1.3.20-7
-- Correct the static package's dependency
-
-* Fri Jun 11 2021 Matt Coleman <matt@datto.com> - 1.3.20-6
-- Move the library into a separate package: hivex-libs
-
-* Fri Jun 11 2021 Matt Coleman <matt@datto.com> - 1.3.20-5
-- Mark LICENSE as a license file
-
-* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 1.3.20-4
-- Rebuilt for Python 3.10
-
-* Wed Jun  2 2021 Richard W.M. Jones <rjones@redhat.com> - 1.3.20-3
-- Add gating tests (for RHEL 9)
-
-* Fri May 21 2021 Jitka Plesnikova <jplesnik@redhat.com> - 1.3.20-2
-- Perl 5.34 rebuild
-
-* Mon May  3 2021 Richard W.M. Jones <rjones@redhat.com> - 1.3.20-1
-- New upstream version 1.3.20.
-- Fixes CVE-2021-3504 missing bounds check in hivex_open.
-
-* Tue Mar 30 2021 Richard W.M. Jones <rjones@redhat.com> - 1.3.19-10
-- Bump and rebuild for ELN.
-
-* Mon Mar  1 13:12:08 GMT 2021 Richard W.M. Jones <rjones@redhat.com> - 1.3.19-9
-- OCaml 4.12.0 build
-
-* Wed Jan 27 2021 Richard W.M. Jones <rjones@redhat.com> - 1.3.19-8
-- Bump and rebuild for s390.
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.19-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Thu Jan 07 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.3.19-6
-- F-34: rebuild against ruby 3.0
-
-* Thu Dec 03 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.19-5
-- Disable static subpackage on RHEL.
-
-* Tue Sep 01 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.19-4
-- OCaml 4.11.1 rebuild
-
-* Fri Aug 21 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.19-3
-- OCaml 4.11.0 rebuild
-
-* Thu Jul 30 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.19-2
-- Disable some failing gnulib tests.
-
-* Wed Jul 29 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.19-1
-- New upstream version 1.3.19.
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.18-28
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jun 23 2020 Jitka Plesnikova <jplesnik@redhat.com> - 1.3.18-27
-- Perl 5.32 rebuild
-
-* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 1.3.18-26
-- Rebuilt for Python 3.9
-
-* Mon May 04 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.18-25
-- OCaml 4.11.0+dev2-2020-04-22 rebuild
-
-* Tue Apr 21 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.18-24
-- OCaml 4.11.0 pre-release attempt 2
-
-* Fri Apr 17 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.18-23
-- OCaml 4.11.0 pre-release
-
-* Thu Apr 02 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.18-22
-- Update all OCaml dependencies for RPM 4.16.
-
-* Wed Feb 26 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.18-21
-- OCaml 4.10.0 final.
-
-* Wed Jan 29 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.18-20
-- Add a couple of upstream patches.
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.18-19
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Mon Jan 20 2020 Vít Ondruch <vondruch@redhat.com> - 1.3.18-18
-- Another rebuild against Ruby 2.7.
-
-* Sun Jan 19 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.18-17
-- OCaml 4.10.0+beta1 rebuild.
-
-* Sat Jan 18 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.3.18-16
-- F-32: rebuild against ruby27
-
-* Thu Jan 09 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.18-15
-- OCaml 4.09.0 for riscv64
-
-* Fri Dec 06 2019 Richard W.M. Jones <rjones@redhat.com> - 1.3.18-14
-- OCaml 4.09.0 (final) rebuild.
-
-* Wed Nov 27 2019 Richard W.M. Jones <rjones@redhat.com> - 1.3.18-13
-- Use gpgverify macro instead of explicit gpgv2 command.
-
-* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1.3.18-12
-- Rebuilt for Python 3.8.0rc1 (#1748018)
-
-* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 1.3.18-11
-- Rebuilt for Python 3.8
-
-* Fri Aug 16 2019 Richard W.M. Jones <rjones@redhat.com> - 1.3.18-10
-- OCaml 4.08.1 (final) rebuild.
-
-* Wed Jul 31 2019 Richard W.M. Jones <rjones@redhat.com> - 1.3.18-9
-- OCaml 4.08.1 (rc2) rebuild.
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.18-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jun 27 2019 Richard W.M. Jones <rjones@redhat.com> - 1.3.18-7
-- OCaml 4.08.0 (final) rebuild.
-
-* Fri May 31 2019 Jitka Plesnikova <jplesnik@redhat.com> - 1.3.18-6
-- Perl 5.30 rebuild
-
-* Mon Apr 29 2019 Richard W.M. Jones <rjones@redhat.com> - 1.3.18-5
-- OCaml 4.08.0 (beta 3) rebuild.
-
-* Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.3.18-4
-- Rebuild for readline 8.0
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.18-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Jan 24 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.3.18-2
-- F-30: rebuild again against ruby26
-
-* Thu Jan 24 2019 Richard W.M. Jones <rjones@redhat.com> - 1.3.18-1
-- New upstream version 1.3.18.
-- Revert: Undefine _ld_as_needed which breaks gnulib tests.
-
-* Thu Jan 24 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.3.17-3
-- F-30: rebuild against ruby26
-
-* Wed Jan 23 2019 Richard W.M. Jones <rjones@redhat.com> - 1.3.17-2
-- Undefine _ld_as_needed which breaks gnulib tests.
-
-* Tue Jan 22 2019 Richard W.M. Jones <rjones@redhat.com> - 1.3.17-1
-- New upstream version 1.3.17.
-- Fixes regression of RHBZ#1145056.
-
-* Thu Jan 17 2019 Richard W.M. Jones <rjones@redhat.com> - 1.3.16-1
-- New upstream version 1.3.16.
-
-* Thu Jan 10 2019 Miro Hrončok <mhroncok@redhat.com> - 1.3.15-12
-- Remove Python 2 subpackage
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.15-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Jul 11 2018 Richard W.M. Jones <rjones@redhat.com> - 1.3.15-10
-- OCaml 4.07.0 (final) rebuild.
-
-* Fri Jul 06 2018 Petr Pisar <ppisar@redhat.com> - 1.3.15-9
-- Perl 5.28 rebuild
-
-* Thu Jul 05 2018 Richard W.M. Jones <rjones@redhat.com> - 1.3.15-8
-- Remove ldconfig
-  https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/SU3LJVDZ7LUSJGZR5MS72BMRAFP3PQQL/
-- BR on python-unversioned-command
-  https://fedoraproject.org/wiki/Changes/Move_usr_bin_python_into_separate_package
-
-* Tue Jul 03 2018 Petr Pisar <ppisar@redhat.com> - 1.3.15-7
-- Perl 5.28 rebuild
-
-* Thu Jun 28 2018 Jitka Plesnikova <jplesnik@redhat.com> - 1.3.15-6
-- Perl 5.28 rebuild
-
-* Tue Jun 19 2018 Richard W.M. Jones <rjones@redhat.com> - 1.3.15-5
-- OCaml 4.07.0-rc1 rebuild.
-
-* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 1.3.15-4
-- Rebuilt for Python 3.7
-
-* Mon Mar 19 2018 Richard W.M. Jones <rjones@redhat.com> - 1.3.15-3
-- Add upstream patch to fix injection of LDFLAGS (RHBZ#1548536).
-
-* Thu Mar  1 2018 Florian Weimer <fweimer@redhat.com> - 1.3.15-2
-- Rebuild with new redhat-rpm-config/perl build flags
-
-* Mon Feb 26 2018 Richard W.M. Jones <rjones@redhat.com> - 1.3.15-1
-- New upstream version 1.3.15.
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.14-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Sat Jan 20 2018 Björn Esser <besser82@fedoraproject.org> - 1.3.14-14
-- Rebuilt for switch to libxcrypt
-
-* Fri Jan 05 2018 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.3.14-13
-- F-28: rebuild for ruby25
-
-* Wed Nov 08 2017 Richard W.M. Jones <rjones@redhat.com> - 1.3.14-12
-- Fix string mutability.
-
-* Wed Nov 08 2017 Richard W.M. Jones <rjones@redhat.com> - 1.3.14-10
-- OCaml 4.06.0 rebuild.
-
-* Mon Sep 18 2017 Richard W.M. Jones <rjones@redhat.com> - 1.3.14-9
-- ocaml-hivex-devel should Require hivex-devel.
-
-* Mon Aug 07 2017 Richard W.M. Jones <rjones@redhat.com> - 1.3.14-8
-- OCaml 4.05.0 rebuild.
-
-* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.14-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.14-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Mon Jun 26 2017 Richard W.M. Jones <rjones@redhat.com> - 1.3.14-5
-- OCaml 4.04.2 rebuild.
-
-* Sun Jun 04 2017 Jitka Plesnikova <jplesnik@redhat.com> - 1.3.14-4
-- Perl 5.26 rebuild
-
-* Mon May 22 2017 Richard W.M. Jones <rjones@redhat.com> - 1.3.14-3
-- Create python2 and python3 subpackages (RHBZ#1453189).
-
-* Fri May 12 2017 Richard W.M. Jones <rjones@redhat.com> - 1.3.14-2
-- OCaml 4.04.1 rebuild.
-
-* Fri Feb 17 2017 Richard W.M. Jones <rjones@redhat.com> - 1.3.14-1
-- New upstream version 1.3.14.
-- Add GPG signature and mechanics for checking it.
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.13-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Fri Jan 13 2017 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.3.13-11
-- F-26: rebuild again for ruby24
-
-* Thu Jan 12 2017 Igor Gnatenko <ignatenko@redhat.com> - 1.3.13-10
-- Rebuild for readline 7.x
-
-* Thu Jan 12 2017 Vít Ondruch <vondruch@redhat.com> - 1.3.13-9
-- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.4
-
-* Sat Nov 05 2016 Richard W.M. Jones <rjones@redhat.com> - 1.3.13-8
-- Rebuild for OCaml 4.04.0.
-
-* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.13-7
-- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
-
-* Tue May 17 2016 Jitka Plesnikova <jplesnik@redhat.com> - 1.3.13-6
-- Perl 5.24 rebuild
-
-* Tue May 10 2016 Richard W.M. Jones <rjones@redhat.com> - 1.3.13-5
-- Explicitly BR rubygem(rdoc) RHBZ#1334753 and rubygem(json) RHBZ#1325022.
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.13-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Tue Jan 12 2016 Vít Ondruch <vondruch@redhat.com> - 1.3.13-3
-- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.3
-
-* Thu Oct 29 2015 Richard W.M. Jones <rjones@redhat.com> - 1.3.13-2
-- New upstream version 1.3.13.
-- Drop ancient 'Conflicts' rule.
-- Drop Perl patch for setting INSTALLDIRS.
-- Depend on pod2html, pod2man binaries explicitly.
-
-* Mon Oct  5 2015 Richard W.M. Jones <rjones@redhat.com> - 1.3.12-1
-- New upstream version 1.3.12.
-- Drop patches which are now upstream.
-- Use OCaml macros to test if OCaml native compiler is available.
-- Use autoreconf --force option.
-
-* Thu Aug 27 2015 Petr Šabata <contyk@redhat.com> - 1.3.11-13
-- Correcting the perl build time dependency list
-  Switching to virtual perl()-style symbols
-  Dropping unused dependencies and adding some new to fix the FTBFS
-
-* Tue Jul 28 2015 Richard W.M. Jones <rjones@redhat.com> - 1.3.11-12
-- OCaml 4.02.3 rebuild.
-
-* Wed Jun 24 2015 Richard W.M. Jones <rjones@redhat.com> - 1.3.11-11
-- ocaml-4.02.2 final rebuild.
-
-* Wed Jun 17 2015 Richard W.M. Jones <rjones@redhat.com> - 1.3.11-10
-- ocaml-4.02.2 rebuild.
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.11-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Fri Jun 05 2015 Jitka Plesnikova <jplesnik@redhat.com> - 1.3.11-8
-- Perl 5.22 rebuild
-
-* Mon Mar  2 2015 Richard W.M. Jones <rjones@redhat.com> - 1.3.11-7
-- Move hivexregedit to perl-hivex subpackage, since otherwise hivex
-  and hence libguestfs depends on perl (RHBZ#1194158).
-
-* Tue Feb 17 2015 Richard W.M. Jones <rjones@redhat.com> - 1.3.11-6
-- ocaml-4.02.1 rebuild.
-
-* Sun Jan 18 2015 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.3.11-5
-- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_2.2
-
 * Thu Nov 20 2014 Richard W.M. Jones <rjones@redhat.com> - 1.3.11-4
 - Increase HIVEX_MAX_SUBKEYS.
 - Don't leak errno E2BIG to callers.
@@ -729,27 +287,9 @@ fi
 - New upstream version 1.3.11.
 - Python objects are now placed in a hivex/ subdirectory.
 
-* Wed Sep 03 2014 Jitka Plesnikova <jplesnik@redhat.com> - 1.3.10-12
-- Perl 5.20 rebuild
-
-* Sat Aug 30 2014 Richard W.M. Jones <rjones@redhat.com> - 1.3.10-11
-- ocaml-4.02.0 final rebuild.
-
-* Wed Aug 27 2014 Jitka Plesnikova <jplesnik@redhat.com> - 1.3.10-10
-- Perl 5.20 rebuild
-
-* Sat Aug 23 2014 Richard W.M. Jones <rjones@redhat.com> - 1.3.10-9
-- ocaml-4.02.0+rc1 rebuild.
-
-* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.10-8
+* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.10-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
-* Sat Aug 02 2014 Richard W.M. Jones <rjones@redhat.com> - 1.3.10-7
-- ocaml-4.02.0-0.8.git10e45753.fc22 rebuild.
-
-* Tue Jul 22 2014 Richard W.M. Jones <rjones@redhat.com> - 1.3.10-6
-- OCaml 4.02.0 beta rebuild.
-
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.10-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 

sources

@@ -1,2 +1 @@
-SHA512 (hivex-1.3.23.tar.gz) = 068fe81a442c8045bf9d98f0c6b782330141d8f1e104a0f191c04a2cff25ee6396c2c4777c107d595a471eb4bcbee903400c9f7946cae036165ac201587f861e
-SHA512 (hivex-1.3.23.tar.gz.sig) = 0bd9968490d96887d9be9cc0be7824cfcab6347ea9255a418c93a8e150ad551fa931ea06a7790b26748735b85caae098716ced94dea6babb7be69a0e2d0bb7c4
+be99b2db9913eab10b9b39219cec55a9  hivex-1.3.11.tar.gz