From 9c09b74788633c14b1bb9648482020f15ebf41d2 Mon Sep 17 00:00:00 2001 From: zfeixiang Date: Fri, 27 Mar 2026 10:27:51 +0800 Subject: [PATCH] upgrade to v1.7 and update owner information Signed-off-by: zfeixiang --- Makefile | 4 +++- NEWS.md | 5 +++++ README.OpenSource | 7 ++++--- include/libfsverity.h | 2 +- lib/libfsverity.pc.in | 2 +- man/fsverity.1 | 2 +- scripts/run-tests.sh | 5 +++-- 7 files changed, 18 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index c3de571..21396f9 100644 --- a/Makefile +++ b/Makefile @@ -218,7 +218,9 @@ boringssl: https://boringssl.googlesource.com/boringssl/+archive/refs/heads/master.tar.gz mkdir boringssl tar xf boringssl.tar.gz -C boringssl - cmake -B boringssl/build boringssl + # BoringSSL is now C++, so build it as a shared library to avoid link + # issues with C programs. + cmake -B boringssl/build -D BUILD_SHARED_LIBS=1 boringssl $(MAKE) -C boringssl/build $(MAKEFLAGS) ############################################################################## diff --git a/NEWS.md b/NEWS.md index d93d1c0..e46e1e9 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,10 @@ # fsverity-utils release notes +## Version 1.7 + +* Allowed fsverity-utils to build when PKCS#11 support is not available in + OpenSSL. In that case, `fsverity sign` just won't support that feature. + ## Version 1.6 * Eliminated the dependency on `pandoc` for installing the manual page. diff --git a/README.OpenSource b/README.OpenSource index 9507ecc..27f4132 100644 --- a/README.OpenSource +++ b/README.OpenSource @@ -3,9 +3,10 @@ "Name" : "fsverity-utils", "License" : "MIT License", "License File" : "LICENSE", - "Version Number" : "v1.6", - "Owner" : "zhangdengyu2@huawei.com", + "Version Number" : "v1.7", + "Owner" : "renzehua3@huawei.com", "Upstream URL" : "https://git.kernel.org/pub/scm/fs/fsverity/fsverity-utils.git", - "Description" : "fsverity userspace utilities" + "Description" : "fsverity userspace utilities", + "Dependencies" : ["OpenSSL"] } ] diff --git a/include/libfsverity.h b/include/libfsverity.h index 453dd95..7d28eee 100644 --- a/include/libfsverity.h +++ b/include/libfsverity.h @@ -22,7 +22,7 @@ extern "C" { #endif #define FSVERITY_UTILS_MAJOR_VERSION 1 -#define FSVERITY_UTILS_MINOR_VERSION 6 +#define FSVERITY_UTILS_MINOR_VERSION 7 #define FS_VERITY_HASH_ALG_SHA256 1 #define FS_VERITY_HASH_ALG_SHA512 2 diff --git a/lib/libfsverity.pc.in b/lib/libfsverity.pc.in index d537d9c..cf25d3c 100644 --- a/lib/libfsverity.pc.in +++ b/lib/libfsverity.pc.in @@ -4,7 +4,7 @@ includedir=@INCDIR@ Name: libfsverity Description: fs-verity library -Version: 1.6 +Version: 1.7 Libs: -L${libdir} -lfsverity Requires.private: libcrypto Cflags: -I${includedir} diff --git a/man/fsverity.1 b/man/fsverity.1 index 1214b24..a6c298e 100644 --- a/man/fsverity.1 +++ b/man/fsverity.1 @@ -5,7 +5,7 @@ .\" Use of this source code is governed by an MIT-style license that can be .\" found in the LICENSE file or at https://opensource.org/licenses/MIT. .\" -.TH "FSVERITY" "1" "March 2024" "fsverity-utils v1.6" "User Commands" +.TH "FSVERITY" "1" "November 2025" "fsverity-utils v1.7" "User Commands" .hy . .SH NAME diff --git a/scripts/run-tests.sh b/scripts/run-tests.sh index e2a4e38..108d0f6 100755 --- a/scripts/run-tests.sh +++ b/scripts/run-tests.sh @@ -206,7 +206,7 @@ TEST_FUNCS+=(sanitizers_test) valgrind_test() { log "Build and test with valgrind" - $MAKE TEST_WRAPPER_PROG="valgrind --quiet --error-exitcode=100 --leak-check=full --errors-for-leak-kinds=all" \ + $MAKE TEST_WRAPPER_PROG="valgrind --quiet --error-exitcode=100 --leak-check=full --errors-for-leak-kinds=definite,possible" \ CFLAGS="-O2 -Werror" check } TEST_FUNCS+=(valgrind_test) @@ -217,7 +217,8 @@ boringssl_test() log "-> Building BoringSSL" $MAKE boringssl log "-> Building fsverity-utils linked to BoringSSL" - $MAKE CFLAGS="-O2 -Werror" LDFLAGS="-Lboringssl/build/crypto" \ + $MAKE CFLAGS="-O2 -Werror" \ + LDFLAGS="-Lboringssl/build -Wl,-rpath=$PWD/boringssl/build" \ CPPFLAGS="-Iboringssl/include" LDLIBS="-lcrypto -lpthread" check } TEST_FUNCS+=(boringssl_test)