Rebase to new stable branch version 1.48.1

resolves: rhbz#2059285

0001-RHEL-Disable-unsupported-remote-drive-protocols-RHBZ.patch

@@ -1,4 +1,4 @@
-From b3327cf9bfc7757cfd75c11aa1d63cc8aae522e6 Mon Sep 17 00:00:00 2001
+From ca7663dd28d0e95bc5bf8f468dc7823033c26328 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Mon, 29 Jul 2013 14:47:56 +0100
 Subject: [PATCH] RHEL: Disable unsupported remote drive protocols

0002-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch

@@ -1,4 +1,4 @@
-From 84814ce67cd4b0d5a844423223498d60a7766388 Mon Sep 17 00:00:00 2001
+From dda9d8a5df1a2bf1c187c96c60c4da06c7c3e24a Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 7 Jul 2015 09:28:03 -0400
 Subject: [PATCH] RHEL: Reject use of libguestfs-winsupport features except for

0003-RHEL-Create-etc-crypto-policies-back-ends-opensslcnf.patch

@@ -1,4 +1,4 @@
-From e73652429cd6f438a1a772f394c69a1cf3ecd2a5 Mon Sep 17 00:00:00 2001
+From cf6c2cf52bbfb8ee8c300d79212e9a75931392d8 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 29 Jun 2021 15:29:11 +0100
 Subject: [PATCH] RHEL: Create /etc/crypto-policies/back-ends/opensslcnf.config

0004-daemon-rpm-c.c-Disable-signature-checking-in-librpm.patch

@@ -1,47 +0,0 @@
-From 19f6758a9264318dcaf5c6658cbdab443fbb9ef7 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Tue, 15 Mar 2022 10:22:49 +0000
-Subject: [PATCH] daemon/rpm-c.c: Disable signature checking in librpm
-
-Older distros (eg CentOS 6) used SHA-1 RPM package signatures which
-some newer distros (eg RHEL 9.0) prevent us from verifying.
-
-This resulted in packages with SHA-1 signatures being skipped by
-librpm (there is a warning in debug output, but if you're not looking
-at that then the package is silently ignored).  In some cases
-essential packages like the kernel were skipped, which would be
-visible as a failure of virt-v2v.  In other cases (eg virt-inspector)
-you'd just see fewer installed packages in the <applications> list.
-
-Since verifying package signatures is not essential for inspection,
-disable this feature in librpm.
-
-Reported-by: Xiaodai Wang
-Thanks: Panu Matilainen
-Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2064182
-Signed-off-by: Richard W.M. Jones <rjones@redhat.com>
-(cherry picked from commit aa6f8038f826bfb37ddbbb575e6962e1e181c5e8)
----
- daemon/rpm-c.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/daemon/rpm-c.c b/daemon/rpm-c.c
-index be0e81e22..020fc588e 100644
---- a/daemon/rpm-c.c
-+++ b/daemon/rpm-c.c
-@@ -90,7 +90,12 @@ value
- guestfs_int_daemon_rpm_start_iterator (value unitv)
- {
-   CAMLparam1 (unitv);
-+
-   ts = rpmtsCreate ();
-+
-+  /* Disable signature checking (RHBZ#2064182). */
-+  rpmtsSetVSFlags (ts, rpmtsVSFlags (ts) | RPMVSF_MASK_NOSIGNATURES);
-+
-   iter = rpmtsInitIterator (ts, RPMDBI_PACKAGES, NULL, 0);
-   CAMLreturn (Val_unit);
- }
--- 
-2.31.1
-

libguestfs.spec

@@ -47,8 +47,8 @@
 Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
-Version:       1.48.0
+Version:       1.48.1
-Release:       2%{?dist}
+Release:       1%{?dist}
 License:       LGPLv2+
 
 # Build only for architectures that have a kernel
@@ -89,7 +89,6 @@ Source8:       copy-patches.sh
 Patch0001:     0001-RHEL-Disable-unsupported-remote-drive-protocols-RHBZ.patch
 Patch0002:     0002-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch
 Patch0003:     0003-RHEL-Create-etc-crypto-policies-back-ends-opensslcnf.patch
-Patch0004:     0004-daemon-rpm-c.c-Disable-signature-checking-in-librpm.patch
 
 %if 0%{patches_touch_autotools}
 BuildRequires: autoconf, automake, libtool, gettext-devel
@@ -1132,6 +1131,10 @@ rm ocaml/html/.gitignore
 
 
 %changelog
+* Thu Apr 14 2022 Richard W.M. Jones <rjones@redhat.com> - 1:1.48.1-1
+- Rebase to new stable branch version 1.48.1
+  resolves: rhbz#2059285
+
 * Thu Mar 17 2022 Richard W.M. Jones <rjones@redhat.com> - 1:1.48.0-2
 - Disable signature checking in librpm
   resolves: rhbz#2065172

sources

@@ -1,2 +1,2 @@
-SHA512 (libguestfs-1.48.0.tar.gz) = b2486f32a3958c2b3e68d3f547dcd192dc7f8c59e0efd8660cd27cae9c218ce4fc2a60480dcb6bb0d10d8abbc2d2f4796075aea1cfab5e3c7cd12c38d4352fe2
+SHA512 (libguestfs-1.48.1.tar.gz) = 34cad3cb9ebfe2d6294fda8eede873470d75aad2eadc5b245556122a3e09b5d51fc012c0144997b66070feb97fe9613f0f9328a973c30839dae74f446a4a4b3c
-SHA512 (libguestfs-1.48.0.tar.gz.sig) = d884d4b5cdd5470978a56c8e31843847567221693711f4e35415c4ca992ad92d872be531641d945314556da65a7573d8cec5748d571ba4204c4bab81ee39bb1e
+SHA512 (libguestfs-1.48.1.tar.gz.sig) = 2addd2767237cc5e00031b68d50d50e0ac6f1da570aefd6e2bba76e919d10f3648802b113bfe99efe9e8c336e96bf6e6e179731d686b09cb5f4bf29f4790ffc0