.gitignore

@@ -1,2 +1,2 @@
-SOURCES/ntfs-3g-system-compression-1.0.tar.gz
-SOURCES/ntfs-3g_ntfsprogs-2022.10.3.tgz
+/ntfs-3g-system-compression-1.0.tar.gz
+/ntfs-3g_ntfsprogs-2022.10.3.tgz

.libguestfs-winsupport.metadata

@@ -1,2 +0,0 @@
-a0c3bb13ac09fe6ac0307fd7a7e9d577099987e9 SOURCES/ntfs-3g-system-compression-1.0.tar.gz
-42f1a5899f394c5aa7a0bd0ba5e3a13b1ddd1a52 SOURCES/ntfs-3g_ntfsprogs-2022.10.3.tgz

gating.yaml

@@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-*
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

libguestfs-winsupport.spec

@@ -5,23 +5,36 @@
 %global         debug_package %{nil}
 
 Name:           libguestfs-winsupport
-Version:        8.10
-Release:        1%{?dist}
+Version:        10.0
+Release:        5%{?dist}
 Summary:        Add support for Windows guests to virt-v2v and virt-p2v
 
 URL:            https://www.tuxera.com/company/open-source/
 # and URL:      https://github.com/ebiggers/ntfs-3g-system-compression
 License:        GPLv2+
 
-# This package shouldn't be installed without installing the base
-# libguestfs package.
-Requires:       libguestfs >= 1:1.38.2
+# These should be the same as libguestfs.spec.
+ExclusiveArch: %{kernel_arches}
+%if 0%{?rhel}
+# No qemu-kvm on POWER (RHBZ#1946532).
+ExcludeArch: %{power64}
+%endif
 
 # Source and patches for ntfs-3g and ntfs-3g-system-compression.
 Source0:        http://tuxera.com/opensource/ntfs-3g_ntfsprogs-%{ntfs_version}.tgz
 Source1:        https://github.com/ebiggers/ntfs-3g-system-compression/archive/v%{version}/ntfs-3g-system-compression-%{compression_version}.tar.gz
 
 Patch0:         ntfs-3g_ntfsprogs-2011.10.9-RC-ntfsck-unsupported-return-0.patch
+Patch1:         ntfs-3g-system-compression-fedora-c99.patch
+
+# Extra dependencies which are not pulled in by other libguestfs
+# components but are needed by any of the ntfs-3g binaries or library
+# have to be listed in this file, AND added as Requires to this spec
+# file.
+Source2:        zz-winsupport-deps
+
+# https://issues.redhat.com/browse/RHEL-46563
+Requires:       fuse-libs
 
 BuildRequires:  make
 BuildRequires:  gcc
@@ -29,6 +42,10 @@ BuildRequires:  libtool, libattr-devel
 BuildRequires:  libconfig-devel, libgcrypt-devel, gnutls-devel, libuuid-devel
 BuildRequires:  autoconf, automake, libtool, fuse-devel
 
+# This package shouldn't be installed without installing the base
+# libguestfs package.
+Requires:       libguestfs >= 1:1.45.6
+
 
 %description
 This optional package adds support for Windows guests (NTFS) to the
@@ -42,6 +59,9 @@ plugin from https://github.com/ebiggers/ntfs-3g-system-compression
 %setup -q -n ntfs-3g_ntfsprogs-%{ntfs_version}
 %setup -n ntfs-3g_ntfsprogs-%{ntfs_version} -T -D -a 1
 %patch0 -p1 -b .unsupported
+pushd ntfs-3g-system-compression-%{compression_version}
+%patch1 -p1 -b .c99
+popd
 
 
 %build
@@ -114,6 +134,7 @@ rm -rf destdir/%{_libdir}/ntfs-3g/*.la
 
 # Take the destdir and put it into a tarball for the libguestfs appliance.
 mkdir -p %{buildroot}%{_libdir}/guestfs/supermin.d
+install -m 0444 %{SOURCE2} %{buildroot}%{_libdir}/guestfs/supermin.d/
 pushd destdir
 tar zvcf %{buildroot}%{_libdir}/guestfs/supermin.d/zz-winsupport.tar.gz .
 popd
@@ -121,46 +142,66 @@ popd
 
 %files
 %doc AUTHORS ChangeLog COPYING CREDITS NEWS README
+%{_libdir}/guestfs/supermin.d/zz-winsupport-deps
 %{_libdir}/guestfs/supermin.d/zz-winsupport.tar.gz
 
 
 %changelog
-* Thu Aug 31 2023 Richard W.M. Jones <rjones@redhat.com> - 8.10-1
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 10.0-5
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
+
+* Tue Jul 08 2024 Richard W.M. Jones <rjones@redhat.com> - 10.0-4
+- Requires fuse-libs
+  resolves: RHEL-46563
+- Try to fix libvirt in the gating test.
+
+* Mon Apr 22 2024 Richard W.M. Jones <rjones@redhat.com> - 10.0-2
+- Import package into CentOS Stream 10
+- Remove resolves refs to work around check-gitbz bug (RHELBLD-14966)
+- Add gating tests
+- Set ExclusiveArch/ExcludeArch to the same as for libguestfs
+
+* Thu Aug 31 2023 Richard W.M. Jones <rjones@redhat.com> - 9.3-1
 - Rebase to ntfs-3g 2022.10.3
 - Fixes: CVE-2022-40284
-- resolves: rhbz#2236373
+- resolves rhbz#2236376
 
-* Mon Sep 26 2022 Richard W.M. Jones <rjones@redhat.com> - 8.8-1
+* Mon Sep 26 2022 Richard W.M. Jones <rjones@redhat.com> - 9.2-1
 - Rebase to ntfs-3g 2022.5.17
 - Fixes: CVE-2021-46790, CVE-2022-30783, CVE-2022-30784, CVE-2022-30785,
   CVE-2022-30786, CVE-2022-30787, CVE-2022-30788, CVE-2022-30789
-  resolves: rhbz#2127240 rhbz#2127248
-  (also: 2127233 2127234 2127241 2127249 2127255 2127256 2127262 2127263)
+  resolves rhbz#2127235 rhbz#2127242
+  (also 2127264 2127250 2127257)
 
-* Fri Sep 17 2021 Richard W.M. Jones <rjones@redhat.com> - 8.6-1
+* Mon Sep 13 2021 Richard W.M. Jones <rjones@redhat.com> - 9.0-1
 - Rebase to ntfs-3g 2021.8.22
-- Fixes: CVE-2021-33285, CVE-2021-33286, CVE-2021-33287, CVE-2021-33289,
-  CVE-2021-35266, CVE-2021-35267, CVE-2021-35268, CVE-2021-35269,
-  CVE-2021-39251, CVE-2021-39252, CVE-2021-39253, CVE-2021-39254
-  resolves: rhbz#2004490
+  resolves rhbz#2002985
 
-* Thu Sep 2 2021 Danilo C. L. de Paula <ddepaula@redhat.com> - 8.2-1.el8
-- Resolves: bz#2000225
-  (Rebase virt:rhel module:stream based on AV-8.6)
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 8.2-4
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  related rhbz#1991688
 
-* Mon Apr 27 2020 Danilo C. L. de Paula <ddepaula@redhat.com> - 8.2
-- Resolves: bz#1810193
-  (Upgrade components in virt:rhel module:stream for RHEL-8.3 release)
+* Wed Jun 02 2021 Richard W.M. Jones <rjones@redhat.com> - 8.2-3
+- Add gating tests (for RHEL 9)
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 8.2-2
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. related rhbz#1947937
+
+* Wed Jan 29 2020 Richard W.M. Jones <rjones@redhat.com> - 8.2-1
+- Rebuild for RHEL AV 8.2.
+- Include ntfs-3g-system-compression plugin.
+  resolves rhbz#1705234, rhbz#1796073
 
 * Fri Jun 28 2019 Danilo de Paula <ddepaula@redhat.com> - 8.0-4
 - Rebuild all virt packages to fix RHEL's upgrade path
-- Resolves: rhbz#1695587
+- resolves rhbz#1695587
   (Ensure modular RPM upgrade path)
 
 * Wed Apr 10 2019 Richard W.M. Jones <rjones@redhat.com> - 8.0-3
 - Fix for CVE-2019-9755
   (heap-based buffer overflow leads to local root privilege escalation)
-  resolves: rhbz#1698503
+  resolves rhbz#1698503
 
 * Mon Jul 16 2018 Richard W.M. Jones <rjones@redhat.com> - 8.0-2
 - Fix for ntfsclone crash (RHBZ#1601146).
@@ -174,53 +215,53 @@ popd
 * Wed Feb 22 2017 Richard W.M. Jones <rjones@redhat.com> - 7.2-2
 - Fix for handling guest filenames with invalid or incomplete
   multibyte or wide characters
-  resolves: rhbz#1301593
+  resolves rhbz#1301593
 
 * Tue Jul 07 2015 Richard W.M. Jones <rjones@redhat.com> - 7.2-1
 - Rebase and rebuild for RHEL 7.2
-  resolves: rhbz#1240278
+  resolves rhbz#1240278
 
 * Tue Jun 30 2015 Richard W.M. Jones <rjones@redhat.com> - 7.1-6
 - Bump version and rebuild.
-  related: rhbz#1221583
+  related rhbz#1221583
 
 * Fri May 15 2015 Richard W.M. Jones <rjones@redhat.com> - 7.1-5
 - Enable aarch64 architecture.
-  resolves: rhbz#1221583
+  resolves rhbz#1221583
 
 * Thu Aug 28 2014 Richard W.M. Jones <rjones@redhat.com> - 7.1-4
 - Enable debuginfo support and stripping.
-  resolves: rhbz#1100319
+  resolves rhbz#1100319
 
 * Thu Aug 28 2014 Richard W.M. Jones <rjones@redhat.com> - 7.1-3
 - Add patches from Fedora package which add fstrim support.
-  resolves: rhbz#1100319
+  resolves rhbz#1100319
 
 * Mon Jul 21 2014 Richard W.M. Jones <rjones@redhat.com> - 7.1-2
 - New package for RHEL 7.1
 - Rebase to ntfs-3g 2014.2.15
-  resolves: rhbz#1100319
+  resolves rhbz#1100319
 - Change the package so it works with supermin5.
 - Remove dependency on external FUSE.
 
 * Wed Apr  3 2013 Richard W.M. Jones <rjones@redhat.com> - 7.0-2
 - Resync against Rawhide package (ntfs-3g 2013.1.13).
 - Drop HAL file since HAL is dead.
-  resolves: rhbz#819939
+  resolves rhbz#819939
 
 * Thu Dec 20 2012 Richard W.M. Jones <rjones@redhat.com> - 7.0-1
 - New package for RHEL 7
-  resolves: rhbz#819939
+  resolves rhbz#819939
 - Resync against Rawhide package.
 
 * Mon Mar 28 2011 Richard W.M. Jones <rjones@redhat.com> - 1.0-7
 - Disable debuginfo package.
-  resolves: RHBZ#691555.
+  resolves RHBZ#691555.
 
 * Tue Mar  8 2011 Richard W.M. Jones <rjones@redhat.com> - 1.0-6
 - Require libguestfs 1.7.17 (newer version in RHEL 6.1).
 - Require febootstrap-supermin-helper instead of febootstrap
-  resolves: RHBZ#670299.
+  resolves RHBZ#670299.
 
 * Thu Jul  1 2010 Richard W.M. Jones <rjones@redhat.com> - 1.0-5
 - Make sure intermediate lib* directories are created in hostfiles (RHBZ#603429)

ntfs-3g-system-compression-fedora-c99.patch

@@ -0,0 +1,11 @@
+diff -rup a/configure.ac b/configure.ac
+--- a/configure.ac	2017-05-25 23:39:39.000000000 -0400
++++ b/configure.ac	2023-03-10 19:04:07.852099760 -0500
+@@ -21,6 +21,7 @@ AC_CHECK_HEADERS([errno.h \
+ 		  stddef.h \
+ 		  stdlib.h \
+ 		  string.h \
++		  time.h \
+ 		  sys/types.h])
+ 
+ PKG_CHECK_MODULES([LIBNTFS_3G], [libntfs-3g >= 2017.3.23], [],

sources

@@ -0,0 +1,2 @@
+SHA512 (ntfs-3g-system-compression-1.0.tar.gz) = 6ac463469db896b9ce4f72af27ae1014de2abd7a968fb19229129b5e6410239607b73e416d43e199b9c721b7bcdb8cf2fa9e4871dfc89af2ab4edcf66d17e07c
+SHA512 (ntfs-3g_ntfsprogs-2022.10.3.tgz) = 891589483954423b19bef6e8a174fb4311ad92b6397a0db80f77c72b746bf18c2fa12457a571947f92755637a6bc784188920d4f017ae12a420819ab0d74af59

tests/basic-test.sh

@@ -0,0 +1,18 @@
+#!/bin/bash -
+set -e
+set -x
+
+# Fix libvirt.
+systemctl restart libvirtd
+
+# Create an NTFS filesystem and mount.
+guestfish -vx <<EOF
+set-program "virt-foo"
+sparse test.img 1G
+run
+part-disk /dev/sda mbr
+mkfs ntfs /dev/sda1
+mount /dev/sda1 /
+touch /tested
+umount-all
+EOF

tests/tests.yml

@@ -0,0 +1,12 @@
+- hosts: localhost
+  roles:
+  - role: standard-test-basic
+    tags:
+    - classic
+    required_packages:
+    - libguestfs-winsupport
+    - libguestfs
+    tests:
+    - simple:
+        dir: .
+        run: ./basic-test.sh

zz-winsupport-deps

@@ -0,0 +1 @@
+fuse-libs