fscrypt: update to 0.3.7

Changelog:
- Upgraded various dependencies, including golang.org/x/crypto to resolve the usual
  CVEs in it (but as usual, not actually affecting fscrypt's use of it).
- When selecting password hashing parameters, fscrypt now takes cgroup limitations
  into consideration.
- fscrypt encrypt no longer follows trailing symlinks when writing the recovery
  instructions.
- fscrypt unlock no longer enters an infinite loop when an incorrect key file is
  specified using --key=FILE, --quiet isn't specified, and standard input is a terminal.
- fscrypt unlock no longer enters an infinite loop when an incorrect password is specified,
  --quiet isn't specified, and standard input isn't a terminal.
- The error message when multiple protectors are available now mentions --unlock-with in
  addition to --protector.
- Documented the udev dependency for /dev/disk/by-uuid/ links.

Signed-off-by: John Audia <redacted>

diff --git a/utils/fscrypt/Makefile b/utils/fscrypt/Makefile
index 102062ba370cf5a38ea4fcc1a631675b16539c8a..9ab832181f8bd5b940d0e347ddde5ad04e3adc8c 100644 (file)
--- a/utils/fscrypt/Makefile
+++ b/utils/fscrypt/Makefile
@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fscrypt
-PKG_VERSION:=0.3.6
+PKG_VERSION:=0.3.7
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/google/fscrypt/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=6d71e17ef3e48cd5df22190df6925f39ee4a5b24e672f0fa616f3b57f52b2a12
+PKG_HASH:=9cd8913293572709e122a7c7fa1463fb0e0cf9b38f1d3bf633939564d8cc6245
 
 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE
@@ -18,6 +18,7 @@ PKG_BUILD_PARALLEL:=1
 PKG_BUILD_FLAGS:=no-mips16
 
 GO_PKG:=github.com/google/fscrypt
+GO_PKG_LDFLAGS_X:=main.version=v$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 include ../../lang/golang/golang-package.mk

diff --git a/utils/fscrypt/test-version.sh b/utils/fscrypt/test-version.sh
new file mode 100644 (file)
index 0000000..32f6a6c
--- /dev/null
+++ b/utils/fscrypt/test-version.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+#
+# Version check override for the fscrypt package.
+#
+# fscrypt does not support --version, -V, or --help flags for reporting its
+# version; it only prints the version via the "fscrypt version" subcommand.
+# pam_fscrypt.so is a PAM module, not a standalone executable, so it has no
+# version output either.
+
+case "$1" in
+fscrypt)
+       fscrypt --version 2>&1 | grep -F "$2"
+       ;;
+*)
+       echo "Untested package: $1" >&2
+       exit 1
+       ;;
+esac