diff --git a/0001-builder-Disable-opensuse-repository.patch b/0001-builder-Disable-opensuse-repository.patch deleted file mode 100644 index fa49b7f..0000000 --- a/0001-builder-Disable-opensuse-repository.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 8e0e91c923bd7076fd906a71678ddd3f328ae2c0 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Mon, 21 Nov 2022 13:03:22 +0000 -Subject: [PATCH] builder: Disable opensuse repository - -The upstream site went down last week, breaking virt-builder. Disable -the repository for now until we can work out what to do. - -Related: https://github.com/libguestfs/libguestfs/issues/99 ---- - builder/opensuse.conf.in | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/builder/opensuse.conf.in b/builder/opensuse.conf.in -index 19f9796992..d802e6178c 100644 ---- a/builder/opensuse.conf.in -+++ b/builder/opensuse.conf.in -@@ -1,3 +1,5 @@ --[opensuse.org] --uri=http://download.opensuse.org/repositories/Virtualization:/virt-builder-images/images/index --gpgkey=file://@SYSCONFDIR@/virt-builder/repos.d/opensuse.gpg -+# Disabled for now, see: -+# https://github.com/libguestfs/libguestfs/issues/99 -+#[opensuse.org] -+#uri=http://download.opensuse.org/repositories/Virtualization:/virt-builder-images/images/index -+#gpgkey=file://@SYSCONFDIR@/virt-builder/repos.d/opensuse.gpg --- -2.37.0.rc2 - diff --git a/guestfs-tools.spec b/guestfs-tools.spec index 648c9dd..ebed5e9 100644 --- a/guestfs-tools.spec +++ b/guestfs-tools.spec @@ -25,8 +25,8 @@ Summary: Tools to access and modify virtual machine disk images Name: guestfs-tools -Version: 1.49.5 -Release: 2%{?dist} +Version: 1.49.6 +Release: 1%{?dist} License: GPLv2+ # Build only for architectures that have a kernel @@ -43,9 +43,6 @@ Source0: http://download.libguestfs.org/guestfs-tools/%{source_directory}/ Source1: http://download.libguestfs.org/guestfs-tools/%{source_directory}/%{name}-%{version}.tar.gz.sig %endif -# https://github.com/libguestfs/libguestfs/issues/99 -Patch: 0001-builder-Disable-opensuse-repository.patch - # Keyring used to verify tarball signature. %if 0%{verify_tarball_signature} Source2: libguestfs.keyring @@ -102,8 +99,9 @@ BuildRequires: gnupg2 %endif # Ensure a minimum version of libguestfs is installed. This contains -# a workaround for openssl bug RHBZ#2133884 -Requires: libguestfs >= 1.49.5-2 +# a workaround for openssl bug RHBZ#2133884 and the hang where we +# called setenv between fork and exec. +Requires: libguestfs >= 1.49.6-1 # For virt-builder: Requires: curl @@ -428,6 +426,10 @@ end %changelog +* Fri Nov 25 2022 Richard W.M. Jones - 1.49.6-1 +- New upstream development version 1.49.6 +- Enable opensuse repository again + * Mon Nov 21 2022 Richard W.M. Jones - 1.49.5-2 - Disable opensuse repository diff --git a/sources b/sources index 056a6b6..e5860d1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (guestfs-tools-1.49.5.tar.gz) = 83d03a0f840c3b73c6bca1895e212d7666fd012972fd5313216fb9fcc24801acc67e59f3f9bb83f7d2329f51ed48dc2e72bda2177aeff04c09a68701751dbeeb -SHA512 (guestfs-tools-1.49.5.tar.gz.sig) = 8d051a0358fd6a673a4d5aeb674743c5dff54b40b3e5078322dc85f279b01d11e057e81cf453fe1f1bdb921a29e12b324a49737c5906938954fdea66fa515ff1 +SHA512 (guestfs-tools-1.49.6.tar.gz) = f9588226346a9e253edda495b0f4bd0abeb8f4406c48ea0f95af458da0d77f00e9fcaca1ce4f0f3dcf882e3e1ef792208d54a7d99571f1b78de6a4a00ca7161c +SHA512 (guestfs-tools-1.49.6.tar.gz.sig) = e7f72627c07b630d925ce3a11d58144cf561ea3dda46fbfe595974465e5bdc936714838cdaa7a95e4470c7752ced7229168e94374f5b454c77bec61370688488