v1.6upstream-master

Signed-off-by: Eric Biggers <ebiggers@google.com>

5 files changed, 22 insertions, 5 deletions

diff --git a/NEWS.md b/NEWS.md
index c63dff9..d93d1c0 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,22 @@
 # fsverity-utils release notes
 
+## Version 1.6
+
+* Eliminated the dependency on `pandoc` for installing the manual page.
+
+* Updated the documentation to reflect recent kernel changes, including the
+  kernel adding support for more Merkle tree block sizes, IMA adding support for
+  fs-verity, and btrfs adding support for fs-verity.
+
+* Updated the documentation to refer to the new fsverity mailing list.
+
+* Fixed a C++ compatibility issue in `libfsverity.h`.
+
+* `fsverity measure` now follows standard command line syntax for arguments
+  beginning with hyphens.  I.e., `fsverity measure --foo` now treats `--foo` as
+  an (unsupported) option, not a filename.  To operate on a file actually named
+  `--foo`, use `fsverity measure -- --foo`.
+
 ## Version 1.5
 
 * Made the `fsverity sign` command and the `libfsverity_sign_digest()` function
diff --git a/include/libfsverity.h b/include/libfsverity.h
index 8af87c7..453dd95 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	5
+#define FSVERITY_UTILS_MINOR_VERSION	6
 
 #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 4c9bb20..d537d9c 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.5
+Version: 1.6
 Libs: -L${libdir} -lfsverity
 Requires.private: libcrypto
 Cflags: -I${includedir}
diff --git a/man/fsverity.1 b/man/fsverity.1
index d29f2af..0bb9f01 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" "February 2022" "fsverity-utils v1.5" "User Commands"
+.TH "FSVERITY" "1" "March 2024" "fsverity-utils v1.6" "User Commands"
 .hy
 .
 .SH NAME
diff --git a/scripts/do-release.sh b/scripts/do-release.sh
index 5339110..9911f1a 100755
--- a/scripts/do-release.sh
+++ b/scripts/do-release.sh
@@ -52,8 +52,8 @@ prepare_release()
 		  include/libfsverity.h
 	sed -E -i "/Version:/s/[0-9]+\.[0-9]+/$VERS/" \
 		  lib/libfsverity.pc.in
-	sed -E -i -e "/^% /s/fsverity-utils v[0-9]+(\.[0-9]+)+/fsverity-utils v$VERS/" \
-		  -e "/^% /s/[a-zA-Z]+ 2[0-9]{3}/$month $year/" \
+	sed -E -i -e "/^\.TH /s/fsverity-utils v[0-9]+(\.[0-9]+)+/fsverity-utils v$VERS/" \
+		  -e "/^\.TH /s/[a-zA-Z]+ 2[0-9]{3}/$month $year/" \
 		  man/*.[1-9]
 	git commit -a --signoff --message="v$VERS"
 	git tag --sign "v$VERS" --message="$PKG"