diff --git a/50-virtiofsd.json b/50-virtiofsd.json
index e359f0b..9eec755 100644
--- a/50-virtiofsd.json
+++ b/50-virtiofsd.json
@@ -1,5 +1,9 @@
{
"description": "virtiofsd vhost-user-fs",
"type": "fs",
- "binary": "@@LIBEXECDIR@@/virtiofsd"
+ "binary": "@@LIBEXECDIR@@/virtiofsd",
+ "features": [
+ "migrate-precopy",
+ "separate-options"
+ ]
}
diff --git a/_service b/_service
index b155f1d..e184f38 100644
--- a/_service
+++ b/_service
@@ -19,10 +19,6 @@
xz
-
- virtiofsd
-
-
virtiofsd
xz
diff --git a/cargo_config b/cargo_config
deleted file mode 100644
index 6fb4ff4..0000000
--- a/cargo_config
+++ /dev/null
@@ -1,5 +0,0 @@
-[source.crates-io]
-replace-with = "vendored-sources"
-
-[source.vendored-sources]
-directory = "vendor"
\ No newline at end of file
diff --git a/vendor.tar.xz b/vendor.tar.xz
index a46a285..829b7a0 100644
--- a/vendor.tar.xz
+++ b/vendor.tar.xz
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:aafa01e1d26ccb1e93314fd327154a2fc3198317bdebed1217099fe02bc3ac9b
-size 24286775
+oid sha256:fcbf986f6c859d95c664f02c58000f5af08d53068ab6c35a282ecd2495b1119d
+size 14890536
diff --git a/virtiofsd.changes b/virtiofsd.changes
index 08ce398..04057a8 100644
--- a/virtiofsd.changes
+++ b/virtiofsd.changes
@@ -1,6 +1,14 @@
+-------------------------------------------------------------------
+Thu Aug 8 19:57:34 UTC 2024 - Caleb Crane
+
+- Service: Remove deprecated cargo_config and cargo_audit services, both
+ are now handled by the cargo_vendor service
+- Add new upstream features for the libvirt/virtiofsd interop config
+
-------------------------------------------------------------------
Thu Aug 08 08:13:17 UTC 2024 - Xiaoguang Wang
+- Fix build failure after update to Rust 1.80 (bsc#1228972)
- Update to version 1.11.1:
* Changes since 1.11.0:
* Add "separate-options" capability
diff --git a/virtiofsd.spec b/virtiofsd.spec
index 9765069..60afdb5 100644
--- a/virtiofsd.spec
+++ b/virtiofsd.spec
@@ -31,8 +31,7 @@ License: Apache-2.0
URL: https://gitlab.com/virtio-fs/virtiofsd
Source0: %{name}-%{version}.tar.xz
Source1: vendor.tar.xz
-Source2: cargo_config
-Source3: 50-virtiofsd.json
+Source2: 50-virtiofsd.json
BuildRequires: cargo-packaging
BuildRequires: libcap-ng-devel
BuildRequires: libseccomp-devel
@@ -44,11 +43,9 @@ A vhost-user virtio-fs device backend written in Rust
%prep
%autosetup -a1
-mkdir .cargo
-cp %{SOURCE2} .cargo/config
# Adjust libvirt/virtiofsd interop config file to handle differences in
# the definition of libexecdir macro on SLE and Tumbleweed (bsc#1219772)
-sed -i 's#@@LIBEXECDIR@@#%{_virtiofsd_libexecdir}#' %{SOURCE3}
+sed -i 's#@@LIBEXECDIR@@#%{_virtiofsd_libexecdir}#' %{SOURCE2}
%build
%{cargo_build}
@@ -56,7 +53,7 @@ sed -i 's#@@LIBEXECDIR@@#%{_virtiofsd_libexecdir}#' %{SOURCE3}
%install
mkdir -p %{buildroot}%{_virtiofsd_libexecdir}
install -D -p -m 0755 %{_builddir}/%{name}-%{version}/target/release/virtiofsd %{buildroot}%{_virtiofsd_libexecdir}/virtiofsd
-install -D -p -m 0644 %{SOURCE3} %{buildroot}%{_datadir}/qemu/vhost-user/50-virtiofsd.json
+install -D -p -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/qemu/vhost-user/50-virtiofsd.json
%check
%{cargo_test}