From 901747f98561cbeedb2ed150793d9b8f94451f20 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 21 Jul 2020 21:46:00 +0000 Subject: [PATCH 1/2] Release 2020.4 A lot of stuff here, new signing API is the biggest. Let's get a release out. --- configure.ac | 2 +- src/libostree/libostree-devel.sym | 22 ---------------------- src/libostree/libostree-released.sym | 22 ++++++++++++++++++++++ tests/test-symbols.sh | 2 +- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/configure.ac b/configure.ac index f39a5006..855528c0 100644 --- 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 5999aabe..2ed658c4 100644 --- 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 33d4d0e3..5c63f78f 100644 --- 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 8f67a46c..75df37e1 100755 --- 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 < Date: Tue, 21 Jul 2020 21:46:43 +0000 Subject: [PATCH 2/2] Post-release version bump --- Makefile-libostree.am | 6 +++--- configure.ac | 4 ++-- src/libostree/libostree-devel.sym | 7 +++++++ 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Makefile-libostree.am b/Makefile-libostree.am index 96b9249b..a180e86b 100644 --- a/Makefile-libostree.am +++ b/Makefile-libostree.am @@ -182,9 +182,9 @@ libostree_1_la_SOURCES += \ endif # USE_GPGME symbol_files = $(top_srcdir)/src/libostree/libostree-released.sym -if BUILDOPT_IS_DEVEL_BUILD -symbol_files += $(top_srcdir)/src/libostree/libostree-devel.sym -endif +#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= EXTRA_DIST += \ diff --git a/configure.ac b/configure.ac index 855528c0..50646f1e 100644 --- a/configure.ac +++ b/configure.ac @@ -7,10 +7,10 @@ dnl Seed the release notes with `git-shortlog-with-prs ..`. Th dnl `git-evtag` to create the tag and push it. Finally, create a GitHub release and attach dnl the tarball from `make dist`. m4_define([year_version], [2020]) -m4_define([release_version], [4]) +m4_define([release_version], [5]) m4_define([package_version], [year_version.release_version]) AC_INIT([libostree], [package_version], [walters@verbum.org]) -is_release_build=yes +is_release_build=no 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 2ed658c4..21669c4a 100644 --- a/src/libostree/libostree-devel.sym +++ b/src/libostree/libostree-devel.sym @@ -17,6 +17,13 @@ Boston, MA 02111-1307, USA. ***/ +LIBOSTREE_2020.5 { +global: + /* Add symbols here, and uncomment the bits in + * Makefile-libostree.am to enable this too. + */ +} LIBOSTREE_2020.4; + /* 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