Add AV and GPOs to virt-inspector output

resolves: RHEL-125955

Synchronize spec file with Fedora.

0016-test-data-phony-guests-Increase-size-of-Windows-imag.patch

@@ -0,0 +1,31 @@
+From 269302e1a500d3cba94194faa258f6b47fef88fb Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Tue, 4 Nov 2025 13:04:12 +0000
+Subject: [PATCH] test-data/phony-guests: Increase size of Windows image
+
+For testing I tried to upload a very large Windows registry to the
+phony Windows image.  However because of the 256M limit on the size of
+the second partition (and NTFS overhead?) this was not possible.
+
+There's no real penalty to increasing the size of this image since
+it's just virtual space, so increase the virtual size to 2G (256M/1.7G
+split).
+
+(cherry picked from commit a39ae0b898825970549876738bd465f6a110de7c)
+---
+ test-data/phony-guests/make-windows-img.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test-data/phony-guests/make-windows-img.sh b/test-data/phony-guests/make-windows-img.sh
+index 0ec6b4851..e72013c3d 100755
+--- a/test-data/phony-guests/make-windows-img.sh
++++ b/test-data/phony-guests/make-windows-img.sh
+@@ -37,7 +37,7 @@ fi
+ 
+ # Create a disk image.
+ guestfish <<EOF
+-sparse windows.img-t 512M
++sparse windows.img-t 2G
+ run
+ 
+ # Format the disk.

0017-inspector-Add-new-class-field-to-output-of-virt-insp.patch

@@ -0,0 +1,72 @@
+From 63df59b34bb0a19f6b1e2821250106691d1945a9 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Mon, 3 Nov 2025 15:26:19 +0000
+Subject: [PATCH] inspector: Add new <class> field to output of virt-inspector
+
+Rebase common submodule to pick up:
+
+  Richard W.M. Jones (1):
+      structs/structs-print.c: Update this generated file
+
+Fixes: https://issues.redhat.com/browse/RHEL-125955
+(cherry picked from commit 53e59d0189dc71d78559478c4924f1a1a994c455)
+---
+ common                       | 2 +-
+ inspector/inspector.c        | 2 ++
+ inspector/virt-inspector.rng | 1 +
+ m4/guestfs-libraries.m4      | 3 ++-
+ 4 files changed, 6 insertions(+), 2 deletions(-)
+
+Submodule common 90399dd18..b54ba2031:
+diff --git a/common/structs/structs-print.c b/common/structs/structs-print.c
+index bfe007cde..8c376b0ee 100644
+--- a/common/structs/structs-print.c
++++ b/common/structs/structs-print.c
+@@ -63,7 +63,7 @@ guestfs_int_print_application2_indent (struct guestfs_application2 *application2
+   fprintf (dest, "%sapp2_source_package: %s%s", indent, application2->app2_source_package, linesep);
+   fprintf (dest, "%sapp2_summary: %s%s", indent, application2->app2_summary, linesep);
+   fprintf (dest, "%sapp2_description: %s%s", indent, application2->app2_description, linesep);
+-  fprintf (dest, "%sapp2_spare1: %s%s", indent, application2->app2_spare1, linesep);
++  fprintf (dest, "%sapp2_class: %s%s", indent, application2->app2_class, linesep);
+   fprintf (dest, "%sapp2_spare2: %s%s", indent, application2->app2_spare2, linesep);
+   fprintf (dest, "%sapp2_spare3: %s%s", indent, application2->app2_spare3, linesep);
+   fprintf (dest, "%sapp2_spare4: %s%s", indent, application2->app2_spare4, linesep);
+diff --git a/inspector/inspector.c b/inspector/inspector.c
+index 1177f44a4..cccc209d0 100644
+--- a/inspector/inspector.c
++++ b/inspector/inspector.c
+@@ -697,6 +697,8 @@ output_applications (xmlTextWriterPtr xo, char *root)
+           single_element ("summary", apps->val[i].app2_summary);
+         if (apps->val[i].app2_description && apps->val[i].app2_description[0])
+           single_element ("description", apps->val[i].app2_description);
++        if (apps->val[i].app2_class && apps->val[i].app2_class[0])
++          single_element ("class", apps->val[i].app2_class);
+       } end_element ();
+     }
+   } end_element ();
+diff --git a/inspector/virt-inspector.rng b/inspector/virt-inspector.rng
+index 29c5798e1..e30686d4f 100644
+--- a/inspector/virt-inspector.rng
++++ b/inspector/virt-inspector.rng
+@@ -212,6 +212,7 @@
+           <optional><element name="source_package"><text/></element></optional>
+           <optional><element name="summary"><text/></element></optional>
+           <optional><element name="description"><text/></element></optional>
++          <optional><element name="class"><text/></element></optional>
+         </element>
+       </zeroOrMore>
+     </element>
+diff --git a/m4/guestfs-libraries.m4 b/m4/guestfs-libraries.m4
+index 82e62d54f..4ca86161c 100644
+--- a/m4/guestfs-libraries.m4
++++ b/m4/guestfs-libraries.m4
+@@ -20,7 +20,8 @@ dnl Any C libraries required by the libguestfs C library (not the daemon).
+ dnl Of course we need libguestfs.
+ dnl
+ dnl We need libguestfs 1.57.1 for guestfs_setfiles.
+-PKG_CHECK_MODULES([LIBGUESTFS], [libguestfs >= 1.57.1])
++dnl We need libguestfs 1.57.6 for guestfs_inspect_get_applications2 app2_class.
++PKG_CHECK_MODULES([LIBGUESTFS], [libguestfs >= 1.57.6])
+ printf "libguestfs version is "; $PKG_CONFIG --modversion libguestfs
+ 
+ dnl Test if it's GNU or XSI strerror_r.

0018-inspector-Add-windows_group_policy-is-Windows-GPOs-d.patch

@@ -0,0 +1,52 @@
+From c715ed2a3b82ce6cfcd44fbb8a29476621ebe049 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Mon, 3 Nov 2025 15:56:56 +0000
+Subject: [PATCH] inspector: Add <windows_group_policy/> is Windows GPOs
+ detected in guest
+
+Fixes: https://issues.redhat.com/browse/RHEL-125955
+(cherry picked from commit d56129cfccedd26739ee5b813060e7547d977c53)
+---
+ inspector/inspector.c        | 3 +++
+ inspector/virt-inspector.rng | 1 +
+ m4/guestfs-libraries.m4      | 1 +
+ 3 files changed, 5 insertions(+)
+
+diff --git a/inspector/inspector.c b/inspector/inspector.c
+index cccc209d0..6b5d50157 100644
+--- a/inspector/inspector.c
++++ b/inspector/inspector.c
+@@ -439,6 +439,9 @@ output_root (xmlTextWriterPtr xo, char *root)
+     if (str)
+       single_element ("windows_current_control_set", str);
+     free (str);
++    i = guestfs_inspect_get_windows_group_policy (g, root);
++    if (i > 0)
++      empty_element ("windows_group_policy");
+     guestfs_pop_error_handler (g);
+ 
+     str = guestfs_inspect_get_hostname (g, root);
+diff --git a/inspector/virt-inspector.rng b/inspector/virt-inspector.rng
+index e30686d4f..90f74cf78 100644
+--- a/inspector/virt-inspector.rng
++++ b/inspector/virt-inspector.rng
+@@ -35,6 +35,7 @@
+             <element name="minor_version"><text/></element>
+             <optional><element name="windows_systemroot"><text/></element></optional>
+             <optional><element name="windows_current_control_set"><text/></element></optional>
++            <optional><element name="windows_group_policy"><empty/></element></optional>
+             <optional><ref name="ospackageformat"/></optional>
+             <optional><ref name="ospackagemanagement"/></optional>
+             <optional><element name="hostname"><text/></element></optional>
+diff --git a/m4/guestfs-libraries.m4 b/m4/guestfs-libraries.m4
+index 4ca86161c..02f2281f8 100644
+--- a/m4/guestfs-libraries.m4
++++ b/m4/guestfs-libraries.m4
+@@ -21,6 +21,7 @@ dnl Of course we need libguestfs.
+ dnl
+ dnl We need libguestfs 1.57.1 for guestfs_setfiles.
+ dnl We need libguestfs 1.57.6 for guestfs_inspect_get_applications2 app2_class.
++dnl We need libguestfs 1.57.6 for guestfs_inspect_get_windows_group_policy
+ PKG_CHECK_MODULES([LIBGUESTFS], [libguestfs >= 1.57.6])
+ printf "libguestfs version is "; $PKG_CONFIG --modversion libguestfs
+ 

0019-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch

@@ -1,4 +1,4 @@
-From df670d9ce28791b2adfbecd52be305ef9e66f88f Mon Sep 17 00:00:00 2001
+From 185264d510814eb1e14c770aa826c82d6a747bb3 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 7 Jul 2015 09:28:03 -0400
 Subject: [PATCH] RHEL: Reject use of libguestfs-winsupport features except for
@@ -11,7 +11,7 @@ edits.
  1 file changed, 1 insertion(+)
 
 diff --git a/test-data/phony-guests/make-windows-img.sh b/test-data/phony-guests/make-windows-img.sh
-index 0ec6b4851..9fa29f98b 100755
+index e72013c3d..ac661f180 100755
 --- a/test-data/phony-guests/make-windows-img.sh
 +++ b/test-data/phony-guests/make-windows-img.sh
 @@ -37,6 +37,7 @@ fi
@@ -19,6 +19,6 @@ index 0ec6b4851..9fa29f98b 100755
  # Create a disk image.
  guestfish <<EOF
 +set-program virt-testing
- sparse windows.img-t 512M
+ sparse windows.img-t 2G
  run
  

0020-RHEL-builder-Disable-opensuse-repository.patch

@@ -1,4 +1,4 @@
-From 51014489c0d57727744d2a7921f2a3a5edfb27d2 Mon Sep 17 00:00:00 2001
+From b8b3b8b6dbcb5b9ccc382b8a4b779104a4e86b87 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Mon, 21 Nov 2022 13:03:22 +0000
 Subject: [PATCH] RHEL: builder: Disable opensuse repository

guestfs-tools.spec

@@ -16,7 +16,7 @@
 Summary:       Tools to access and modify virtual machine disk images
 Name:          guestfs-tools
 Version:       1.54.0
-Release:       6%{?dist}
+Release:       7%{?dist}
 License:       GPL-2.0-or-later AND LGPL-2.0-or-later
 
 # Build only for architectures that have a kernel
@@ -60,15 +60,18 @@ Patch0012:     0012-builder-Build-fedora-42-template.patch
 Patch0013:     0013-Update-common-submodule.patch
 Patch0014:     0014-common-update-submodule.patch
 Patch0015:     0015-pod-Document-removal-of-sm-options.patch
-Patch0016:     0016-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch
+Patch0016:     0016-test-data-phony-guests-Increase-size-of-Windows-imag.patch
-Patch0017:     0017-RHEL-builder-Disable-opensuse-repository.patch
+Patch0017:     0017-inspector-Add-new-class-field-to-output-of-virt-insp.patch
+Patch0018:     0018-inspector-Add-windows_group_policy-is-Windows-GPOs-d.patch
+Patch0019:     0019-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch
+Patch0020:     0020-RHEL-builder-Disable-opensuse-repository.patch
 
 # Basic build requirements.
 BuildRequires: autoconf, automake, libtool, gettext-devel
 BuildRequires: gcc, gcc-c++
 BuildRequires: make
 BuildRequires: glibc-utils
-BuildRequires: libguestfs-devel >= 1:1.57.1-1
+BuildRequires: libguestfs-devel >= 1:1.57.6-1
 BuildRequires: libguestfs-xfs
 BuildRequires: perl(Pod::Simple)
 BuildRequires: perl(Pod::Man)
@@ -114,11 +117,8 @@ BuildRequires: perl-generators
 BuildRequires: gnupg2
 %endif
 
-# Temporary, remove when libguestfs 1.57.5 is available in RHEL 10.2
-BuildRequires: passt
-
 # Ensure a minimum version of libguestfs is installed.
-Requires:      libguestfs%{?_isa} >= 1:1.57.5-1.el10
+Requires:      libguestfs%{?_isa} >= 1:1.57.6-1
 
 # For virt-builder:
 Requires:      curl
@@ -416,7 +416,8 @@ end
 
 
 %changelog
-* Fri Oct 17 2025 Richard W.M. Jones <rjones@redhat.com> - 1.54.0-6
+* Wed Nov 05 2025 Richard W.M. Jones <rjones@redhat.com> - 1.54.0-7
+- Synchronize spec file with Fedora
 - Fix pnputils after virt-customize --inject-virtio-win
   resolves: RHEL-116537
 - Unify spec files between Fedora and RHEL.
@@ -424,6 +425,8 @@ end
   resolves: RHEL-116716
 - Remove virt-customize subscription-manager options
   resolves: RHEL-122307
+- Add AV and GPOs to virt-inspector output
+  resolves: RHEL-125955
 
 * Wed Aug 13 2025 Richard W.M. Jones <rjones@redhat.com> - 1.54.0-3
 - Rebase to guestfs-tools 1.54.0