summaryrefslogtreecommitdiffstats
path: root/pkgs/development/interpreters/lua-5/default.nix
diff options
context:
space:
mode:
authorChristian Kauhaus <kc@flyingcircus.io>2019-11-21 10:53:10 +0100
committerChristian Kauhaus <kc@flyingcircus.io>2019-11-21 11:10:45 +0100
commit9a1e9258f689df835acd4d89c5e960f128ecb41c (patch)
treeb18285162a4eb796b996bfb2440385f89f8d8838 /pkgs/development/interpreters/lua-5/default.nix
parent6cffb5072f9ad20d3ddaa54469d9b38f8720291c (diff)
lua-5.3: add patch for CVE-2019-6706
Taken from http://launchpadlibrarian.net/417853567/lua5.3_5.3.3-1_5.3.3-1ubuntu0.18.10.1.diff.gz and adapted to our needs. Re #54799
Diffstat (limited to 'pkgs/development/interpreters/lua-5/default.nix')
-rw-r--r--pkgs/development/interpreters/lua-5/default.nix7
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix
index 1398e66d9a5b..7e79ff8f117a 100644
--- a/pkgs/development/interpreters/lua-5/default.nix
+++ b/pkgs/development/interpreters/lua-5/default.nix
@@ -1,5 +1,5 @@
# similar to interpreters/python/default.nix
-{ stdenv, lib, callPackage, fetchurl }:
+{ stdenv, lib, callPackage, fetchurl, fetchpatch }:
let
dsoPatch51 = fetchurl {
url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/lua-arch.patch?h=packages/lua51";
@@ -18,7 +18,10 @@ in rec {
lua5_3 = callPackage ./interpreter.nix {
sourceVersion = { major = "5"; minor = "3"; patch = "5"; };
hash = "0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac";
- patches = lib.optionals stdenv.isDarwin [ ./5.2.darwin.patch ] ;
+ patches =
+ lib.optionals stdenv.isDarwin [ ./5.2.darwin.patch ] ++ [
+ ./CVE-2019-6706.patch
+ ];
postConfigure = lib.optionalString (!stdenv.isDarwin) ''
cat ${./lua-5.3-dso.make} >> src/Makefile
sed -e 's/ALL_T *= */& $(LUA_SO)/' -i src/Makefile