From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id kKtSIa+B7GBRMwAAgWs5BA (envelope-from ) for ; Mon, 12 Jul 2021 19:53:51 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id 4AcUHa+B7GBABQAAB5/wlQ (envelope-from ) for ; Mon, 12 Jul 2021 17:53:51 +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 2DB061620C for ; Mon, 12 Jul 2021 19:53:51 +0200 (CEST) Received: from localhost ([::1]:43820 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m307q-0006ip-7U for larch@yhetil.org; Mon, 12 Jul 2021 13:53:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56894) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3074-0004iU-7G for guix-patches@gnu.org; Mon, 12 Jul 2021 13:53:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55521) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3073-0006EI-Sg for guix-patches@gnu.org; Mon, 12 Jul 2021 13:53:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m3073-0005qe-SL for guix-patches@gnu.org; Mon, 12 Jul 2021 13:53:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49538] [CORE-UPDATES][PATCH] gnu: openssl-1.0: Build with openssl sources. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 12 Jul 2021 17:53:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49538 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49538@debbugs.gnu.org Cc: Efraim Flashner X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162611234922438 (code B ref -1); Mon, 12 Jul 2021 17:53:01 +0000 Received: (at submit) by debbugs.gnu.org; 12 Jul 2021 17:52:29 +0000 Received: from localhost ([127.0.0.1]:38834 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m306X-0005pq-6g for submit@debbugs.gnu.org; Mon, 12 Jul 2021 13:52:29 -0400 Received: from lists.gnu.org ([209.51.188.17]:55388) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m306V-0005pi-RS for submit@debbugs.gnu.org; Mon, 12 Jul 2021 13:52:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56818) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m306V-000399-Hi for guix-patches@gnu.org; Mon, 12 Jul 2021 13:52:27 -0400 Received: from flashner.co.il ([178.62.234.194]:48210) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m306T-0005Vu-Gb for guix-patches@gnu.org; Mon, 12 Jul 2021 13:52:27 -0400 Received: from localhost (unknown [31.210.177.125]) by flashner.co.il (Postfix) with ESMTPSA id 68CF8400F4; Mon, 12 Jul 2021 17:51:52 +0000 (UTC) From: Efraim Flashner Date: Mon, 12 Jul 2021 20:50:22 +0300 Message-Id: <9d380d39f78149a6a6d78c484fab6ce6cb1059ba.1626112108.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=178.62.234.194; envelope-from=efraim@flashner.co.il; helo=flashner.co.il X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1626112431; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=J03DzSlwtHqVQWUF/034ts23Gmr4N5Yghcz2Cqrw738=; b=in/ukgNO6Jv8kVf7WT3lkI+cb9hVsEeydoFoqCfsH03wFpHBO6XEO03cu0Qn0je6sIoWFW oda3YMpdbtfaMJHzRSxBmOBNff/1L9hUjiz/ngPHuy1B0aIC2trJnP+H7FC+B6bS3v9eBS S4GxaR/oHYcaz5s/94P8XzD+tQaJjFwr0v2lik/e6vqx5IyMEn2E3vdzNUKnTEINMHgody +Md6aBaIbSw91ZqRnw01JDvje99bXFCvwqnD0E4CFGjQFp0sT1+29Ar0gZVI2Ll2EI5g1b ibygGrdvGG4sBKac/OP98okNsWInxGw/2sGHsieEieGuvhAyai29oabuG8WCbw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1626112431; a=rsa-sha256; cv=none; b=pi9+LPFOjRSlcWzvPtEhrtr6rgEu5fzMKQO907YUVa/XPbSljJEeqOuCgHvu7smicMtWX+ 22tSm4qbGQWelz806IUHmEs9fEwCkcJ7HpxUjmzEpYLfDuCEuX8a/jsFgpm1BCl9tFsweN 0hd6QKr5YNJiQnLcMtqU6es7A4oV04BewM8rYFrgxx4HTVQ6hQ05WfXnR1sIZ6z41a5LI+ C6iAl5XCFoey/QrNI/LkDmYkTIWfKAPvDZ63hM2PfZ1yQQ22rxQi8dk6oYE/uD6TGSPUdq yieVXWskt2KYY5isBNOtL71u3RMLJm6BvZq7ltsZU4ZG86WvAXdLwkbkCgZ1/w== ARC-Authentication-Results: i=1; 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-Migadu-Spam-Score: 2.59 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-Migadu-Queue-Id: 2DB061620C X-Spam-Score: 2.59 X-Migadu-Scanner: scn0.migadu.com X-TUID: yPQQ2njuzNuO * gnu/packages/tls.scm (openssl-1.0): Replace package with openssl built with openssl-1.0 API. --- I was poking around with openssl on master and I realized that openssl-1.1 can be built targeting the API for 1.1, 1.0 or 0.9.8. I test built dillo with openssl-1.1 with the API for 1.0 and it was working for me. I figure this isn't a bad way to make things a bit better while we try to get rid of openssl-1.0. --- gnu/packages/tls.scm | 92 ++------------------------------------------ 1 file changed, 3 insertions(+), 89 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 297e16dd70..ed22518e02 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -447,97 +447,11 @@ required structures.") (home-page "https://www.openssl.org/"))) (define-public openssl-1.0 - (package - (inherit openssl) + (package/inherit openssl (name "openssl") - (version "1.0.2u") - (source (origin - (method url-fetch) - (uri (list (string-append "https://www.openssl.org/source/openssl-" - version ".tar.gz") - (string-append "ftp://ftp.openssl.org/source/" - "openssl-" version ".tar.gz") - (string-append "ftp://ftp.openssl.org/source/old/" - (string-trim-right version char-set:letter) - "/openssl-" version ".tar.gz"))) - (sha256 - (base32 - "05lxcs4hzyfqd5jn0d9p0fvqna62v2s4pc9qgmq0dpcknkzwdl7c")) - (patches (search-patches "openssl-runpath.patch" - "openssl-c-rehash-in.patch")))) - (outputs '("out" - "doc" ;1.5MiB of man3 pages - "static")) ;6MiB of .a files (arguments - (substitute-keyword-arguments (package-arguments openssl) - ;; Parallel build is not supported in 1.0.x. - ((#:parallel-build? _ #f) #f) - ((#:phases phases) - `(modify-phases ,phases - (add-before 'patch-source-shebangs 'patch-tests - (lambda* (#:key inputs native-inputs #:allow-other-keys) - (let ((bash (assoc-ref (or native-inputs inputs) "bash"))) - (substitute* (find-files "test" ".*") - (("/bin/sh") - (string-append bash "/bin/sh")) - (("/bin/rm") - "rm")) - #t))) - (add-before 'configure 'patch-Makefile.org - (lambda* (#:key outputs #:allow-other-keys) - ;; The default MANDIR is some unusual place. Fix that. - (let ((out (assoc-ref outputs "out"))) - (patch-makefile-SHELL "Makefile.org") - (substitute* "Makefile.org" - (("^MANDIR[[:blank:]]*=.*$") - (string-append "MANDIR = " out "/share/man\n"))) - #t))) - (replace 'configure - ;; Override this phase because OpenSSL 1.0 does not understand -rpath. - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (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-" ,version) - - (string-append "--prefix=" out) - ,@(if (%current-target-system) - '((getenv "CONFIGURE_TARGET_ARCH")) - '()))))) - (delete 'move-extra-documentation) - (add-after 'install 'move-man3-pages - (lambda* (#:key outputs #:allow-other-keys) - ;; Move section 3 man pages to "doc". - (let* ((out (assoc-ref outputs "out")) - (man3 (string-append out "/share/man/man3")) - (doc (assoc-ref outputs "doc")) - (target (string-append doc "/share/man/man3"))) - (mkdir-p target) - (for-each (lambda (file) - (rename-file file - (string-append target "/" - (basename file)))) - (find-files man3)) - (delete-file-recursively man3) - #t))) - ;; XXX: Duplicate this phase to make sure 'version' evaluates - ;; in the current scope and not the inherited one. - (replace 'remove-miscellany - (lambda* (#:key outputs #:allow-other-keys) - ;; The 'misc' directory contains random undocumented shell and Perl - ;; scripts. Remove them to avoid retaining a reference on Perl. - (let ((out (assoc-ref outputs "out"))) - (delete-file-recursively (string-append out "/share/openssl-" - ,version "/misc")) - #t))))))))) + `(#:configure-flags (list "--api=1.0.0") + ,@((package-arguments openssl)))))) (define-public libressl (package base-commit: 12c2648f4e8e050d9374ca70efd1856dc8238979 -- 2.32.0