summaryrefslogtreecommitdiff
path: root/lang/lua51
diff options
context:
space:
mode:
authorbsiegert <bsiegert>2015-03-22 17:20:24 +0000
committerbsiegert <bsiegert>2015-03-22 17:20:24 +0000
commitc43b317f1862a5ff60bda7731536f397e31b3e41 (patch)
tree3b22d9442f90ed3c17471ea0a7060a6fb4fc18a4 /lang/lua51
parentad5bf33a20d26df8204f0a53da4bff9f5543aeb4 (diff)
downloadpkgsrc-c43b317f1862a5ff60bda7731536f397e31b3e41.tar.gz
SECURITY: Add a patch for CVE-2014-5461, taken from the Debian package.
Bump PKGREVISION.
Diffstat (limited to 'lang/lua51')
-rw-r--r--lang/lua51/Makefile4
-rw-r--r--lang/lua51/distinfo3
-rw-r--r--lang/lua51/patches/patch-src_ldo.c14
3 files changed, 18 insertions, 3 deletions
diff --git a/lang/lua51/Makefile b/lang/lua51/Makefile
index ce9bf56aa03..5ab88899584 100644
--- a/lang/lua51/Makefile
+++ b/lang/lua51/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2014/10/09 14:06:38 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2015/03/22 17:20:24 bsiegert Exp $
DISTNAME= lua-${LUA_VERSION}
PKGNAME= lua51-${LUA_VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= lang
MASTER_SITES= http://www.lua.org/ftp/ \
http://www.tecgraf.puc-rio.br/lua/ftp/
diff --git a/lang/lua51/distinfo b/lang/lua51/distinfo
index 71f4325c80f..c4f7912b6a1 100644
--- a/lang/lua51/distinfo
+++ b/lang/lua51/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2014/10/19 22:26:38 alnsn Exp $
+$NetBSD: distinfo,v 1.4 2015/03/22 17:20:24 bsiegert Exp $
SHA1 (lua-5.1.5.tar.gz) = b3882111ad02ecc6b972f8c1241647905cb2e3fc
RMD160 (lua-5.1.5.tar.gz) = b0c2234675335a8bf158a125b6778cf800c754a0
@@ -7,3 +7,4 @@ SHA1 (patch-aa) = 4af5fcbd1c76bc7b0815a330c43d1e5eb715e6ff
SHA1 (patch-ab) = 53e8e2693e3afa819079e253f212988a44357412
SHA1 (patch-ac) = bd2348dcb273de09ddc09da906c93de6cc209c5c
SHA1 (patch-etc_lua.pc) = 80a01ac1af362410407aff65b644e946e898b1ee
+SHA1 (patch-src_ldo.c) = 003e15eb594a89984213f3be5ca3a30750daabdb
diff --git a/lang/lua51/patches/patch-src_ldo.c b/lang/lua51/patches/patch-src_ldo.c
new file mode 100644
index 00000000000..93e3d80de04
--- /dev/null
+++ b/lang/lua51/patches/patch-src_ldo.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_ldo.c,v 1.1 2015/03/22 17:20:24 bsiegert Exp $
+
+Patch for CVS-2014-5461, from Debian.
+--- src/ldo.c.orig 2015-03-22 17:11:01.000000000 +0000
++++ src/ldo.c
+@@ -274,7 +274,7 @@ int luaD_precall (lua_State *L, StkId fu
+ CallInfo *ci;
+ StkId st, base;
+ Proto *p = cl->p;
+- luaD_checkstack(L, p->maxstacksize);
++ luaD_checkstack(L, p->maxstacksize + p->numparams);
+ func = restorestack(L, funcr);
+ if (!p->is_vararg) { /* no varargs? */
+ base = func + 1;