diff --git a/0001-RHEL-Remove-libguestfs-live-RHBZ-798980.patch b/0001-RHEL-Remove-libguestfs-live-RHBZ-798980.patch index ec066eb..ef3bcac 100644 --- a/0001-RHEL-Remove-libguestfs-live-RHBZ-798980.patch +++ b/0001-RHEL-Remove-libguestfs-live-RHBZ-798980.patch @@ -1,7 +1,7 @@ -From 802b515677d77936a2ae0d6e945a0364e4246002 Mon Sep 17 00:00:00 2001 +From fb09175a21b9ee333e3ad01ab9c8652263200ca4 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 21 Dec 2012 15:50:11 +0000 -Subject: [PATCH 1/5] RHEL: Remove libguestfs live (RHBZ#798980). +Subject: [PATCH 1/6] RHEL: Remove libguestfs live (RHBZ#798980). This isn't supported in RHEL. @@ -51,5 +51,5 @@ index 690e09b5e..919e2f248 100644 daemon/test-daemon-start.pl \ daemon/test-btrfs.pl -- -2.30.1 +2.31.1 diff --git a/0002-RHEL-Remove-9p-APIs-from-RHEL-RHBZ-921710.patch b/0002-RHEL-Remove-9p-APIs-from-RHEL-RHBZ-921710.patch index e8cc8fa..6496e82 100644 --- a/0002-RHEL-Remove-9p-APIs-from-RHEL-RHBZ-921710.patch +++ b/0002-RHEL-Remove-9p-APIs-from-RHEL-RHBZ-921710.patch @@ -1,7 +1,7 @@ -From c8770be96ddbebd7f1f726d97aa566fb1558ce2d Mon Sep 17 00:00:00 2001 +From e0af86a09b80b5fa0c5f308ae6f34d8315c1dc4d Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 18 Jul 2013 18:31:53 +0100 -Subject: [PATCH 2/5] RHEL: Remove 9p APIs from RHEL (RHBZ#921710). +Subject: [PATCH 2/6] RHEL: Remove 9p APIs from RHEL (RHBZ#921710). --- daemon/9p.c | 182 -------------------------------------- @@ -204,10 +204,10 @@ index 743a96abd..000000000 - return 0; -} diff --git a/daemon/Makefile.am b/daemon/Makefile.am -index 216029b7c..8bf601367 100644 +index 6f13bd43c..cc4dbcd85 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am -@@ -83,7 +83,6 @@ guestfsd_SOURCES = \ +@@ -84,7 +84,6 @@ guestfsd_SOURCES = \ ../common/protocol/guestfs_protocol.h \ ../common/utils/cleanups.h \ ../common/utils/guestfs-utils.h \ @@ -216,7 +216,7 @@ index 216029b7c..8bf601367 100644 actions.h \ available.c \ diff --git a/docs/C_SOURCE_FILES b/docs/C_SOURCE_FILES -index 060be051b..7a05f3b24 100644 +index 6a97d8b0e..896314e7e 100644 --- a/docs/C_SOURCE_FILES +++ b/docs/C_SOURCE_FILES @@ -43,7 +43,6 @@ common/visit/visit.c @@ -228,7 +228,7 @@ index 060be051b..7a05f3b24 100644 daemon/actions.h daemon/augeas.c diff --git a/generator/actions_core.ml b/generator/actions_core.ml -index bb92ef2ca..5f849bad1 100644 +index bb602ee02..db8156c51 100644 --- a/generator/actions_core.ml +++ b/generator/actions_core.ml @@ -6157,27 +6157,6 @@ This returns true iff the device exists and contains all zero bytes. @@ -293,7 +293,7 @@ index 650f8ddac..c4e735967 100644 src/optargs-ntfsclone_out.c \ src/optargs-ntfsfix.c \ diff --git a/po/POTFILES b/po/POTFILES -index c5f4e6aa7..aeb701e32 100644 +index 29205b6a6..23afe619c 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -26,7 +26,6 @@ common/utils/stringlists-utils.c @@ -304,7 +304,7 @@ index c5f4e6aa7..aeb701e32 100644 daemon/acl.c daemon/augeas.c daemon/available.c -@@ -251,7 +250,6 @@ gobject/src/optargs-mkfs_btrfs.c +@@ -264,7 +263,6 @@ gobject/src/optargs-mkfs_btrfs.c gobject/src/optargs-mksquashfs.c gobject/src/optargs-mkswap.c gobject/src/optargs-mktemp.c @@ -325,5 +325,5 @@ index 919e2f248..e3613fec4 100644 SLOW_TESTS += bigdirs/test-big-dirs.pl -- -2.30.1 +2.31.1 diff --git a/0003-RHEL-Disable-unsupported-remote-drive-protocols-RHBZ.patch b/0003-RHEL-Disable-unsupported-remote-drive-protocols-RHBZ.patch index 48a015e..841ec13 100644 --- a/0003-RHEL-Disable-unsupported-remote-drive-protocols-RHBZ.patch +++ b/0003-RHEL-Disable-unsupported-remote-drive-protocols-RHBZ.patch @@ -1,7 +1,7 @@ -From 41beea618d3da3b0351b3d8aa7eb7be40f369877 Mon Sep 17 00:00:00 2001 +From fddb44d1a2c77739c9441d2cc0acfef9e62718a6 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 29 Jul 2013 14:47:56 +0100 -Subject: [PATCH 3/5] RHEL: Disable unsupported remote drive protocols +Subject: [PATCH 3/6] RHEL: Disable unsupported remote drive protocols (RHBZ#962113). This disables support for unsupported remote drive protocols: @@ -220,7 +220,7 @@ index 21d424984..ddabeb639 100755 rm test-add-uri.out rm test-add-uri.img diff --git a/generator/actions_core.ml b/generator/actions_core.ml -index 5f849bad1..f6f8844b8 100644 +index db8156c51..b87071e3b 100644 --- a/generator/actions_core.ml +++ b/generator/actions_core.ml @@ -297,29 +297,6 @@ F is interpreted as a local file or device. @@ -605,5 +605,5 @@ index 12937fb30..b3e4f9903 100755 -grep -sq -- '-drive file=ssh://rich@example.com/disk.img,' "$DEBUG_QEMU_FILE" || fail -rm "$DEBUG_QEMU_FILE" -- -2.30.1 +2.31.1 diff --git a/0004-RHEL-Remove-User-Mode-Linux-RHBZ-1144197.patch b/0004-RHEL-Remove-User-Mode-Linux-RHBZ-1144197.patch index 32505ae..edf5f00 100644 --- a/0004-RHEL-Remove-User-Mode-Linux-RHBZ-1144197.patch +++ b/0004-RHEL-Remove-User-Mode-Linux-RHBZ-1144197.patch @@ -1,7 +1,7 @@ -From 2cad9372eb4f3a1c37f254eb2e9af797693fa7d4 Mon Sep 17 00:00:00 2001 +From 155063a0c8290eb9c32c552c439cb8023d4a6390 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 19 Sep 2014 13:38:20 +0100 -Subject: [PATCH 4/5] RHEL: Remove User-Mode Linux (RHBZ#1144197). +Subject: [PATCH 4/6] RHEL: Remove User-Mode Linux (RHBZ#1144197). This isn't supported in RHEL. --- @@ -68,5 +68,5 @@ index 5aec50a57..8b9fcd770 100644 static int shutdown_uml (guestfs_h *g, void *datav, int check_for_errors) -- -2.30.1 +2.31.1 diff --git a/0005-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch b/0005-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch index 84457c1..7edf33e 100644 --- a/0005-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch +++ b/0005-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch @@ -1,7 +1,7 @@ -From f3fde497b6e0b079ff86360f6c0b6ef8d433c39b Mon Sep 17 00:00:00 2001 +From b33e943827b2decc2a01f198f1b300a3c3f6710e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 7 Jul 2015 09:28:03 -0400 -Subject: [PATCH 5/5] RHEL: Reject use of libguestfs-winsupport features except +Subject: [PATCH 5/6] RHEL: Reject use of libguestfs-winsupport features except for virt-* tools (RHBZ#1240276). Fix the tests: it doesn't let us use guestfish for arbitrary Windows @@ -13,7 +13,7 @@ edits. 3 files changed, 19 insertions(+) diff --git a/generator/c.ml b/generator/c.ml -index 86d3b26f8..a625361a9 100644 +index ea69abf76..56ee38aa4 100644 --- a/generator/c.ml +++ b/generator/c.ml @@ -1846,6 +1846,22 @@ and generate_client_actions actions () = @@ -65,5 +65,5 @@ index 105291dc3..5ca4f3b6d 100644 exit (EXIT_FAILURE); -- -2.30.1 +2.31.1 diff --git a/0006-RHEL-Create-etc-crypto-policies-back-ends-opensslcnf.patch b/0006-RHEL-Create-etc-crypto-policies-back-ends-opensslcnf.patch new file mode 100644 index 0000000..ce915e9 --- /dev/null +++ b/0006-RHEL-Create-etc-crypto-policies-back-ends-opensslcnf.patch @@ -0,0 +1,33 @@ +From 18c910479cb6465bcd3954c5d07f3ab6df5c944a Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Tue, 29 Jun 2021 15:29:11 +0100 +Subject: [PATCH 6/6] RHEL: Create + /etc/crypto-policies/back-ends/opensslcnf.config + +https://bugzilla.redhat.com/show_bug.cgi?id=1977214#c13 +--- + appliance/init | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/appliance/init b/appliance/init +index b1c4d09ea..be46f9648 100755 +--- a/appliance/init ++++ b/appliance/init +@@ -70,6 +70,14 @@ if ! test -e /etc/mtab; then + ln -s /proc/mounts /etc/mtab + fi + ++# openssl 3 requires /etc/crypto-policies/back-ends/opensslcnf.config ++# to exist, but it is created in a %post script in crypto-policies ++# https://bugzilla.redhat.com/show_bug.cgi?id=1977214#c13 ++if ! test -r /etc/crypto-policies/back-ends/opensslcnf.config && ++ test -f /usr/share/crypto-policies/DEFAULT/opensslcnf.txt; then ++ ln -s /usr/share/crypto-policies/DEFAULT/opensslcnf.txt /etc/crypto-policies/back-ends/opensslcnf.config ++fi ++ + # devtmpfs is required since udev 176 + mount -t devtmpfs /dev /dev + mkdir -p /dev/pts +-- +2.31.1 + diff --git a/libguestfs.spec b/libguestfs.spec index 9af27a1..f60a2c0 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -61,7 +61,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 Version: 1.45.6 -Release: 8%{?dist} +Release: 9%{?dist} License: LGPLv2+ # Build only for architectures that have a kernel @@ -102,6 +102,7 @@ Patch9002: 0002-RHEL-Remove-9p-APIs-from-RHEL-RHBZ-921710.patch Patch9003: 0003-RHEL-Disable-unsupported-remote-drive-protocols-RHBZ.patch Patch9004: 0004-RHEL-Remove-User-Mode-Linux-RHBZ-1144197.patch Patch9005: 0005-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch +Patch9006: 0006-RHEL-Create-etc-crypto-policies-back-ends-opensslcnf.patch %endif %if 0%{patches_touch_autotools} @@ -1123,6 +1124,10 @@ rm ocaml/html/.gitignore %changelog +* Tue Jun 29 2021 Richard W.M. Jones - 1:1.45.6-9 +- RHEL 9 patch for openssl missing configuration file + https://bugzilla.redhat.com/show_bug.cgi?id=1977214#c13 + * Thu Jun 24 2021 Richard W.M. Jones - 1:1.45.6-8 - Remove Suggests for unsupported qemu drivers in RHEL (RHBZ#1975703)