Release 0.13

Just an update to support libostree v2021.4, but bumping semver
because a few APIs (correctly) gained `Option<T>`.

rust-bindings/rust/Cargo.toml

@@ -8,7 +8,7 @@ license = "MIT"
 name = "ostree"
 readme = "README.md"
 repository = "https://github.com/ostreedev/ostree-rs"
-version = "0.12.3"
+version = "0.13.0"
 
 exclude = [
     "conf/**",
@@ -85,3 +85,4 @@ v2020_8 = ["v2020_7", "ffi/v2020_8"]
 v2021_1 = ["v2020_8", "ffi/v2021_1"]
 v2021_2 = ["v2021_1", "ffi/v2021_2"]
 v2021_3 = ["v2021_2", "ffi/v2021_3"]
+v2021_4 = ["v2021_3", "ffi/v2021_4"]

rust-bindings/rust/conf/ostree.toml

@@ -54,6 +54,7 @@ generate = [
     "OSTree.RepoPullFlags",
     "OSTree.RepoRemoteChange",
     "OSTree.RepoResolveRevExtFlags",
+    "OSTree.RepoVerifyFlags",
     "OSTree.SePolicyRestoreconFlags",
     "OSTree.StaticDeltaGenerateOpt",
     "OSTree.SysrootSimpleWriteDeploymentFlags",

rust-bindings/rust/src/auto/constants.rs

@@ -38,6 +38,8 @@ pub static COMMIT_META_KEY_VERSION: once_cell::sync::Lazy<&'static str> = once_c
 pub static DIRMETA_GVARIANT_STRING: once_cell::sync::Lazy<&'static str> = once_cell::sync::Lazy::new(|| unsafe{CStr::from_ptr(ffi::OSTREE_DIRMETA_GVARIANT_STRING).to_str().unwrap()});
 #[doc(alias = "OSTREE_FILEMETA_GVARIANT_STRING")]
 pub static FILEMETA_GVARIANT_STRING: once_cell::sync::Lazy<&'static str> = once_cell::sync::Lazy::new(|| unsafe{CStr::from_ptr(ffi::OSTREE_FILEMETA_GVARIANT_STRING).to_str().unwrap()});
+#[doc(alias = "OSTREE_GPG_KEY_GVARIANT_STRING")]
+pub static GPG_KEY_GVARIANT_STRING: once_cell::sync::Lazy<&'static str> = once_cell::sync::Lazy::new(|| unsafe{CStr::from_ptr(ffi::OSTREE_GPG_KEY_GVARIANT_STRING).to_str().unwrap()});
 #[cfg(any(feature = "v2021_1", feature = "dox"))]
 #[cfg_attr(feature = "dox", doc(cfg(feature = "v2021_1")))]
 #[doc(alias = "OSTREE_METADATA_KEY_BOOTABLE")]

rust-bindings/rust/src/auto/flags.rs

@@ -19,6 +19,8 @@ bitflags! {
         const NONE = ffi::OSTREE_CHECKSUM_FLAGS_NONE as u32;
         #[doc(alias = "OSTREE_CHECKSUM_FLAGS_IGNORE_XATTRS")]
         const IGNORE_XATTRS = ffi::OSTREE_CHECKSUM_FLAGS_IGNORE_XATTRS as u32;
+        #[doc(alias = "OSTREE_CHECKSUM_FLAGS_CANONICAL_PERMISSIONS")]
+        const CANONICAL_PERMISSIONS = ffi::OSTREE_CHECKSUM_FLAGS_CANONICAL_PERMISSIONS as u32;
     }
 }
 
@@ -404,6 +406,48 @@ impl FromGlib<ffi::OstreeRepoResolveRevExtFlags> for RepoResolveRevExtFlags {
     }
 }
 
+#[cfg(any(feature = "v2021_4", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2021_4")))]
+bitflags! {
+    #[doc(alias = "OstreeRepoVerifyFlags")]
+    pub struct RepoVerifyFlags: u32 {
+        #[doc(alias = "OSTREE_REPO_VERIFY_FLAGS_NONE")]
+        const NONE = ffi::OSTREE_REPO_VERIFY_FLAGS_NONE as u32;
+        #[doc(alias = "OSTREE_REPO_VERIFY_FLAGS_NO_GPG")]
+        const NO_GPG = ffi::OSTREE_REPO_VERIFY_FLAGS_NO_GPG as u32;
+        #[doc(alias = "OSTREE_REPO_VERIFY_FLAGS_NO_SIGNAPI")]
+        const NO_SIGNAPI = ffi::OSTREE_REPO_VERIFY_FLAGS_NO_SIGNAPI as u32;
+    }
+}
+
+#[cfg(any(feature = "v2021_4", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2021_4")))]
+impl fmt::Display for RepoVerifyFlags {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        <Self as fmt::Debug>::fmt(self, f)
+    }
+}
+
+#[cfg(any(feature = "v2021_4", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2021_4")))]
+#[doc(hidden)]
+impl IntoGlib for RepoVerifyFlags {
+    type GlibType = ffi::OstreeRepoVerifyFlags;
+
+    fn into_glib(self) -> ffi::OstreeRepoVerifyFlags {
+        self.bits()
+    }
+}
+
+#[cfg(any(feature = "v2021_4", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2021_4")))]
+#[doc(hidden)]
+impl FromGlib<ffi::OstreeRepoVerifyFlags> for RepoVerifyFlags {
+    unsafe fn from_glib(value: ffi::OstreeRepoVerifyFlags) -> Self {
+        Self::from_bits_truncate(value)
+    }
+}
+
 bitflags! {
     #[doc(alias = "OstreeSePolicyRestoreconFlags")]
     pub struct SePolicyRestoreconFlags: u32 {
@@ -483,6 +527,8 @@ bitflags! {
     pub struct SysrootUpgraderFlags: u32 {
         #[doc(alias = "OSTREE_SYSROOT_UPGRADER_FLAGS_IGNORE_UNCONFIGURED")]
         const IGNORE_UNCONFIGURED = ffi::OSTREE_SYSROOT_UPGRADER_FLAGS_IGNORE_UNCONFIGURED as u32;
+        #[doc(alias = "OSTREE_SYSROOT_UPGRADER_FLAGS_STAGE")]
+        const STAGE = ffi::OSTREE_SYSROOT_UPGRADER_FLAGS_STAGE as u32;
     }
 }
 

rust-bindings/rust/src/auto/mod.rs

@@ -145,6 +145,9 @@ pub use self::flags::RepoListRefsExtFlags;
 pub use self::flags::RepoPruneFlags;
 pub use self::flags::RepoPullFlags;
 pub use self::flags::RepoResolveRevExtFlags;
+#[cfg(any(feature = "v2021_4", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2021_4")))]
+pub use self::flags::RepoVerifyFlags;
 pub use self::flags::SePolicyRestoreconFlags;
 pub use self::flags::SysrootSimpleWriteDeploymentFlags;
 pub use self::flags::SysrootUpgraderFlags;
@@ -177,6 +180,7 @@ pub use self::constants::COMMIT_META_KEY_SOURCE_TITLE;
 pub use self::constants::COMMIT_META_KEY_VERSION;
 pub use self::constants::DIRMETA_GVARIANT_STRING;
 pub use self::constants::FILEMETA_GVARIANT_STRING;
+pub use self::constants::GPG_KEY_GVARIANT_STRING;
 #[cfg(any(feature = "v2021_1", feature = "dox"))]
 #[cfg_attr(feature = "dox", doc(cfg(feature = "v2021_1")))]
 pub use self::constants::METADATA_KEY_BOOTABLE;

rust-bindings/rust/src/auto/repo.rs

@@ -36,6 +36,9 @@ use crate::RepoRemoteChange;
 #[cfg_attr(feature = "dox", doc(cfg(feature = "v2016_7")))]
 use crate::RepoResolveRevExtFlags;
 use crate::RepoTransactionStats;
+#[cfg(any(feature = "v2021_4", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2021_4")))]
+use crate::RepoVerifyFlags;
 #[cfg(any(feature = "v2020_7", feature = "dox"))]
 #[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_7")))]
 use crate::Sign;
@@ -527,6 +530,20 @@ impl Repo {
         }
     }
 
+    //#[cfg(any(feature = "v2021_3", feature = "dox"))]
+    //#[cfg_attr(feature = "dox", doc(cfg(feature = "v2021_3")))]
+    //#[doc(alias = "ostree_repo_lock_pop")]
+    //pub fn lock_pop<P: IsA<gio::Cancellable>>(&self, lock_type: /*Ignored*/RepoLockType, cancellable: Option<&P>) -> Result<(), glib::Error> {
+    //    unsafe { TODO: call ffi:ostree_repo_lock_pop() }
+    //}
+
+    //#[cfg(any(feature = "v2021_3", feature = "dox"))]
+    //#[cfg_attr(feature = "dox", doc(cfg(feature = "v2021_3")))]
+    //#[doc(alias = "ostree_repo_lock_push")]
+    //pub fn lock_push<P: IsA<gio::Cancellable>>(&self, lock_type: /*Ignored*/RepoLockType, cancellable: Option<&P>) -> Result<(), glib::Error> {
+    //    unsafe { TODO: call ffi:ostree_repo_lock_push() }
+    //}
+
     #[cfg(any(feature = "v2017_15", feature = "dox"))]
     #[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_15")))]
     #[doc(alias = "ostree_repo_mark_commit_partial")]
@@ -650,7 +667,7 @@ impl Repo {
     }
 
     #[doc(alias = "ostree_repo_read_commit_detached_metadata")]
-    pub fn read_commit_detached_metadata<P: IsA<gio::Cancellable>>(&self, checksum: &str, cancellable: Option<&P>) -> Result<glib::Variant, glib::Error> {
+    pub fn read_commit_detached_metadata<P: IsA<gio::Cancellable>>(&self, checksum: &str, cancellable: Option<&P>) -> Result<Option<glib::Variant>, glib::Error> {
         unsafe {
             let mut out_metadata = ptr::null_mut();
             let mut error = ptr::null_mut();
@@ -680,7 +697,7 @@ impl Repo {
     }
 
     #[doc(alias = "ostree_repo_remote_add")]
-    pub fn remote_add<P: IsA<gio::Cancellable>>(&self, name: &str, url: &str, options: Option<&glib::Variant>, cancellable: Option<&P>) -> Result<(), glib::Error> {
+    pub fn remote_add<P: IsA<gio::Cancellable>>(&self, name: &str, url: Option<&str>, options: Option<&glib::Variant>, cancellable: Option<&P>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
             let _ = ffi::ostree_repo_remote_add(self.to_glib_none().0, name.to_glib_none().0, url.to_glib_none().0, options.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
@@ -689,7 +706,7 @@ impl Repo {
     }
 
     #[doc(alias = "ostree_repo_remote_change")]
-    pub fn remote_change<P: IsA<gio::File>, Q: IsA<gio::Cancellable>>(&self, sysroot: Option<&P>, changeop: RepoRemoteChange, name: &str, url: &str, options: Option<&glib::Variant>, cancellable: Option<&Q>) -> Result<(), glib::Error> {
+    pub fn remote_change<P: IsA<gio::File>, Q: IsA<gio::Cancellable>>(&self, sysroot: Option<&P>, changeop: RepoRemoteChange, name: &str, url: Option<&str>, options: Option<&glib::Variant>, cancellable: Option<&Q>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
             let _ = ffi::ostree_repo_remote_change(self.to_glib_none().0, sysroot.map(|p| p.as_ref()).to_glib_none().0, changeop.into_glib(), name.to_glib_none().0, url.to_glib_none().0, options.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
@@ -730,6 +747,18 @@ impl Repo {
         }
     }
 
+    #[cfg(any(feature = "v2021_4", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2021_4")))]
+    #[doc(alias = "ostree_repo_remote_get_gpg_keys")]
+    pub fn remote_get_gpg_keys<P: IsA<gio::Cancellable>>(&self, name: Option<&str>, key_ids: &[&str], cancellable: Option<&P>) -> Result<Vec<glib::Variant>, glib::Error> {
+        unsafe {
+            let mut out_keys = ptr::null_mut();
+            let mut error = ptr::null_mut();
+            let _ = ffi::ostree_repo_remote_get_gpg_keys(self.to_glib_none().0, name.to_glib_none().0, key_ids.to_glib_none().0, &mut out_keys, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            if error.is_null() { Ok(FromGlibPtrContainer::from_glib_container(out_keys)) } else { Err(from_glib_full(error)) }
+        }
+    }
+
     #[doc(alias = "ostree_repo_remote_get_gpg_verify")]
     pub fn remote_get_gpg_verify(&self, name: &str) -> Result<bool, glib::Error> {
         unsafe {
@@ -926,6 +955,18 @@ impl Repo {
         }
     }
 
+    #[cfg(any(feature = "v2021_4", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2021_4")))]
+    #[doc(alias = "ostree_repo_signature_verify_commit_data")]
+    pub fn signature_verify_commit_data(&self, remote_name: &str, commit_data: &glib::Bytes, commit_metadata: &glib::Bytes, flags: RepoVerifyFlags) -> Result<Option<glib::GString>, glib::Error> {
+        unsafe {
+            let mut out_results = ptr::null_mut();
+            let mut error = ptr::null_mut();
+            let _ = ffi::ostree_repo_signature_verify_commit_data(self.to_glib_none().0, remote_name.to_glib_none().0, commit_data.to_glib_none().0, commit_metadata.to_glib_none().0, flags.into_glib(), &mut out_results, &mut error);
+            if error.is_null() { Ok(from_glib_full(out_results)) } else { Err(from_glib_full(error)) }
+        }
+    }
+
     #[doc(alias = "ostree_repo_static_delta_execute_offline")]
     pub fn static_delta_execute_offline<P: IsA<gio::File>, Q: IsA<gio::Cancellable>>(&self, dir_or_file: &P, skip_validation: bool, cancellable: Option<&Q>) -> Result<(), glib::Error> {
         unsafe {

rust-bindings/rust/src/auto/repo_finder_result.rs

@@ -3,7 +3,7 @@
 // DO NOT EDIT
 
 use std::cmp;
-use glib::translate::*;
+use glib::translate::ToGlibPtr;
 
 glib::wrapper! {
     #[derive(Debug, Hash)]

rust-bindings/rust/sys/Cargo.toml

@@ -56,6 +56,7 @@ v2020_8 = ["v2020_7"]
 v2021_1 = ["v2020_8"]
 v2021_2 = ["v2021_1"]
 v2021_3 = ["v2021_2"]
+v2021_4 = ["v2021_3"]
 
 [lib]
 name = "ostree_sys"
@@ -73,10 +74,8 @@ name = "ostree-sys"
 repository = "https://gitlab.com/fkrull/ostree-rs"
 version = "0.8.2"
 edition = "2018"
-
 [package.metadata.docs.rs]
 features = ["dox"]
-
 [package.metadata.system-deps.ostree_1]
 name = "ostree-1"
 version = "0.0"
@@ -200,3 +199,6 @@ version = "2021.2"
 
 [package.metadata.system-deps.ostree_1.v2021_3]
 version = "2021.3"
+
+[package.metadata.system-deps.ostree_1.v2021_4]
+version = "2021.4"

rust-bindings/rust/sys/tests/abi.rs

@@ -3,10 +3,10 @@
 // DO NOT EDIT
 
 use ostree_sys::*;
+use std::mem::{align_of, size_of};
 use std::env;
 use std::error::Error;
 use std::ffi::OsString;
-use std::mem::{align_of, size_of};
 use std::path::Path;
 use std::process::Command;
 use std::str;
@@ -64,18 +64,21 @@ fn pkg_config_cflags(packages: &[&str]) -> Result<Vec<String>, Box<dyn Error>> {
     if packages.is_empty() {
         return Ok(Vec::new());
     }
-    let pkg_config = env::var_os("PKG_CONFIG").unwrap_or_else(|| OsString::from("pkg-config"));
+    let pkg_config = env::var_os("PKG_CONFIG")
+        .unwrap_or_else(|| OsString::from("pkg-config"));
     let mut cmd = Command::new(pkg_config);
     cmd.arg("--cflags");
     cmd.args(packages);
     let out = cmd.output()?;
     if !out.status.success() {
-        return Err(format!("command {:?} returned {}", &cmd, out.status).into());
+        return Err(format!("command {:?} returned {}",
+                           &cmd, out.status).into());
     }
     let stdout = str::from_utf8(&out.stdout)?;
     Ok(shell_words::split(stdout.trim())?)
 }
 
+
 #[derive(Copy, Clone, Debug, Eq, PartialEq)]
 struct Layout {
     size: usize,
@@ -169,7 +172,8 @@ fn cross_validate_layout_with_c() {
 
     let mut results = Results::default();
 
-    for ((rust_name, rust_layout), (c_name, c_layout)) in RUST_LAYOUTS.iter().zip(c_layouts.iter())
+    for ((rust_name, rust_layout), (c_name, c_layout)) in
+        RUST_LAYOUTS.iter().zip(c_layouts.iter())
     {
         if rust_name != c_name {
             results.record_failed();
@@ -210,386 +214,71 @@ fn get_c_output(name: &str) -> Result<String, Box<dyn Error>> {
 }
 
 const RUST_LAYOUTS: &[(&str, Layout)] = &[
-    (
+    ("OstreeAsyncProgressClass", Layout {size: size_of::<OstreeAsyncProgressClass>(), alignment: align_of::<OstreeAsyncProgressClass>()}),
-        "OstreeAsyncProgressClass",
+    ("OstreeChecksumFlags", Layout {size: size_of::<OstreeChecksumFlags>(), alignment: align_of::<OstreeChecksumFlags>()}),
-        Layout {
+    ("OstreeCollectionRef", Layout {size: size_of::<OstreeCollectionRef>(), alignment: align_of::<OstreeCollectionRef>()}),
-            size: size_of::<OstreeAsyncProgressClass>(),
+    ("OstreeCollectionRefv", Layout {size: size_of::<OstreeCollectionRefv>(), alignment: align_of::<OstreeCollectionRefv>()}),
-            alignment: align_of::<OstreeAsyncProgressClass>(),
+    ("OstreeCommitSizesEntry", Layout {size: size_of::<OstreeCommitSizesEntry>(), alignment: align_of::<OstreeCommitSizesEntry>()}),
-        },
+    ("OstreeContentWriterClass", Layout {size: size_of::<OstreeContentWriterClass>(), alignment: align_of::<OstreeContentWriterClass>()}),
-    ),
+    ("OstreeDeploymentUnlockedState", Layout {size: size_of::<OstreeDeploymentUnlockedState>(), alignment: align_of::<OstreeDeploymentUnlockedState>()}),
-    (
+    ("OstreeDiffDirsOptions", Layout {size: size_of::<OstreeDiffDirsOptions>(), alignment: align_of::<OstreeDiffDirsOptions>()}),
-        "OstreeChecksumFlags",
+    ("OstreeDiffFlags", Layout {size: size_of::<OstreeDiffFlags>(), alignment: align_of::<OstreeDiffFlags>()}),
-        Layout {
+    ("OstreeDiffItem", Layout {size: size_of::<OstreeDiffItem>(), alignment: align_of::<OstreeDiffItem>()}),
-            size: size_of::<OstreeChecksumFlags>(),
+    ("OstreeGpgError", Layout {size: size_of::<OstreeGpgError>(), alignment: align_of::<OstreeGpgError>()}),
-            alignment: align_of::<OstreeChecksumFlags>(),
+    ("OstreeGpgSignatureAttr", Layout {size: size_of::<OstreeGpgSignatureAttr>(), alignment: align_of::<OstreeGpgSignatureAttr>()}),
-        },
+    ("OstreeGpgSignatureFormatFlags", Layout {size: size_of::<OstreeGpgSignatureFormatFlags>(), alignment: align_of::<OstreeGpgSignatureFormatFlags>()}),
-    ),
+    ("OstreeMutableTreeClass", Layout {size: size_of::<OstreeMutableTreeClass>(), alignment: align_of::<OstreeMutableTreeClass>()}),
-    (
+    ("OstreeMutableTreeIter", Layout {size: size_of::<OstreeMutableTreeIter>(), alignment: align_of::<OstreeMutableTreeIter>()}),
-        "OstreeCollectionRef",
+    ("OstreeObjectType", Layout {size: size_of::<OstreeObjectType>(), alignment: align_of::<OstreeObjectType>()}),
-        Layout {
+    ("OstreeRepoCheckoutAtOptions", Layout {size: size_of::<OstreeRepoCheckoutAtOptions>(), alignment: align_of::<OstreeRepoCheckoutAtOptions>()}),
-            size: size_of::<OstreeCollectionRef>(),
+    ("OstreeRepoCheckoutFilterResult", Layout {size: size_of::<OstreeRepoCheckoutFilterResult>(), alignment: align_of::<OstreeRepoCheckoutFilterResult>()}),
-            alignment: align_of::<OstreeCollectionRef>(),
+    ("OstreeRepoCheckoutMode", Layout {size: size_of::<OstreeRepoCheckoutMode>(), alignment: align_of::<OstreeRepoCheckoutMode>()}),
-        },
+    ("OstreeRepoCheckoutOverwriteMode", Layout {size: size_of::<OstreeRepoCheckoutOverwriteMode>(), alignment: align_of::<OstreeRepoCheckoutOverwriteMode>()}),
-    ),
+    ("OstreeRepoCommitFilterResult", Layout {size: size_of::<OstreeRepoCommitFilterResult>(), alignment: align_of::<OstreeRepoCommitFilterResult>()}),
-    (
+    ("OstreeRepoCommitIterResult", Layout {size: size_of::<OstreeRepoCommitIterResult>(), alignment: align_of::<OstreeRepoCommitIterResult>()}),
-        "OstreeCollectionRefv",
+    ("OstreeRepoCommitModifierFlags", Layout {size: size_of::<OstreeRepoCommitModifierFlags>(), alignment: align_of::<OstreeRepoCommitModifierFlags>()}),
-        Layout {
+    ("OstreeRepoCommitState", Layout {size: size_of::<OstreeRepoCommitState>(), alignment: align_of::<OstreeRepoCommitState>()}),
-            size: size_of::<OstreeCollectionRefv>(),
+    ("OstreeRepoCommitTraverseFlags", Layout {size: size_of::<OstreeRepoCommitTraverseFlags>(), alignment: align_of::<OstreeRepoCommitTraverseFlags>()}),
-            alignment: align_of::<OstreeCollectionRefv>(),
+    ("OstreeRepoCommitTraverseIter", Layout {size: size_of::<OstreeRepoCommitTraverseIter>(), alignment: align_of::<OstreeRepoCommitTraverseIter>()}),
-        },
+    ("OstreeRepoFileClass", Layout {size: size_of::<OstreeRepoFileClass>(), alignment: align_of::<OstreeRepoFileClass>()}),
-    ),
+    ("OstreeRepoFinderAvahiClass", Layout {size: size_of::<OstreeRepoFinderAvahiClass>(), alignment: align_of::<OstreeRepoFinderAvahiClass>()}),
-    (
+    ("OstreeRepoFinderConfigClass", Layout {size: size_of::<OstreeRepoFinderConfigClass>(), alignment: align_of::<OstreeRepoFinderConfigClass>()}),
-        "OstreeCommitSizesEntry",
+    ("OstreeRepoFinderInterface", Layout {size: size_of::<OstreeRepoFinderInterface>(), alignment: align_of::<OstreeRepoFinderInterface>()}),
-        Layout {
+    ("OstreeRepoFinderMountClass", Layout {size: size_of::<OstreeRepoFinderMountClass>(), alignment: align_of::<OstreeRepoFinderMountClass>()}),
-            size: size_of::<OstreeCommitSizesEntry>(),
+    ("OstreeRepoFinderOverrideClass", Layout {size: size_of::<OstreeRepoFinderOverrideClass>(), alignment: align_of::<OstreeRepoFinderOverrideClass>()}),
-            alignment: align_of::<OstreeCommitSizesEntry>(),
+    ("OstreeRepoFinderResult", Layout {size: size_of::<OstreeRepoFinderResult>(), alignment: align_of::<OstreeRepoFinderResult>()}),
-        },
+    ("OstreeRepoFinderResultv", Layout {size: size_of::<OstreeRepoFinderResultv>(), alignment: align_of::<OstreeRepoFinderResultv>()}),
-    ),
+    ("OstreeRepoListObjectsFlags", Layout {size: size_of::<OstreeRepoListObjectsFlags>(), alignment: align_of::<OstreeRepoListObjectsFlags>()}),
-    (
+    ("OstreeRepoListRefsExtFlags", Layout {size: size_of::<OstreeRepoListRefsExtFlags>(), alignment: align_of::<OstreeRepoListRefsExtFlags>()}),
-        "OstreeContentWriterClass",
+    ("OstreeRepoLockType", Layout {size: size_of::<OstreeRepoLockType>(), alignment: align_of::<OstreeRepoLockType>()}),
-        Layout {
+    ("OstreeRepoMode", Layout {size: size_of::<OstreeRepoMode>(), alignment: align_of::<OstreeRepoMode>()}),
-            size: size_of::<OstreeContentWriterClass>(),
+    ("OstreeRepoPruneFlags", Layout {size: size_of::<OstreeRepoPruneFlags>(), alignment: align_of::<OstreeRepoPruneFlags>()}),
-            alignment: align_of::<OstreeContentWriterClass>(),
+    ("OstreeRepoPruneOptions", Layout {size: size_of::<OstreeRepoPruneOptions>(), alignment: align_of::<OstreeRepoPruneOptions>()}),
-        },
+    ("OstreeRepoPullFlags", Layout {size: size_of::<OstreeRepoPullFlags>(), alignment: align_of::<OstreeRepoPullFlags>()}),
-    ),
+    ("OstreeRepoRemoteChange", Layout {size: size_of::<OstreeRepoRemoteChange>(), alignment: align_of::<OstreeRepoRemoteChange>()}),
-    (
+    ("OstreeRepoResolveRevExtFlags", Layout {size: size_of::<OstreeRepoResolveRevExtFlags>(), alignment: align_of::<OstreeRepoResolveRevExtFlags>()}),
-        "OstreeDeploymentUnlockedState",
+    ("OstreeRepoTransactionStats", Layout {size: size_of::<OstreeRepoTransactionStats>(), alignment: align_of::<OstreeRepoTransactionStats>()}),
-        Layout {
+    ("OstreeRepoVerifyFlags", Layout {size: size_of::<OstreeRepoVerifyFlags>(), alignment: align_of::<OstreeRepoVerifyFlags>()}),
-            size: size_of::<OstreeDeploymentUnlockedState>(),
+    ("OstreeSePolicyRestoreconFlags", Layout {size: size_of::<OstreeSePolicyRestoreconFlags>(), alignment: align_of::<OstreeSePolicyRestoreconFlags>()}),
-            alignment: align_of::<OstreeDeploymentUnlockedState>(),
+    ("OstreeSignInterface", Layout {size: size_of::<OstreeSignInterface>(), alignment: align_of::<OstreeSignInterface>()}),
-        },
+    ("OstreeStaticDeltaGenerateOpt", Layout {size: size_of::<OstreeStaticDeltaGenerateOpt>(), alignment: align_of::<OstreeStaticDeltaGenerateOpt>()}),
-    ),
+    ("OstreeStaticDeltaIndexFlags", Layout {size: size_of::<OstreeStaticDeltaIndexFlags>(), alignment: align_of::<OstreeStaticDeltaIndexFlags>()}),
-    (
+    ("OstreeSysrootDeployTreeOpts", Layout {size: size_of::<OstreeSysrootDeployTreeOpts>(), alignment: align_of::<OstreeSysrootDeployTreeOpts>()}),
-        "OstreeDiffDirsOptions",
+    ("OstreeSysrootSimpleWriteDeploymentFlags", Layout {size: size_of::<OstreeSysrootSimpleWriteDeploymentFlags>(), alignment: align_of::<OstreeSysrootSimpleWriteDeploymentFlags>()}),
-        Layout {
+    ("OstreeSysrootUpgraderFlags", Layout {size: size_of::<OstreeSysrootUpgraderFlags>(), alignment: align_of::<OstreeSysrootUpgraderFlags>()}),
-            size: size_of::<OstreeDiffDirsOptions>(),
+    ("OstreeSysrootUpgraderPullFlags", Layout {size: size_of::<OstreeSysrootUpgraderPullFlags>(), alignment: align_of::<OstreeSysrootUpgraderPullFlags>()}),
-            alignment: align_of::<OstreeDiffDirsOptions>(),
+    ("OstreeSysrootWriteDeploymentsOpts", Layout {size: size_of::<OstreeSysrootWriteDeploymentsOpts>(), alignment: align_of::<OstreeSysrootWriteDeploymentsOpts>()}),
-        },
-    ),
-    (
-        "OstreeDiffFlags",
-        Layout {
-            size: size_of::<OstreeDiffFlags>(),
-            alignment: align_of::<OstreeDiffFlags>(),
-        },
-    ),
-    (
-        "OstreeDiffItem",
-        Layout {
-            size: size_of::<OstreeDiffItem>(),
-            alignment: align_of::<OstreeDiffItem>(),
-        },
-    ),
-    (
-        "OstreeGpgError",
-        Layout {
-            size: size_of::<OstreeGpgError>(),
-            alignment: align_of::<OstreeGpgError>(),
-        },
-    ),
-    (
-        "OstreeGpgSignatureAttr",
-        Layout {
-            size: size_of::<OstreeGpgSignatureAttr>(),
-            alignment: align_of::<OstreeGpgSignatureAttr>(),
-        },
-    ),
-    (
-        "OstreeGpgSignatureFormatFlags",
-        Layout {
-            size: size_of::<OstreeGpgSignatureFormatFlags>(),
-            alignment: align_of::<OstreeGpgSignatureFormatFlags>(),
-        },
-    ),
-    (
-        "OstreeMutableTreeClass",
-        Layout {
-            size: size_of::<OstreeMutableTreeClass>(),
-            alignment: align_of::<OstreeMutableTreeClass>(),
-        },
-    ),
-    (
-        "OstreeMutableTreeIter",
-        Layout {
-            size: size_of::<OstreeMutableTreeIter>(),
-            alignment: align_of::<OstreeMutableTreeIter>(),
-        },
-    ),
-    (
-        "OstreeObjectType",
-        Layout {
-            size: size_of::<OstreeObjectType>(),
-            alignment: align_of::<OstreeObjectType>(),
-        },
-    ),
-    (
-        "OstreeRepoCheckoutAtOptions",
-        Layout {
-            size: size_of::<OstreeRepoCheckoutAtOptions>(),
-            alignment: align_of::<OstreeRepoCheckoutAtOptions>(),
-        },
-    ),
-    (
-        "OstreeRepoCheckoutFilterResult",
-        Layout {
-            size: size_of::<OstreeRepoCheckoutFilterResult>(),
-            alignment: align_of::<OstreeRepoCheckoutFilterResult>(),
-        },
-    ),
-    (
-        "OstreeRepoCheckoutMode",
-        Layout {
-            size: size_of::<OstreeRepoCheckoutMode>(),
-            alignment: align_of::<OstreeRepoCheckoutMode>(),
-        },
-    ),
-    (
-        "OstreeRepoCheckoutOverwriteMode",
-        Layout {
-            size: size_of::<OstreeRepoCheckoutOverwriteMode>(),
-            alignment: align_of::<OstreeRepoCheckoutOverwriteMode>(),
-        },
-    ),
-    (
-        "OstreeRepoCommitFilterResult",
-        Layout {
-            size: size_of::<OstreeRepoCommitFilterResult>(),
-            alignment: align_of::<OstreeRepoCommitFilterResult>(),
-        },
-    ),
-    (
-        "OstreeRepoCommitIterResult",
-        Layout {
-            size: size_of::<OstreeRepoCommitIterResult>(),
-            alignment: align_of::<OstreeRepoCommitIterResult>(),
-        },
-    ),
-    (
-        "OstreeRepoCommitModifierFlags",
-        Layout {
-            size: size_of::<OstreeRepoCommitModifierFlags>(),
-            alignment: align_of::<OstreeRepoCommitModifierFlags>(),
-        },
-    ),
-    (
-        "OstreeRepoCommitState",
-        Layout {
-            size: size_of::<OstreeRepoCommitState>(),
-            alignment: align_of::<OstreeRepoCommitState>(),
-        },
-    ),
-    (
-        "OstreeRepoCommitTraverseFlags",
-        Layout {
-            size: size_of::<OstreeRepoCommitTraverseFlags>(),
-            alignment: align_of::<OstreeRepoCommitTraverseFlags>(),
-        },
-    ),
-    (
-        "OstreeRepoCommitTraverseIter",
-        Layout {
-            size: size_of::<OstreeRepoCommitTraverseIter>(),
-            alignment: align_of::<OstreeRepoCommitTraverseIter>(),
-        },
-    ),
-    (
-        "OstreeRepoFileClass",
-        Layout {
-            size: size_of::<OstreeRepoFileClass>(),
-            alignment: align_of::<OstreeRepoFileClass>(),
-        },
-    ),
-    (
-        "OstreeRepoFinderAvahiClass",
-        Layout {
-            size: size_of::<OstreeRepoFinderAvahiClass>(),
-            alignment: align_of::<OstreeRepoFinderAvahiClass>(),
-        },
-    ),
-    (
-        "OstreeRepoFinderConfigClass",
-        Layout {
-            size: size_of::<OstreeRepoFinderConfigClass>(),
-            alignment: align_of::<OstreeRepoFinderConfigClass>(),
-        },
-    ),
-    (
-        "OstreeRepoFinderInterface",
-        Layout {
-            size: size_of::<OstreeRepoFinderInterface>(),
-            alignment: align_of::<OstreeRepoFinderInterface>(),
-        },
-    ),
-    (
-        "OstreeRepoFinderMountClass",
-        Layout {
-            size: size_of::<OstreeRepoFinderMountClass>(),
-            alignment: align_of::<OstreeRepoFinderMountClass>(),
-        },
-    ),
-    (
-        "OstreeRepoFinderOverrideClass",
-        Layout {
-            size: size_of::<OstreeRepoFinderOverrideClass>(),
-            alignment: align_of::<OstreeRepoFinderOverrideClass>(),
-        },
-    ),
-    (
-        "OstreeRepoFinderResult",
-        Layout {
-            size: size_of::<OstreeRepoFinderResult>(),
-            alignment: align_of::<OstreeRepoFinderResult>(),
-        },
-    ),
-    (
-        "OstreeRepoFinderResultv",
-        Layout {
-            size: size_of::<OstreeRepoFinderResultv>(),
-            alignment: align_of::<OstreeRepoFinderResultv>(),
-        },
-    ),
-    (
-        "OstreeRepoListObjectsFlags",
-        Layout {
-            size: size_of::<OstreeRepoListObjectsFlags>(),
-            alignment: align_of::<OstreeRepoListObjectsFlags>(),
-        },
-    ),
-    (
-        "OstreeRepoListRefsExtFlags",
-        Layout {
-            size: size_of::<OstreeRepoListRefsExtFlags>(),
-            alignment: align_of::<OstreeRepoListRefsExtFlags>(),
-        },
-    ),
-    (
-        "OstreeRepoMode",
-        Layout {
-            size: size_of::<OstreeRepoMode>(),
-            alignment: align_of::<OstreeRepoMode>(),
-        },
-    ),
-    (
-        "OstreeRepoPruneFlags",
-        Layout {
-            size: size_of::<OstreeRepoPruneFlags>(),
-            alignment: align_of::<OstreeRepoPruneFlags>(),
-        },
-    ),
-    (
-        "OstreeRepoPruneOptions",
-        Layout {
-            size: size_of::<OstreeRepoPruneOptions>(),
-            alignment: align_of::<OstreeRepoPruneOptions>(),
-        },
-    ),
-    (
-        "OstreeRepoPullFlags",
-        Layout {
-            size: size_of::<OstreeRepoPullFlags>(),
-            alignment: align_of::<OstreeRepoPullFlags>(),
-        },
-    ),
-    (
-        "OstreeRepoRemoteChange",
-        Layout {
-            size: size_of::<OstreeRepoRemoteChange>(),
-            alignment: align_of::<OstreeRepoRemoteChange>(),
-        },
-    ),
-    (
-        "OstreeRepoResolveRevExtFlags",
-        Layout {
-            size: size_of::<OstreeRepoResolveRevExtFlags>(),
-            alignment: align_of::<OstreeRepoResolveRevExtFlags>(),
-        },
-    ),
-    (
-        "OstreeRepoTransactionStats",
-        Layout {
-            size: size_of::<OstreeRepoTransactionStats>(),
-            alignment: align_of::<OstreeRepoTransactionStats>(),
-        },
-    ),
-    (
-        "OstreeSePolicyRestoreconFlags",
-        Layout {
-            size: size_of::<OstreeSePolicyRestoreconFlags>(),
-            alignment: align_of::<OstreeSePolicyRestoreconFlags>(),
-        },
-    ),
-    (
-        "OstreeSignInterface",
-        Layout {
-            size: size_of::<OstreeSignInterface>(),
-            alignment: align_of::<OstreeSignInterface>(),
-        },
-    ),
-    (
-        "OstreeStaticDeltaGenerateOpt",
-        Layout {
-            size: size_of::<OstreeStaticDeltaGenerateOpt>(),
-            alignment: align_of::<OstreeStaticDeltaGenerateOpt>(),
-        },
-    ),
-    (
-        "OstreeStaticDeltaIndexFlags",
-        Layout {
-            size: size_of::<OstreeStaticDeltaIndexFlags>(),
-            alignment: align_of::<OstreeStaticDeltaIndexFlags>(),
-        },
-    ),
-    (
-        "OstreeSysrootDeployTreeOpts",
-        Layout {
-            size: size_of::<OstreeSysrootDeployTreeOpts>(),
-            alignment: align_of::<OstreeSysrootDeployTreeOpts>(),
-        },
-    ),
-    (
-        "OstreeSysrootSimpleWriteDeploymentFlags",
-        Layout {
-            size: size_of::<OstreeSysrootSimpleWriteDeploymentFlags>(),
-            alignment: align_of::<OstreeSysrootSimpleWriteDeploymentFlags>(),
-        },
-    ),
-    (
-        "OstreeSysrootUpgraderFlags",
-        Layout {
-            size: size_of::<OstreeSysrootUpgraderFlags>(),
-            alignment: align_of::<OstreeSysrootUpgraderFlags>(),
-        },
-    ),
-    (
-        "OstreeSysrootUpgraderPullFlags",
-        Layout {
-            size: size_of::<OstreeSysrootUpgraderPullFlags>(),
-            alignment: align_of::<OstreeSysrootUpgraderPullFlags>(),
-        },
-    ),
-    (
-        "OstreeSysrootWriteDeploymentsOpts",
-        Layout {
-            size: size_of::<OstreeSysrootWriteDeploymentsOpts>(),
-            alignment: align_of::<OstreeSysrootWriteDeploymentsOpts>(),
-        },
-    ),
 ];
 
 const RUST_CONSTANTS: &[(&str, &str)] = &[
+    ("(guint) OSTREE_CHECKSUM_FLAGS_CANONICAL_PERMISSIONS", "2"),
     ("(guint) OSTREE_CHECKSUM_FLAGS_IGNORE_XATTRS", "1"),
     ("(guint) OSTREE_CHECKSUM_FLAGS_NONE", "0"),
     ("OSTREE_COMMIT_GVARIANT_STRING", "(a{sv}aya(say)sstayay)"),
     ("OSTREE_COMMIT_META_KEY_ARCHITECTURE", "ostree.architecture"),
-    (
+    ("OSTREE_COMMIT_META_KEY_COLLECTION_BINDING", "ostree.collection-binding"),
-        "OSTREE_COMMIT_META_KEY_COLLECTION_BINDING",
-        "ostree.collection-binding",
-    ),
     ("OSTREE_COMMIT_META_KEY_ENDOFLIFE", "ostree.endoflife"),
-    (
+    ("OSTREE_COMMIT_META_KEY_ENDOFLIFE_REBASE", "ostree.endoflife-rebase"),
-        "OSTREE_COMMIT_META_KEY_ENDOFLIFE_REBASE",
-        "ostree.endoflife-rebase",
-    ),
     ("OSTREE_COMMIT_META_KEY_REF_BINDING", "ostree.ref-binding"),
     ("OSTREE_COMMIT_META_KEY_SOURCE_TITLE", "ostree.source-title"),
     ("OSTREE_COMMIT_META_KEY_VERSION", "version"),
@@ -607,16 +296,14 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[
     ("(gint) OSTREE_GPG_ERROR_MISSING_KEY", "2"),
     ("(gint) OSTREE_GPG_ERROR_NO_SIGNATURE", "0"),
     ("(gint) OSTREE_GPG_ERROR_REVOKED_KEY", "5"),
+    ("OSTREE_GPG_KEY_GVARIANT_STRING", "(aa{sv}aa{sv}a{sv})"),
     ("(gint) OSTREE_GPG_SIGNATURE_ATTR_EXP_TIMESTAMP", "7"),
     ("(gint) OSTREE_GPG_SIGNATURE_ATTR_FINGERPRINT", "5"),
     ("(gint) OSTREE_GPG_SIGNATURE_ATTR_FINGERPRINT_PRIMARY", "12"),
     ("(gint) OSTREE_GPG_SIGNATURE_ATTR_HASH_ALGO_NAME", "9"),
     ("(gint) OSTREE_GPG_SIGNATURE_ATTR_KEY_EXPIRED", "2"),
     ("(gint) OSTREE_GPG_SIGNATURE_ATTR_KEY_EXP_TIMESTAMP", "13"),
-    (
+    ("(gint) OSTREE_GPG_SIGNATURE_ATTR_KEY_EXP_TIMESTAMP_PRIMARY", "14"),
-        "(gint) OSTREE_GPG_SIGNATURE_ATTR_KEY_EXP_TIMESTAMP_PRIMARY",
-        "14",
-    ),
     ("(gint) OSTREE_GPG_SIGNATURE_ATTR_KEY_MISSING", "4"),
     ("(gint) OSTREE_GPG_SIGNATURE_ATTR_KEY_REVOKED", "3"),
     ("(gint) OSTREE_GPG_SIGNATURE_ATTR_PUBKEY_ALGO_NAME", "8"),
@@ -630,10 +317,7 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[
     ("OSTREE_MAX_METADATA_WARN_SIZE", "7340032"),
     ("OSTREE_METADATA_KEY_BOOTABLE", "ostree.bootable"),
     ("OSTREE_METADATA_KEY_LINUX", "ostree.linux"),
-    (
+    ("OSTREE_META_KEY_DEPLOY_COLLECTION_ID", "ostree.deploy-collection-id"),
-        "OSTREE_META_KEY_DEPLOY_COLLECTION_ID",
-        "ostree.deploy-collection-id",
-    ),
     ("(gint) OSTREE_OBJECT_TYPE_COMMIT", "4"),
     ("(gint) OSTREE_OBJECT_TYPE_COMMIT_META", "6"),
     ("(gint) OSTREE_OBJECT_TYPE_DIR_META", "3"),
@@ -656,23 +340,11 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[
     ("(gint) OSTREE_REPO_COMMIT_ITER_RESULT_END", "1"),
     ("(gint) OSTREE_REPO_COMMIT_ITER_RESULT_ERROR", "0"),
     ("(gint) OSTREE_REPO_COMMIT_ITER_RESULT_FILE", "2"),
-    (
+    ("(guint) OSTREE_REPO_COMMIT_MODIFIER_FLAGS_CANONICAL_PERMISSIONS", "4"),
-        "(guint) OSTREE_REPO_COMMIT_MODIFIER_FLAGS_CANONICAL_PERMISSIONS",
-        "4",
-    ),
     ("(guint) OSTREE_REPO_COMMIT_MODIFIER_FLAGS_CONSUME", "16"),
-    (
+    ("(guint) OSTREE_REPO_COMMIT_MODIFIER_FLAGS_DEVINO_CANONICAL", "32"),
-        "(guint) OSTREE_REPO_COMMIT_MODIFIER_FLAGS_DEVINO_CANONICAL",
+    ("(guint) OSTREE_REPO_COMMIT_MODIFIER_FLAGS_ERROR_ON_UNLABELED", "8"),
-        "32",
+    ("(guint) OSTREE_REPO_COMMIT_MODIFIER_FLAGS_GENERATE_SIZES", "2"),
-    ),
-    (
-        "(guint) OSTREE_REPO_COMMIT_MODIFIER_FLAGS_ERROR_ON_UNLABELED",
-        "8",
-    ),
-    (
-        "(guint) OSTREE_REPO_COMMIT_MODIFIER_FLAGS_GENERATE_SIZES",
-        "2",
-    ),
     ("(guint) OSTREE_REPO_COMMIT_MODIFIER_FLAGS_NONE", "0"),
     ("(guint) OSTREE_REPO_COMMIT_MODIFIER_FLAGS_SKIP_XATTRS", "1"),
     ("(guint) OSTREE_REPO_COMMIT_STATE_FSCK_PARTIAL", "2"),
@@ -687,6 +359,8 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[
     ("(guint) OSTREE_REPO_LIST_REFS_EXT_EXCLUDE_MIRRORS", "4"),
     ("(guint) OSTREE_REPO_LIST_REFS_EXT_EXCLUDE_REMOTES", "2"),
     ("(guint) OSTREE_REPO_LIST_REFS_EXT_NONE", "0"),
+    ("(gint) OSTREE_REPO_LOCK_EXCLUSIVE", "1"),
+    ("(gint) OSTREE_REPO_LOCK_SHARED", "0"),
     ("OSTREE_REPO_METADATA_REF", "ostree-metadata"),
     ("(gint) OSTREE_REPO_MODE_ARCHIVE", "1"),
     ("(gint) OSTREE_REPO_MODE_ARCHIVE_Z2", "1"),
@@ -709,14 +383,11 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[
     ("(gint) OSTREE_REPO_REMOTE_CHANGE_REPLACE", "4"),
     ("(guint) OSTREE_REPO_RESOLVE_REV_EXT_LOCAL_ONLY", "1"),
     ("(guint) OSTREE_REPO_RESOLVE_REV_EXT_NONE", "0"),
-    (
+    ("(guint) OSTREE_REPO_VERIFY_FLAGS_NONE", "0"),
-        "(guint) OSTREE_SEPOLICY_RESTORECON_FLAGS_ALLOW_NOLABEL",
+    ("(guint) OSTREE_REPO_VERIFY_FLAGS_NO_GPG", "1"),
-        "1",
+    ("(guint) OSTREE_REPO_VERIFY_FLAGS_NO_SIGNAPI", "2"),
-    ),
+    ("(guint) OSTREE_SEPOLICY_RESTORECON_FLAGS_ALLOW_NOLABEL", "1"),
-    (
+    ("(guint) OSTREE_SEPOLICY_RESTORECON_FLAGS_KEEP_EXISTING", "2"),
-        "(guint) OSTREE_SEPOLICY_RESTORECON_FLAGS_KEEP_EXISTING",
-        "2",
-    ),
     ("(guint) OSTREE_SEPOLICY_RESTORECON_FLAGS_NONE", "0"),
     ("OSTREE_SHA256_DIGEST_LEN", "32"),
     ("OSTREE_SHA256_STRING_LEN", "64"),
@@ -726,40 +397,19 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[
     ("(gint) OSTREE_STATIC_DELTA_INDEX_FLAGS_NONE", "0"),
     ("OSTREE_SUMMARY_GVARIANT_STRING", "(a(s(taya{sv}))a{sv})"),
     ("OSTREE_SUMMARY_SIG_GVARIANT_STRING", "a{sv}"),
-    (
+    ("(guint) OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_NONE", "0"),
-        "(guint) OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_NONE",
+    ("(guint) OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_NOT_DEFAULT", "2"),
-        "0",
+    ("(guint) OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_NO_CLEAN", "4"),
-    ),
+    ("(guint) OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_RETAIN", "1"),
-    (
+    ("(guint) OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_RETAIN_PENDING", "8"),
-        "(guint) OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_NOT_DEFAULT",
+    ("(guint) OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_RETAIN_ROLLBACK", "16"),
-        "2",
+    ("(guint) OSTREE_SYSROOT_UPGRADER_FLAGS_IGNORE_UNCONFIGURED", "2"),
-    ),
+    ("(guint) OSTREE_SYSROOT_UPGRADER_FLAGS_STAGE", "4"),
-    (
+    ("(guint) OSTREE_SYSROOT_UPGRADER_PULL_FLAGS_ALLOW_OLDER", "1"),
-        "(guint) OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_NO_CLEAN",
-        "4",
-    ),
-    (
-        "(guint) OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_RETAIN",
-        "1",
-    ),
-    (
-        "(guint) OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_RETAIN_PENDING",
-        "8",
-    ),
-    (
-        "(guint) OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_RETAIN_ROLLBACK",
-        "16",
-    ),
-    (
-        "(guint) OSTREE_SYSROOT_UPGRADER_FLAGS_IGNORE_UNCONFIGURED",
-        "2",
-    ),
-    (
-        "(guint) OSTREE_SYSROOT_UPGRADER_PULL_FLAGS_ALLOW_OLDER",
-        "1",
-    ),
     ("(guint) OSTREE_SYSROOT_UPGRADER_PULL_FLAGS_NONE", "0"),
     ("(guint) OSTREE_SYSROOT_UPGRADER_PULL_FLAGS_SYNTHETIC", "2"),
     ("OSTREE_TIMESTAMP", "0"),
     ("OSTREE_TREE_GVARIANT_STRING", "(a(say)a(sayay))"),
 ];
+
+

rust-bindings/rust/sys/tests/constant.c

@@ -28,6 +28,7 @@
     printf("\n");
 
 int main() {
+    PRINT_CONSTANT((guint) OSTREE_CHECKSUM_FLAGS_CANONICAL_PERMISSIONS);
     PRINT_CONSTANT((guint) OSTREE_CHECKSUM_FLAGS_IGNORE_XATTRS);
     PRINT_CONSTANT((guint) OSTREE_CHECKSUM_FLAGS_NONE);
     PRINT_CONSTANT(OSTREE_COMMIT_GVARIANT_STRING);
@@ -52,6 +53,7 @@ int main() {
     PRINT_CONSTANT((gint) OSTREE_GPG_ERROR_MISSING_KEY);
     PRINT_CONSTANT((gint) OSTREE_GPG_ERROR_NO_SIGNATURE);
     PRINT_CONSTANT((gint) OSTREE_GPG_ERROR_REVOKED_KEY);
+    PRINT_CONSTANT(OSTREE_GPG_KEY_GVARIANT_STRING);
     PRINT_CONSTANT((gint) OSTREE_GPG_SIGNATURE_ATTR_EXP_TIMESTAMP);
     PRINT_CONSTANT((gint) OSTREE_GPG_SIGNATURE_ATTR_FINGERPRINT);
     PRINT_CONSTANT((gint) OSTREE_GPG_SIGNATURE_ATTR_FINGERPRINT_PRIMARY);
@@ -114,6 +116,8 @@ int main() {
     PRINT_CONSTANT((guint) OSTREE_REPO_LIST_REFS_EXT_EXCLUDE_MIRRORS);
     PRINT_CONSTANT((guint) OSTREE_REPO_LIST_REFS_EXT_EXCLUDE_REMOTES);
     PRINT_CONSTANT((guint) OSTREE_REPO_LIST_REFS_EXT_NONE);
+    PRINT_CONSTANT((gint) OSTREE_REPO_LOCK_EXCLUSIVE);
+    PRINT_CONSTANT((gint) OSTREE_REPO_LOCK_SHARED);
     PRINT_CONSTANT(OSTREE_REPO_METADATA_REF);
     PRINT_CONSTANT((gint) OSTREE_REPO_MODE_ARCHIVE);
     PRINT_CONSTANT((gint) OSTREE_REPO_MODE_ARCHIVE_Z2);
@@ -136,6 +140,9 @@ int main() {
     PRINT_CONSTANT((gint) OSTREE_REPO_REMOTE_CHANGE_REPLACE);
     PRINT_CONSTANT((guint) OSTREE_REPO_RESOLVE_REV_EXT_LOCAL_ONLY);
     PRINT_CONSTANT((guint) OSTREE_REPO_RESOLVE_REV_EXT_NONE);
+    PRINT_CONSTANT((guint) OSTREE_REPO_VERIFY_FLAGS_NONE);
+    PRINT_CONSTANT((guint) OSTREE_REPO_VERIFY_FLAGS_NO_GPG);
+    PRINT_CONSTANT((guint) OSTREE_REPO_VERIFY_FLAGS_NO_SIGNAPI);
     PRINT_CONSTANT((guint) OSTREE_SEPOLICY_RESTORECON_FLAGS_ALLOW_NOLABEL);
     PRINT_CONSTANT((guint) OSTREE_SEPOLICY_RESTORECON_FLAGS_KEEP_EXISTING);
     PRINT_CONSTANT((guint) OSTREE_SEPOLICY_RESTORECON_FLAGS_NONE);
@@ -154,6 +161,7 @@ int main() {
     PRINT_CONSTANT((guint) OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_RETAIN_PENDING);
     PRINT_CONSTANT((guint) OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_RETAIN_ROLLBACK);
     PRINT_CONSTANT((guint) OSTREE_SYSROOT_UPGRADER_FLAGS_IGNORE_UNCONFIGURED);
+    PRINT_CONSTANT((guint) OSTREE_SYSROOT_UPGRADER_FLAGS_STAGE);
     PRINT_CONSTANT((guint) OSTREE_SYSROOT_UPGRADER_PULL_FLAGS_ALLOW_OLDER);
     PRINT_CONSTANT((guint) OSTREE_SYSROOT_UPGRADER_PULL_FLAGS_NONE);
     PRINT_CONSTANT((guint) OSTREE_SYSROOT_UPGRADER_PULL_FLAGS_SYNTHETIC);

rust-bindings/rust/sys/tests/layout.c

@@ -43,6 +43,7 @@ int main() {
     printf("%s;%zu;%zu\n", "OstreeRepoFinderResultv", sizeof(OstreeRepoFinderResultv), alignof(OstreeRepoFinderResultv));
     printf("%s;%zu;%zu\n", "OstreeRepoListObjectsFlags", sizeof(OstreeRepoListObjectsFlags), alignof(OstreeRepoListObjectsFlags));
     printf("%s;%zu;%zu\n", "OstreeRepoListRefsExtFlags", sizeof(OstreeRepoListRefsExtFlags), alignof(OstreeRepoListRefsExtFlags));
+    printf("%s;%zu;%zu\n", "OstreeRepoLockType", sizeof(OstreeRepoLockType), alignof(OstreeRepoLockType));
     printf("%s;%zu;%zu\n", "OstreeRepoMode", sizeof(OstreeRepoMode), alignof(OstreeRepoMode));
     printf("%s;%zu;%zu\n", "OstreeRepoPruneFlags", sizeof(OstreeRepoPruneFlags), alignof(OstreeRepoPruneFlags));
     printf("%s;%zu;%zu\n", "OstreeRepoPruneOptions", sizeof(OstreeRepoPruneOptions), alignof(OstreeRepoPruneOptions));
@@ -50,6 +51,7 @@ int main() {
     printf("%s;%zu;%zu\n", "OstreeRepoRemoteChange", sizeof(OstreeRepoRemoteChange), alignof(OstreeRepoRemoteChange));
     printf("%s;%zu;%zu\n", "OstreeRepoResolveRevExtFlags", sizeof(OstreeRepoResolveRevExtFlags), alignof(OstreeRepoResolveRevExtFlags));
     printf("%s;%zu;%zu\n", "OstreeRepoTransactionStats", sizeof(OstreeRepoTransactionStats), alignof(OstreeRepoTransactionStats));
+    printf("%s;%zu;%zu\n", "OstreeRepoVerifyFlags", sizeof(OstreeRepoVerifyFlags), alignof(OstreeRepoVerifyFlags));
     printf("%s;%zu;%zu\n", "OstreeSePolicyRestoreconFlags", sizeof(OstreeSePolicyRestoreconFlags), alignof(OstreeSePolicyRestoreconFlags));
     printf("%s;%zu;%zu\n", "OstreeSignInterface", sizeof(OstreeSignInterface), alignof(OstreeSignInterface));
     printf("%s;%zu;%zu\n", "OstreeStaticDeltaGenerateOpt", sizeof(OstreeStaticDeltaGenerateOpt), alignof(OstreeStaticDeltaGenerateOpt));