From 15740d042c9c5258a1c082b5e228cf6f115edbb0 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 22 Jul 2022 15:08:25 -0400 Subject: [PATCH 1/3] Release 2022.5 --- Makefile-libostree.am | 3 --- configure.ac | 2 +- src/libostree/libostree-devel.sym | 5 ----- src/libostree/libostree-released.sym | 6 ++++++ tests/test-symbols.sh | 2 +- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Makefile-libostree.am b/Makefile-libostree.am index dd7ed8df..f93f712a 100644 --- a/Makefile-libostree.am +++ b/Makefile-libostree.am @@ -174,9 +174,6 @@ 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= diff --git a/configure.ac b/configure.ac index 445c53e0..964df128 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ m4_define([year_version], [2022]) m4_define([release_version], [5]) 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 145ec1ec..eef5cba0 100644 --- a/src/libostree/libostree-devel.sym +++ b/src/libostree/libostree-devel.sym @@ -20,11 +20,6 @@ - uncomment the include in Makefile-libostree.am */ -LIBOSTREE_2022.5 { -global: - ostree_kernel_args_append_if_missing; - ostree_sysroot_deployment_set_kargs_in_place; -} LIBOSTREE_2022.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 diff --git a/src/libostree/libostree-released.sym b/src/libostree/libostree-released.sym index 5afdfd3e..a5b9bdda 100644 --- a/src/libostree/libostree-released.sym +++ b/src/libostree/libostree-released.sym @@ -683,6 +683,12 @@ global: ostree_fs_get_all_xattrs_at; } LIBOSTREE_2022.2; +LIBOSTREE_2022.5 { +global: + ostree_kernel_args_append_if_missing; + ostree_sysroot_deployment_set_kargs_in_place; +} LIBOSTREE_2022.4; + /* NOTE: Only add more content here in release commits! See the * comments at the top of this file. */ diff --git a/tests/test-symbols.sh b/tests/test-symbols.sh index a14849d5..6eeb73ae 100755 --- a/tests/test-symbols.sh +++ b/tests/test-symbols.sh @@ -54,7 +54,7 @@ echo 'ok documented symbols' # ONLY update this checksum in release commits! cat > released-sha256.txt < Date: Fri, 22 Jul 2022 15:09:07 -0400 Subject: [PATCH 2/3] configure: post-release version bump --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 964df128..56e0e040 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,10 @@ AC_PREREQ([2.63]) dnl To perform a release, follow the instructions in `docs/CONTRIBUTING.md`. m4_define([year_version], [2022]) -m4_define([release_version], [5]) +m4_define([release_version], [6]) 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]) From 55292e40079b1a1ae1ff469c31ebe9fca8a833e6 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 22 Jul 2022 15:19:43 -0400 Subject: [PATCH 3/3] rust-bindings: Fix `cargo fmt` --- rust-bindings/tests/sign/mod.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rust-bindings/tests/sign/mod.rs b/rust-bindings/tests/sign/mod.rs index f3c817a3..300beedf 100644 --- a/rust-bindings/tests/sign/mod.rs +++ b/rust-bindings/tests/sign/mod.rs @@ -74,7 +74,9 @@ echo $ED25519SECRET > ed25519.secret let badsigs = [b"".as_slice()].to_variant(); let e = signer.data_verify(payload, &badsigs).err().unwrap(); - assert!(e.to_string().contains("Invalid signature length of 0 bytes")) + assert!(e + .to_string() + .contains("Invalid signature length of 0 bytes")) } #[test]