vim: add patch for possible overflow with corrupted spell file

LnL7 · LnL7 · commit 538e642832a7 · 2017-02-15T20:50:23.000+01:00
diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix
@@ -13,19 +13,24 @@ rec {
 
   hardeningDisable = [ "fortify" ];
 
+  patches = [
+    (fetchpatch {
+      name = "CVE-2016-1248.diff";
+      url = https://github.com/vim/vim/commit/d0b5138b.diff;
+      sha256 = "057kg95ipjdirbkr082wbwrbz5l79mwxir8ymkxhma6l6wbxidif";
+    })
+    (fetchpatch {
+      name = "CVE-2017-5953.patch";
+      url = https://github.com/vim/vim/commit/399c297aa93afe2c0a39e2a1b3f972aebba44c9d.patch;
+      sha256 = "19i2m27czkm9di999nbf5mrvb9dx8w5r5169pakmljg4zzbc61g5";
+    })
+  ];
+
   postPatch =
     # Use man from $PATH; escape sequences are still problematic.
     ''
       substituteInPlace runtime/ftplugin/man.vim \
         --replace "/usr/bin/man " "man "
-
-      patch -p1 < '${
-        fetchpatch {
-          name = "cve-2016-1248.diff";
-          url = "https://github.com/vim/vim/commit/d0b5138b.diff";
-          sha256 = "057kg95ipjdirbkr082wbwrbz5l79mwxir8ymkxhma6l6wbxidif";
-        }
-      }'
     '';
 
   meta = with lib; {
diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix
@@ -61,7 +61,7 @@ composableDerivation {
           }.src;
       };
 
-    patches = [ ./cflags-prune.diff ];
+    patches = common.patches ++ [ ./cflags-prune.diff ];
 
     configureFlags
       = [ "--enable-gui=${args.gui}" "--with-features=${args.features}" ];
diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix
@@ -14,7 +14,7 @@ in
 stdenv.mkDerivation rec {
   name = "vim-${version}";
 
-  inherit (common) version src postPatch hardeningDisable enableParallelBuilding meta;
+  inherit (common) version src patches postPatch hardeningDisable enableParallelBuilding meta;
 
   buildInputs = [ ncurses pkgconfig ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ Carbon Cocoa ];
