diff --git a/Makefile-bash.am b/Makefile-bash.am index 2cb03151..b42f6bfa 100644 --- a/Makefile-bash.am +++ b/Makefile-bash.am @@ -2,6 +2,8 @@ # # Copyright (C) 2017 Red Hat Inc. # +# SPDX-License-Identifier: LGPL-2.0+ +# # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either diff --git a/Makefile-boot.am b/Makefile-boot.am index 828187ec..d3d2f673 100644 --- a/Makefile-boot.am +++ b/Makefile-boot.am @@ -2,6 +2,8 @@ # # Copyright (C) 2013 Colin Walters # +# SPDX-License-Identifier: LGPL-2.0+ +# # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either diff --git a/Makefile-decls.am b/Makefile-decls.am index 06018594..115c19fb 100644 --- a/Makefile-decls.am +++ b/Makefile-decls.am @@ -1,5 +1,7 @@ # Copyright (C) 2011,2014 Colin Walters # +# SPDX-License-Identifier: LGPL-2.0+ +# # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either diff --git a/Makefile-libostree-defines.am b/Makefile-libostree-defines.am index 3fba576b..58f77a2c 100644 --- a/Makefile-libostree-defines.am +++ b/Makefile-libostree-defines.am @@ -3,6 +3,8 @@ # # Copyright (C) 2013 Colin Walters # +# SPDX-License-Identifier: LGPL-2.0+ +# # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either diff --git a/Makefile-libostree.am b/Makefile-libostree.am index 19f8184e..9dc81b2f 100644 --- a/Makefile-libostree.am +++ b/Makefile-libostree.am @@ -2,6 +2,8 @@ # # Copyright (C) 2011,2014 Colin Walters # +# SPDX-License-Identifier: LGPL-2.0+ +# # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either diff --git a/Makefile-man.am b/Makefile-man.am index b3881526..e2f88a16 100644 --- a/Makefile-man.am +++ b/Makefile-man.am @@ -2,6 +2,8 @@ # # Copyright (C) 2016 Colin Walters # +# SPDX-License-Identifier: LGPL-2.0+ +# # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either @@ -41,6 +43,10 @@ if BUILDOPT_FUSE man1_files += rofiles-fuse.1 endif +if ENABLE_EXPERIMENTAL_API +man1_files += ostree-find-remotes.1 +endif + man5_files = ostree.repo.5 ostree.repo-config.5 man1_MANS = $(addprefix man/,$(man1_files)) diff --git a/Makefile-ostree.am b/Makefile-ostree.am index 04faa436..c366c84f 100644 --- a/Makefile-ostree.am +++ b/Makefile-ostree.am @@ -2,6 +2,8 @@ # # Copyright (C) 2011 Colin Walters # +# SPDX-License-Identifier: LGPL-2.0+ +# # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either diff --git a/Makefile-otutil.am b/Makefile-otutil.am index b4ee1c4b..5bafb2d0 100644 --- a/Makefile-otutil.am +++ b/Makefile-otutil.am @@ -2,6 +2,8 @@ # # Copyright (C) 2011 Colin Walters # +# SPDX-License-Identifier: LGPL-2.0+ +# # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either diff --git a/Makefile-switchroot.am b/Makefile-switchroot.am index 70aa1c87..8a8ec570 100644 --- a/Makefile-switchroot.am +++ b/Makefile-switchroot.am @@ -1,5 +1,7 @@ # Copyright (C) 2011 Colin Walters # +# SPDX-License-Identifier: LGPL-2.0+ +# # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either @@ -43,7 +45,7 @@ if BUILDOPT_USE_STATIC_COMPILER ostree_boot_SCRIPTS = ostree-prepare-root ostree-prepare-root : $(ostree_prepare_root_SOURCES) - $(STATIC_COMPILER) -o $@ -static $(ostree_prepare_root_SOURCES) $(AM_CPPFLAGS) $(AM_CFLAGS) $(DEFAULT_INCLUDES) + $(STATIC_COMPILER) -o $@ -static $(top_srcdir)/src/switchroot/ostree-prepare-root.c $(AM_CPPFLAGS) $(AM_CFLAGS) $(DEFAULT_INCLUDES) else ostree_boot_PROGRAMS += ostree-prepare-root ostree_prepare_root_CFLAGS = $(AM_CFLAGS) -Isrc/switchroot diff --git a/Makefile-tests.am b/Makefile-tests.am index 284dc76f..48363b9a 100644 --- a/Makefile-tests.am +++ b/Makefile-tests.am @@ -2,6 +2,8 @@ # # Copyright (C) 2013 Colin Walters # +# SPDX-License-Identifier: LGPL-2.0+ +# # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either diff --git a/Makefile.am b/Makefile.am index ea1863d3..85542edb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,7 @@ # Copyright (C) 2011 Colin Walters # +# SPDX-License-Identifier: LGPL-2.0+ +# # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either diff --git a/Makefile.in b/Makefile.in index 90f9284c..370b9222 100644 --- a/Makefile.in +++ b/Makefile.in @@ -16,6 +16,8 @@ # Copyright (C) 2011 Colin Walters # +# SPDX-License-Identifier: LGPL-2.0+ +# # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either @@ -33,6 +35,8 @@ # Copyright (C) 2011,2014 Colin Walters # +# SPDX-License-Identifier: LGPL-2.0+ +# # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either @@ -95,6 +99,8 @@ # # Copyright (C) 2011 Colin Walters # +# SPDX-License-Identifier: LGPL-2.0+ +# # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either @@ -114,6 +120,8 @@ # # Copyright (C) 2011,2014 Colin Walters # +# SPDX-License-Identifier: LGPL-2.0+ +# # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either @@ -134,6 +142,8 @@ # # Copyright (C) 2013 Colin Walters # +# SPDX-License-Identifier: LGPL-2.0+ +# # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either @@ -153,6 +163,8 @@ # # Copyright (C) 2011 Colin Walters # +# SPDX-License-Identifier: LGPL-2.0+ +# # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either @@ -170,6 +182,8 @@ # Copyright (C) 2011 Colin Walters # +# SPDX-License-Identifier: LGPL-2.0+ +# # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either @@ -187,6 +201,8 @@ # Copyright (C) 2016 Colin Walters # +# SPDX-License-Identifier: LGPL-2.0+ +# # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either @@ -206,6 +222,8 @@ # # Copyright (C) 2013 Colin Walters # +# SPDX-License-Identifier: LGPL-2.0+ +# # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either @@ -225,6 +243,8 @@ # # Copyright (C) 2013 Colin Walters # +# SPDX-License-Identifier: LGPL-2.0+ +# # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either @@ -244,6 +264,8 @@ # # Copyright (C) 2016 Colin Walters # +# SPDX-License-Identifier: LGPL-2.0+ +# # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either @@ -263,6 +285,8 @@ # # Copyright (C) 2017 Red Hat Inc. # +# SPDX-License-Identifier: LGPL-2.0+ +# # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either @@ -541,8 +565,9 @@ check_PROGRAMS = $(am__EXEEXT_13) $(am__EXEEXT_14) $(am__EXEEXT_15) # We still want to distribute the source, even if we are not building it @BUILDOPT_TRIVIAL_HTTPD_FALSE@@ENABLE_MAN_TRUE@am__append_87 = man/ostree-trivial-httpd.xml @BUILDOPT_FUSE_TRUE@@ENABLE_MAN_TRUE@am__append_88 = rofiles-fuse.1 -@ENABLE_MAN_TRUE@am__append_89 = $(man1_MANS:.1=.xml) $(man5_MANS:.5=.xml) -@ENABLE_MAN_TRUE@am__append_90 = \ +@ENABLE_EXPERIMENTAL_API_TRUE@@ENABLE_MAN_TRUE@am__append_89 = ostree-find-remotes.1 +@ENABLE_MAN_TRUE@am__append_90 = $(man1_MANS:.1=.xml) $(man5_MANS:.5=.xml) +@ENABLE_MAN_TRUE@am__append_91 = \ @ENABLE_MAN_TRUE@ $(man1_MANS) \ @ENABLE_MAN_TRUE@ $(man5_MANS) \ @ENABLE_MAN_TRUE@ $(NULL) @@ -2055,7 +2080,7 @@ CLEANFILES = $(am__append_13) $(BUILT_SOURCES) $(am__append_48) \ tests/ostree-remount-symlink-stamp \ tests/rofiles-fuse-symlink-stamp tests/ostree \ tests/ostree-prepare-root tests/ostree-remount \ - tests/rofiles-fuse $(am__append_90) + tests/rofiles-fuse $(am__append_91) EXTRA_DIST = $(all_dist_test_scripts) $(all_dist_test_data) autogen.sh \ COPYING README.md $(am__append_15) libglnx/README.md \ libglnx/COPYING libglnx/libglnx.m4 $(NULL) \ @@ -2081,7 +2106,7 @@ EXTRA_DIST = $(all_dist_test_scripts) $(all_dist_test_data) autogen.sh \ src/boot/ostree-prepare-root.service \ src/boot/ostree-remount.service src/boot/grub2/grub2-15_ostree \ src/boot/grub2/ostree-grub-generator $(NULL) $(am__append_87) \ - $(am__append_89) + $(am__append_90) bin_SCRIPTS = lib_LTLIBRARIES = libostree-1.la pkglibexec_SCRIPTS = $(am__append_84) @@ -2758,7 +2783,7 @@ tests_test_gpg_verify_result_LDADD = $(TESTS_LDADD) $(OT_INTERNAL_GPGME_LIBS) @ENABLE_MAN_TRUE@ ostree-reset.1 ostree-rev-parse.1 \ @ENABLE_MAN_TRUE@ ostree-show.1 ostree-summary.1 \ @ENABLE_MAN_TRUE@ ostree-static-delta.1 $(am__append_86) \ -@ENABLE_MAN_TRUE@ $(am__append_88) +@ENABLE_MAN_TRUE@ $(am__append_88) $(am__append_89) @ENABLE_MAN_TRUE@man5_files = ostree.repo.5 ostree.repo-config.5 @ENABLE_MAN_TRUE@man1_MANS = $(addprefix man/,$(man1_files)) @ENABLE_MAN_TRUE@man5_MANS = $(addprefix man/,$(man5_files)) @@ -8471,7 +8496,7 @@ src/ostree/parse-datetime.c: src/ostree/parse-datetime.y Makefile $(AM_V_GEN) $(YACC) $< -o $@ @BUILDOPT_USE_STATIC_COMPILER_TRUE@ostree-prepare-root : $(ostree_prepare_root_SOURCES) -@BUILDOPT_USE_STATIC_COMPILER_TRUE@ $(STATIC_COMPILER) -o $@ -static $(ostree_prepare_root_SOURCES) $(AM_CPPFLAGS) $(AM_CFLAGS) $(DEFAULT_INCLUDES) +@BUILDOPT_USE_STATIC_COMPILER_TRUE@ $(STATIC_COMPILER) -o $@ -static $(top_srcdir)/src/switchroot/ostree-prepare-root.c $(AM_CPPFLAGS) $(AM_CFLAGS) $(DEFAULT_INCLUDES) tests/libreaddir-rand.so: Makefile $(AM_V_GEN) ln -fns ../.libs/libreaddir-rand.so tests diff --git a/README.md b/README.md index 5bf8b7b0..bf9088bd 100644 --- a/README.md +++ b/README.md @@ -108,3 +108,10 @@ Contributing ------------ See [Contributing](CONTRIBUTING.md). + + +Licensing +------- + +The license for the *code* of libostree can be found in [COPYING](COPYING). +The license for the *documentation* of libostree is: `SPDX-License-Identifier: (CC-BY-SA-3.0 OR GFDL-1.3-or-later)` diff --git a/apidoc/Makefile.am b/apidoc/Makefile.am index d46eac78..d64ce451 100644 --- a/apidoc/Makefile.am +++ b/apidoc/Makefile.am @@ -1,5 +1,7 @@ # Copyright (C) 2013 Colin Walters # +# SPDX-License-Identifier: LGPL-2.0+ +# # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either diff --git a/apidoc/Makefile.in b/apidoc/Makefile.in index 10322c52..05ea1c49 100644 --- a/apidoc/Makefile.in +++ b/apidoc/Makefile.in @@ -16,6 +16,8 @@ # Copyright (C) 2013 Colin Walters # +# SPDX-License-Identifier: LGPL-2.0+ +# # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either @@ -36,6 +38,8 @@ # # Copyright (C) 2013 Colin Walters # +# SPDX-License-Identifier: LGPL-2.0+ +# # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either diff --git a/apidoc/html/index.html b/apidoc/html/index.html index 17d56a36..21de5d66 100644 --- a/apidoc/html/index.html +++ b/apidoc/html/index.html @@ -14,7 +14,7 @@
-

for OSTree 2018.1

+

for OSTree 2018.2

diff --git a/apidoc/html/ostree-Core-repository-independent-functions.html b/apidoc/html/ostree-Core-repository-independent-functions.html index b2775515..ec27659a 100644 --- a/apidoc/html/ostree-Core-repository-independent-functions.html +++ b/apidoc/html/ostree-Core-repository-independent-functions.html @@ -419,6 +419,14 @@ +gchar * + + +ostree_commit_get_content_checksum () + + + + gboolean @@ -1044,14 +1052,15 @@ ostree_parse_refspec (const char< char **out_remote, char **out_ref, GError **error); -

Split a refspec like "gnome-ostree:gnome-ostree/buildmaster" into -two parts; out_remote - will be set to "gnome-ostree", and out_ref +

Split a refspec like gnome-ostree:gnome-ostree/buildmaster or just +gnome-ostree/buildmaster into two parts. In the first case, out_remote -will be "gnome-ostree/buildmaster".

-

If refspec - refers to a local ref, out_remote - will be NULL.

+will be set to gnome-ostree, and out_ref + to gnome-ostree/buildmaster. +In the second case (a local ref), out_remote + will be NULL, and out_ref + +will be gnome-ostree/buildmaster. In both cases, TRUE will be returned.

Parameters

@@ -1068,13 +1077,14 @@ will be "gnome-ostree/buildmaster".

- - + + - - + + @@ -1084,6 +1094,10 @@ will be "gnome-ostree/buildmaster".

out_remote

The remote name, or NULL if the refspec refs to a local ref.

[out][allow-none]

Return location for the remote name, +or NULL if the refspec refs to a local ref.

[out][nullable][optional]

out_ref

Name of ref.

[out][allow-none]

Return location for the ref name.

[out][not nullable][optional]

error
+
+

Returns

+

TRUE on successful parsing, FALSE otherwise

+
@@ -2332,6 +2346,42 @@ ostree_commit_get_timestamp (GVar
+

ostree_commit_get_content_checksum ()

+
gchar *
+ostree_commit_get_content_checksum (GVariant *commit_variant);
+

There are use cases where one wants a checksum just of the content of a +commit. OSTree commits by default capture the current timestamp, and may have +additional metadata, which means that re-committing identical content +often results in a new checksum.

+

By comparing checksums of content, it's possible to easily distinguish +cases where nothing actually changed.

+

The content checksums is simply defined as SHA256(root dirtree_checksum || root_dirmeta_checksum), +i.e. the SHA-256 of the root "dirtree" object's checksum concatenated with the +root "dirmeta" checksum (both in binary form, not hexadecimal).

+
+

Parameters

+
+++++ + + + + + +

commit_variant

A commit object

 
+
+
+

Returns

+

A SHA-256 hex string, or NULL if commit_variant +is not well-formed.

+

[nullable]

+
+
+
+

ostree_check_version ()

gboolean
 ostree_check_version (guint required_year,
diff --git a/apidoc/html/ostree-OstreeRepo.html b/apidoc/html/ostree-OstreeRepo.html
index adc085d5..190f1505 100644
--- a/apidoc/html/ostree-OstreeRepo.html
+++ b/apidoc/html/ostree-OstreeRepo.html
@@ -7947,7 +7947,9 @@ by 
     
     
+    
     
     
     
diff --git a/apidoc/html/reference.html b/apidoc/html/reference.html
index 6c2fad75..a45edd56 100644
--- a/apidoc/html/reference.html
+++ b/apidoc/html/reference.html
@@ -266,6 +266,10 @@ OSTREE_CHECK_VERSION, macro in ostree-version
 
 

 

+ostree_commit_get_content_checksum, function in Core repository-independent functions
+

+

+

 ostree_commit_get_parent, function in Core repository-independent functions
 

 

diff --git a/apidoc/ostree-sections.txt b/apidoc/ostree-sections.txt
index d3cf1c68..4421ed10 100644
--- a/apidoc/ostree-sections.txt
+++ b/apidoc/ostree-sections.txt
@@ -149,6 +149,7 @@ ostree_validate_structureof_dirtree
 ostree_validate_structureof_dirmeta
 ostree_commit_get_parent
 ostree_commit_get_timestamp
+ostree_commit_get_content_checksum
 ostree_check_version
 
 
diff --git a/apidoc/version.xml b/apidoc/version.xml
index 20e4b07d..442b5276 100644
--- a/apidoc/version.xml
+++ b/apidoc/version.xml
@@ -1 +1 @@
-2018.1
\ No newline at end of file
+2018.2
\ No newline at end of file
diff --git a/buildutil/tap-driver.sh b/buildutil/tap-driver.sh
index 19aa531d..6a52d170 100755
--- a/buildutil/tap-driver.sh
+++ b/buildutil/tap-driver.sh
@@ -1,6 +1,8 @@
 #! /bin/sh
 # Copyright (C) 2011-2013 Free Software Foundation, Inc.
 #
+# SPDX-License-Identifier: LGPL-2.0+
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2, or (at your option)
diff --git a/configure b/configure
index 6f9a9540..8d879ab3 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libostree 2018.1.
+# Generated by GNU Autoconf 2.69 for libostree 2018.2.
 #
 # Report bugs to .
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libostree'
 PACKAGE_TARNAME='libostree'
-PACKAGE_VERSION='2018.1'
-PACKAGE_STRING='libostree 2018.1'
+PACKAGE_VERSION='2018.2'
+PACKAGE_STRING='libostree 2018.2'
 PACKAGE_BUGREPORT='walters@verbum.org'
 PACKAGE_URL=''
 
@@ -1541,7 +1541,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libostree 2018.1 to adapt to many kinds of systems.
+\`configure' configures libostree 2018.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1611,7 +1611,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libostree 2018.1:";;
+     short | recursive ) echo "Configuration of libostree 2018.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1853,7 +1853,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libostree configure 2018.1
+libostree configure 2018.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2325,7 +2325,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libostree $as_me 2018.1, which was
+It was created by libostree $as_me 2018.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3193,7 +3193,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libostree'
- VERSION='2018.1'
+ VERSION='2018.2'
 
 
 # Some tools Automake needs.
@@ -5927,9 +5927,9 @@ test -n "$YACC" || YACC="yacc"
 
 YEAR_VERSION=2018
 
-RELEASE_VERSION=1
+RELEASE_VERSION=2
 
-PACKAGE_VERSION=2018.1
+PACKAGE_VERSION=2018.2
 
 
 if echo "$CFLAGS" | grep -q -E -e '-Werror($| )'; then :
@@ -17564,7 +17564,7 @@ else
   with_static_compiler=no
 fi
 
- if test x$with_static_compiler != xno; then
+ if test "x$with_static_compiler" != xno; then
   BUILDOPT_USE_STATIC_COMPILER_TRUE=
   BUILDOPT_USE_STATIC_COMPILER_FALSE='#'
 else
@@ -18381,7 +18381,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libostree $as_me 2018.1, which was
+This file was extended by libostree $as_me 2018.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -18447,7 +18447,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libostree config.status 2018.1
+libostree config.status 2018.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index a4e1e74f..1b299d55 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl update libostree-released.sym from libostree-devel.sym, and update the check
 dnl in test-symbols.sh, and also set is_release_build=yes below.  Then make
 dnl another post-release commit to bump the version, and set is_release_build=no.
 m4_define([year_version], [2018])
-m4_define([release_version], [1])
+m4_define([release_version], [2])
 m4_define([package_version], [year_version.release_version])
 AC_INIT([libostree], [package_version], [walters@verbum.org])
 is_release_build=yes
@@ -519,7 +519,7 @@ AC_ARG_WITH(static-compiler,
             AS_HELP_STRING([--with-static-compiler],
                            [Use the given compiler to build ostree-prepare-root statically linked (default: no)]),,
               [with_static_compiler=no])
-AM_CONDITIONAL(BUILDOPT_USE_STATIC_COMPILER, test x$with_static_compiler != xno)
+AM_CONDITIONAL(BUILDOPT_USE_STATIC_COMPILER, test "x$with_static_compiler" != xno)
 AC_SUBST(STATIC_COMPILER, $with_static_compiler)
 
 dnl for tests (but we can't use asan with gjs or any introspection,
diff --git a/man/ostree-admin-cleanup.xml b/man/ostree-admin-cleanup.xml
index e91e1c46..b7dfb653 100644
--- a/man/ostree-admin-cleanup.xml
+++ b/man/ostree-admin-cleanup.xml
@@ -5,6 +5,8 @@
 
+
+
+
+
+
+
+    
+        ostree find-remotes
+        OSTree
+
+        
+            
+                Developer
+                Matthew
+                Leeds
+                matthew.leeds@endlessm.com
+            
+        
+    
+
+    
+        ostree find-remotes
+        1
+    
+
+    
+        ostree-find-remotes
+        Find remotes to serve the given refs
+    
+
+    
+            
+                ostree find-remotes OPTIONS COLLECTION-ID REF COLLECTION-ID REF
+            
+    
+
+    
+        Description
+
+        
+        
+            OSTree has the ability do pulls not just from configured remote
+            servers but also from peer computers on the LAN and from mounted
+            filesystems such as USB drives. Currently this requires compiling
+            OSTree with experimental API enabled, and it requires the use of
+            collection IDs and GPG verification.
+        
+        
+            The find-remotes command searches for remotes
+            which claim to provide one or more of the given COLLECTION-ID REF
+            pairs and prints information about them, with remotes sorted by
+            latency (Mounts > LAN > Internet). By default, OSTree searches for
+            remotes in configuration files, on mounted filesystems (in a
+            well-known location), and on the LAN using Avahi. Searching for LAN
+            remotes requires OSTree to have been compiled with Avahi support,
+            and it requires an Avahi daemon to be running. You can override the
+            default set of finders (sources for remotes) using the
+             option documented below.
+        
+    
+
+    
+        Options
+
+        
+            
+                
+
+                
+                  Do not invoke fsync().
+                
+                
+            
+
+            
+                =FINDERS
+
+                
+                  Use the specified comma separated list of finders rather than
+                  the default set. Possible values: config,
+                  lan, and mount (or any
+                  combination thereof).
+                
+            
+
+            
+                
+
+                
+                  Pull the most recent commit found for each ref.
+                
+            
+
+        
+    
+
+    
+        Example
+        $ ostree find-remotes --finders=mount,lan com.exampleos.Os exampleos/x86_64/standard
+
+Result 0: http://10.0.64.202:43381/0
+ - Finder: OstreeRepoFinderAvahi
+ - Keyring: exampleos.trustedkeys.gpg
+ - Priority: 60
+ - Summary last modified: 2018-01-12T19:00:28Z
+ - Refs:
+    - (com.exampleos.Os, exampleos/x86_64/standard) = c91acd964b3fda561b87bfb7f7c80e36220d76b567f0ce90c0e60742ef33c360
+
+1/1 refs were found.
+
+    
+
diff --git a/man/ostree-fsck.xml b/man/ostree-fsck.xml
index 2432506b..4e292db6 100644
--- a/man/ostree-fsck.xml
+++ b/man/ostree-fsck.xml
@@ -5,6 +5,8 @@
 
+
             
                 ostree-fsck1
 
diff --git a/man/rofiles-fuse.xml b/man/rofiles-fuse.xml
index 3d282c00..4a48ce9b 100644
--- a/man/rofiles-fuse.xml
+++ b/man/rofiles-fuse.xml
@@ -5,6 +5,8 @@