From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id uPzfOImAwl5kfwAA0tVLHw (envelope-from ) for ; Mon, 18 May 2020 12:33:13 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id 6Cc5NImAwl5IEQAAB5/wlQ (envelope-from ) for ; Mon, 18 May 2020 12:33:13 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 4D32794042B for ; Mon, 18 May 2020 12:33:13 +0000 (UTC) Received: from localhost ([::1]:56504 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jaexE-0003md-7m for larch@yhetil.org; Mon, 18 May 2020 08:33:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50836) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jaex4-0003kl-KR for guix-patches@gnu.org; Mon, 18 May 2020 08:33:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34650) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jaex4-000174-Bm for guix-patches@gnu.org; Mon, 18 May 2020 08:33:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jaex4-0000e7-7k for guix-patches@gnu.org; Mon, 18 May 2020 08:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41363] [PATCH 1/3] gnu: Add lua-ossl. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 18 May 2020 12:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41363 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41363@debbugs.gnu.org Received: via spool by 41363-submit@debbugs.gnu.org id=B41363.15898051472427 (code B ref 41363); Mon, 18 May 2020 12:33:02 +0000 Received: (at 41363) by debbugs.gnu.org; 18 May 2020 12:32:27 +0000 Received: from localhost ([127.0.0.1]:46193 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaewU-0000d5-QT for submit@debbugs.gnu.org; Mon, 18 May 2020 08:32:27 -0400 Received: from mailout.easymail.ca ([64.68.200.34]:52236) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaewS-0000cn-Q1 for 41363@debbugs.gnu.org; Mon, 18 May 2020 08:32:25 -0400 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 3608CBFA79 for <41363@debbugs.gnu.org>; Mon, 18 May 2020 12:32:19 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo04-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo04-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id N8pmp2OiGiEj for <41363@debbugs.gnu.org>; Mon, 18 May 2020 12:32:18 +0000 (UTC) Received: from mercury.simonsouth.net (unknown [108.162.141.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id D0E79BFA6C for <41363@debbugs.gnu.org>; Mon, 18 May 2020 12:32:17 +0000 (UTC) From: Simon South References: <878shqtyaa.fsf@mercury.simonsouth.net> <20200517160940.5132-1-simon@simonsouth.net> Date: Mon, 18 May 2020 08:32:17 -0400 In-Reply-To: <20200517160940.5132-1-simon@simonsouth.net> (Simon South's message of "Sun, 17 May 2020 12:09:38 -0400") Message-ID: <87367xifu6.fsf@mercury.simonsouth.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: -1.01 X-TUID: uk0K2PjCe3xN --=-=-= Content-Type: text/plain luaossl doesn't actually require M4 to build, unlike cqueues. Here's a replacement patch that omits M4 from the package inputs. --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-Add-lua-ossl.patch Content-Transfer-Encoding: quoted-printable Content-Description: [PATCH 1/3] gnu: Add lua-ossl. >From 610918a771b84a081af24940ae94d35b1af7511e Mon Sep 17 00:00:00 2001 From: Simon South Date: Fri, 15 May 2020 11:18:44 -0400 Subject: [PATCH 1/3] gnu: Add lua-ossl. To: 41363@debbugs.gnu.org * gnu/packages/lua.scm (make-lua-ossl): New function. (lua-ossl, lua5.1-ossl, lua5.2-ossl): New variables. --- gnu/packages/lua.scm | 61 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 181ce76559..defb7b68e6 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -11,6 +11,7 @@ ;;; Copyright =C2=A9 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright =C2=A9 2018 Fis Trivial ;;; Copyright =C2=A9 2020 Nicolas Goaziou +;;; Copyright =C2=A9 2020 Simon South ;;; ;;; This file is part of GNU Guix. ;;; @@ -38,6 +39,7 @@ #:use-module (guix build-system trivial) #:use-module (gnu packages) #:use-module (gnu packages readline) + #:use-module (gnu packages m4) #:use-module (gnu packages tls) #:use-module (gnu packages xml) #:use-module (gnu packages glib) @@ -292,6 +294,65 @@ directory structure and file attributes.") (define-public lua5.2-filesystem (make-lua-filesystem "lua5.2-filesystem" lua-5.2)) =20 +(define (make-lua-ossl name lua) + (package + (name name) + (version "20170903") + (source (origin + (method url-fetch) + (uri (string-append "https://25thandclement.com/~william/" + "projects/releases/luaossl-" version ".t= gz")) + (sha256 + (base32 + "10392bvd0lzyibipblgiss09zlqh3a5zgqg1b9lgbybpqb9cv2k3")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags + (let ((out (assoc-ref %outputs "out")) + (lua-api-version ,(version-major+minor (package-version lua))= )) + (list "CC=3Dgcc" + "CFLAGS=3D'-D HAVE_SYS_SYSCTL_H=3D0'" ; sys/sysctl.h is dep= recated + (string-append "DESTDIR=3D" out) + (string-append "LUA_APIS=3D" lua-api-version) + "prefix=3D")) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'check) + (add-after 'install 'check + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (lua-version ,(version-major+minor (package-version lua= )))) + (setenv "LUA_CPATH" + (string-append out "/lib/lua/" lua-version "/?.so;;= ")) + (setenv "LUA_PATH" + (string-append out "/share/lua/" lua-version "/?.lu= a;;")) + (with-directory-excursion "regress" + (for-each (lambda (f) + (invoke "lua" f)) + (find-files "." "^[0-9].*\\.lua$")))) + #t))))) + (inputs + `(("lua" ,lua) + ("openssl" ,openssl))) + (home-page "https://25thandclement.com/~william/projects/luaossl.html") + (synopsis "OpenSSL bindings for Lua") + (description "The luaossl extension module for Lua provides comprehens= ive, +low-level bindings to the OpenSSL library, including support for certifica= te and +key management, key generation, signature verification, and deep bindings = to the +distinguished name, alternative name, and X.509v3 extension interfaces. I= t also +binds OpenSSL's bignum, message digest, HMAC, cipher, and CSPRNG interface= s.") + (license license:expat))) + +(define-public lua-ossl + (make-lua-ossl "lua-ossl" lua)) + +(define-public lua5.1-ossl + (make-lua-ossl "lua5.1-ossl" lua-5.1)) + +(define-public lua5.2-ossl + (make-lua-ossl "lua5.2-ossl" lua-5.2)) + (define (make-lua-sec name lua) (package (name name) --=20 2.26.2 --=-=-=--