From 2a4b03fc8eb421ee880ec30c0f72bebfa44311ef Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 24 Sep 2025 08:11:46 +0000 Subject: [PATCH] import CS virtiofsd-1.13.2-1.el10 --- .gitignore | 4 +- .virtiofsd.metadata | 2 - SPECS/virtiofsd.spec | 86 ----------------------- sources | 2 + virtiofsd.spec | 161 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 165 insertions(+), 90 deletions(-) delete mode 100644 .virtiofsd.metadata delete mode 100644 SPECS/virtiofsd.spec create mode 100644 sources create mode 100644 virtiofsd.spec diff --git a/.gitignore b/.gitignore index 6fa9755..22cd2bf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/virtiofsd-1.13.0-vendor.tar.gz -SOURCES/virtiofsd-1.13.0.crate +virtiofsd-1.13.2-vendor.tar.gz +virtiofsd-1.13.2.crate diff --git a/.virtiofsd.metadata b/.virtiofsd.metadata deleted file mode 100644 index 404efb2..0000000 --- a/.virtiofsd.metadata +++ /dev/null @@ -1,2 +0,0 @@ -62e4e81e4d8ecdf59060e1abe3cf88369efc356a SOURCES/virtiofsd-1.13.0-vendor.tar.gz -22b6662f16af3c075b0ffd13bbfe9d97ae99a8ac SOURCES/virtiofsd-1.13.0.crate diff --git a/SPECS/virtiofsd.spec b/SPECS/virtiofsd.spec deleted file mode 100644 index 884dc14..0000000 --- a/SPECS/virtiofsd.spec +++ /dev/null @@ -1,86 +0,0 @@ -Name: virtiofsd -Version: 1.13.0 -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 -* Mon Dec 02 2024 Miroslav Rezanina - 1.13.0-1 -- Update to upstream version 1.13.0 [RHEL-69134] -- Resolves: RHEL-69134 - (Rebase virtiofsd to latest version for RHEL 9.6) - -* Tue Jul 16 2024 Miroslav Rezanina - 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 - 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 - 1.7.2-1 -- Update to upstream version 1.7.2 [bz#2233498] - -* Tue Jul 18 2023 German Maglione - 1.7.0-1 -- Update to upstream version 1.7.0 [bz#2222221] - -* Thu Dec 22 2022 German Maglione - 1.5.0-1 -- Update to upstream version 1.5.0 [bz#2123070] - -* Wed Jul 27 2022 Sergio Lopez - 1.4.0-1 -- Update to upstream version 1.4.0 [bz#2111356] - -* Mon Jun 27 2022 Sergio Lopez - 1.3.0-1 -- Update to upstream version 1.3.0 [bz#2077854] - -* Fri Feb 18 2022 Sergio Lopez - 1.1.0-3 -- Restore "Provides: virtiofsd", despite rpmdeplint complains, to - satisfy qemu-kvm dependencies - -* Fri Jan 28 2022 Sergio Lopez - 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 - 1.1.0-1 -- Initial package - diff --git a/sources b/sources new file mode 100644 index 0000000..ee018ed --- /dev/null +++ b/sources @@ -0,0 +1,2 @@ +SHA512 (virtiofsd-1.13.2-vendor.tar.gz) = 45fabfd02e6c06542dda5e00934821cb11c6c0ae87e0c393e20c7a84a1f7facf9f691f90c43ad6c6901fabc8c708503339d51ed4b03d50380cb1560cb6eb697c +SHA512 (virtiofsd-1.13.2.crate) = 628d023c6033eec6db6aa5effd1d960322a57234d174638c89af4223a24c4a67cc8c711867bec3849b9d69ea9e79b68c04c03834ef5d0a12111938dd1b9840ee diff --git a/virtiofsd.spec b/virtiofsd.spec new file mode 100644 index 0000000..0c1da1c --- /dev/null +++ b/virtiofsd.spec @@ -0,0 +1,161 @@ +Name: virtiofsd +Version: 1.13.2 +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 + +Requires: shadow-utils + +%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 Jun 16 2025 Miroslav Rezanina - 1.13.2-1 +- Rebase to 1.13.2 [RHEL-97010] +- Resolves: RHEL-97010 + (Rebase virtiofsd to latest version for RHEL 9.6.z) + +* Mon Dec 02 2024 Miroslav Rezanina - 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 - 1.11.1-2 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + +* Tue Jul 16 2024 Miroslav Rezanina - 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 - 1.10.0-3.1 +- Bump release for June 2024 mass rebuild + +* Thu Feb 01 2024 Yaakov Selkowitz - 1.10.0-2.1 +- Update Rust macro usage + +* Sat Jan 27 2024 Fedora Release Engineering - 1.10.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Tue Jan 23 2024 Sergio Lopez - 1.10.0-1 +- Update to version 1.10.0 + +* Sun Dec 24 2023 Sergio Lopez - 1.9.0-1 +- Update to version 1.9.0 + +* Fri Sep 29 2023 Colin Walters - 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 - 1.7.0-4 +- Rebuild for vm-memory v0.12.2 / CVE-2023-41051. + +* Sat Jul 22 2023 Fedora Release Engineering - 1.7.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Jul 19 2023 Sergio Lopez - 1.7.0-2 +- Update license specification to conform SPDX format + +* Tue Jul 18 2023 Sergio Lopez - 1.7.0-1 +- Update to version 1.7.0 +- Drop no longer needed temporary patch + +* Tue May 09 2023 Sergio Lopez - 1.5.1-3 +- Only use Obsoletes/Provides on Fedora 39 and later + +* Wed Apr 26 2023 Daniel P. Berrangé - 1.5.1-2 +- Add Obsoletes/Provides for qemu-virtiofsd to get an upgrade path (rhbz #2189368) + +* Thu Feb 09 2023 Sergio Lopez - 1.5.1-1 +- Update to version 1.5.1 + +* Sun Feb 05 2023 Fabio Valentini - 1.4.0-3 +- Rebuild for fixed frame pointer compiler flags in Rust RPM macros. + +* Sat Jan 21 2023 Fedora Release Engineering - 1.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Tue Jul 26 2022 Sergio Lopez - 1.4.0-1 +- Update to version 1.4.0 + +* Sat Jul 23 2022 Fedora Release Engineering - 1.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jun 06 2022 Sergio Lopez - 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 - 1.2.0-1 +- Initial package +