From 32fddd8e29ba6bfebc7ba2081f02d2dc9730256a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 29 May 2016 08:50:15 +0300 Subject: gnu: lua-5.1: Fix CVE-2014-5461. * gnu/packages/lua.scm (lua-5.1)[source]: Add patch. * gnu/packages/patches/lua-CVE-2014-5461: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/packages/lua.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages/lua.scm') diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 17874f86ab..a5315342ea 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2014 Raimon Grau ;;; Copyright © 2014 Mark H Weaver ;;; Copyright © 2014 Andreas Enge +;;; Copyright © 2016 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -78,7 +79,8 @@ for configuration, scripting, and rapid prototyping.") version ".tar.gz")) (sha256 (base32 "0cskd4w0g6rdm2q8q3i4n1h3j8kylhs3rq8mxwl9vwlmlxbgqh16")) - (patches (search-patches "lua51-liblua-so.patch")))))) + (patches (search-patches "lua51-liblua-so.patch" + "lua-CVE-2014-5461.patch")))))) (define-public luajit (package -- cgit v1.2.3 From a4349e7a00c479bb7926cfb5efc78daacf7191b4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 29 May 2016 08:56:07 +0300 Subject: gnu: lua: Use 'modify-phases'. * gnu/packages/lua.scm (lua)[arguments]: Use 'modify-phases'. --- gnu/packages/lua.scm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'gnu/packages/lua.scm') diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index a5315342ea..f699330899 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -47,18 +47,18 @@ (guix build utils) (srfi srfi-1)) #:test-target "test" - #:phases (alist-replace - 'build - (lambda _ (zero? (system* "make" "CFLAGS=-fPIC" "linux"))) - (alist-replace - 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (zero? (system* "make" "install" - (string-append "INSTALL_TOP=" out) - (string-append "INSTALL_MAN=" out - "/share/man/man1"))))) - (alist-delete 'configure %standard-phases))))) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda _ (zero? (system* "make" "CFLAGS=-fPIC" "linux")))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (zero? (system* "make" "install" + (string-append "INSTALL_TOP=" out) + (string-append "INSTALL_MAN=" out + "/share/man/man1"))))))))) (home-page "http://www.lua.org/") (synopsis "Embeddable scripting language") (description -- cgit v1.2.3 From 2cb33ef86e23854241fcade8342aca2fb48ce376 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 29 May 2016 08:57:27 +0300 Subject: gnu: lua: Update to 5.2.4. * gnu/packages/lua.scm (lua): Update to 5.2.4. --- gnu/packages/lua.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/lua.scm') diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index f699330899..abe657f644 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -31,13 +31,13 @@ (define-public lua (package (name "lua") - (version "5.2.3") + (version "5.2.4") (source (origin (method url-fetch) (uri (string-append "http://www.lua.org/ftp/lua-" version ".tar.gz")) (sha256 - (base32 "0b8034v1s82n4dg5rzcn12067ha3nxaylp2vdp8gg08kjsbzphhk")) + (base32 "0jwznq0l8qg9wh5grwg07b5cy3lzngvl5m2nl1ikp6vqssmf9qmr")) (patches (search-patches "lua-pkgconfig.patch" "lua52-liblua-so.patch")))) (build-system gnu-build-system) -- cgit v1.2.3 From 89deaf167af6ddb71c656c90f8a4d6e19feb4a47 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 29 May 2016 09:12:47 +0300 Subject: gnu: luajit: Update to 2.0.4. * gnu/packages/lua.scm (luajit): Update to 2.0.4. --- gnu/packages/lua.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/lua.scm') diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index abe657f644..b4b5dee8be 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -85,13 +85,13 @@ for configuration, scripting, and rapid prototyping.") (define-public luajit (package (name "luajit") - (version "2.0.3") + (version "2.0.4") (source (origin (method url-fetch) (uri (string-append "http://luajit.org/download/LuaJIT-" version ".tar.gz")) (sha256 - (base32 "0ydxpqkmsn2c341j4r2v6r5r0ig3kbwv3i9jran3iv81s6r6rgjm")) + (base32 "0zc0y7p6nx1c0pp4nhgbdgjljpfxsb5kgwp4ysz22l1p2bms83v2")) (patches (search-patches "luajit-symlinks.patch" "luajit-no_ldconfig.patch")))) (build-system gnu-build-system) -- cgit v1.2.3