From patchwork Mon Nov 16 17:26:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 25157 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 428A927BBF6; Mon, 16 Nov 2020 17:27:20 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 80B6327BBF5 for ; Mon, 16 Nov 2020 17:27:19 +0000 (GMT) Received: from localhost ([::1]:48598 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1keiHe-0003K9-Nb for patchwork@mira.cbaines.net; Mon, 16 Nov 2020 12:27:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50304) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1keiHP-0003Jt-N1 for guix-patches@gnu.org; Mon, 16 Nov 2020 12:27:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:45525) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1keiHO-0001Av-Ay for guix-patches@gnu.org; Mon, 16 Nov 2020 12:27:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1keiHO-0006fG-6L for guix-patches@gnu.org; Mon, 16 Nov 2020 12:27:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44656] [PATCH] Upgrade pypy3 Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 16 Nov 2020 17:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44656 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Lars-Dominik Braun Cc: 44656@debbugs.gnu.org Received: via spool by 44656-submit@debbugs.gnu.org id=B44656.160554760225592 (code B ref 44656); Mon, 16 Nov 2020 17:27:02 +0000 Received: (at 44656) by debbugs.gnu.org; 16 Nov 2020 17:26:42 +0000 Received: from localhost ([127.0.0.1]:57071 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1keiH3-0006eh-Mr for submit@debbugs.gnu.org; Mon, 16 Nov 2020 12:26:41 -0500 Received: from mira.cbaines.net ([212.71.252.8]:37664) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1keiH1-0006eY-Jk for 44656@debbugs.gnu.org; Mon, 16 Nov 2020 12:26:40 -0500 Received: from localhost (188.30.135.14.threembb.co.uk [188.30.135.14]) by mira.cbaines.net (Postfix) with ESMTPSA id B462A27BBF5; Mon, 16 Nov 2020 17:26:38 +0000 (GMT) Received: from capella (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 59e32ddb; Mon, 16 Nov 2020 17:26:36 +0000 (UTC) References: <20201115123911.GA1956@noor.fritz.box> <87zh3ibekx.fsf@cbaines.net> <20201115195549.GA1304@noor.fritz.box> User-agent: mu4e 1.4.13; emacs 27.1 From: Christopher Baines In-reply-to: <20201115195549.GA1304@noor.fritz.box> Date: Mon, 16 Nov 2020 17:26:32 +0000 Message-ID: <874klpnrg7.fsf@cbaines.net> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Lars-Dominik Braun writes: >> If there are things that aren't essential to change when changing the >> version, they're fine to have in subsequent commits/patches. > the patches do not depend on each other. The second patch merely > contains quality of life improvements that work with or without bumping > the version. But I though I just send them in one go. Fair enough, the version upgrade works fine for me. Regarding the second patch: ++ if not os.path.exists(odir): ++ odir = None + + # OpenSSL didn't supply the goods. Try some other options + for f in certFiles: @@ -793,7 +806,12 @@ ease from the desktop to a microcontroller or embedded system.") ; attribute 'IntFlag' (invoke "python2" "package.py" "--archive-name" "pypy-dist" - "--builddir" (getcwd))))) + "--builddir" (getcwd)) + ;; install pip and setuptools into the dist directory. + ;; XXX: Breaks virtualenv, because it does not set +w + ;; on files copied from the store. + ;(invoke "pypy-dist/bin/pypy3" "-m" "ensurepip") + ))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (if tests? I'm not quite sure what this would do if it's commented back in. diff --git a/gnu/packages/patches/pypy3-7.3.1-ssl-paths.patch b/gnu/packages/patches/pypy3-7.3.1-ssl-paths.patch new file mode 100644 index 0000000000..d21133b4ae --- /dev/null +++ b/gnu/packages/patches/pypy3-7.3.1-ssl-paths.patch @@ -0,0 +1,41 @@ +Fix default certificate search path, still allowing the user to override it +with environment variables. + +--- a/lib_pypy/_cffi_ssl/_stdssl/__init__.py ++++ b/lib_pypy/_cffi_ssl/_stdssl/__init__.py +@@ -1679,20 +1679,9 @@ def get_default_verify_paths(): + https://golang.org/src/crypto/x509/root_linux.go (for the files) + ''' + certFiles = [ +- "/etc/ssl/certs/ca-certificates.crt", # Debian/Ubuntu/Gentoo etc. +- "/etc/pki/tls/certs/ca-bundle.crt", # Fedora/RHEL 6 +- "/etc/ssl/ca-bundle.pem", # OpenSUSE +- "/etc/pki/tls/cacert.pem", # OpenELEC +- "/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem", # CentOS/RHEL 7 +- "/etc/ssl/cert.pem", # Alpine Linux + ] + certDirectories = [ +- "/etc/ssl/certs", # SLES10/SLES11 +- "/system/etc/security/cacerts", # Android +- "/usr/local/share/certs", # FreeBSD +- "/etc/pki/tls/certs", # Fedora/RHEL +- "/etc/openssl/certs", # NetBSD +- "/var/ssl/certs", # AIX ++ "@GUIX_CERT_PATH@", + ] I'm not sure about removing these bits. pypy3 from Guix may be used on Debian or Fedora, and maybe using certificates from those systems would be appropriate then? + + # optimization: reuse the values from a local varaible +@@ -1707,9 +1696,10 @@ def get_default_verify_paths(): + ofile = _cstr_decode_fs(lib.X509_get_default_cert_file()) + odir = _cstr_decode_fs(lib.X509_get_default_cert_dir()) + +- if os.path.exists(ofile) and os.path.exists(odir): +- get_default_verify_paths.retval = (ofile_env, ofile, odir_env, odir) +- return get_default_verify_paths.retval ++ if not os.path.exists(ofile): ++ ofile = None