[arch-commits] Commit in ostree/trunk (PKGBUILD fusermount3.diff)

[Jan Steffens]

    Date: Friday, August 19, 2022 @ 18:18:14
  Author: heftig
Revision: 454054

2022.5-4: FS#75649 Use fusermount3

Added:
  ostree/trunk/fusermount3.diff
Modified:
  ostree/trunk/PKGBUILD

------------------+
 PKGBUILD         |    9 +++++-
 fusermount3.diff |   74 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 81 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-08-19 18:17:44 UTC (rev 454053)
+++ PKGBUILD	2022-08-19 18:18:14 UTC (rev 454054)
@@ -5,7 +5,7 @@
 pkgname=ostree
 _commit=15740d042c9c5258a1c082b5e228cf6f115edbb0  # tags/v2022.5^0
 pkgver=2022.5
-pkgrel=3
+pkgrel=4
 pkgdesc="Operating system and container binary deployment and upgrades"
 url="https://ostreedev.github.io/ostree/"
 arch=(x86_64)
@@ -19,10 +19,12 @@
   "git+https://github.com/ostreedev/ostree#commit=$_commit"
   git+https://github.com/mendsley/bsdiff
   git+https://gitlab.gnome.org/GNOME/libglnx.git
+  fusermount3.diff
 )
 b2sums=('SKIP'
         'SKIP'
-        'SKIP')
+        'SKIP'
+        '58993607327ef5408472b410f4bc05dfe9e65ddc3afc875fa28ab16cdc42f999ff63012b794905b0f90ba5a0680d5a8115923484465ddcaa7d5287666e4f71e8')
 # upstream ticket about chain of trust:
 # https://github.com/ostreedev/ostree/issues/2349
 validpgpkeys=('1CEC7A9DF7DA85ABEF843DC0A866D7CCAE087291') # Colin Walters <walters at redhat.com>
@@ -33,6 +35,9 @@
   # https://github.com/ostreedev/ostree/issues/2685
   git cherry-pick -n edba4b33be10c052 0a908a180fcce98c
 
+  # Use fusermount3
+  git apply -3 ../fusermount3.diff
+
   git submodule init
   git submodule set-url bsdiff "$srcdir/bsdiff"
   git submodule set-url libglnx "$srcdir/libglnx"

Added: fusermount3.diff
===================================================================
--- fusermount3.diff	                        (rev 0)
+++ fusermount3.diff	2022-08-19 18:18:14 UTC (rev 454054)
@@ -0,0 +1,74 @@
+diff --git i/docs/buildsystem-and-repos.md w/docs/buildsystem-and-repos.md
+index e265ee7a..2e9250d5 100644
+--- i/docs/buildsystem-and-repos.md
++++ w/docs/buildsystem-and-repos.md
+@@ -151,7 +151,7 @@ rofiles-fuse exampleos-build mnt
+ # Now run global "triggers", generate cache files:
+ ldconfig -r mnt
+   (Insert other programs here)
+-fusermount -u mnt
++fusermount3 -u mnt
+ ostree --repo=build-repo commit -b exampleos/x86_64/standard --link-checkout-speedup exampleos-build
+ ```
+ 
+diff --git i/man/rofiles-fuse.xml w/man/rofiles-fuse.xml
+index f4d23739..e8569130 100644
+--- i/man/rofiles-fuse.xml
++++ w/man/rofiles-fuse.xml
+@@ -89,7 +89,7 @@ $ mkdir mnt/anewdir
+ $ rm mnt/someoriginalcontent -rf
+ 
+ # Commit and cleanup
+-$ fusermount -u mnt
++$ fusermount3 -u mnt
+ $ ostree --repo=repo commit --link-checkout-speedup -b somebranch -s 'Commit new content' --tree=dir=branch-checkout
+ $ rm mnt branch-checkout -rf
+ 	</programlisting>
+diff --git i/tests/libtest.sh w/tests/libtest.sh
+index 686f08dc..10cc5a63 100755
+--- i/tests/libtest.sh
++++ w/tests/libtest.sh
+@@ -635,7 +635,7 @@ skip_one_without_strace_fault_injection() {
+ }
+ 
+ skip_without_fuse () {
+-    fusermount --version >/dev/null 2>&1 || skip "no fusermount"
++    fusermount3 --version >/dev/null 2>&1 || skip "no fusermount3"
+ 
+     capsh --print | grep -q 'Bounding set.*[^a-z]cap_sys_admin' || \
+         skip "No cap_sys_admin in bounding set, can't use FUSE"
+diff --git i/tests/test-demo-buildsystem.sh w/tests/test-demo-buildsystem.sh
+index 2dc78dc3..50995b87 100755
+--- i/tests/test-demo-buildsystem.sh
++++ w/tests/test-demo-buildsystem.sh
+@@ -55,7 +55,7 @@ exampleos_recompose() {
+     # Now that we have our rootfs, run triggers
+     rofiles-fuse exampleos-build mnt
+     demo_triggers mnt/
+-    fusermount -u mnt
++    fusermount3 -u mnt
+     
+     # Then we commit it, using --link-checkout-speedup to effectively
+     # only re-checksum the ldconfig file.  We also have dummy commit
+diff --git i/tests/test-rofiles-fuse.sh w/tests/test-rofiles-fuse.sh
+index a56a76c6..c61945d6 100755
+--- i/tests/test-rofiles-fuse.sh
++++ w/tests/test-rofiles-fuse.sh
+@@ -37,7 +37,7 @@ $OSTREE checkout -H test2 checkout-test2
+ 
+ rofiles-fuse checkout-test2 mnt
+ cleanup_fuse() {
+-    fusermount -u ${test_tmpdir}/mnt || true
++    fusermount3 -u ${test_tmpdir}/mnt || true
+ }
+ libtest_exit_cmds+=(cleanup_fuse)
+ assert_file_has_content mnt/firstfile first
+@@ -133,7 +133,7 @@ echo "ok flock"
+ 
+ copyup_reset() {
+     cd ${test_tmpdir}
+-    fusermount -u mnt
++    fusermount3 -u mnt
+     rm checkout-test2 -rf
+     $OSTREE checkout -H test2 checkout-test2
+     rofiles-fuse --copyup checkout-test2 mnt