Drop gvariant dependency

It isn't an actively maintained crate and our usage is tiny and not performance sensitive enough to warrant the zero-copy it entails. Just motivated by doing a pass over our dependencies. Signed-off-by: Colin Walters <[email protected]>
cgwalters · Oct 15, 2024 · abf7eae · abf7eae
1 parent 2d0512c
commit abf7eae
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/lib/Cargo.toml b/lib/Cargo.toml
@@ -26,7 +26,6 @@ clap_mangen = { version = "0.2.20", optional = true }
 cap-std-ext = { workspace = true, features = ["fs_utf8"] }
 hex = "^0.4.3"
 fn-error-context = { workspace = true }
-gvariant = "0.5.0"
 indicatif = "0.17.8"
 libc = { workspace = true }
 liboverdrop = "0.1.0"

diff --git a/lib/src/lsm.rs b/lib/src/lsm.rs
@@ -19,8 +19,6 @@ use cap_std_ext::cap_std::fs::{Metadata, MetadataExt};
 #[cfg(feature = "install")]
 use cap_std_ext::dirext::CapStdExtDirExt;
 use fn_error_context::context;
-#[cfg(feature = "install")]
-use gvariant::{aligned_bytes::TryAsAligned, Marker, Structure};
 use ostree_ext::gio;
 use ostree_ext::ostree;
 use rustix::fd::AsFd;
@@ -177,12 +175,12 @@ pub(crate) fn selinux_set_permissive(permissive: bool) -> Result<()> {
 #[cfg(feature = "install")]
 /// Check if the ostree-formatted extended attributes include a security.selinux value.
 pub(crate) fn xattrs_have_selinux(xattrs: &ostree::glib::Variant) -> bool {
-    let v = xattrs.data_as_bytes();
-    let v = v.try_as_aligned().unwrap();
-    let v = gvariant::gv!("a(ayay)").cast(v);
-    for xattr in v.iter() {
-        let k = xattr.to_tuple().0;
-        if k == SELINUX_XATTR {
+    let n = xattrs.n_children();
+    for i in 0..n {
+        let child = xattrs.child_value(i);
+        let key = child.child_value(0);
+        let key = key.data_as_bytes();
+        if key == SELINUX_XATTR {
             return true;
         }
     }