OCaml 5.1 rebuild for Fedora 40

The former is deprecated according to:
https://spdx.org/licenses/LGPL-2.1.html

.gitignore

@@ -1,8 +1,4 @@
 /.build-*
 /clog
 /hivex-*.tar.gz
-/hivex-1.3.14.tar.gz.sig
+/hivex-*.tar.gz.sig
-/hivex-1.3.15.tar.gz.sig
-/hivex-1.3.16.tar.gz.sig
-/hivex-1.3.17.tar.gz.sig
-/hivex-1.3.18.tar.gz.sig

0001-Win-Hivex-Regedit-Accept-CRLF-line-endings.patch

@@ -1,24 +0,0 @@
-From 564a923a91d042e24e9259d86f69e0061f28ef4f Mon Sep 17 00:00:00 2001
-From: Vladimir Panteleev <git@thecybershadow.net>
-Date: Thu, 16 Jan 2020 12:11:20 +0000
-Subject: [PATCH 1/2] Win::Hivex::Regedit: Accept CRLF line endings
-
----
- perl/lib/Win/Hivex/Regedit.pm | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/perl/lib/Win/Hivex/Regedit.pm b/perl/lib/Win/Hivex/Regedit.pm
-index 34426f1..2b17036 100644
---- a/perl/lib/Win/Hivex/Regedit.pm
-+++ b/perl/lib/Win/Hivex/Regedit.pm
-@@ -144,6 +144,7 @@ sub reg_import
-         # this is fairly common in pasted regedit files.
-         $lineno++;
-         chomp;
-+        s/\r$//;
-         if (s/\\\s*$//) {
-             $_ .= <$fh>;
-             redo unless eof ($fh);
--- 
-2.24.1
-

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

@@ -0,0 +1,102 @@
+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-Win-Hivex-Regedit-Ignore-comments.patch

@@ -1,36 +0,0 @@
-From 003028c3c0d33e952430d3f4e1a987a777674eb3 Mon Sep 17 00:00:00 2001
-From: Vladimir Panteleev <git@thecybershadow.net>
-Date: Thu, 16 Jan 2020 12:11:21 +0000
-Subject: [PATCH 2/2] Win::Hivex::Regedit: Ignore comments
-
----
- perl/lib/Win/Hivex/Regedit.pm | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/perl/lib/Win/Hivex/Regedit.pm b/perl/lib/Win/Hivex/Regedit.pm
-index 2b17036..f0dbb50 100644
---- a/perl/lib/Win/Hivex/Regedit.pm
-+++ b/perl/lib/Win/Hivex/Regedit.pm
-@@ -153,8 +153,8 @@ sub reg_import
-         #print STDERR "reg_import: parsing <<<$_>>>\n";
- 
-         if ($state eq "outer") {
--            # Ignore blank lines, headers.
--            next if /^\s*$/;
-+            # Ignore blank lines, headers, comments.
-+            next if /^\s*(;.*)?$/;
- 
-             # .* is needed before Windows Registry Editor Version.. in
-             # order to eat a possible Unicode BOM which regedit writes
-@@ -193,7 +193,7 @@ sub reg_import
-                 my $value = _parse_value ("", $1, $encoding);
-                 croak (_parse_error ($_, $lineno)) unless defined $value;
-                 push @newvalues, $value;
--            } elsif (/^\s*$/) { # blank line after values
-+            } elsif (/^\s*(;.*)?$/) { # blank line after values
-                 _merge_node ($hmap, \%params, $newnode, \@newvalues, \@delvalues);
-                 $state = "outer";
-             } else {
--- 
-2.24.1
-

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

@@ -0,0 +1,160 @@
+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

@@ -0,0 +1,80 @@
+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

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

hivex.spec

@@ -1,19 +1,19 @@
 # Conditionalize Ocaml support.  This looks ass-backwards, but it's not.
-%ifarch %{ocaml_native_compiler}
+%ifarch %{ix86}
-%bcond_without ocaml
-%else
 %bcond_with ocaml
+%else
+%bcond_without ocaml
 %endif
 
 # Verify tarball signature with GPGv2.
 %global verify_tarball_signature 1
 
 Name:           hivex
-Version:        1.3.18
+Version:        1.3.23
-Release:        21%{?dist}.1
+Release:        13%{?dist}
 Summary:        Read and write Windows Registry binary hive files
 
-License:        LGPLv2
+License:        LGPL-2.1-only AND LGPL-2.0-or-later AND GPL-2.0-or-later
 URL:            http://libguestfs.org/
 
 Source0:        http://libguestfs.org/download/hivex/%{name}-%{version}.tar.gz
@@ -26,10 +26,15 @@ Source1:        http://libguestfs.org/download/hivex/%{name}-%{version}.tar.gz.s
 Source2:       libguestfs.keyring
 %endif
 
-# Patches - all upstream since 1.3.18.
+# Upstream patches to fix Ruby minitest support.
-Patch0001:      0001-Win-Hivex-Regedit-Accept-CRLF-line-endings.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=2229653
-Patch0002:      0002-Win-Hivex-Regedit-Ignore-comments.patch
+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
+BuildRequires:  autoconf, automake, libtool, gettext-devel
 BuildRequires:  perl-interpreter
 BuildRequires:  perl-devel
 BuildRequires:  perl-generators
@@ -64,11 +69,13 @@ BuildRequires:  rubygem(rdoc)
 BuildRequires:  readline-devel
 BuildRequires:  libxml2-devel
 %if 0%{verify_tarball_signature}
-BuildRequires: gnupg2
+BuildRequires:  gnupg2
 %endif
 
-# https://fedoraproject.org/wiki/Packaging:No_Bundled_Libraries#Packages_granted_exceptions
+Requires:       %{name}-libs = %{version}-%{release}
-Provides:      bundled(gnulib)
+
+Conflicts:      %{name} < 1.3.20-6
+Obsoletes:      %{name} < 1.3.20-6
 
 
 %description
@@ -102,9 +109,20 @@ For Python 3 bindings, see 'python3-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} = %{version}-%{release}
+Requires:       %{name}-libs = %{version}-%{release}
 Requires:       pkgconfig
 
 
@@ -113,20 +131,24 @@ Requires:       pkgconfig
 for %{name}.
 
 
+%if !0%{?rhel}
 %package static
 Summary:        Statically linked library for %{name}
-Requires:       %{name} = %{version}-%{release}
+License:        LGPL-2.1-only AND LGPL-2.0-or-later
+Requires:       %{name}-devel = %{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}
-Requires:      %{name} = %{version}-%{release}
+License:       LGPL-2.0-or-later
+Requires:      %{name}-libs%{?_isa} = %{version}-%{release}
 
 
 %description -n ocaml-%{name}
@@ -138,8 +160,9 @@ programs which use %{name} you will also need ocaml-%{name}-devel.
 
 %package -n ocaml-%{name}-devel
 Summary:       OCaml bindings for %{name}
-Requires:      ocaml-%{name} = %{version}-%{release}
+License:       LGPL-2.0-or-later
-Requires:      %{name}-devel = %{version}-%{release}
+Requires:      ocaml-%{name}%{?_isa} = %{version}-%{release}
+Requires:      %{name}-devel%{?_isa} = %{version}-%{release}
 
 
 %description -n ocaml-%{name}-devel
@@ -150,8 +173,8 @@ required to use the OCaml bindings for %{name}.
 
 %package -n perl-%{name}
 Summary:       Perl bindings for %{name}
-Requires:      %{name} = %{version}-%{release}
+License:       LGPL-2.0-or-later AND GPL-2.0-or-later
-Requires:      perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:      %{name}-libs = %{version}-%{release}
 
 
 %description -n perl-%{name}
@@ -160,7 +183,8 @@ perl-%{name} contains Perl bindings for %{name}.
 
 %package -n python3-%{name}
 Summary:       Python 3 bindings for %{name}
-Requires:      %{name} = %{version}-%{release}
+License:       LGPL-2.0-or-later
+Requires:      %{name}-libs = %{version}-%{release}
 
 %description -n python3-%{name}
 python3-%{name} contains Python 3 bindings for %{name}.
@@ -168,7 +192,8 @@ python3-%{name} contains Python 3 bindings for %{name}.
 
 %package -n ruby-%{name}
 Summary:       Ruby bindings for %{name}
-Requires:      %{name} = %{version}-%{release}
+License:       LGPL-2.0-or-later
+Requires:      %{name}-libs = %{version}-%{release}
 Requires:      ruby(release)
 Requires:      ruby
 Provides:      ruby(hivex) = %{version}
@@ -184,12 +209,17 @@ ruby-%{name} contains Ruby bindings for %{name}.
 %setup -q
 %autopatch -p1
 
+autoreconf -fi
+
 
 %build
 %configure \
     PYTHON=%{__python3} \
 %if !%{with ocaml}
     --disable-ocaml \
+%endif
+%if 0%{?rhel}
+    --disable-static \
 %endif
     %{nil}
 make V=1 INSTALLDIRS=vendor %{?_smp_mflags}
@@ -224,45 +254,54 @@ if ! make check -k; then
 fi
 
 %files -f %{name}.lang
-%doc README LICENSE
+%doc README.md
+%license LICENSE
 %{_bindir}/hivexget
 %{_bindir}/hivexml
 %{_bindir}/hivexsh
-%{_libdir}/libhivex.so.*
 %{_mandir}/man1/hivexget.1*
 %{_mandir}/man1/hivexml.1*
 %{_mandir}/man1/hivexsh.1*
 
 
+%files libs
+%doc README.md
+%license LICENSE
+%{_libdir}/libhivex.so.*
+
+
 %files devel
-%doc LICENSE
+%license LICENSE
 %{_libdir}/libhivex.so
 %{_mandir}/man3/hivex.3*
 %{_includedir}/hivex.h
 %{_libdir}/pkgconfig/hivex.pc
 
 
+%if !0%{?rhel}
 %files static
-%doc LICENSE
+%license LICENSE
 %{_libdir}/libhivex.a
+%endif
 
 
 %if %{with ocaml}
 %files -n ocaml-%{name}
-%doc README
+%doc README.md
-%{_libdir}/ocaml/hivex
+%dir %{_libdir}/ocaml/hivex
-%exclude %{_libdir}/ocaml/hivex/*.a
+%{_libdir}/ocaml/hivex/META
-%exclude %{_libdir}/ocaml/hivex/*.cmxa
+%{_libdir}/ocaml/hivex/*.cma
-%exclude %{_libdir}/ocaml/hivex/*.cmx
+%{_libdir}/ocaml/hivex/*.cmi
-%exclude %{_libdir}/ocaml/hivex/*.mli
 %{_libdir}/ocaml/stublibs/*.so
 %{_libdir}/ocaml/stublibs/*.so.owner
 
 
 %files -n ocaml-%{name}-devel
-%{_libdir}/ocaml/hivex/*.a
+%ifarch %{ocaml_native_compiler}
 %{_libdir}/ocaml/hivex/*.cmxa
 %{_libdir}/ocaml/hivex/*.cmx
+%endif
+%{_libdir}/ocaml/hivex/*.a
 %{_libdir}/ocaml/hivex/*.mli
 %endif
 
@@ -287,8 +326,164 @@ fi
 
 
 %changelog
-* Thu Feb 27 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.18-21.1
+* Thu Oct 05 2023 Richard W.M. Jones <rjones@redhat.com> - 1.3.23-13
-- OCaml 4.10.0 final (Fedora 32).
+- 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.

sources

@@ -1,2 +1,2 @@
-SHA512 (hivex-1.3.18.tar.gz) = 1851351118921e81df9e505f90d00048a178572c2edd3de40194a69915176bdb615e2eb5afea408d57063e98257c8d1e3d0cd6730407153892cc9e3befc4aa3a
+SHA512 (hivex-1.3.23.tar.gz) = 068fe81a442c8045bf9d98f0c6b782330141d8f1e104a0f191c04a2cff25ee6396c2c4777c107d595a471eb4bcbee903400c9f7946cae036165ac201587f861e
-SHA512 (hivex-1.3.18.tar.gz.sig) = 3b35181ed780456e21da48ef4c1ad630adf6e4db56a88711c0e9fe189806932d0bfcfde40d037488c7e512a8bc515c258c11e09853e448cae09e6bc8b9635341
+SHA512 (hivex-1.3.23.tar.gz.sig) = 0bd9968490d96887d9be9cc0be7824cfcab6347ea9255a418c93a8e150ad551fa931ea06a7790b26748735b85caae098716ced94dea6babb7be69a0e2d0bb7c4