Port to ostree-ext 0.13, cap-std 3

- Soooo much churn around the extension traits
- A little bit of small ostree-ext porting

Cargo.toml

@@ -48,9 +48,9 @@ anyhow = "1.0.75"
 binread = "2.2.0"
 bitflags = "2.4"
 camino = "1.1.6"
-cap-std-ext = "3.0"
+cap-std-ext = "4"
 cap-primitives = "3"
-cap-std = { version = "2", features = ["fs_utf8"] }
+cap-std = { version = "3", features = ["fs_utf8"] }
 containers-image-proxy = { version = "0.5.8", features = ["proxy_v0_2_4"] }
 # Explicitly force on libc
 rustix = { version = "0.38", features = ["use-libc", "process", "fs"] }
@@ -73,7 +73,7 @@ nix = { version = "0.27.1", features = ["fs", "mount", "signal", "user"] }
 openssl = "0.10.60"
 once_cell = "1.19.0"
 os-release = "0.1.0"
-ostree-ext = "0.12"
+ostree-ext = "0.13"
 paste = "1.0"
 phf = { version = "0.11", features = ["macros"] }
 rand = "0.8.5"
@@ -129,3 +129,6 @@ bin-unit-tests = []
 sanitizers = []
 
 default = []
+
+[patch.crates-io]
+ostree-ext = { path = "../../ostreedev/ostree-rs-ext/lib" }

rpmostree-cxxrs.cxx

@@ -1430,7 +1430,6 @@ struct ContainerImageState final
 {
   ::rust::String base_commit;
   ::rust::String merge_commit;
-  bool is_layered;
   ::rust::String image_digest;
   ::rust::String version;
   ::rpmostreecxx::ExportedManifestDiff cached_update_diff;
@@ -2815,6 +2814,9 @@ extern "C"
   ::rust::repr::PtrLen
   rpmostreecxx$cxxbridge1$complete_rpm_layering (::std::int32_t rootfs) noexcept;
 
+  ::rust::repr::PtrLen
+  rpmostreecxx$cxxbridge1$deduplicate_tmpfiles_entries (::std::int32_t rootfs) noexcept;
+
   ::rust::repr::PtrLen rpmostreecxx$cxxbridge1$passwd_cleanup (::std::int32_t rootfs) noexcept;
 
   ::rust::repr::PtrLen rpmostreecxx$cxxbridge1$migrate_group_except_root (
@@ -2944,9 +2946,6 @@ extern "C"
   void rpmostreecxx$cxxbridge1$cache_branch_to_nevra (::rust::Str nevra,
                                                       ::rust::String *return$) noexcept;
 
-  ::rust::repr::PtrLen
-  rpmostreecxx$cxxbridge1$deduplicate_tmpfiles_entries (::std::int32_t rootfs) noexcept;
-
   ::std::uint32_t
   rpmostreecxx$cxxbridge1$CxxGObjectArray$length (::rpmostreecxx::CxxGObjectArray &self) noexcept
   {
@@ -5699,6 +5698,16 @@ complete_rpm_layering (::std::int32_t rootfs)
     }
 }
 
+void
+deduplicate_tmpfiles_entries (::std::int32_t rootfs)
+{
+  ::rust::repr::PtrLen error$ = rpmostreecxx$cxxbridge1$deduplicate_tmpfiles_entries (rootfs);
+  if (error$.ptr)
+    {
+      throw ::rust::impl< ::rust::Error>::error (error$);
+    }
+}
+
 void
 passwd_cleanup (::std::int32_t rootfs)
 {
@@ -6105,16 +6114,6 @@ cache_branch_to_nevra (::rust::Str nevra) noexcept
   rpmostreecxx$cxxbridge1$cache_branch_to_nevra (nevra, &return$.value);
   return ::std::move (return$.value);
 }
-
-void
-deduplicate_tmpfiles_entries (::std::int32_t rootfs)
-{
-  ::rust::repr::PtrLen error$ = rpmostreecxx$cxxbridge1$deduplicate_tmpfiles_entries (rootfs);
-  if (error$.ptr)
-    {
-      throw ::rust::impl< ::rust::Error>::error (error$);
-    }
-}
 } // namespace rpmostreecxx
 
 extern "C"
@@ -6829,6 +6828,5 @@ Vec< ::rpmostreecxx::LockedPackage>::truncate (::std::size_t len)
 {
   return cxxbridge1$rust_vec$rpmostreecxx$LockedPackage$truncate (this, len);
 }
-
 } // namespace cxxbridge1
 } // namespace rust

rpmostree-cxxrs.h

@@ -1212,7 +1212,6 @@ struct ContainerImageState final
 {
   ::rust::String base_commit;
   ::rust::String merge_commit;
-  bool is_layered;
   ::rust::String image_digest;
   ::rust::String version;
   ::rpmostreecxx::ExportedManifestDiff cached_update_diff;
@@ -2016,6 +2015,8 @@ bool prepare_rpm_layering (::std::int32_t rootfs, ::rust::Str merge_passwd_dir);
 
 void complete_rpm_layering (::std::int32_t rootfs);
 
+void deduplicate_tmpfiles_entries (::std::int32_t rootfs);
+
 void passwd_cleanup (::std::int32_t rootfs);
 
 void migrate_group_except_root (::std::int32_t rootfs,
@@ -2058,6 +2059,4 @@ ::rpmostreecxx::GKeyFile *treefile_to_origin (::rpmostreecxx::Treefile const &tf
 void origin_validate_roundtrip (::rpmostreecxx::GKeyFile const &kf) noexcept;
 
 ::rust::String cache_branch_to_nevra (::rust::Str nevra) noexcept;
-
-void deduplicate_tmpfiles_entries (::std::int32_t rootfs);
 } // namespace rpmostreecxx

rust/src/builtins/compose/mod.rs

@@ -6,15 +6,13 @@ pub(crate) mod commit;
 
 use crate::cxxrsutil::CxxResult;
 use anyhow::{Context, Result};
-use cap_std::fs::{Dir, DirBuilder, Permissions};
+use cap_std::fs::{Dir, DirBuilder, DirBuilderExt, MetadataExt, Permissions, PermissionsExt};
 use cap_std_ext::cap_std;
 use cap_std_ext::dirext::CapStdExtDirExt;
 use fn_error_context::context;
 use rustix::fd::AsFd;
-use rustix::fs::{AtFlags, FileType, MetadataExt};
+use rustix::fs::{AtFlags, FileType};
 use std::io::Read;
-use std::os::unix::fs::DirBuilderExt;
-use std::os::unix::prelude::PermissionsExt;
 
 use crate::core::OSTREE_BOOTED;
 

rust/src/builtins/scriptlet_intercept/groupadd.rs

@@ -4,12 +4,11 @@
 
 use super::common::{self, SYSUSERS_DIR};
 use anyhow::{anyhow, Context, Result};
-use cap_std::fs::{Dir, Permissions};
+use cap_std::fs::{Dir, Permissions, PermissionsExt};
 use cap_std_ext::prelude::CapStdExtDirExt;
 use clap::{Arg, ArgAction, Command};
 use fn_error_context::context;
 use std::io::Write;
-use std::os::unix::prelude::PermissionsExt;
 
 /// Entrypoint for (the rpm-ostree implementation of) `groupadd`.
 #[context("Intercepting groupadd")]

rust/src/builtins/scriptlet_intercept/useradd.rs

@@ -4,12 +4,11 @@
 
 use super::common::{self, SYSUSERS_DIR};
 use anyhow::{anyhow, Context, Result};
-use cap_std::fs::{Dir, Permissions};
+use cap_std::fs::{Dir, Permissions, PermissionsExt};
 use cap_std_ext::prelude::CapStdExtDirExt;
 use clap::{Arg, ArgAction, Command};
 use fn_error_context::context;
 use std::io::Write;
-use std::os::unix::prelude::PermissionsExt;
 
 /// Entrypoint for (the rpm-ostree implementation of) `useradd`.
 #[context("Intercepting useradd")]

rust/src/builtins/scriptlet_intercept/usermod.rs

@@ -4,12 +4,11 @@
 
 use super::common::{self, SYSUSERS_DIR};
 use anyhow::{anyhow, Context, Result};
-use cap_std::fs::{Dir, Permissions};
+use cap_std::fs::{Dir, Permissions, PermissionsExt};
 use cap_std_ext::prelude::CapStdExtDirExt;
 use clap::{Arg, ArgAction, Command};
 use fn_error_context::context;
 use std::io::Write;
-use std::os::unix::prelude::PermissionsExt;
 
 /// Entrypoint for (the rpm-ostree implementation of) `usermod`.
 #[context("Intercepting usermod")]

rust/src/capstdext.rs

@@ -5,10 +5,9 @@
 
 use cap_std::fs::DirBuilder;
 use cap_std_ext::cap_std;
-use cap_std_ext::cap_std::fs::Dir;
+use cap_std_ext::cap_std::fs::{Dir, DirBuilderExt};
 use std::ffi::OsStr;
 use std::io::Result;
-use std::os::unix::fs::DirBuilderExt;
 use std::path::Path;
 
 pub(crate) fn dirbuilder_from_mode(m: u32) -> DirBuilder {

rust/src/cliwrap.rs

@@ -5,15 +5,13 @@
 
 use anyhow::{anyhow, Result};
 use camino::Utf8Path;
-use cap_std::fs::{Dir, DirBuilder, Permissions};
+use cap_std::fs::{Dir, DirBuilder, DirBuilderExt, Permissions, PermissionsExt};
 use cap_std_ext::cap_std;
 use cap_std_ext::prelude::CapStdExtDirExt;
 use fn_error_context::context;
 use rayon::prelude::*;
 use std::collections::HashSet;
 use std::io::prelude::*;
-use std::os::unix::fs::DirBuilderExt;
-use std::os::unix::prelude::PermissionsExt;
 mod cliutil;
 mod dracut;
 mod grubby;

rust/src/composepost.rs

@@ -20,19 +20,17 @@ use cap_std::fs::Dir;
 use cap_std::fs_utf8::Dir as Utf8Dir;
 use cap_std::io_lifetimes::AsFilelike;
 use cap_std_ext::cap_std;
-use cap_std_ext::cap_std::fs::Permissions;
+use cap_std_ext::cap_std::fs::{DirBuilderExt, MetadataExt, Permissions, PermissionsExt};
 use cap_std_ext::dirext::CapStdExtDirExt;
 use fn_error_context::context;
 use gio::prelude::*;
 use gio::FileType;
 use ostree_ext::{gio, glib};
 use rayon::prelude::*;
-use rustix::fs::MetadataExt;
 use std::borrow::Cow;
 use std::collections::BTreeSet;
 use std::fmt::Write as FmtWrite;
 use std::io::{BufRead, BufReader, Seek, Write};
-use std::os::unix::fs::{DirBuilderExt, PermissionsExt};
 use std::os::unix::io::AsRawFd;
 use std::os::unix::prelude::IntoRawFd;
 use std::path::{Path, PathBuf};

rust/src/core.rs

@@ -8,8 +8,7 @@ use crate::ffiutil;
 use anyhow::Context;
 use anyhow::{anyhow, Result};
 use camino::Utf8Path;
-use cap_std::fs::Dir;
-use cap_std::fs::Permissions;
+use cap_std::fs::{Dir, Permissions, PermissionsExt};
 use cap_std_ext::cap_std;
 use cap_std_ext::prelude::CapStdExtDirExt;
 use ffiutil::*;
@@ -22,7 +21,6 @@ use ostree_ext::ostree;
 use std::fs::File;
 use std::io::{BufReader, Read};
 use std::os::unix::io::{AsRawFd, FromRawFd};
-use std::os::unix::prelude::PermissionsExt;
 
 /// The binary forked from useradd that pokes the sss cache.
 /// It spews warnings (and sometimes fatal errors) when used

rust/src/daemon.rs

@@ -9,17 +9,15 @@ use crate::ffi::{
     OverrideReplacementSource, OverrideReplacementType, ParsedRevision, ParsedRevisionKind,
 };
 use anyhow::{anyhow, format_err, Result};
-use cap_std::fs::Dir;
+use cap_std::fs::{Dir, MetadataExt, PermissionsExt};
 use cap_std_ext::cap_std;
 use cap_std_ext::dirext::CapStdExtDirExt;
 use fn_error_context::context;
 use glib::prelude::*;
 use ostree_ext::{gio, glib, ostree};
 use rustix::fd::BorrowedFd;
-use rustix::fs::MetadataExt;
 use std::collections::{BTreeMap, BTreeSet};
 use std::io::Read;
-use std::os::unix::fs::PermissionsExt;
 use std::path::Path;
 
 const RPM_OSTREED_COMMIT_VERIFICATION_CACHE: &str = "rpm-ostree/gpgcheck-cache";

rust/src/dirdiff.rs

@@ -222,9 +222,8 @@ pub(crate) fn diff(src: &Dir, dest: &Dir) -> Result<Diff> {
 #[cfg(test)]
 mod test {
     use super::*;
-    use cap_std::fs::Permissions;
+    use cap_std::fs::{Permissions, PermissionsExt};
     use cap_std_ext::cap_tempfile;
-    use std::os::unix::fs::PermissionsExt;
 
     #[test]
     fn test_diff() -> Result<()> {

rust/src/extensions.rs

@@ -8,13 +8,12 @@
 
 use anyhow::{bail, Context, Result};
 use cap_std::fs::Dir;
-use cap_std::fs::Permissions;
+use cap_std::fs::{Permissions, PermissionsExt};
 use cap_std_ext::cap_std;
 use cap_std_ext::dirext::CapStdExtDirExt;
 use serde_derive::{Deserialize, Serialize};
 use std::collections::HashMap;
 use std::io::Read;
-use std::os::unix::prelude::PermissionsExt;
 
 use crate::cxxrsutil::*;
 use crate::ffi::StringMapping;

rust/src/lib.rs

@@ -184,7 +184,6 @@ pub mod ffi {
     pub(crate) struct ContainerImageState {
         pub base_commit: String,
         pub merge_commit: String,
-        pub is_layered: bool,
         pub image_digest: String,
         pub version: String,
         pub cached_update_diff: ExportedManifestDiff,