From 02af3cd19ab53a56e9bbe49242d9f07442f33fd1 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 24 Aug 2018 15:51:36 +0200
Subject: [PATCH 1/2] fscrypt: 0.2.3 -> 0.2.4 (security, CVE-2018-6558)

(cherry picked from commit 4f519e5dc8d41acfc31ded7b1bbb46b55aa23e3a)
Reason: Security update: "The pam_fscrypt module in fscrypt before 0.2.4
may incorrectly restore primary and supplementary group IDs to the
values associated with the root user, which allows attackers to gain
privileges via a successful login through certain applications that use
Linux-PAM (aka pam)."
---
 pkgs/os-specific/linux/fscrypt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/fscrypt/default.nix b/pkgs/os-specific/linux/fscrypt/default.nix
index 267e31d427c6..da787d84d79d 100644
--- a/pkgs/os-specific/linux/fscrypt/default.nix
+++ b/pkgs/os-specific/linux/fscrypt/default.nix
@@ -4,7 +4,7 @@
 
 buildGoPackage rec {
   name = "fscrypt-${version}";
-  version = "0.2.3";
+  version = "0.2.4";
 
   goPackagePath = "github.com/google/fscrypt";
 
@@ -12,7 +12,7 @@ buildGoPackage rec {
     owner = "google";
     repo = "fscrypt";
     rev = "v${version}";
-    sha256 = "126bbxim4nj56kplvyv528i88mfray50r2rc6ysblkmaw6x0fd9c";
+    sha256 = "10gbyqzgi30as1crvqbb4rc5p8zzbzk1q5j080h1gnz56qzwivr8";
   };
 
   buildInputs = [ pam ];

From 27018df730e47bd6af8f6dc6aa07013e8d6d4f17 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 4 Oct 2018 20:42:00 +0200
Subject: [PATCH 2/2] fscrypt: Fix the build (requires Go 1.10)

---
 pkgs/os-specific/linux/fscrypt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/fscrypt/default.nix b/pkgs/os-specific/linux/fscrypt/default.nix
index da787d84d79d..1a9e36f516d3 100644
--- a/pkgs/os-specific/linux/fscrypt/default.nix
+++ b/pkgs/os-specific/linux/fscrypt/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, pam }:
+{ stdenv, buildGo110Package, fetchFromGitHub, pam }:
 
 # Don't use this for anything important yet!
 
-buildGoPackage rec {
+buildGo110Package rec {
   name = "fscrypt-${version}";
   version = "0.2.4";