summary refs log tree commit diff
path: root/pkgs/os-specific/linux/shadow/default.nix
diff options
context:
space:
mode:
authorRickard Nilsson <rickynils@gmail.com>2017-08-16 15:10:50 +0200
committerRickard Nilsson <rickynils@gmail.com>2017-08-17 13:23:56 +0200
commit5f8a45c136ebb99283f2b9eb724835b22f6829be (patch)
tree9cc53480f940fcb22f7d5049f6e17fea35cda6c6 /pkgs/os-specific/linux/shadow/default.nix
parent1f9d9deb8aaa25225d2e171381ad4ddca85e4a12 (diff)
downloadnixpkgs-5f8a45c136ebb99283f2b9eb724835b22f6829be.tar
nixpkgs-5f8a45c136ebb99283f2b9eb724835b22f6829be.tar.gz
nixpkgs-5f8a45c136ebb99283f2b9eb724835b22f6829be.tar.bz2
nixpkgs-5f8a45c136ebb99283f2b9eb724835b22f6829be.tar.lz
nixpkgs-5f8a45c136ebb99283f2b9eb724835b22f6829be.tar.xz
nixpkgs-5f8a45c136ebb99283f2b9eb724835b22f6829be.tar.zst
nixpkgs-5f8a45c136ebb99283f2b9eb724835b22f6829be.zip
shadow: 4.4 -> 4.5
Fixes CVE-2017-12424
Diffstat (limited to 'pkgs/os-specific/linux/shadow/default.nix')
-rw-r--r--pkgs/os-specific/linux/shadow/default.nix8
1 files changed, 2 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix
index 0c0edde05e2..64d7a694fc1 100644
--- a/pkgs/os-specific/linux/shadow/default.nix
+++ b/pkgs/os-specific/linux/shadow/default.nix
@@ -20,13 +20,13 @@ in
 
 stdenv.mkDerivation rec {
   name = "shadow-${version}";
-  version = "4.4";
+  version = "4.5";
 
   src = fetchFromGitHub {
     owner = "shadow-maint";
     repo = "shadow";
     rev = "${version}";
-    sha256 = "005qk3n86chc8mlg86qhrns2kpl52n5f3las3m5s6266xij3qwka";
+    sha256 = "1aj7s2arnsfqf34ak40is2zmwm666l28pay6rv1ffx46j0wj4hws";
   };
 
   buildInputs = stdenv.lib.optional (pam != null && stdenv.isLinux) pam;
@@ -37,10 +37,6 @@ stdenv.mkDerivation rec {
   patches =
     [ ./keep-path.patch
       dots_in_usernames
-      (fetchpatch {
-        url = https://github.com/shadow-maint/shadow/commit/507f96cdeb54079fb636c7ce21e371f7a16a520e.patch;
-        sha256 = "10k70fx3z051f83p1k7ljjaawbykhn7cy6fg1zy04jp3xkvdwxc7";
-      })
     ];
 
   # The nix daemon often forbids even creating set[ug]id files.