Regenerate for OSTree 2020.2

rust-bindings/rust/sys/Cargo.toml

@@ -46,6 +46,7 @@ v2019_2 = ["v2018_9"]
 v2019_3 = ["v2019_2"]
 v2019_4 = ["v2019_3"]
 v2019_6 = ["v2019_4"]
+v2020_1 = ["v2019_6"]
 dox = []
 
 [lib]

rust-bindings/rust/sys/build.rs

@@ -31,7 +31,9 @@ fn main() {
 fn find() -> Result<(), Error> {
     let package_name = "ostree-1";
     let shared_libs = ["ostree-1"];
-    let version = if cfg!(feature = "v2019_6") {
+    let version = if cfg!(feature = "v2020_1") {
+        "2020.1"
+    } else if cfg!(feature = "v2019_6") {
         "2019.6"
     } else if cfg!(feature = "v2019_4") {
         "2019.4"

rust-bindings/rust/sys/src/lib.rs

@@ -36,6 +36,9 @@ pub type OstreeGpgError = c_int;
 pub const OSTREE_GPG_ERROR_NO_SIGNATURE: OstreeGpgError = 0;
 pub const OSTREE_GPG_ERROR_INVALID_SIGNATURE: OstreeGpgError = 1;
 pub const OSTREE_GPG_ERROR_MISSING_KEY: OstreeGpgError = 2;
+pub const OSTREE_GPG_ERROR_EXPIRED_SIGNATURE: OstreeGpgError = 3;
+pub const OSTREE_GPG_ERROR_EXPIRED_KEY: OstreeGpgError = 4;
+pub const OSTREE_GPG_ERROR_REVOKED_KEY: OstreeGpgError = 5;
 
 pub type OstreeGpgSignatureAttr = c_int;
 pub const OSTREE_GPG_SIGNATURE_ATTR_VALID: OstreeGpgSignatureAttr = 0;
@@ -274,6 +277,26 @@ impl ::std::fmt::Debug for OstreeCollectionRef {
     }
 }
 
+#[repr(C)]
+#[derive(Copy, Clone)]
+pub struct OstreeCommitSizesEntry {
+    pub checksum: *mut c_char,
+    pub objtype: OstreeObjectType,
+    pub unpacked: u64,
+    pub archived: u64,
+}
+
+impl ::std::fmt::Debug for OstreeCommitSizesEntry {
+    fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
+        f.debug_struct(&format!("OstreeCommitSizesEntry @ {:?}", self as *const _))
+         .field("checksum", &self.checksum)
+         .field("objtype", &self.objtype)
+         .field("unpacked", &self.unpacked)
+         .field("archived", &self.archived)
+         .finish()
+    }
+}
+
 #[repr(C)]
 #[derive(Copy, Clone)]
 pub struct OstreeDiffDirsOptions {
@@ -907,6 +930,17 @@ extern "C" {
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
     pub fn ostree_collection_ref_hash(ref_: gconstpointer) -> c_uint;
 
+    //=========================================================================
+    // OstreeCommitSizesEntry
+    //=========================================================================
+    pub fn ostree_commit_sizes_entry_get_type() -> GType;
+    #[cfg(any(feature = "v2020_1", feature = "dox"))]
+    pub fn ostree_commit_sizes_entry_new(checksum: *const c_char, objtype: OstreeObjectType, unpacked: u64, archived: u64) -> *mut OstreeCommitSizesEntry;
+    #[cfg(any(feature = "v2020_1", feature = "dox"))]
+    pub fn ostree_commit_sizes_entry_copy(entry: *const OstreeCommitSizesEntry) -> *mut OstreeCommitSizesEntry;
+    #[cfg(any(feature = "v2020_1", feature = "dox"))]
+    pub fn ostree_commit_sizes_entry_free(entry: *mut OstreeCommitSizesEntry);
+
     //=========================================================================
     // OstreeDiffItem
     //=========================================================================
@@ -1415,18 +1449,25 @@ extern "C" {
     pub fn ostree_sysroot_get_subbootversion(self_: *mut OstreeSysroot) -> c_int;
     #[cfg(any(feature = "v2016_4", feature = "dox"))]
     pub fn ostree_sysroot_init_osname(self_: *mut OstreeSysroot, osname: *const c_char, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg(any(feature = "v2020_1", feature = "dox"))]
+    pub fn ostree_sysroot_initialize(self_: *mut OstreeSysroot, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg(any(feature = "v2020_1", feature = "dox"))]
+    pub fn ostree_sysroot_is_booted(self_: *mut OstreeSysroot) -> gboolean;
     pub fn ostree_sysroot_load(self_: *mut OstreeSysroot, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
     #[cfg(any(feature = "v2016_4", feature = "dox"))]
     pub fn ostree_sysroot_load_if_changed(self_: *mut OstreeSysroot, out_changed: *mut gboolean, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
     pub fn ostree_sysroot_lock(self_: *mut OstreeSysroot, error: *mut *mut glib::GError) -> gboolean;
     pub fn ostree_sysroot_lock_async(self_: *mut OstreeSysroot, cancellable: *mut gio::GCancellable, callback: gio::GAsyncReadyCallback, user_data: gpointer);
     pub fn ostree_sysroot_lock_finish(self_: *mut OstreeSysroot, result: *mut gio::GAsyncResult, error: *mut *mut glib::GError) -> gboolean;
+    pub fn ostree_sysroot_lock_with_mount_namespace(self_: *mut OstreeSysroot, error: *mut *mut glib::GError) -> gboolean;
     pub fn ostree_sysroot_origin_new_from_refspec(self_: *mut OstreeSysroot, refspec: *const c_char) -> *mut glib::GKeyFile;
     pub fn ostree_sysroot_prepare_cleanup(self_: *mut OstreeSysroot, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
     #[cfg(any(feature = "v2017_7", feature = "dox"))]
     pub fn ostree_sysroot_query_deployments_for(self_: *mut OstreeSysroot, osname: *const c_char, out_pending: *mut *mut OstreeDeployment, out_rollback: *mut *mut OstreeDeployment);
     #[cfg(any(feature = "v2017_7", feature = "dox"))]
     pub fn ostree_sysroot_repo(self_: *mut OstreeSysroot) -> *mut OstreeRepo;
+    #[cfg(any(feature = "v2020_1", feature = "dox"))]
+    pub fn ostree_sysroot_set_mount_namespace_in_use(self_: *mut OstreeSysroot);
     pub fn ostree_sysroot_simple_write_deployment(sysroot: *mut OstreeSysroot, osname: *const c_char, new_deployment: *mut OstreeDeployment, merge_deployment: *mut OstreeDeployment, flags: OstreeSysrootSimpleWriteDeploymentFlags, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
     #[cfg(any(feature = "v2018_5", feature = "dox"))]
     pub fn ostree_sysroot_stage_tree(self_: *mut OstreeSysroot, osname: *const c_char, revision: *const c_char, origin: *mut glib::GKeyFile, merge_deployment: *mut OstreeDeployment, override_kernel_argv: *mut *mut c_char, out_new_deployment: *mut *mut OstreeDeployment, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
@@ -1498,6 +1539,8 @@ extern "C" {
     pub fn ostree_cmp_checksum_bytes(a: *const u8, b: *const u8) -> c_int;
     #[cfg(any(feature = "v2018_2", feature = "dox"))]
     pub fn ostree_commit_get_content_checksum(commit_variant: *mut glib::GVariant) -> *mut c_char;
+    #[cfg(any(feature = "v2020_1", feature = "dox"))]
+    pub fn ostree_commit_get_object_sizes(commit_variant: *mut glib::GVariant, out_sizes_entries: *mut *mut glib::GPtrArray, error: *mut *mut glib::GError) -> gboolean;
     pub fn ostree_commit_get_parent(commit_variant: *mut glib::GVariant) -> *mut c_char;
     pub fn ostree_commit_get_timestamp(commit_variant: *mut glib::GVariant) -> u64;
     pub fn ostree_content_file_parse(compressed: gboolean, content_path: *mut gio::GFile, trusted: gboolean, out_input: *mut *mut gio::GInputStream, out_file_info: *mut *mut gio::GFileInfo, out_xattrs: *mut *mut glib::GVariant, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;

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

@@ -243,6 +243,7 @@ const RUST_LAYOUTS: &[(&str, Layout)] = &[
     ("OstreeChecksumFlags", Layout {size: size_of::<OstreeChecksumFlags>(), alignment: align_of::<OstreeChecksumFlags>()}),
     ("OstreeCollectionRef", Layout {size: size_of::<OstreeCollectionRef>(), alignment: align_of::<OstreeCollectionRef>()}),
     ("OstreeCollectionRefv", Layout {size: size_of::<OstreeCollectionRefv>(), alignment: align_of::<OstreeCollectionRefv>()}),
+    ("OstreeCommitSizesEntry", Layout {size: size_of::<OstreeCommitSizesEntry>(), alignment: align_of::<OstreeCommitSizesEntry>()}),
     ("OstreeDeploymentUnlockedState", Layout {size: size_of::<OstreeDeploymentUnlockedState>(), alignment: align_of::<OstreeDeploymentUnlockedState>()}),
     ("OstreeDiffDirsOptions", Layout {size: size_of::<OstreeDiffDirsOptions>(), alignment: align_of::<OstreeDiffDirsOptions>()}),
     ("OstreeDiffFlags", Layout {size: size_of::<OstreeDiffFlags>(), alignment: align_of::<OstreeDiffFlags>()}),
@@ -305,9 +306,12 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[
     ("(guint) OSTREE_DIFF_FLAGS_NONE", "0"),
     ("OSTREE_DIRMETA_GVARIANT_STRING", "(uuua(ayay))"),
     ("OSTREE_FILEMETA_GVARIANT_STRING", "(uuua(ayay))"),
+    ("(gint) OSTREE_GPG_ERROR_EXPIRED_KEY", "4"),
+    ("(gint) OSTREE_GPG_ERROR_EXPIRED_SIGNATURE", "3"),
     ("(gint) OSTREE_GPG_ERROR_INVALID_SIGNATURE", "1"),
     ("(gint) OSTREE_GPG_ERROR_MISSING_KEY", "2"),
     ("(gint) OSTREE_GPG_ERROR_NO_SIGNATURE", "0"),
+    ("(gint) OSTREE_GPG_ERROR_REVOKED_KEY", "5"),
     ("(gint) OSTREE_GPG_SIGNATURE_ATTR_EXP_TIMESTAMP", "7"),
     ("(gint) OSTREE_GPG_SIGNATURE_ATTR_FINGERPRINT", "5"),
     ("(gint) OSTREE_GPG_SIGNATURE_ATTR_FINGERPRINT_PRIMARY", "12"),