From 206260ffd045ec0d9b2eedfde693090a6e9d9928 Mon Sep 17 00:00:00 2001
From: Armin Kuster <akuster808@gmail.com>
Date: Fri, 17 Mar 2023 16:17:12 -0400
Subject: fscrypt: update to 1.1.0

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 recipes-security/fscrypt/fscrypt_1.0.0.bb | 51 -------------------------------
 recipes-security/fscrypt/fscrypt_1.1.0.bb | 51 +++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 51 deletions(-)
 delete mode 100644 recipes-security/fscrypt/fscrypt_1.0.0.bb
 create mode 100644 recipes-security/fscrypt/fscrypt_1.1.0.bb

diff --git a/recipes-security/fscrypt/fscrypt_1.0.0.bb b/recipes-security/fscrypt/fscrypt_1.0.0.bb
deleted file mode 100644
index 8147fe6..0000000
--- a/recipes-security/fscrypt/fscrypt_1.0.0.bb
+++ /dev/null
@@ -1,51 +0,0 @@
-SUMMARY = "fscrypt is a high-level tool for the management of Linux filesystem encryption"
-DESCIPTION = "fscrypt manages metadata, key generation, key wrapping, PAM integration, \
-and provides a uniform interface for creating and modifying encrypted directories. For \
-a small, low-level tool that directly sets policies, see fscryptctl \
-(https://github.com/google/fscryptcl)."
-HOMEPAGE = "https://github.com/google/fscrypt"
-SECTION = "base"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-# fscrypt depends on go and libpam
-DEPENDS += "go-native libpam"
-
-SRCREV = "92b1e9a8670ccd3916a7d24a06cab1e4c9815bc4"
-SRC_URI = "git://github.com/google/fscrypt.git;branch=master;protocol=https"
-
-GO_IMPORT = "import"
-
-inherit go goarch features_check
-
-REQUIRED_DISTRO_FEATURES = "pam"
-
-S = "${WORKDIR}/git"
-
-do_compile() {
-	export GOARCH=${TARGET_GOARCH}
-	export GOROOT="${STAGING_LIBDIR_NATIVE}/${TARGET_SYS}/go"
-	export GOPATH="${WORKDIR}/git"
-
-	# Pass the needed cflags/ldflags so that cgo
-	# can find the needed headers files and libraries
-	export CGO_ENABLED="1"
-	export CGO_CFLAGS="${CFLAGS} --sysroot=${STAGING_DIR_TARGET}"
-	export CGO_LDFLAGS="${LDFLAGS} --sysroot=${STAGING_DIR_TARGET}"
-
-	cd ${S}/src/${GO_IMPORT}
-	oe_runmake
-
-	# Golang forces permissions to 0500 on directories and 0400 on files in
-	# the module cache which prevents us from easily cleaning up the build
-	# directory. Let's just fix the permissions here so we don't have to
-	# hack the clean tasks.
-	chmod -R u+w ${S}/pkg/mod
-}
-
-do_install() {
-	install -d ${D}/${bindir}
-	install ${S}/src/${GO_IMPORT}/bin/fscrypt ${D}/${bindir}/fscrypt
-}
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-security/fscrypt/fscrypt_1.1.0.bb b/recipes-security/fscrypt/fscrypt_1.1.0.bb
new file mode 100644
index 0000000..ea9593b
--- /dev/null
+++ b/recipes-security/fscrypt/fscrypt_1.1.0.bb
@@ -0,0 +1,51 @@
+SUMMARY = "fscrypt is a high-level tool for the management of Linux filesystem encryption"
+DESCIPTION = "fscrypt manages metadata, key generation, key wrapping, PAM integration, \
+and provides a uniform interface for creating and modifying encrypted directories. For \
+a small, low-level tool that directly sets policies, see fscryptctl \
+(https://github.com/google/fscryptcl)."
+HOMEPAGE = "https://github.com/google/fscrypt"
+SECTION = "base"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
+
+# fscrypt depends on go and libpam
+DEPENDS += "go-native libpam"
+
+SRCREV = "7c80c73c084ce9ea49a03b814dac7a82fd7b4c23"
+SRC_URI = "git://github.com/google/fscrypt.git;branch=master;protocol=https"
+
+GO_IMPORT = "import"
+
+inherit go goarch features_check
+
+REQUIRED_DISTRO_FEATURES = "pam"
+
+S = "${WORKDIR}/git"
+
+do_compile() {
+	export GOARCH=${TARGET_GOARCH}
+	export GOROOT="${STAGING_LIBDIR_NATIVE}/${TARGET_SYS}/go"
+	export GOPATH="${WORKDIR}/git"
+
+	# Pass the needed cflags/ldflags so that cgo
+	# can find the needed headers files and libraries
+	export CGO_ENABLED="1"
+	export CGO_CFLAGS="${CFLAGS} --sysroot=${STAGING_DIR_TARGET}"
+	export CGO_LDFLAGS="${LDFLAGS} --sysroot=${STAGING_DIR_TARGET}"
+
+	cd ${S}/src/${GO_IMPORT}
+	oe_runmake
+
+	# Golang forces permissions to 0500 on directories and 0400 on files in
+	# the module cache which prevents us from easily cleaning up the build
+	# directory. Let's just fix the permissions here so we don't have to
+	# hack the clean tasks.
+	chmod -R u+w ${S}/pkg/mod
+}
+
+do_install() {
+	install -d ${D}/${bindir}
+	install ${S}/src/${GO_IMPORT}/bin/fscrypt ${D}/${bindir}/fscrypt
+}
+
+BBCLASSEXTEND = "native nativesdk"
-- 
cgit v1.2.3-54-g00ecf