From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id EOjQE4Tu+mMVAgEAbAwnHQ (envelope-from ) for ; Sun, 26 Feb 2023 06:30:44 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id OHbUE4Tu+mNs9wAA9RJhRA (envelope-from ) for ; Sun, 26 Feb 2023 06:30:44 +0100 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 C44CB17CF7 for ; Sun, 26 Feb 2023 06:30:43 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=mkSittm1; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1677389444; a=rsa-sha256; cv=none; b=dclgWZjAYUzbScTrVUvsvdxPWpUYDkWF4QgXgliUduDu8iNULavIHZ0Mj5hjSPpkYcyKgp XURr5Op5+qN+/Zr/n8/OEC5DRKS4c1b1ZpHy5CPlIpzbToBad/DsvRWBrAchef7kkjgAmq rgUkrSeNU8DE94w5XDryLn6uqTVQdY3K9zAGAFGeRQTty8uZF+0iFYdCngpGc/txK1/tJl /T596YfHX0MAqVzI2INquY0yMW84yGyOfEFNaAJCpVhxa1IhX2v06Y0BDxKcY5cwL/Y15M JAjgSyRvy+W1e5ERBo+O5nP439fFeYdrwo9C+rs3UpzPUJMD0Npg0rGMed7qqg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=mkSittm1; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1677389444; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=uylHATIgjDtx7YsP5tuZRd60DUid7cIxlIMmu8Y0g8U=; b=dkYJHe9FKEadcMIEhXgl9gRiifeu8YpkQheHHdf1omFmeJWmPHwCTfnkZpmG1GeUaKE/HC T60tCxN7xztT8Z9ZlLh//cC/vFmXWIVlgphh1Y1Z8f+Ol/Rz0CVs6ABX7Jer0UwnrLqBJg c0ZOdKxXKbYk2jaWCSaDE0nf1jG49Ynkwb1WJUEMfhq8ruUA5/CDVo7TlywXf3Wwu2+Oud XzG6ewnh3yOWmH4zRLoOKIt2Ah+McqPKjyZFTRRv4RSfEEWQ6kt/kImj6wVvtyB4ZgnTwX aCGVx5dlC8bK8DyjSQhh1+spcu2kNEgqRq/R2TpYYH888H97qaccc15VxTPBFg== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pW9c2-0003P8-04; Sun, 26 Feb 2023 00:30:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pW9bo-0003OM-3I for bug-guix@gnu.org; Sun, 26 Feb 2023 00:30:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pW9bn-0003gR-Ht for bug-guix@gnu.org; Sun, 26 Feb 2023 00:30:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pW9bn-0006Bx-6I for bug-guix@gnu.org; Sun, 26 Feb 2023 00:30:03 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#56137: [PATCH 1/2] gnu: openssl-1.1: Do not quasiquote arguments. References: <87r13h3tqr.fsf@gnu.org> In-Reply-To: <87r13h3tqr.fsf@gnu.org> Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sun, 26 Feb 2023 05:30:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56137 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 56137@debbugs.gnu.org Cc: sjors@sprovoost.nl, ludo@gnu.org, maximedevos@telenet.be, Maxim Cournoyer , zimon.toutoune@gmail.com Received: via spool by 56137-submit@debbugs.gnu.org id=B56137.167738936023699 (code B ref 56137); Sun, 26 Feb 2023 05:30:03 +0000 Received: (at 56137) by debbugs.gnu.org; 26 Feb 2023 05:29:20 +0000 Received: from localhost ([127.0.0.1]:42141 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW9b5-0006AA-DG for submit@debbugs.gnu.org; Sun, 26 Feb 2023 00:29:20 -0500 Received: from mail-qt1-f176.google.com ([209.85.160.176]:35660) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW9b3-00069w-5s for 56137@debbugs.gnu.org; Sun, 26 Feb 2023 00:29:18 -0500 Received: by mail-qt1-f176.google.com with SMTP id w42so3633652qtc.2 for <56137@debbugs.gnu.org>; Sat, 25 Feb 2023 21:29:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=uylHATIgjDtx7YsP5tuZRd60DUid7cIxlIMmu8Y0g8U=; b=mkSittm1zLsoRZ6MBynQOIPUB+xTrFP3Xwx+lCm82Cjl27g13NvnxACfxmHkQ8xGPc RuCbedpkTfTlawxyHSXinz/d8GcczBRCcGvdTrU2QpbQ/DGExepnCeeZw851/4V9SYGY ZRjZx4vv76M/gCoLYnnlIvjbgclOFuSTWo17+4mijSUR7wFo0HukKkKxsJrWBpLuGweb KnR28sl+EvPEn0o6sVhTlX1iXsyFromyUa4V5SdMHLtUDixE0yuVw1Ox3oUvpClRX5uG SGitX86Xnvt65D5ZIGSIOC7zqmtAoP2dDjzSFdlAJwz1JS4noeyF9sRhbtlKIt5SmOYA nmEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=uylHATIgjDtx7YsP5tuZRd60DUid7cIxlIMmu8Y0g8U=; b=LftVXF4CCn7KVqB1yluu+8wlafdIgI8d44Qr0wGTDe24NoVc1PdUuF+gTf59oScGQl 2XvDnvYUeZ59xmyl6NODTanVpW7sshjHEy0gqYGwDE0A1XZesB0ip7AQobQPEXoh7nMC kMc3xNygU5r6kHX5bi3GOcwYybZihcBx1qYlisnV3TFzeowxpIfGz/HPvQMZZ4NtVkzH HzBXU6XziamaTEMWU3bKzCnkHxShCp/wOj2CCxGkSVA+ys86qgEuDnqgPrWH+8bHDibX At2YcIUb2kHsBb1wGmLb4BPrL4w0fSRNxnTaU8RWkTgdeE6ReyrWDF9ZLWKluzbkM/4P mQ4g== X-Gm-Message-State: AO0yUKU1m4PQbyynpCFFnIhNUAAVhiXAUsrRCUyoMwKef1Zt89xVjhDJ QHUf2z57di19eHlJwmI2L1qNZrAxe7XlWdYW X-Google-Smtp-Source: AK7set8gaVZECPMBiLZ4J9A/iRvdzZmJb67Q0qmZo5DMgNT1WAY9WnNadZyzMvOLnh6jIicKvJRhVA== X-Received: by 2002:ac8:5cc7:0:b0:3b6:8bc3:a09c with SMTP id s7-20020ac85cc7000000b003b68bc3a09cmr8671833qta.25.1677389351396; Sat, 25 Feb 2023 21:29:11 -0800 (PST) Received: from localhost.localdomain (dsl-141-27.b2b2c.ca. [66.158.141.27]) by smtp.gmail.com with ESMTPSA id z15-20020ac8454f000000b003b848759ed8sm2429567qtn.47.2023.02.25.21.29.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Feb 2023 21:29:11 -0800 (PST) From: Maxim Cournoyer Date: Sun, 26 Feb 2023 00:29:04 -0500 Message-Id: <20230226052906.784-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: X-Migadu-Queue-Id: C44CB17CF7 X-Spam-Score: -1.68 X-Migadu-Spam-Score: -1.68 X-Migadu-Scanner: scn0.migadu.com List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-TUID: YUP7R7Swt3aB * gnu/packages/tls.scm (openssl-1.1): Do not quasiquote arguments. --- gnu/packages/tls.scm | 190 +++++++++++++++++++++---------------------- 1 file changed, 94 insertions(+), 96 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 59e0e28feb..524b801443 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2018 Clément Lassieur ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen -;;; Copyright © 2020, 2021 Maxim Cournoyer +;;; Copyright © 2020, 2021, 2023 Maxim Cournoyer ;;; Copyright © 2021 Solene Rapenne ;;; Copyright © 2021 Brice Waegeneire ;;; Copyright © 2021 Maxime Devos @@ -515,107 +515,105 @@ (define-public openssl-1.1 "static")) ;6.4 MiB of .a files (native-inputs (list perl)) (arguments - `(#:parallel-tests? #f - #:test-target "test" + (list + #:parallel-tests? #f + #:test-target "test" - ;; Changes to OpenSSL sometimes cause Perl to "sneak in" to the closure, - ;; so we explicitly disallow it here. - #:disallowed-references ,(list (canonical-package perl)) - #:phases - ,#~ - (modify-phases %standard-phases - #$@(if (%current-target-system) - #~((add-before - 'configure 'set-cross-compile - (lambda* (#:key target #:allow-other-keys) - (setenv "CROSS_COMPILE" (string-append target "-")) - (setenv "CONFIGURE_TARGET_ARCH" - #$(target->openssl-target - (%current-target-system)))))) - #~()) - ;; This test seems to be dependant on kernel features. - ;; https://github.com/openssl/openssl/issues/12242 - #$@(if (or (target-arm?) - (target-riscv64?)) - #~((replace 'check - (lambda* (#:key tests? test-target #:allow-other-keys) - (when tests? - (invoke "make" "TESTS=-test_afalg" test-target))))) - #~()) - (replace 'configure - (lambda* (#:key configure-flags #:allow-other-keys) - (let* ((out #$output) - (lib (string-append out "/lib"))) - ;; It's not a shebang so patch-source-shebangs misses it. - (substitute* "config" - (("/usr/bin/env") - (string-append (assoc-ref %build-inputs "coreutils") - "/bin/env"))) - (apply - invoke #$@(if (%current-target-system) - #~("./Configure") - #~("./config")) - "shared" ;build shared libraries - "--libdir=lib" + ;; Changes to OpenSSL sometimes cause Perl to "sneak in" to the closure, + ;; so we explicitly disallow it here. + #:disallowed-references (list (canonical-package perl)) + #:phases + #~(modify-phases %standard-phases + #$@(if (%current-target-system) + #~((add-before 'configure 'set-cross-compile + (lambda* (#:key target #:allow-other-keys) + (setenv "CROSS_COMPILE" (string-append target "-")) + (setenv "CONFIGURE_TARGET_ARCH" + #$(target->openssl-target + (%current-target-system)))))) + #~()) + ;; This test seems to be dependant on kernel features. + ;; https://github.com/openssl/openssl/issues/12242 + #$@(if (or (target-arm?) + (target-riscv64?)) + #~((replace 'check + (lambda* (#:key tests? test-target #:allow-other-keys) + (when tests? + (invoke "make" "TESTS=-test_afalg" test-target))))) + #~()) + (replace 'configure + (lambda* (#:key configure-flags #:allow-other-keys) + (let* ((out #$output) + (lib (string-append out "/lib"))) + ;; It's not a shebang so patch-source-shebangs misses it. + (substitute* "config" + (("/usr/bin/env") + (string-append (assoc-ref %build-inputs "coreutils") + "/bin/env"))) + (apply + invoke #$@(if (%current-target-system) + #~("./Configure") + #~("./config")) + "shared" ;build shared libraries + "--libdir=lib" - ;; The default for this catch-all directory is - ;; PREFIX/ssl. Change that to something more - ;; conventional. - (string-append "--openssldir=" out - "/share/openssl-" - #$(package-version this-package)) + ;; The default for this catch-all directory is + ;; PREFIX/ssl. Change that to something more + ;; conventional. + (string-append "--openssldir=" out + "/share/openssl-" + #$(package-version this-package)) - (string-append "--prefix=" out) - (string-append "-Wl,-rpath," lib) - #$@(if (%current-target-system) - #~((getenv "CONFIGURE_TARGET_ARCH")) - #~()) - configure-flags) - ;; Output the configure variables. - (invoke "perl" "configdata.pm" "--dump")))) - (add-after 'install 'move-static-libraries - (lambda _ - ;; Move static libraries to the "static" output. - (let* ((out #$output) - (lib (string-append out "/lib")) - (static #$output:static) - (slib (string-append static "/lib"))) - (for-each (lambda (file) - (install-file file slib) - (delete-file file)) - (find-files - lib - #$(if (target-mingw?) - '(lambda (filename _) - (and (string-suffix? ".a" filename) - (not (string-suffix? ".dll.a" filename)))) - "\\.a$")))))) - (add-after 'install 'move-extra-documentation - (lambda _ - ;; Move man pages and full HTML documentation to "doc". - (let* ((out #$output) - (man (string-append out "/share/man")) - (html (string-append out "/share/doc/openssl")) - (doc #$output:doc) - (man-target (string-append doc "/share/man")) - (html-target (string-append doc "/share/doc/openssl"))) - (mkdir-p (dirname man-target)) - (mkdir-p (dirname html-target)) - (rename-file man man-target) - (rename-file html html-target)))) - (add-after - 'install 'remove-miscellany - (lambda _ - ;; The 'misc' directory contains random undocumented shell and Perl - ;; scripts. Remove them to avoid retaining a reference on Perl. - (delete-file-recursively (string-append #$output "/share/openssl-" - #$(package-version this-package) - "/misc"))))))) + (string-append "--prefix=" out) + (string-append "-Wl,-rpath," lib) + #$@(if (%current-target-system) + #~((getenv "CONFIGURE_TARGET_ARCH")) + #~()) + configure-flags) + ;; Output the configure variables. + (invoke "perl" "configdata.pm" "--dump")))) + (add-after 'install 'move-static-libraries + (lambda _ + ;; Move static libraries to the "static" output. + (let* ((out #$output) + (lib (string-append out "/lib")) + (static #$output:static) + (slib (string-append static "/lib"))) + (for-each (lambda (file) + (install-file file slib) + (delete-file file)) + (find-files + lib + #$(if (target-mingw?) + '(lambda (filename _) + (and (string-suffix? ".a" filename) + (not (string-suffix? ".dll.a" filename)))) + "\\.a$")))))) + (add-after 'install 'move-extra-documentation + (lambda _ + ;; Move man pages and full HTML documentation to "doc". + (let* ((out #$output) + (man (string-append out "/share/man")) + (html (string-append out "/share/doc/openssl")) + (doc #$output:doc) + (man-target (string-append doc "/share/man")) + (html-target (string-append doc "/share/doc/openssl"))) + (mkdir-p (dirname man-target)) + (mkdir-p (dirname html-target)) + (rename-file man man-target) + (rename-file html html-target)))) + (add-after + 'install 'remove-miscellany + (lambda _ + ;; The 'misc' directory contains random undocumented shell and Perl + ;; scripts. Remove them to avoid retaining a reference on Perl. + (delete-file-recursively (string-append #$output "/share/openssl-" + #$(package-version this-package) + "/misc"))))))) (native-search-paths (list $SSL_CERT_DIR $SSL_CERT_FILE)) (synopsis "SSL/TLS implementation") - (description - "OpenSSL is an implementation of SSL/TLS.") + (description "OpenSSL is an implementation of SSL/TLS.") (license license:openssl) (home-page "https://www.openssl.org/"))) base-commit: cb0d8100b288b5b0d130820207db17764b7d2140 -- 2.39.1