Sync from SUSE:SLFO:Main guestfs-tools revision 44485825225e23ac104fcfffd9d4378c

builder-update-openSUSE.gpg-key.patch

@@ -0,0 +1,39 @@
+Subject: builder: Update opensuse.gpg key
+From: Richard W.M. Jones rjones@redhat.com Tue Nov 12 10:43:58 2024 +0000
+Date: Tue Nov 12 10:43:58 2024 +0000:
+Git: 97f52913f7d674cf79daaea716e774425269a361
+
+Key downloaded from
+https://build.opensuse.org/projects/Virtualization:containers/signing_keys
+
+Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2324689
+
+diff --git a/builder/opensuse.gpg b/builder/opensuse.gpg
+index 001376f0..07753dea 100644
+--- a/builder/opensuse.gpg
++++ b/builder/opensuse.gpg
+@@ -8,14 +8,14 @@ ES3MaeH8aiwup/ogjhmk0SbCQQ/ib21p3XWBwx2oz/KM6Voq9tKDvMczjzNRY3ZT
+ 6Di3FsUSKI7kgljiNiuN+675YwqEqxWEJgdE5a7Zb67giH1Ik08b5wQiF5jSAICD
+ DxW7/ibWBvZJnqhqQT2xJpLC5VaJqwkN8o83ABEBAAG0PlZpcnR1YWxpemF0aW9u
+ IE9CUyBQcm9qZWN0IDxWaXJ0dWFsaXphdGlvbkBidWlsZC5vcGVuc3VzZS5vcmc+
+-iQE7BBMBAgAmBQJSJgJdAhsDBQkEHrAABgsJCAcDAgQVAggDBBYCAwECHgECF4AA
+-CgkQoZP7tXIXT8ITnwf3SVUUoVjVLFCjhIxdet8BL011cJDwr9TwKEQfq4Ybsq5L
+-5Y1/Zk86rTzrVOZrODLwNRIC3fMuegZV5f85KMggXu37Di+UvX+dQW9v1hte+hAT
+-+gsqb60kOnE/Yacgkb6D3xIzRudAB2q/xfvHl/hgfn416yGI8NvntT7n4Hk9wT28
+-9JSFkun0uaessg77aXlAdsqHwdugm9hELeva89OoYoiZ4d9r4ScTMSj0UkNgnh7g
+-CyIScZHYqiiOeosUtAX9u1PyUFfFsg9s5snfud7aF48EfXU0RTtZAGKtG4GPDv3q
+-bYc5TJ2pQzs9y5Bk/jAMR/QQw8CKglBsn1cjYkKViEYEExECAAYFAlImAl0ACgkQ
+-OzARt2udZSO5yACgr6Ei7QZ+PAmg4Mr5db+4M3aepAEAniU33RaTKBCGkwQi6kHr
+-4VaII2/E
+-=l8DH
++iQE8BBMBAgAmBQJmr8VoAhsDBQkYqHMLBgsJCAcDAgQVAggDBBYCAwECHgECF4AA
++CgkQoZP7tXIXT8LoHQgAk9wAwmx6Cpfl758Hc2qVHA/46YtuiK78ZipBWbM+hA5l
++jpRuagsV88isQWy5AGPC7aJkY2J1/CTXAsqE1ElCVFCNY8K9VjD/itZNqp0B1GLZ
++6xtOchYZW6eGWqSr9GuCioT1A54/a0aHpn8k0tULWGXDsu4/Vb4HHOYXLOVwWshy
++iMt5LmIOkGUYSw1UgeS9Z3kIdC7V3cGe7stLIYu9TpANmn5L4Hd2k4ds2csWJp+F
++18Gsd21uLOadXKXkWTkO9cj834YzWjAuPeEgKjm4XF8G3Sc8JJeSUA4F3Yh2AXB/
++AV00XnGuZrslgt0QkFI1kN6xX379eV2QyZUq7VeZ34hGBBMRAgAGBQJSJgJdAAoJ
++EDswEbdrnWUjucgAoK+hIu0GfjwJoODK+XW/uDN2nqQBAJ4lN90WkygQhpMEIupB
++6+FWiCNvxA==
++=ycq0
+ -----END PGP PUBLIC KEY BLOCK-----

guestfs-tools-1.53.3.tar.gz.sig

@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQJFBAABCAAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAmbEeHQRHHJpY2hAYW5u
-ZXhpYS5vcmcACgkQkXOPc+G3aKBXkBAAocT+LU2lCMfG2yuWemJiioihNF9nqB8j
-mqLxsKUk/lBCevODrcYglU33mCJW70GQBU6XKLktr3YMNbQDBSl+CAInT9qXFKQB
-BLh6K652Kb7L5TaYsKAIckkhOfu+W7zuODFZ/J1tHSFLewUfGkzbNyWbit6IMu71
-yYJdUapKryci0xfwdTRCKviDCodygSN4mLWlMyQtZqlX/awuUkGwcPje37RlTJt3
-ooSEGptfe09QhXxJZP1/iZF+FcU0DAW33XpjR/oGny4hE3AVvTrXLE2wg+pK+E13
-E15OVS7E+0LtYAGRv1mg6tYRwAx3wgdCrQSypjormaCE849UihhQXD9mKQ3qpzqY
-9KaB46k5DB2oFBpMvCmEMbRDnHombuh0aFE5Z6FVPC2oY9TEJgq234AMT+g0g0hL
-/8etCJ8Y7/f8ydzN3zN/FNVFIQ4Mjxqxc/jyV4TqIVjrtRP6w32FXN5vBJav2c5a
-CZu3PM4G6OhaKXRzTVj45ylnpw6GePONuxB+MY8vs3t6tvhur6dQTUMhe3poagqC
-D6GKwIx1NMam1/uJifVA2db6iZuhaeNIMX40cBEum1tLRcPlQAPzjP50Cov5e4tg
-mBHcyfaFaS3x3VEqCW8aaKxdqZxIwsYFjP6WtDrCkYKTW1CwftnC4iCswLNYYq0H
-vhB3ZCuSEwI=
-=B/TP
------END PGP SIGNATURE-----

guestfs-tools-1.53.4.tar.gz.sig

@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQJFBAABCAAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAmcX1tMRHHJpY2hAYW5u
+ZXhpYS5vcmcACgkQkXOPc+G3aKC1hQ/+Ivgz5wnurekgPA2URdE61b6il7gnIQHd
+JtHxJWJYZYhzHU1TW+16UWdUnjNVOBrkkI4h7fUT8OZAoykKDf9xZkl2NM9g2KBx
+syfX32C4Q1v8E7p4aC6ZJM/G5JWY7r9gh53JB9z74hMkyHhGILV4L9X872ugBkgZ
+GaM8P3UjJyLXBet2FbRqiFrGBmGCuy3+O1aCnoWImemGhzNWEdU4n5pkaR3S7cAS
+qYKMMzr8XyYJDEm+B8oaSfEsGPXplaj93c17Pp69dmyXxo3PdYSvGK/zjou8Hm0s
+7WEHygh7VEJvQC6dn3PM4WbL67B0BW2KrrxeCUQx6271EyXXSAfqMyFmbSreDcgI
+RuKiufJOwUH7ep7Op7vv5mF3JUMr7LqjzyjugeUnIJMFGW2p4wHdHi1yNNxm112F
+DHWwnzITf2ibhIl86UNYPzLb/Dd45+VXsT11E4r6bdyirKCnpIN5O9QWWA1AZ81l
+lL5RXnPO3kGOzvJVoUXIEx98XTdehhyY3Zsb60nZ6eW6NVFUCqluFEU9lyUsaOFD
+g5LrLllO/QsofVXiDJWg81MK7lAXUw37/1O/4zAgLr+OF8duHonSyaTc2SeYPGQh
+vJniaoZlXDiaOikElide7EUgZtE+2fQH6N2OCqwAzblmkl7aaeH5Kmxk+9lb0f/4
+8fBR7udQqXs=
+=l73/
+-----END PGP SIGNATURE-----

guestfs-tools.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Tue Nov 12 04:37:05 MST 2024 - carnold@suse.com
+
+- virt-builder ships with out-of-date openSUSE signing key
+  resulting in a GPG failure
+  builder-update-openSUSE.gpg-key.patch
+
+-------------------------------------------------------------------
+Tue Oct 29 07:51:25 MDT 2024 - carnold@suse.com
+
+- Update to version 1.53.4 (jsc#PED-8910)
+  * mlcustomize: Update generated options for virt-v2v
+  * Various build fixes and dependency changes
+
 -------------------------------------------------------------------
 Thu Aug 29 15:15:13 MDT 2024 - carnold@suse.com
 

guestfs-tools.spec

@@ -20,7 +20,7 @@
 %global patches_touch_autotools 1
 
 # The source directory.
-#%global source_directory 1.52-stable
+###%global source_directory 1.52-stable
 %global source_directory 1.53-development
 
 #
@@ -31,7 +31,7 @@
 
 Summary:        Tools to access and modify virtual machine disk images
 Name:           guestfs-tools
-Version:        1.53.3
+Version:        1.53.4
 Release:        0
 License:        GPL-2.0-or-later
 
@@ -43,6 +43,8 @@ URL:            http://libguestfs.org/
 Source0:        http://download.libguestfs.org/guestfs-tools/%{source_directory}/%{name}-%{version}.tar.gz
 Source1:        http://download.libguestfs.org/guestfs-tools/%{source_directory}/%{name}-%{version}.tar.gz.sig
 
+Patch0:         builder-update-openSUSE.gpg-key.patch
+
 %if 0%{patches_touch_autotools}
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -57,7 +59,7 @@ BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  libguestfs-devel >= 1.45.3-1
 BuildRequires:  libguestfs-xfs
-BuildRequires:  libjansson-devel
+BuildRequires:  libjson-c-devel
 BuildRequires:  libosinfo-devel
 BuildRequires:  libvirt-devel
 BuildRequires:  libxcrypt-devel