From f38e293ddaba0672d4cb439c24195b016639c497 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 10 Jun 2025 13:02:57 +0100 Subject: [PATCH] builder: Update link to templates to use https resolves: RHEL-94874 --- ...pdate-link-to-templates-to-use-https.patch | 23 +++++++++++++++++++ guestfs-tools.spec | 9 ++++++-- 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 0010-builder-Update-link-to-templates-to-use-https.patch diff --git a/0010-builder-Update-link-to-templates-to-use-https.patch b/0010-builder-Update-link-to-templates-to-use-https.patch new file mode 100644 index 0000000..5a06966 --- /dev/null +++ b/0010-builder-Update-link-to-templates-to-use-https.patch @@ -0,0 +1,23 @@ +From a0fbbc98f5fb069bcbf15a5a8ec51e4c778a2bd5 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Tue, 3 Jun 2025 08:29:57 +0100 +Subject: [PATCH] builder: Update link to templates to use https + +Fixes: https://issues.redhat.com/browse/RHEL-94873 +Reported-by: Xiang Hua Chen +(cherry picked from commit 5a2458f38d40e5c6f3eceb8e7de162724ff9e374) +--- + builder/libguestfs.conf.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/builder/libguestfs.conf.in b/builder/libguestfs.conf.in +index 8d8feab75..08b6a6234 100644 +--- a/builder/libguestfs.conf.in ++++ b/builder/libguestfs.conf.in +@@ -1,5 +1,5 @@ + [libguestfs.org] +-uri=http://builder.libguestfs.org/index.asc ++uri=https://builder.libguestfs.org/index.asc + gpgkey=file://@SYSCONFDIR@/virt-builder/repos.d/libguestfs.gpg + + [archive.libguestfs.org] diff --git a/guestfs-tools.spec b/guestfs-tools.spec index 7429f77..e55a2b5 100644 --- a/guestfs-tools.spec +++ b/guestfs-tools.spec @@ -19,7 +19,7 @@ Summary: Tools to access and modify virtual machine disk images Name: guestfs-tools Version: 1.52.2 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL-2.0-or-later AND LGPL-2.0-or-later # Build only for architectures that have a kernel @@ -45,7 +45,7 @@ Source2: libguestfs.keyring Source3: copy-patches.sh # Patches are maintained in the following repository: -# https://github.com/rwmjones/guestfs-tools/commits/rhel-9.6 +# https://github.com/rwmjones/guestfs-tools/commits/rhel-9.7 # Patches. Patch0001: 0001-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch @@ -57,6 +57,7 @@ Patch0006: 0006-build-Remove-Jansson-dependency.patch Patch0007: 0007-test-data-phony-fedora-Add-simple-static-bin-sh.patch Patch0008: 0008-drivers-Handle-large-output-from-rpm-ql-command.patch Patch0009: 0009-Update-common-submodule.patch +Patch0010: 0010-builder-Update-link-to-templates-to-use-https.patch %if 0%{patches_touch_autotools} BuildRequires: autoconf, automake, libtool, gettext-devel @@ -414,6 +415,10 @@ end %changelog +* Tue Jun 10 2025 Richard W.M. Jones - 1.52.2-5 +- builder: Update link to templates to use https + resolves: RHEL-94874 + * Thu Mar 13 2025 Richard W.M. Jones - 1.52.2-4 - mlcustomize: Remove dnf --verbose option resolves: RHEL-83200