Rebase on debian 2022.1-3

Makefile-bash.am

@@ -15,9 +15,7 @@
 # Lesser General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# License along with this library. If not, see <https://www.gnu.org/licenses/>.
 
 completionsdir = @BASH_COMPLETIONSDIR@
 dist_completions_DATA = bash/ostree

Makefile-boot.am

@@ -15,9 +15,7 @@
 # Lesser General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# License along with this library. If not, see <https://www.gnu.org/licenses/>.
 
 if BUILDOPT_DRACUT
 # Not using $(libdir) here is intentional, dracut modules go in prefix/lib
@@ -65,7 +63,7 @@ endif
 
 EXTRA_DIST += src/boot/dracut/module-setup.sh \
  src/boot/dracut/ostree.conf \
- src/boot/mkinitcpio/ostree \
+ src/boot/mkinitcpio \
  src/boot/ostree-prepare-root.service \
  src/boot/ostree-finalize-staged.path \
  src/boot/ostree-remount.service \

Makefile-decls.am

@@ -13,9 +13,7 @@
 # Lesser General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# License along with this library. If not, see <https://www.gnu.org/licenses/>.
 
 # Common variables
 AM_CPPFLAGS =

Makefile-libostree-defines.am

@@ -16,18 +16,18 @@
 # Lesser General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# License along with this library. If not, see <https://www.gnu.org/licenses/>.
 
 libostree_public_headers = \
  src/libostree/ostree.h \
  src/libostree/ostree-async-progress.h \
  src/libostree/ostree-autocleanups.h \
+ src/libostree/ostree-content-writer.h \
  src/libostree/ostree-core.h \
  src/libostree/ostree-dummy-enumtypes.h \
  src/libostree/ostree-mutable-tree.h \
  src/libostree/ostree-repo.h \
+ src/libostree/ostree-repo-os.h \
  src/libostree/ostree-types.h \
  src/libostree/ostree-repo-file.h \
  src/libostree/ostree-diff.h \

Makefile-libostree.am

@@ -15,24 +15,13 @@
 # Lesser General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# License along with this library. If not, see <https://www.gnu.org/licenses/>.
 
 include Makefile-libostree-defines.am
 
-
-if ENABLE_RUST
-bupsplitpath = @abs_top_builddir@/target/@RUST_TARGET_SUBDIR@/libbupsplit_rs.a
-BUPSPLIT_RUST_SRCS = rust/src/bupsplit.rs
-EXTRA_DIST += $(BUPSPLIT_RUST_SRCS)
-$(bupsplitpath): Makefile $(BUPSPLIT_RUST_SRCS)
- cd $(top_srcdir)/rust && CARGO_TARGET_DIR=@abs_top_builddir@/target cargo build --verbose $(CARGO_RELEASE_ARGS)
-else
 bupsplitpath = libbupsplit.la
 noinst_LTLIBRARIES += libbupsplit.la
 libbupsplit_la_SOURCES = src/libostree/bupsplit.h src/libostree/bupsplit.c
-endif # ENABLE_RUST
 
 lib_LTLIBRARIES += libostree-1.la
 
@@ -75,6 +64,8 @@ libostree_1_la_SOURCES = \
  src/libostree/ostree-checksum-input-stream.h \
  src/libostree/ostree-chain-input-stream.c \
  src/libostree/ostree-chain-input-stream.h \
+ src/libostree/ostree-content-writer.c \
+ src/libostree/ostree-content-writer.h \
  src/libostree/ostree-lzma-common.c \
  src/libostree/ostree-lzma-common.h \
  src/libostree/ostree-lzma-compressor.c \
@@ -92,6 +83,7 @@ libostree_1_la_SOURCES = \
  src/libostree/ostree-ref.c \
  src/libostree/ostree-remote.c \
  src/libostree/ostree-remote-private.h \
+ src/libostree/ostree-repo-os.c \
  src/libostree/ostree-repo.c \
  src/libostree/ostree-repo-checkout.c \
  src/libostree/ostree-repo-commit.c \
@@ -101,6 +93,7 @@ libostree_1_la_SOURCES = \
  src/libostree/ostree-repo-libarchive.c \
  src/libostree/ostree-repo-prune.c \
  src/libostree/ostree-repo-refs.c \
+ src/libostree/ostree-repo-verity.c \
  src/libostree/ostree-repo-traverse.c \
  src/libostree/ostree-repo-private.h \
  src/libostree/ostree-repo-file.c \
@@ -151,15 +144,7 @@ endif
 if HAVE_LIBSOUP_CLIENT_CERTS
 libostree_1_la_SOURCES += \
  src/libostree/ostree-tls-cert-interaction.c \
- src/libostree/ostree-tls-cert-interaction.h \
- $(NULL)
-endif
-libostree_experimental_headers = \
- $(NULL)
-if !ENABLE_EXPERIMENTAL_API
-libostree_1_la_SOURCES += $(libostree_experimental_headers)
-else # if ENABLE_EXPERIMENTAL_API
-libostree_1_la_SOURCES += \
+ src/libostree/ostree-tls-cert-interaction-private.h \
  $(NULL)
 endif
 
@@ -185,10 +170,10 @@ endif # USE_GPGME
 
 symbol_files = $(top_srcdir)/src/libostree/libostree-released.sym
 
-## Uncomment this include when adding new development symbols.
-#if BUILDOPT_IS_DEVEL_BUILD
-#symbol_files += $(top_srcdir)/src/libostree/libostree-devel.sym
-#endif
+# Uncomment this include when adding new development symbols.
+# if BUILDOPT_IS_DEVEL_BUILD
+# symbol_files += $(top_srcdir)/src/libostree/libostree-devel.sym
+# endif
 
 # http://blog.jgc.org/2007/06/escaping-comma-and-space-in-gnu-make.html
 wl_versionscript_arg = -Wl,--version-script=
@@ -204,9 +189,6 @@ libostree_1_la_LDFLAGS = -version-number 1:0:0 -Bsymbolic-functions $(addprefix
 libostree_1_la_LIBADD = libotutil.la libglnx.la libbsdiff.la $(OT_INTERNAL_GIO_UNIX_LIBS) $(OT_INTERNAL_GPGME_LIBS) \
  $(OT_DEP_LZMA_LIBS) $(OT_DEP_ZLIB_LIBS) $(OT_DEP_CRYPTO_LIBS)
 # Some change between rust-1.21.0-1.fc27 and rust-1.22.1-1.fc27.x86_64
-if ENABLE_RUST
-libostree_1_la_LIBADD += -ldl
-endif
 libostree_1_la_LIBADD += $(bupsplitpath)
 EXTRA_libostree_1_la_DEPENDENCIES = $(symbol_files)
 
@@ -291,13 +273,9 @@ OSTree-1.0.gir: libostree-1.la Makefile
 OSTree_1_0_gir_EXPORT_PACKAGES = ostree-1
 OSTree_1_0_gir_INCLUDES = Gio-2.0
 OSTree_1_0_gir_CFLAGS = $(libostree_1_la_CFLAGS)
-if ENABLE_EXPERIMENTAL_API
-# When compiling this is set via config.h, but g-ir-scanner can't use that
-OSTree_1_0_gir_CFLAGS += -DOSTREE_ENABLE_EXPERIMENTAL_API=1
-endif
 OSTree_1_0_gir_LIBS = libostree-1.la
 OSTree_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=Ostree --symbol-prefix=ostree $(GI_SCANNERFLAGS)
-OSTree_1_0_gir_FILES = $(libostreeinclude_HEADERS) $(filter-out %-private.h %/ostree-soup-uri.h $(libostree_experimental_headers),$(libostree_1_la_SOURCES))
+OSTree_1_0_gir_FILES = $(libostreeinclude_HEADERS) $(filter-out %-private.h %/ostree-soup-uri.h,$(libostree_1_la_SOURCES))
 INTROSPECTION_GIRS += OSTree-1.0.gir
 gir_DATA += OSTree-1.0.gir
 typelib_DATA += OSTree-1.0.typelib

Makefile-man.am

@@ -15,9 +15,7 @@
 # Lesser General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# License along with this library. If not, see <https://www.gnu.org/licenses/>.
 
 if ENABLE_MAN
 

Makefile-ostree.am

@@ -15,9 +15,7 @@
 # Lesser General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# License along with this library. If not, see <https://www.gnu.org/licenses/>.
 
 bin_PROGRAMS += ostree
 
@@ -60,11 +58,6 @@ nodist_ostree_SOURCES = \
  src/ostree/parse-datetime.c \
  $(NULL)
 
-if ENABLE_EXPERIMENTAL_API
-ostree_SOURCES += \
- $(NULL)
-endif
-
 if USE_GPGME
 ostree_SOURCES += \
  src/ostree/ot-builtin-gpg-sign.c \
@@ -110,6 +103,7 @@ ostree_SOURCES += \
 if USE_GPGME
 ostree_SOURCES += \
  src/ostree/ot-remote-builtin-gpg-import.c \
+ src/ostree/ot-remote-builtin-gpg-list-keys.c \
  $(NULL)
 endif
 

Makefile-otutil.am

@@ -15,9 +15,7 @@
 # Lesser General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# License along with this library. If not, see <https://www.gnu.org/licenses/>.
 
 noinst_LTLIBRARIES += libotutil.la
 
@@ -49,6 +47,8 @@ if USE_GPGME
 libotutil_la_SOURCES += \
  src/libotutil/ot-gpg-utils.c \
  src/libotutil/ot-gpg-utils.h \
+ src/libotutil/zbase32.c \
+ src/libotutil/zbase32.h \
  $(NULL)
 endif
 

Makefile-switchroot.am

@@ -13,9 +13,7 @@
 # Lesser General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# License along with this library. If not, see <https://www.gnu.org/licenses/>.
 
 if BUILDOPT_SYSTEMD
 ostree_boot_PROGRAMS += ostree-remount

Makefile-tests.am

@@ -15,9 +15,7 @@
 # Lesser General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# License along with this library. If not, see <https://www.gnu.org/licenses/>.
 
 EXTRA_DIST += \
  buildutil/tap-driver.sh \
@@ -64,11 +62,13 @@ _installed_or_uninstalled_test_scripts = \
  tests/test-basic-user.sh \
  tests/test-basic-user-only.sh \
  tests/test-basic-root.sh \
+ tests/test-cli-extensions.sh \
  tests/test-pull-subpath.sh \
  tests/test-archivez.sh \
  tests/test-remote-add.sh \
  tests/test-remote-headers.sh \
  tests/test-commit-sign.sh \
+ tests/test-commit-timestamp.sh \
  tests/test-export.sh \
  tests/test-help.sh \
  tests/test-libarchive.sh \
@@ -151,13 +151,12 @@ _installed_or_uninstalled_test_scripts = \
 if USE_GPGME
 _installed_or_uninstalled_test_scripts += \
  tests/test-remote-gpg-import.sh \
+ tests/test-remote-gpg-list-keys.sh \
  tests/test-gpg-signed-commit.sh \
  tests/test-admin-gpg.sh \
  $(NULL)
 endif
 
-experimental_test_scripts = \
- $(NULL)
 test_extra_programs = \
  tests/get-byte-order \
  tests/repo-finder-mount \
@@ -171,12 +170,6 @@ tests_repo_finder_mount_SOURCES = tests/repo-finder-mount.c
 tests_repo_finder_mount_CFLAGS = $(common_tests_cflags)
 tests_repo_finder_mount_LDADD = $(common_tests_ldadd) libostreetest.la
 
-if ENABLE_EXPERIMENTAL_API
-_installed_or_uninstalled_test_scripts += $(experimental_test_scripts)
-else
-EXTRA_DIST += $(experimental_test_scripts)
-endif
-
 if BUILDOPT_FUSE
 _installed_or_uninstalled_test_scripts += tests/test-rofiles-fuse.sh
 uninstalled_test_data += tests/rofiles-fuse-symlink-stamp
@@ -397,6 +390,10 @@ tests_test_rfc2616_dates_SOURCES = \
 tests_test_rfc2616_dates_CFLAGS = $(TESTS_CFLAGS)
 tests_test_rfc2616_dates_LDADD = $(TESTS_LDADD)
 
+noinst_PROGRAMS += tests/test-commit-sign-sh-ext
+tests_test_commit_sign_sh_ext_CFLAGS = $(TESTS_CFLAGS)
+tests_test_commit_sign_sh_ext_LDADD = $(TESTS_LDADD)
+
 if USE_GPGME
 tests_test_gpg_verify_result_SOURCES = \
  src/libostree/ostree-gpg-verify-result-private.h \
@@ -439,8 +436,11 @@ if ENABLE_INSTALLED_TESTS_EXCLUSIVE
 dist_installed_test_scripts = $(_installed_or_uninstalled_test_scripts)
 installed_test_programs = $(_installed_or_uninstalled_test_programs)
 check-local:
+ echo "NOTE: Run the Rust installed tests (uninstalled) with ./tests/run-installed"
  echo "NOTE: Exclusive installed tests are enabled; to run them, make install, then: gnome-desktop-testing-runner -p 0 libostree/"
 else
+check-local:
+ echo "NOTE: Run the Rust installed tests (uninstalled) with ./tests/run-installed"
 dist_test_scripts += $(_installed_or_uninstalled_test_scripts)
 test_programs += $(_installed_or_uninstalled_test_programs)
 endif

Makefile.am

@@ -13,9 +13,7 @@
 # Lesser General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# License along with this library. If not, see <https://www.gnu.org/licenses/>.
 
 include Makefile-decls.am
 
@@ -31,7 +29,7 @@ AM_CPPFLAGS += -DDATADIR='"$(datadir)"' -DLIBEXECDIR='"$(libexecdir)"' \
  -DOSTREE_COMPILATION \
  -DG_LOG_DOMAIN=\"OSTree\" \
  -DOSTREE_GITREV='"$(OSTREE_GITREV)"' \
- -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_40 '-DGLIB_VERSION_MAX_ALLOWED=G_ENCODE_VERSION(2,50)' \
+ -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_44 '-DGLIB_VERSION_MAX_ALLOWED=G_ENCODE_VERSION(2,50)' \
  -DSOUP_VERSION_MIN_REQUIRED=SOUP_VERSION_2_40 '-DSOUP_VERSION_MAX_ALLOWED=G_ENCODE_VERSION(2,48)'
 # For strict aliasing, see https://bugzilla.gnome.org/show_bug.cgi?id=791622
 AM_CFLAGS += -std=gnu99 -fno-strict-aliasing $(WARN_CFLAGS)
@@ -46,6 +44,18 @@ GITIGNOREFILES = aclocal.m4 build-aux/ buildutil/*.m4 config.h.in gtk-doc.make
 # Generated by coreos-assembler build-fast and kola
 GITIGNOREFILES += fastbuild-*.qcow2 _kola_temp/
 
+# Rust stuff
+GITIGNOREFILES += target/ Cargo.lock
+
+# Jekyll docs
+GITIGNOREFILES += \
+ docs/.bundle/ \
+ docs/Gemfile.lock \
+ docs/_site/ \
+ docs/reference/ \
+ docs/vendor/ \
+ $(NULL)
+
 SUBDIRS += .
 
 if ENABLE_GTK_DOC
@@ -71,30 +81,6 @@ GIRS =
 TYPELIBS = $(GIRS:.gir=.typelib)
 endif
 
-# These bits based on gnome:librsvg/Makefile.am
-if ENABLE_RUST
-if RUST_DEBUG
-CARGO_RELEASE_ARGS=
-else
-CARGO_RELEASE_ARGS=--release
-endif
-
-check-local:
- cd $(srcdir)/rust && CARGO_TARGET_DIR=$(abs_top_builddir)/target cargo test
-
-clean-local:
- cd $(srcdir)/rust && CARGO_TARGET_DIR=$(abs_top_builddir)/target cargo clean
-
-dist-hook:
- (cd $(distdir)/rust && \
- cp $(abs_top_srcdir)/rust/Cargo.lock . && \
- cargo vendor -q && \
- mkdir .cargo && \
- cp cargo-vendor-config .cargo/config)
-
-EXTRA_DIST += $(srcdir)/rust/Cargo.toml $(srcdir)/rust/cargo-vendor-config
-endif # end ENABLE_RUST
-
 libglnx_srcpath := $(srcdir)/libglnx
 libglnx_cflags := $(OT_DEP_GIO_UNIX_CFLAGS) "-I$(libglnx_srcpath)"
 libglnx_libs := $(OT_DEP_GIO_UNIX_LIBS)