From 8f14a2c35468160cf9e6c7cbab6888662dca42e1 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 10 Dec 2022 12:36:51 +0000 Subject: [PATCH] New upstream development version 1.49.8 --- ...n-etc-crypto-policies-back-ends-file.patch | 43 ------------------- libguestfs.spec | 9 ++-- sources | 4 +- 3 files changed, 6 insertions(+), 50 deletions(-) delete mode 100644 0001-appliance-Copy-in-etc-crypto-policies-back-ends-file.patch diff --git a/0001-appliance-Copy-in-etc-crypto-policies-back-ends-file.patch b/0001-appliance-Copy-in-etc-crypto-policies-back-ends-file.patch deleted file mode 100644 index 3bbf62b..0000000 --- a/0001-appliance-Copy-in-etc-crypto-policies-back-ends-file.patch +++ /dev/null @@ -1,43 +0,0 @@ -From d6ba398825bfdd67daf57bac0a4d8bcb281a62a8 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Tue, 11 Oct 2022 21:48:30 +0100 -Subject: [PATCH] appliance: Copy in /etc/crypto-policies/back-ends/ files - -Downstream patched openssl in Fedora 37+ broke unless -/etc/crypto-policies/back-ends/opensslcnf.conf is present. Files in -this directory are generated by %post rules that use scripting -languages so cannot easily be created by supermin. - -Force a copy of the host files into the appliance. This is not ideal -and is hopefully a temporary fix until Fedora's openssl is fixed. - -A symptom of this problem is the error: - - Requested hash sha256 is not supported. - Failed to set pbkdf parameters. - -Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2133884 ---- - appliance/hostfiles.in | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/appliance/hostfiles.in b/appliance/hostfiles.in -index e78c79bd34..2c42a858e8 100644 ---- a/appliance/hostfiles.in -+++ b/appliance/hostfiles.in -@@ -14,6 +14,12 @@ dnl FRUGALWARE=1 For Frugalware. - dnl MAGEIA=1 For Mageia. - dnl OPENMANDRIVA=1 For OpenMandriva. - -+# Work around broken openssl in Fedora 37+ by forcibly copying in -+# these host configuration files (RHBZ#2133884). -+ifelse(REDHAT,1, -+/etc/crypto-policies/back-ends/*.config -+) -+ - /etc/ld.so.cache - /lib/lsb/* - /usr/share/augeas/lenses/*.aug --- -2.37.0.rc2 - diff --git a/libguestfs.spec b/libguestfs.spec index 6467e6e..24a864b 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -47,7 +47,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 -Version: 1.49.7 +Version: 1.49.8 Release: 1%{?dist} License: LGPLv2+ @@ -82,10 +82,6 @@ Source7: libguestfs.keyring # Maintainer script which helps with handling patches. Source8: copy-patches.sh -# Workaround for openssl bug RHBZ#2133884 -# Upstream in libguestfs -Patch: 0001-appliance-Copy-in-etc-crypto-policies-back-ends-file.patch - %if 0%{patches_touch_autotools} BuildRequires: autoconf, automake, libtool, gettext-devel %endif @@ -1126,6 +1122,9 @@ rm ocaml/html/.gitignore %changelog +* Sat Dec 10 2022 Richard W.M. Jones - 1:1.49.8-1 +- New upstream development version 1.49.8 + * Mon Nov 28 2022 Richard W.M. Jones - 1:1.49.7-1 - New upstream development version 1.49.7 diff --git a/sources b/sources index 49a4e1d..ec90b21 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libguestfs-1.49.7.tar.gz) = b8b1f69db431c1fe1892edb4e1391fae991aeb567dbe418ac930ff5643b50ea6733c83b4d82841821061b61cfcf55de76e32f40e17c0bab6c2ceb8083a223f5c -SHA512 (libguestfs-1.49.7.tar.gz.sig) = 80e9f7137783cc12f598d150c68dd27e1bfc0fb95810436529ad61eb621865b378d84c346e72a159f984bae405ea176a41682fa2e3ee9065fb8cae0717233452 +SHA512 (libguestfs-1.49.8.tar.gz) = d8ea933780b70b482136ee1573cc30fdf04a519a62dd22980f0913c2ed0b6be53627cbc19a28c71189c3a5b985d5876fbea1399da5a674cf34f542b9e4ac5451 +SHA512 (libguestfs-1.49.8.tar.gz.sig) = 81fbfc765b8df830fbdb00c22f35505a3fd18fc76ded2b442d642b257a591ab43846f43d09129e2dd34a60a0761e9246216e9cf6731de0be9739471263b1e08f