New upstream version 2022.3

tests/repo-finder-mount.c

@@ -1,5 +1,6 @@
 /*
  * Copyright © 2017 Endless Mobile, Inc.
+ * Copyright (C) 2022 Igalia S.L.
  *
  * SPDX-License-Identifier: LGPL-2.0+
  *
@@ -47,7 +48,7 @@ result_cb (GObject      *source_object,
 static void
 collection_ref_free0 (OstreeCollectionRef *ref)
 {
-  g_clear_pointer (&ref, (GDestroyNotify) ostree_collection_ref_free);
+  g_clear_pointer (&ref, ostree_collection_ref_free);
 }
 
 int

tests/test-basic-bare-split-xattrs.sh

@@ -56,7 +56,7 @@ rm -rf -- repo files
 if [ "${PRIVILEGED}" = "true" ]; then
     COMMIT="d614c428015227259031b0f19b934dade908942fd71c49047e0daa70e7800a5d"
     cd ${test_tmpdir}
-    ${SUDO} tar --same-permissions --same-owner -xaf ${test_srcdir}/fixtures/bare-split-xattrs/basic.tar.xz
+    ${SUDO} tar --same-permissions --same-owner -xaf ${test_srcdir}/bare-split-xattrs-basic.tar.xz
     ${SUDO} ${OSTREE} fsck --all
     ${OSTREE} log ${COMMIT} > out.txt
     assert_file_has_content_literal out.txt "fixtures: bare-split-xattrs repo"

tests/test-cli-extensions.sh

@@ -15,7 +15,9 @@ echo '1..2'
 mkdir -p ./localbin
 ORIG_PATH="${PATH}"
 export PATH="./localbin/:${PATH}"
-ln -s /usr/bin/env ./localbin/ostree-env
+echo '#!/bin/sh' >> ./localbin/ostree-env
+echo 'env "$@"' >> ./localbin/ostree-env
+chmod +x ./localbin/ostree-env
 export A_CUSTOM_TEST_FLAG="myvalue"
 ${CMD_PREFIX} ostree env >out.txt
 assert_file_has_content out.txt "^A_CUSTOM_TEST_FLAG=myvalue"

tests/test-mock-gio.c

@@ -1,5 +1,6 @@
 /*
  * Copyright © 2017 Endless Mobile, Inc.
+ * Copyright (C) 2022 Igalia S.L.
  *
  * SPDX-License-Identifier: LGPL-2.0+
  *
@@ -136,7 +137,7 @@ ostree_mock_volume_monitor_new (GList *mounts,
   monitor->mounts = g_list_copy_deep (mounts, (GCopyFunc) g_object_ref, NULL);
   monitor->volumes = g_list_copy_deep (volumes, (GCopyFunc) g_object_ref, NULL);
 
-  return g_steal_pointer (&monitor);
+  return (GVolumeMonitor *)g_steal_pointer (&monitor);
 }
 
 /* Mock volume class. This returns a static set of data to the caller, which it

tests/test-prune.sh

@@ -350,7 +350,7 @@ tap_ok --commit-only and --delete-commit
 # Test --delete-commit when it creates orphaned commits
 reinitialize_commit_only_test_repo
 # get the current HEAD's parent on dev branch
-COMMIT_TO_DELETE=$(${CMD_PREFIX} ostree --repo=repo log dev | grep ^commit | cut -f 2 -d' ' | head -n 2 | tail -n 1)
+COMMIT_TO_DELETE=$(${CMD_PREFIX} ostree --repo=repo log dev | grep ^commit | cut -f 2 -d' ' | sed -ne '2p')
 ${CMD_PREFIX} ostree --repo=repo prune --commit-only --refs-only --delete-commit=$COMMIT_TO_DELETE
 # we deleted a commit that orphaned another, so we lose two commits
 assert_repo_has_n_commits repo 4