.gitignore

@@ -1,21 +1,2 @@
-/virtiofsd-1.2.0.crate
+SOURCES/virtiofsd-1.11.1-vendor.tar.gz
-/virtiofsd-1.3.0.crate
+SOURCES/virtiofsd-1.11.1.crate
-/virtiofsd-1.4.0.crate
-/virtiofsd-1.5.0.crate
-/virtiofsd-1.5.1.crate
-/virtiofsd-1.5.1-vendor.tar.xz
-/virtiofsd-1.7.0.crate
-/virtiofsd-1.7.0-vendor.tar.xz
-/virtiofsd-1.9.0.crate
-/virtiofsd-1.9.0-vendor.tar.xz
-/virtiofsd-1.10.0.crate
-/virtiofsd-1.10.0-vendor.tar.xz
-/virtiofsd-1.7.0-vendor.tar.gz
-/virtiofsd-1.7.2.crate
-/virtiofsd-1.7.2-vendor.tar.gz
-/virtiofsd-1.10.1.crate
-/virtiofsd-1.10.1-vendor.tar.gz
-/virtiofsd-1.11.1.crate
-/virtiofsd-1.11.1-vendor.tar.gz
-/virtiofsd-1.13.0.crate
-/virtiofsd-1.13.0-vendor.tar.gz

.virtiofsd.metadata

@@ -0,0 +1,2 @@
+074b8d95eee7f575ce132b94c767f834b4e63882 SOURCES/virtiofsd-1.11.1-vendor.tar.gz
+8bf665f7e57ab2bd9bb0b901d846e8b5bd2450d1 SOURCES/virtiofsd-1.11.1.crate

README.md

@@ -1,3 +0,0 @@
-# virtiofsd
-
-The virtiofsd package

SPECS/virtiofsd.spec

@@ -0,0 +1,81 @@
+Name:           virtiofsd
+Version:        1.11.1
+Release:        1%{?dist}
+Summary:        Virtio-fs vhost-user device daemon (Rust version)
+
+# Upstream license specification: Apache-2.0 AND BSD-3-Clause
+License:        Apache-2.0 AND BSD-3-Clause
+URL:            https://gitlab.com/virtio-fs/virtiofsd
+Source0:        %{crates_source}
+Source1:        %{name}-%{version}-vendor.tar.gz
+
+ExclusiveArch:  x86_64 aarch64 s390x
+BuildRequires:  rust-toolset
+BuildRequires:  libcap-ng-devel
+BuildRequires:  libseccomp-devel
+Provides: virtiofsd
+Obsoletes: qemu-virtiofsd = 17:6.2.0
+# Both qemu-virtiofsd and virtiofsd ship the same binary
+Conflicts: qemu-virtiofsd = 17:6.2.0
+
+%description
+%{summary}.
+
+%prep
+%setup -q -n %{name}-%{version}
+
+%cargo_prep -V 1
+
+%build
+%cargo_build
+
+%install
+mkdir -p %{buildroot}%{_libexecdir}
+install -D -p -m 0755 target/release/virtiofsd %{buildroot}%{_libexecdir}/virtiofsd
+install -D -p -m 0644 50-virtiofsd.json %{buildroot}%{_datadir}/qemu/vhost-user/50-virtiofsd.json
+
+%files
+%license LICENSE-APACHE LICENSE-BSD-3-Clause
+%doc README.md
+%{_libexecdir}/virtiofsd
+%{_datadir}/qemu/vhost-user/50-virtiofsd.json
+
+%changelog
+* Tue Jul 16 2024 Miroslav Rezanina <mrezanin@redhat.com> - 1.11.1-1
+- Update to upstream version 1.11.1 [RHEL-47989]
+- Resolves: RHEL-47989
+  (Rebase virtiofsd to latest version for RHEL 9.5)
+
+* Thu Jan 25 2024 Miroslav Rezanina <mrezanin@redhat.com> - 1.10.1-1
+- Update to upstream version 1.10.1 [RHEL-22739]
+- Resolves: RHEL-22739
+  (Rebase virtiofsd to latest version for RHEL 9.4)
+
+* Tue Jul 18 2023 German Maglione <gmaglione@redhat.com> - 1.7.2-1
+- Update to upstream version 1.7.2 [bz#2233498]
+
+* Tue Jul 18 2023 German Maglione <gmaglione@redhat.com> - 1.7.0-1
+- Update to upstream version 1.7.0 [bz#2222221]
+
+* Thu Dec 22 2022 German Maglione <gmaglione@redhat.com> - 1.5.0-1
+- Update to upstream version 1.5.0 [bz#2123070]
+
+* Wed Jul 27 2022 Sergio Lopez <slp@redhat.com> - 1.4.0-1
+- Update to upstream version 1.4.0 [bz#2111356]
+
+* Mon Jun 27 2022 Sergio Lopez <slp@redhat.com> - 1.3.0-1
+- Update to upstream version 1.3.0 [bz#2077854]
+
+* Fri Feb 18 2022 Sergio Lopez <slp@redhat.com> - 1.1.0-3
+- Restore "Provides: virtiofsd", despite rpmdeplint complains, to
+  satisfy qemu-kvm dependencies
+
+* Fri Jan 28 2022 Sergio Lopez <slp@redhat.com> - 1.1.0-2
+- Explicitly declare the conflict with qemu-virtiofsd
+- Remove explicit library dependencies
+- Remove useless "Provides: virtiosfd"
+- Remove Windows binaries from vendor tarball
+
+* Thu Jan 27 2022 Sergio Lopez <slp@redhat.com> - 1.1.0-1
+- Initial package
+

gating.yaml

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

sources

@@ -1,2 +0,0 @@
-SHA512 (virtiofsd-1.13.0.crate) = 97dde01c7b5d60b67f8684a2c51d05b9e02b2592edb0ec82c3931a635f5dfda5a6e4eaff5adb03f5fa597e85e3b326667f53bf0c5c51963d5100309341623621
-SHA512 (virtiofsd-1.13.0-vendor.tar.gz) = 87d659a2fc565bd952ac7658160e6077ef4c5283b39cae58aed61a889e6240f42a5234fad236297bb31ee6c252aef7177460af1ad9ee51e17ebf69b3a53a7f55

tests/tests.yml

@@ -1,12 +0,0 @@
-- hosts: localhost
-  roles:
-  - role: standard-test-basic
-    tags:
-    - classic
-    remote_user: root
-    tests:
-    - virtiofsd_printcaps:
-        dir: .
-        run: ./virtiofsd_printcaps.sh
-    required_packages:
-    - virtiofsd

tests/virtiofsd_printcaps.sh

@@ -1,3 +0,0 @@
-#!/bin/bash -ex
-
-/usr/libexec/virtiofsd --print-capabilities

virtiofsd-relax-env_logger-dep.diff

@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index cedd3f4..082cd68 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -31,7 +31,7 @@ version = "1.2"
- version = "0.2.2"
- 
- [dependencies.env_logger]
--version = "0.10.0"
-+version = "0.9.0"
- 
- [dependencies.futures]
- version = "0.3"

virtiofsd.spec

@@ -1,154 +0,0 @@
-Name:           virtiofsd
-Version:        1.13.0
-Release:        1%{?dist}
-Summary:        Virtio-fs vhost-user device daemon (Rust version)
-
-License:        Apache-2.0 AND BSD-3-Clause
-URL:            https://gitlab.com/virtio-fs/virtiofsd
-Source:         %{crates_source}
-# To create the vendor tarball:
-#   tar xf %%{name}-%%{version}.crate ; pushd %%{name}-%%{version} ; \
-#   cargo vendor && tar Jcvf ../%%{name}-%%{version}-vendor.tar.xz vendor/ ; popd
-Source1:        %{name}-%{version}-vendor.tar.gz
-
-ExclusiveArch:  %{rust_arches}
-# Some of our deps (i.e. vm-memory) are not available on 32 bits targets.
-# In addition, there's no ppc64 qemu-kvm available for RHEL.
-%if 0%{?rhel}
-ExcludeArch:    i686 %{power64}
-%else
-ExcludeArch:    i686
-%endif
-
-%if 0%{?rhel}
-BuildRequires:  rust-toolset
-%else
-BuildRequires:  rust-packaging >= 21
-%endif
-BuildRequires:  libcap-ng-devel
-BuildRequires:  libseccomp-devel
-%if 0%{?rhel}
-Requires:       qemu-kvm-common
-%else
-Requires:       qemu-common
-%endif
-Provides:       vhostuser-backend(fs)
-Conflicts:      qemu-virtiofsd
-%if 0%{?fedora} > 38
-Obsoletes:      qemu-virtiofsd <= 2:8.0.0-1
-Provides:       qemu-virtiofsd = 2:7.2.1-1
-%endif
-
-%description
-%{summary}.
-
-%prep
-%autosetup -n %{name}-%{version_no_tilde} -p1 %{?rhel:-a1}
-%if 0%{?rhel}
-%cargo_prep -v vendor
-rm -f Cargo.lock
-%else
-%cargo_prep
-
-%generate_buildrequires
-%cargo_generate_buildrequires
-%endif
-
-%build
-%cargo_build
-%cargo_license_summary
-%{cargo_license} > LICENSE.dependencies
-%if 0%{?rhel}
-%cargo_vendor_manifest
-%endif
-
-%install
-mkdir -p %{buildroot}%{_libexecdir}
-install -D -p -m 0755 target/release/virtiofsd %{buildroot}%{_libexecdir}/virtiofsd
-install -D -p -m 0644 50-virtiofsd.json %{buildroot}%{_datadir}/qemu/vhost-user/50-qemu-virtiofsd.json
-
-%files
-%license LICENSE-APACHE LICENSE-BSD-3-Clause
-%license LICENSE.dependencies
-%if 0%{?rhel}
-%license cargo-vendor.txt
-%endif
-%doc README.md
-%{_libexecdir}/virtiofsd
-%{_datadir}/qemu/vhost-user/50-qemu-virtiofsd.json
-
-%changelog
-* Mon Dec 02 2024 Miroslav Rezanina <mrezanin@redhat.com> - 1.13.0-1
-- Rebase to 1.13.0 [RHEL-69290]
-- Resolves: RHEL-69290
-  (Rebase virtiofsd to latest version for RHEL 10.0)
-
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.11.1-2
-- Bump release for October 2024 mass rebuild:
-  Resolves: RHEL-64018
-
-* Tue Jul 16 2024 Miroslav Rezanina <mrezanin@redhat.com> - 1.11.1-1
-- Update to upstream version 1.11.1 [RHEL-48645]
-- Resolves: RHEL-48645
-  (Rebase virtiofsd to latest version for RHEL 10.0 Beta)
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.10.0-3.1
-- Bump release for June 2024 mass rebuild
-
-* Thu Feb 01 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 1.10.0-2.1
-- Update Rust macro usage
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Tue Jan 23 2024 Sergio Lopez <slp@redhat.com> - 1.10.0-1
-- Update to version 1.10.0
-
-* Sun Dec 24 2023 Sergio Lopez <slp@redhat.com> - 1.9.0-1
-- Update to version 1.9.0
-
-* Fri Sep 29 2023 Colin Walters <walters@verbum.org> - 1.7.0-5
-- Rebuild with latest vhost-user-backend; xref
-  https://gitlab.com/virtio-fs/virtiofsd/-/issues/62#note_1584371000
-
-* Tue Sep 19 2023 Fabio Valentini <decathorpe@gmail.com> - 1.7.0-4
-- Rebuild for vm-memory v0.12.2 / CVE-2023-41051.
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Wed Jul 19 2023 Sergio Lopez <slp@redhat.com> - 1.7.0-2
-- Update license specification to conform SPDX format
-
-* Tue Jul 18 2023 Sergio Lopez <slp@redhat.com> - 1.7.0-1
-- Update to version 1.7.0
-- Drop no longer needed temporary patch
-
-* Tue May 09 2023 Sergio Lopez <slp@redhat.com> - 1.5.1-3
-- Only use Obsoletes/Provides on Fedora 39 and later
-
-* Wed Apr 26 2023 Daniel P. Berrangé <berrange@redhat.com> - 1.5.1-2
-- Add Obsoletes/Provides for qemu-virtiofsd to get an upgrade path (rhbz #2189368)
-
-* Thu Feb 09 2023 Sergio Lopez <slp@redhat.com> - 1.5.1-1
-- Update to version 1.5.1
-
-* Sun Feb 05 2023 Fabio Valentini <decathorpe@gmail.com> - 1.4.0-3
-- Rebuild for fixed frame pointer compiler flags in Rust RPM macros.
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Tue Jul 26 2022 Sergio Lopez <slp@redhat.com> - 1.4.0-1
-- Update to version 1.4.0
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Mon Jun 06 2022 Sergio Lopez <slp@redhat.com> - 1.3.0-1
-- Update to version 1.3.0
-- Build on all rust arches except i686 (32-bit targets are not supported)
-
-* Mon May 16 2022 Sergio Lopez <slp@redhat.com> - 1.2.0-1
-- Initial package
-