GNU bug report logs - #58901
[PATCH] gnu: luajit: Update to commit 6c4826.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 58901 in the body.
You can then email your comments to 58901 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Leo Nikkilä <hello <at> lnikki.la>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: luajit: Update to commit 6c4826.
Date: Sun, 30 Oct 2022 21:19:53 +0200

Greetings, attached is a patch to update luajit to commit
6c4826f12c4d33b8b978004bc681eb1eef2be977.

My motivation for doing this was to get Neovim to build on aarch64-linux
again, which has been failing for a while due to incompatibilities with
the 2.1.0-beta3 release:

- https://ci.guix.gnu.org/build/1558481/details
- https://github.com/neovim/neovim/issues/15146#issuecomment-884154715

The 2.1.0-beta3 release is from 2017, and now quite dated.

Unfortunately there hasn't been a tagged release in a long time, and
dependents have resorted to various commits of the 2.1.0 branch. I chose
this particular commit from Nixpkgs:

- https://github.com/NixOS/nixpkgs/blob/3fa15c357033b1c7bdb88f34c1fb9f6427b4754c/pkgs/development/interpreters/luajit/2.1.nix

In addition to fixing the Neovim build, this also fixes a vulnerability
that has been reported in the luajit 2.1.0-beta3 release and patched in
the development tree:

- https://nvd.nist.gov/vuln/detail/CVE-2020-24372
- https://github.com/LuaJIT/LuaJIT/issues/603

I was also able to remove the luajit patch for a missing ldconfig, this
behaviour has been fixed in upstream since January 2020:

- https://github.com/LuaJIT/LuaJIT/commit/18c9cf7d3788a8f7408df45df92fc4ae3bcc0d80

Here's what `guix refresh' has to say about luajit:

    $ guix refresh --list-dependent luajit
    Building the following 42 packages would ensure 62 dependent packages are rebuilt: arcan-wayland <at> 0.5.5.2-1.b4dd1fb xarcan <at> 0.5.4-1.8e6ee02 arcan-sdl <at> 0.5.5.2-1.b4dd1fb sysbench <at> 1.0.20 knot-resolver <at> 5.4.4 edi <at> 0.8.0 rage <at> 0.4.0 ephoto <at> 1.6.0 enlightenment <at> 0.25.4 terminology <at> 1.12.1 evisum <at> 0.6.0 econnman <at> 1.1 epour <at> 0.7.0 jami <at> 20220825.0828.c10f01f pinentry-efl <at> 1.2.0 instead <at> 3.3.5 love-nuklear <at> 2.6.1 mrrescue <at> 1.02e tome4 <at> 1.7.4 solarus-quest-editor <at> 1.6.5 naev <at> 0.9.4 mrg <at> 0.1.4 uftrace <at> 0.11 bpftrace <at> 0.15.0 rspamd <at> 3.2 hexchat <at> 2.16.1 minetest-unified-inventory <at> 2021-12-26 minetest-worldedit <at> 1.3 minetest-ethereal <at> 1.29-0.7670c1d minetest-throwing-arrows <at> 1.1-0.059cc89 minetest-basic-trains <at> 1.0.1 minetest-mesecons <at> 1.2.1-63.27c3c51 minetest-homedecor-modpack <at> 2022-05-18 minetest-coloredwood <at> 2021-04-14-1 minetest-technic <at> 2022-02-06 minetest-mobs-animal <at> 2021-11-14 obs-wlrobs <at> 1.0 obs-spectralizer <at> 1.3.3 obs-websocket <at> 4.9.1 eovim <at> 0.2.0 luakit <at> 2.3 nginx-lua-module <at> 0.10.16

I've tested this update by successfully building the dependent packages
on x86_64-linux and aarch64-linux, except for nginx-lua-module and
obs-websocket which have been failing on CI as well due to build errors
unrelated to luajit.

Message #8 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Leo Nikkilä <hello <at> lnikki.la>
To: guix-patches <at> gnu.org
Cc: Leo Nikkilä <hello <at> lnikki.la>
Subject: [PATCH] gnu: luajit: Update to commit 6c4826.
Date: Sun, 30 Oct 2022 21:19:56 +0200

* gnu/packages/lua.scm (luajit)[source]: Use git-fetch, remove patch.
* gnu/packages/patches/luajit-no_ldconfig.patch: Delete patch.
---
 gnu/packages/lua.scm                          | 73 ++++++++++---------
 gnu/packages/patches/luajit-no_ldconfig.patch | 31 --------
 2 files changed, 39 insertions(+), 65 deletions(-)
 delete mode 100644 gnu/packages/patches/luajit-no_ldconfig.patch

diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm
index 829c819975..d914228107 100644
--- a/gnu/packages/lua.scm
+++ b/gnu/packages/lua.scm
@@ -17,6 +17,7 @@
 ;;; Copyright © 2021 Greg Hogan <code <at> greghogan.com>
 ;;; Copyright © 2022 Brandon Lucas <br <at> ndon.dk>
 ;;; Copyright © 2022 Luis Henrique Gomes Higino <luishenriquegh2701 <at> gmail.com>
+;;; Copyright © 2022 Leo Nikkilä <hello <at> lnikki.la>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -149,43 +150,47 @@ (define-public lua-5.1
                                       "lua51-pkgconfig.patch"))))))
 
 (define-public luajit
-  (package
-    (name "luajit")
-    (version "2.1.0-beta3")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "http://luajit.org/download/LuaJIT-"
-                                  version ".tar.gz"))
-              (sha256
-               (base32 "1hyrhpkwjqsv54hnnx4cl8vk44h9d6c9w0fz1jfjz00w255y7lhs"))
-              (patches (search-patches "luajit-no_ldconfig.patch"))))
-    (build-system gnu-build-system)
-    (arguments
-     `(#:tests? #f                      ; luajit is distributed without tests
-       #:phases
-       (modify-phases %standard-phases
-         (delete 'configure)            ; no configure script
-         (add-after 'install 'create-luajit-symlink
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (bin (string-append out "/bin")))
-               (with-directory-excursion bin
-                 (symlink ,(string-append name "-" version)
-                          ,name)
-                 #t)))))
-         #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")))))
-    (home-page "https://www.luajit.org/")
-    (synopsis "Just in time compiler for Lua programming language version 5.1")
-    ;; On powerpc64le-linux, the build fails with an error: "No support for
-    ;; PowerPC 64 bit mode (yet)".  See: https://issues.guix.gnu.org/49220
-    (supported-systems (fold delete %supported-systems
-                             (list "powerpc64le-linux" "riscv64-linux")))
-    (description
-     "LuaJIT is a Just-In-Time Compiler (JIT) for the Lua
+  (let ((branch "2.1.0-beta3")
+        (commit "6c4826f12c4d33b8b978004bc681eb1eef2be977"))
+    (package
+      (name "luajit")
+      (version (git-version branch "0" commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://luajit.org/git/luajit.git")
+                      (commit commit)))
+                (sha256
+                 (base32
+                  "1a002yh8v1i1q9w09494q0b8vsbmw3amn9jgfs5qnz7ba54jij0q"))))
+      (build-system gnu-build-system)
+      (arguments
+       `(#:tests? #f                    ; luajit is distributed without tests
+         #:phases
+         (modify-phases %standard-phases
+           (delete 'configure)          ; no configure script
+           (add-after 'install 'create-luajit-symlink
+             (lambda* (#:key outputs #:allow-other-keys)
+               (let* ((out (assoc-ref outputs "out"))
+                      (bin (string-append out "/bin")))
+                 (with-directory-excursion bin
+                   (symlink ,(string-append name "-" branch)
+                            ,name))))))
+         #:make-flags (list (string-append "PREFIX="
+                                           (assoc-ref %outputs "out")))))
+      (home-page "https://www.luajit.org/")
+      (synopsis
+       "Just in time compiler for Lua programming language version 5.1")
+      ;; On powerpc64le-linux, the build fails with an error: "No support for
+      ;; PowerPC 64 bit mode (yet)".  See: https://issues.guix.gnu.org/49220
+      (supported-systems (fold delete %supported-systems
+                               (list "powerpc64le-linux" "riscv64-linux")))
+      (description
+       "LuaJIT is a Just-In-Time Compiler (JIT) for the Lua
 programming language.  Lua is a powerful, dynamic and light-weight programming
 language.  It may be embedded or used as a general-purpose, stand-alone
 language.")
-    (license license:x11)))
+      (license license:x11))))
 
 (define-public luajit-lua52-openresty
   (package
diff --git a/gnu/packages/patches/luajit-no_ldconfig.patch b/gnu/packages/patches/luajit-no_ldconfig.patch
deleted file mode 100644
index 8000e8e4e5..0000000000
--- a/gnu/packages/patches/luajit-no_ldconfig.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 629200f48e18dc1a3a5229739748bad0e2a6a0a2 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Tom=C3=A1=C5=A1=20=C4=8Cech?= <sleep_walker <at> suse.cz>
-Date: Wed, 4 Feb 2015 11:37:16 +0100
-Subject: [PATCH] Do not silently and prematurely end install when ldconfig is
- missing
-
----
- Makefile | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 343ecb5..4667146 100644
---- a/Makefile
-+++ b/Makefile
-@@ -112,9 +112,10 @@ install: $(INSTALL_DEP)
- 	$(RM) $(INSTALL_TSYM) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2)
- 	cd src && test -f $(FILE_SO) && \
- 	  $(INSTALL_X) $(FILE_SO) $(INSTALL_DYN) && \
--	  $(LDCONFIG) $(INSTALL_LIB) && \
--	  $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT1) && \
--	  $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT2) || :
-+	  ( $(LDCONFIG) $(INSTALL_LIB) ; \
-+	    $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT1) && \
-+	    $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT2) || : \
-+	  )
- 	cd etc && $(INSTALL_F) $(FILE_MAN) $(INSTALL_MAN)
- 	cd etc && $(SED_PC) $(FILE_PC) > $(FILE_PC).tmp && \
- 	  $(INSTALL_F) $(FILE_PC).tmp $(INSTALL_PC) && \
--- 
-2.2.2
-
-- 
2.34.0

Message #13 received at 58901-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Leo Nikkilä <hello <at> lnikki.la>
Cc: 58901-done <at> debbugs.gnu.org
Subject: Re: bug#58901: [PATCH] gnu: luajit: Update to commit 6c4826.
Date: Mon, 14 Nov 2022 12:23:40 +0100

Hi,

Leo Nikkilä <hello <at> lnikki.la> skribis:

> Greetings, attached is a patch to update luajit to commit
> 6c4826f12c4d33b8b978004bc681eb1eef2be977.
>
> My motivation for doing this was to get Neovim to build on aarch64-linux
> again, which has been failing for a while due to incompatibilities with
> the 2.1.0-beta3 release:
>
> - https://ci.guix.gnu.org/build/1558481/details
> - https://github.com/neovim/neovim/issues/15146#issuecomment-884154715
>
> The 2.1.0-beta3 release is from 2017, and now quite dated.
>
> Unfortunately there hasn't been a tagged release in a long time, and
> dependents have resorted to various commits of the 2.1.0 branch. I chose
> this particular commit from Nixpkgs:
>
> - https://github.com/NixOS/nixpkgs/blob/3fa15c357033b1c7bdb88f34c1fb9f6427b4754c/pkgs/development/interpreters/luajit/2.1.nix
>
> In addition to fixing the Neovim build, this also fixes a vulnerability
> that has been reported in the luajit 2.1.0-beta3 release and patched in
> the development tree:
>
> - https://nvd.nist.gov/vuln/detail/CVE-2020-24372
> - https://github.com/LuaJIT/LuaJIT/issues/603
>
> I was also able to remove the luajit patch for a missing ldconfig, this
> behaviour has been fixed in upstream since January 2020:
>
> - https://github.com/LuaJIT/LuaJIT/commit/18c9cf7d3788a8f7408df45df92fc4ae3bcc0d80

That makes a lot of sense.  Finally applied, thanks!

Ludo’.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.