Release 2020.4

A lot of stuff here, new signing API is the biggest.  Let's
get a release out.

diff --git a/configure.ac b/configure.ac
index f39a5006566c872427d4dc04f79087fdb96c0c1b..855528c00c3a73cd28dd0afe8267feb62b5546b2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@ m4_define([year_version], [2020])
 m4_define([release_version], [4])
 m4_define([package_version], [year_version.release_version])
 AC_INIT([libostree], [package_version], [walters@verbum.org])
-is_release_build=no
+is_release_build=yes
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([buildutil])
 AC_CONFIG_AUX_DIR([build-aux])

diff --git a/src/libostree/libostree-devel.sym b/src/libostree/libostree-devel.sym
index 5999aabe52f2236f0b835a4fbad1a3d792cae604..2ed658c4086b28b8aae5441673e812bf84ca4023 100644 (file)
--- a/src/libostree/libostree-devel.sym
+++ b/src/libostree/libostree-devel.sym
@@ -17,28 +17,6 @@
   Boston, MA 02111-1307, USA.
 ***/
 
-/* Add new symbols here.  Release commits should copy this section into -released.sym. */
-LIBOSTREE_2020.2 {
-global:
-  ostree_repo_commit_modifier_set_sepolicy_from_commit;
-  ostree_sign_get_type;
-  ostree_sign_get_all;
-  ostree_sign_commit;
-  ostree_sign_commit_verify;
-  ostree_sign_data;
-  ostree_sign_data_verify;
-  ostree_sign_get_by_name;
-  ostree_sign_get_name;
-  ostree_sign_clear_keys;
-  ostree_sign_load_pk;
-  ostree_sign_metadata_format;
-  ostree_sign_metadata_key;
-  ostree_sign_set_pk;
-  ostree_sign_add_pk;
-  ostree_sign_set_sk;
-  ostree_sign_summary;
-} LIBOSTREE_2020.1;
-
 /* Stub section for the stable release *after* this development one; don't
  * edit this other than to update the year.  This is just a copy/paste
  * source.  Replace $LASTSTABLE with the last stable version, and $NEWVERSION

diff --git a/src/libostree/libostree-released.sym b/src/libostree/libostree-released.sym
index 33d4d0e3f06ce3e1f6518391d7e4b66325f6f1e7..5c63f78fc120c2726bdc519f1e05eebb8fb14e1e 100644 (file)
--- a/src/libostree/libostree-released.sym
+++ b/src/libostree/libostree-released.sym
@@ -593,6 +593,28 @@ global:
   ostree_sysroot_set_mount_namespace_in_use;
 } LIBOSTREE_2019.6;
 
+/* Add new symbols here.  Release commits should copy this section into -released.sym. */
+LIBOSTREE_2020.4 {
+global:
+  ostree_repo_commit_modifier_set_sepolicy_from_commit;
+  ostree_sign_get_type;
+  ostree_sign_get_all;
+  ostree_sign_commit;
+  ostree_sign_commit_verify;
+  ostree_sign_data;
+  ostree_sign_data_verify;
+  ostree_sign_get_by_name;
+  ostree_sign_get_name;
+  ostree_sign_clear_keys;
+  ostree_sign_load_pk;
+  ostree_sign_metadata_format;
+  ostree_sign_metadata_key;
+  ostree_sign_set_pk;
+  ostree_sign_add_pk;
+  ostree_sign_set_sk;
+  ostree_sign_summary;
+} LIBOSTREE_2020.1;
+
 /* No new symbols in 2020.2 */
 
 /* NOTE: Only add more content here in release commits!  See the

diff --git a/tests/test-symbols.sh b/tests/test-symbols.sh
index 8f67a46c4a06f0b54fd28cd5c74478aa7ef3078c..75df37e1e7eda9ab1a3f94a535f83012aca5e4b7 100755 (executable)
--- a/tests/test-symbols.sh
+++ b/tests/test-symbols.sh
@@ -66,7 +66,7 @@ echo 'ok documented symbols'
 
 # ONLY update this checksum in release commits!
 cat > released-sha256.txt <<EOF
-dd16acf1370f9b4ecd77d4eb7c4b45548b249f33f629d3147ddc9d264bd32e41  ${released_syms}
+1f83814b9a785f9f612ee8f707dadb86d0dcbdc22603937575b7beefb26b50cc  ${released_syms}
 EOF
 sha256sum -c released-sha256.txt