git.iko.soy/typeable/nixpkgs
on master help sign in
ostree: 2021.6 → 2022.1

https://github.com/ostreedev/ostree/releases/tag/v2022.1 Also fix `libostree/test-basic-user.sh.test` and `libostree/test-basic-user-only.sh.test` installed tests (another instance of https://github.com/ostreedev/ostree/issues/1592). There is one new broken test `libostree/test-cli-extensions.sh.test` due to https://github.com/ostreedev/ostree/issues/2553

commit4ce30abaf613c4ff11886fd3d1f6327697b508f1 authorJan Tojnar <jtojnar@gmail.com> dateWed 23 Feb 2022, 09:42 (5 years ago) parent08372f6
3 files changed+56−47
compare with master
unifiedsplit
pkgs/tools/misc/ostree/01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch+22−24 pkgs/tools/misc/ostree/default.nix+4−4 pkgs/tools/misc/ostree/fix-1592.patch+30−19
pkgs/tools/misc/ostree/01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch+22−24
@@ -1,4 +1,4 @@
1−From 977fdfad2ceba7232b4f78144b20640d7fd0aedb Mon Sep 17 00:00:00 2001
1+From 196c2e1036ed990bca57c199f271c0359509e9f9 Mon Sep 17 00:00:00 2001
22From: Colin Walters <walters@verbum.org>
33Date: Tue, 19 Jun 2018 09:34:18 -0400
44Subject: [PATCH] Drop "ostree trivial-httpd" CLI, move to tests directory
@@ -14,19 +14,19 @@ Also at this point nothing should depend on `ostree trivial-httpd`.
1414 Makefile-ostree.am | 7 ---
1515 Makefile-tests.am | 7 +++
1616 configure.ac | 9 ---
17− man/ostree-trivial-httpd.xml | 118 -----------------------------------
17+ man/ostree-trivial-httpd.xml | 116 -----------------------------------
1818 src/ostree/main.c | 5 --
1919 tests/libtest.sh | 13 ++--
20− 7 files changed, 12 insertions(+), 153 deletions(-)
20+ 7 files changed, 12 insertions(+), 151 deletions(-)
2121 delete mode 100644 man/ostree-trivial-httpd.xml
2222
2323diff --git a/Makefile-man.am b/Makefile-man.am
24−index bc58103b..bcfde285 100644
24+index 78025fff..4aa668f6 100644
2525--- a/Makefile-man.am
2626+++ b/Makefile-man.am
27−@@ -34,12 +34,6 @@ ostree-init.1 ostree-log.1 ostree-ls.1 ostree-prune.1 ostree-pull-local.1 \
27+@@ -32,12 +32,6 @@ ostree-init.1 ostree-log.1 ostree-ls.1 ostree-prune.1 ostree-pull-local.1 \
2828 ostree-pull.1 ostree-refs.1 ostree-remote.1 ostree-reset.1 \
29− ostree-rev-parse.1 ostree-show.1 ostree-summary.1 \
29+ ostree-rev-parse.1 ostree-show.1 ostree-sign.1 ostree-summary.1 \
3030 ostree-static-delta.1
3131-if USE_LIBSOUP
3232-man1_files += ostree-trivial-httpd.1
@@ -38,10 +38,10 @@ index bc58103b..bcfde285 100644
3838 if BUILDOPT_FUSE
3939 man1_files += rofiles-fuse.1
4040diff --git a/Makefile-ostree.am b/Makefile-ostree.am
41−index f861afe4..497d99b0 100644
41+index 82af1681..dabc7004 100644
4242--- a/Makefile-ostree.am
4343+++ b/Makefile-ostree.am
44−@@ -144,13 +144,6 @@ ostree_SOURCES += src/ostree/ot-builtin-pull.c
44+@@ -138,13 +138,6 @@ ostree_SOURCES += src/ostree/ot-builtin-pull.c
4545 endif
4646
4747 if USE_LIBSOUP
@@ -56,10 +56,10 @@ index f861afe4..497d99b0 100644
5656 # This is necessary for the cookie jar bits
5757 ostree_CFLAGS += $(OT_INTERNAL_SOUP_CFLAGS)
5858diff --git a/Makefile-tests.am b/Makefile-tests.am
59−index fc2f2d91..7343b63f 100644
59+index 6bae65cf..47b3ab20 100644
6060--- a/Makefile-tests.am
6161+++ b/Makefile-tests.am
62−@@ -263,6 +263,13 @@ _installed_or_uninstalled_test_programs += \
62+@@ -275,6 +275,13 @@ _installed_or_uninstalled_test_programs += \
6363 $(NULL)
6464 endif
6565
@@ -74,10 +74,10 @@ index fc2f2d91..7343b63f 100644
7474 test_programs += tests/test-repo-finder-avahi
7575 endif
7676diff --git a/configure.ac b/configure.ac
77−index 46a900f5..2f91cdec 100644
77+index 93b98cb9..a588eea6 100644
7878--- a/configure.ac
7979+++ b/configure.ac
80−@@ -190,14 +190,6 @@ if test x$with_soup != xno; then OSTREE_FEATURES="$OSTREE_FEATURES libsoup"; fi
80+@@ -186,14 +186,6 @@ if test x$with_soup != xno; then OSTREE_FEATURES="$OSTREE_FEATURES libsoup"; fi
8181 AM_CONDITIONAL(USE_LIBSOUP, test x$with_soup != xno)
8282 AM_CONDITIONAL(HAVE_LIBSOUP_CLIENT_CERTS, test x$have_libsoup_client_certs = xyes)
8383
@@ -92,20 +92,20 @@ index 46a900f5..2f91cdec 100644
9292 AS_IF([test x$with_curl = xyes && test x$with_soup = xno], [
9393 AC_MSG_WARN([Curl enabled, but libsoup is not; libsoup is needed for tests (make check, etc.)])
9494 ])
95−@@ -617,7 +609,6 @@ echo "
96− Rust (internal oxidation): $rust_debug_release
95+@@ -606,7 +598,6 @@ echo "
96+ introspection: $found_introspection
9797 rofiles-fuse: $enable_rofiles_fuse
9898 HTTP backend: $fetcher_backend
9999- \"ostree trivial-httpd\": $enable_trivial_httpd_cmdline
100100 SELinux: $with_selinux
101+ fs-verity: $ac_cv_header_linux_fsverity_h
101102 cryptographic checksums: $with_crypto
102− systemd: $have_libsystemd
103103diff --git a/man/ostree-trivial-httpd.xml b/man/ostree-trivial-httpd.xml
104104deleted file mode 100644
105−index d03c12be..00000000
105+index 7ba1dae8..00000000
106106--- a/man/ostree-trivial-httpd.xml
107107+++ /dev/null
108−@@ -1,118 +0,0 @@
108+@@ -1,116 +0,0 @@
109109-<?xml version='1.0'?> <!--*-nxml-*-->
110110-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
111111- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
@@ -126,9 +126,7 @@ index d03c12be..00000000
126126-Lesser General Public License for more details.
127127-
128128-You should have received a copy of the GNU Lesser General Public
129−-License along with this library; if not, write to the
130−-Free Software Foundation, Inc., 59 Temple Place - Suite 330,
131−-Boston, MA 02111-1307, USA.
129+-License along with this library. If not, see <https://www.gnu.org/licenses/>.
132130--->
133131-
134132-<refentry id="ostree">
@@ -225,7 +223,7 @@ index d03c12be..00000000
225223- </refsect1>
226224-</refentry>
227225diff --git a/src/ostree/main.c b/src/ostree/main.c
228−index a523ff9a..61ea742d 100644
226+index 7d17080c..19d9b8b0 100644
229227--- a/src/ostree/main.c
230228+++ b/src/ostree/main.c
231229@@ -118,11 +118,6 @@ static OstreeCommand commands[] = {
@@ -241,10 +239,10 @@ index a523ff9a..61ea742d 100644
241239 };
242240
243241diff --git a/tests/libtest.sh b/tests/libtest.sh
244−index 3f5fd931..eacd96de 100755
242+index 686f08dc..79f8bd1f 100755
245243--- a/tests/libtest.sh
246244+++ b/tests/libtest.sh
247−@@ -160,15 +160,12 @@ fi
245+@@ -174,15 +174,12 @@ fi
248246 if test -n "${OSTREE_UNINSTALLED:-}"; then
249247 OSTREE_HTTPD=${OSTREE_UNINSTALLED}/ostree-trivial-httpd
250248 else
@@ -266,5 +264,5 @@ index 3f5fd931..eacd96de 100755
266264
267265 files_are_hardlinked() {
268266--
269−2.25.0
267+2.35.1
270268
pkgs/tools/misc/ostree/default.nix+4−4
@@ -20,7 +20,7 @@
2020, autoconf
2121, automake
2222, libtool
23−, fuse
23+, fuse3
2424, util-linuxMinimal
2525, libselinux
2626, libsodium
@@ -41,13 +41,13 @@ let
4141 ]));
4242in stdenv.mkDerivation rec {
4343 pname = "ostree";
44− version = "2021.6";
44+ version = "2022.1";
4545
4646 outputs = [ "out" "dev" "man" "installedTests" ];
4747
4848 src = fetchurl {
4949 url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz";
50− sha256 = "sha256-6AYxyxNj1HNP6dDJH2mmi+OEgWbW4EgdsZzkSpy09TE=";
50+ sha256 = "sha256-Q6AOeFaEK4o09mFvws4c4jjvQyEMykH3DmtLDSqfytU=";
5151 };
5252
5353 patches = [
@@ -90,7 +90,7 @@ in stdenv.mkDerivation rec {
9090 libsoup
9191 glib-networking
9292 gpgme
93− fuse
93+ fuse3
9494 libselinux
9595 libsodium
9696 libcap
pkgs/tools/misc/ostree/fix-1592.patch+30−19
@@ -1,8 +1,19 @@
1+--- a/tests/basic-test.sh
2++++ b/tests/basic-test.sh
3+@@ -226,7 +226,7 @@ cd ${test_tmpdir}
4+ if $OSTREE commit ${COMMIT_ARGS} -b test-bootable --bootable $test_tmpdir/checkout-test2-4 2>err.txt; then
5+ fatal "committed non-bootable tree"
6+ fi
7+-assert_file_has_content err.txt "error: .*No such file or directory"
8++assert_file_has_content err.txt "error:.*No such file or directory"
9+ echo "ok commit fails bootable if no kernel"
10+
11+ cd ${test_tmpdir}
112diff --git a/tests/pull-test.sh b/tests/pull-test.sh
2−index a8bc49a9..4a08ebb5 100644
13+index f4084290..4af5ec6f 100644
314--- a/tests/pull-test.sh
415+++ b/tests/pull-test.sh
5−@@ -275,7 +275,7 @@
16+@@ -297,7 +297,7 @@ ostree_repo_init mirrorrepo-local --mode=archive
617 if ${CMD_PREFIX} ostree --repo=mirrorrepo-local pull-local otherrepo 2>err.txt; then
718 fatal "pull with mixed refs succeeded?"
819 fi
@@ -11,7 +22,7 @@ index a8bc49a9..4a08ebb5 100644
1122 ${CMD_PREFIX} ostree --repo=mirrorrepo-local pull-local otherrepo localbranch
1223 ${CMD_PREFIX} ostree --repo=mirrorrepo-local rev-parse localbranch
1324 ${CMD_PREFIX} ostree --repo=mirrorrepo-local fsck
14−@@ -286,7 +286,7 @@
25+@@ -308,7 +308,7 @@ if ${CMD_PREFIX} ostree --repo=mirrorrepo-local pull-local otherrepo nosuchbranc
1526 fatal "pulled nonexistent branch"
1627 fi
1728 # So true
@@ -20,7 +31,7 @@ index a8bc49a9..4a08ebb5 100644
2031 echo "ok pull-local nonexistent branch"
2132
2233 cd ${test_tmpdir}
23−@@ -593,5 +593,5 @@
34+@@ -687,5 +687,5 @@ rm ostree-srv/gnomerepo/summary
2435 if ${CMD_PREFIX} ostree --repo=repo pull origin main 2>err.txt; then
2536 fatal "pull of invalid ref succeeded"
2637 fi
@@ -28,10 +39,10 @@ index a8bc49a9..4a08ebb5 100644
2839+assert_file_has_content_literal err.txt 'Fetching checksum for ref ((empty), main): Invalid rev lots of html here lots of html here lots of html here lots of'
2940 echo "ok pull got HTML for a ref"
3041diff --git a/tests/test-config.sh b/tests/test-config.sh
31−index 7e913d32..69d1675d 100755
42+index 2d9aaf53..f1e28614 100755
3243--- a/tests/test-config.sh
3344+++ b/tests/test-config.sh
34−@@ -46,7 +46,7 @@
45+@@ -44,7 +44,7 @@ assert_file_has_content list.txt "http://example\.com/ostree/repo/"
3546 if ${CMD_PREFIX} ostree config --repo=repo get --group=core lock-timeout-secs extra 2>err.txt; then
3647 assert_not_reached "ostree config get should error out if too many arguments are given"
3748 fi
@@ -40,7 +51,7 @@ index 7e913d32..69d1675d 100755
4051 echo "ok config get"
4152
4253 ${CMD_PREFIX} ostree config --repo=repo set core.mode bare-user-only
43−@@ -63,7 +63,7 @@
54+@@ -61,7 +61,7 @@ assert_file_has_content repo/config "http://example\.com/ostree/"
4455 if ${CMD_PREFIX} ostree config --repo=repo set --group=core lock-timeout-secs 120 extra 2>err.txt; then
4556 assert_not_reached "ostree config set should error out if too many arguments are given"
4657 fi
@@ -48,8 +59,8 @@ index 7e913d32..69d1675d 100755
4859+assert_file_has_content err.txt "Too many arguments given"
4960 echo "ok config set"
5061
51− # Check that "ostree config unset" works
52−@@ -78,7 +78,7 @@
62+ # Check that using `--` works and that "ostree config unset" works
63+@@ -78,7 +78,7 @@ if ${CMD_PREFIX} ostree config --repo=repo get core.lock-timeout-secs 2>err.txt;
5364 fi
5465 # Check for any character where quotation marks would be as they appear differently in the Fedora and Debian
5566 # test suites (“” and '' respectively). See: https://github.com/ostreedev/ostree/pull/1839
@@ -58,7 +69,7 @@ index 7e913d32..69d1675d 100755
5869
5970 # Check that it's idempotent
6071 ${CMD_PREFIX} ostree config --repo=repo unset core.lock-timeout-secs
61−@@ -95,5 +95,5 @@
72+@@ -95,5 +95,5 @@ ${CMD_PREFIX} ostree config --repo=repo unset --group='remote "aoeuhtns"' 'xa.ti
6273 if ${CMD_PREFIX} ostree config --repo=repo unset core.lock-timeout-secs extra 2>err.txt; then
6374 assert_not_reached "ostree config unset should error out if too many arguments are given"
6475 fi
@@ -66,10 +77,10 @@ index 7e913d32..69d1675d 100755
6677+assert_file_has_content err.txt "Too many arguments given"
6778 echo "ok config unset"
6879diff --git a/tests/test-fsck-collections.sh b/tests/test-fsck-collections.sh
69−index dc6bcfeb..4a5eef55 100755
80+index 3dbcdd23..d6359979 100755
7081--- a/tests/test-fsck-collections.sh
7182+++ b/tests/test-fsck-collections.sh
72−@@ -100,7 +100,7 @@
83+@@ -98,7 +98,7 @@ ${CMD_PREFIX} ostree fsck --repo=repo
7384 if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then
7485 assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!"
7586 fi
@@ -78,7 +89,7 @@ index dc6bcfeb..4a5eef55 100755
7889 assert_file_has_content fsck "^Validating refs\.\.\.$"
7990
8091 echo "ok 3 fsck detects missing ref bindings"
81−@@ -113,7 +113,7 @@
92+@@ -111,7 +111,7 @@ ${CMD_PREFIX} ostree --repo=repo refs --collections --create=org.example.Collect
8293 if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then
8394 assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!"
8495 fi
@@ -87,7 +98,7 @@ index dc6bcfeb..4a5eef55 100755
8798 assert_file_has_content fsck "^Validating refs\.\.\.$"
8899 assert_file_has_content fsck "^Validating refs in collections\.\.\.$"
89100
90−@@ -127,7 +127,7 @@
101+@@ -125,7 +125,7 @@ ${CMD_PREFIX} ostree --repo=repo refs --collections --create=org.example.Collect
91102 if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then
92103 assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!"
93104 fi
@@ -96,7 +107,7 @@ index dc6bcfeb..4a5eef55 100755
96107 assert_file_has_content fsck "^Validating refs\.\.\.$"
97108 assert_file_has_content fsck "^Validating refs in collections\.\.\.$"
98109
99−@@ -147,7 +147,7 @@
110+@@ -145,7 +145,7 @@ echo "ok 6 fsck ignores unreferenced ref bindings"
100111 if ${CMD_PREFIX} ostree fsck --repo=repo --verify-back-refs > fsck 2> fsck-error; then
101112 assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!"
102113 fi
@@ -105,7 +116,7 @@ index dc6bcfeb..4a5eef55 100755
105116 assert_file_has_content fsck "^Validating refs\.\.\.$"
106117 assert_file_has_content fsck "^Validating refs in collections\.\.\.$"
107118
108−@@ -186,7 +186,7 @@
119+@@ -184,7 +184,7 @@ ${CMD_PREFIX} ostree --repo=repo refs --create=new-ref $(cat ref3-checksum)
109120 if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then
110121 assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!"
111122 fi
@@ -114,7 +125,7 @@ index dc6bcfeb..4a5eef55 100755
114125 assert_file_has_content fsck "^Validating refs\.\.\.$"
115126
116127 echo "ok 9 fsck detects missing ref bindings"
117−@@ -205,7 +205,7 @@
128+@@ -203,7 +203,7 @@ echo "ok 10 fsck ignores unreferenced ref bindings"
118129 if ${CMD_PREFIX} ostree fsck --repo=repo --verify-back-refs > fsck 2> fsck-error; then
119130 assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!"
120131 fi
@@ -124,10 +135,10 @@ index dc6bcfeb..4a5eef55 100755
124135
125136 echo "ok 11 fsck ignores unreferenced ref bindings"
126137diff --git a/tests/test-remote-add.sh b/tests/test-remote-add.sh
127−index bb7eae89..62a3bcd7 100755
138+index 2f5ea634..0f63853c 100755
128139--- a/tests/test-remote-add.sh
129140+++ b/tests/test-remote-add.sh
130−@@ -83,7 +83,7 @@
141+@@ -81,7 +81,7 @@ echo "ok remote delete"
131142 if $OSTREE remote delete nosuchremote 2>err.txt; then
132143 assert_not_reached "Deleting remote unexpectedly succeeded"
133144 fi