From patchwork Wed Dec 5 21:19:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 396 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 4937816853; Wed, 5 Dec 2018 21:20:17 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTPS id E965D1684D for ; Wed, 5 Dec 2018 21:20:16 +0000 (GMT) Received: from localhost ([::1]:36912 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gUeae-00086X-0e for patchwork@mira.cbaines.net; Wed, 05 Dec 2018 16:20:16 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40664) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gUeaW-00085P-HA for guix-patches@gnu.org; Wed, 05 Dec 2018 16:20:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gUeaS-0003Cs-CB for guix-patches@gnu.org; Wed, 05 Dec 2018 16:20:08 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:58675) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gUeaQ-0003Bv-M3 for guix-patches@gnu.org; Wed, 05 Dec 2018 16:20:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gUeaQ-0005n5-E7 for guix-patches@gnu.org; Wed, 05 Dec 2018 16:20:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#33637] [PATCH] gnu: python: Update to 3.7.1. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 05 Dec 2018 21:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 33637 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33637@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.154404479222235 (code B ref -1); Wed, 05 Dec 2018 21:20:02 +0000 Received: (at submit) by debbugs.gnu.org; 5 Dec 2018 21:19:52 +0000 Received: from localhost ([127.0.0.1]:34700 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gUeaF-0005mZ-Lo for submit@debbugs.gnu.org; Wed, 05 Dec 2018 16:19:51 -0500 Received: from eggs.gnu.org ([208.118.235.92]:59205) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gUeaB-0005mJ-In for submit@debbugs.gnu.org; Wed, 05 Dec 2018 16:19:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gUea5-0002xZ-8u for submit@debbugs.gnu.org; Wed, 05 Dec 2018 16:19:42 -0500 Received: from lists.gnu.org ([2001:4830:134:3::11]:42428) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gUea5-0002xT-5J for submit@debbugs.gnu.org; Wed, 05 Dec 2018 16:19:41 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40567) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gUea3-0007nW-CL for guix-patches@gnu.org; Wed, 05 Dec 2018 16:19:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gUea0-0002tt-0Y for guix-patches@gnu.org; Wed, 05 Dec 2018 16:19:39 -0500 Received: from li622-129.members.linode.com ([212.71.249.129]:43370 helo=mira.cbaines.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gUeZz-0002sm-O0 for guix-patches@gnu.org; Wed, 05 Dec 2018 16:19:35 -0500 Received: by mira.cbaines.net (Postfix, from userid 113) id AD3EF16850; Wed, 5 Dec 2018 21:19:33 +0000 (GMT) Received: from localhost (cpc102582-walt20-2-0-cust14.13-2.cable.virginm.net [86.27.34.15]) by mira.cbaines.net (Postfix) with ESMTPSA id 62C6616842 for ; Wed, 5 Dec 2018 21:19:33 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id c4e1200e for ; Wed, 5 Dec 2018 21:19:33 +0000 (UTC) From: Christopher Baines Date: Wed, 5 Dec 2018 21:19:33 +0000 Message-Id: <20181205211933.15313-1-mail@cbaines.net> X-Mailer: git-send-email 2.19.2 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 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 Remove the replacement, as version 3.7.1 includes the fix for this issue. * gnu/packages/python.scm (python-3.7): Update to 3.7.1. (python-3/fixed): Remove this. --- gnu/packages/python.scm | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index d0401b7bd..1abf2e816 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -343,8 +343,7 @@ data types.") (define-public python-3.7 (package (inherit python-2) (name "python") - (version "3.7.0") - (replacement python-3/fixed) + (version "3.7.1") (source (origin (method url-fetch) (uri (string-append "https://www.python.org/ftp/python/" @@ -357,7 +356,7 @@ data types.") (patch-flags '("-p0")) (sha256 (base32 - "0j9mic5c9lbd2b20wka7hily7szz740wy9ilfrczxap63rnrk0h3")) + "0v9x4h22rh5cwpsq1mwpdi3c9lc9820lzp2nmn9g20llij72nzps")) (snippet '(begin (for-each delete-file @@ -416,14 +415,6 @@ data types.") ;; Current 3.x version. (define-public python-3 python-3.7) -(define python-3/fixed - (package - (inherit python-3) - (source (origin - (inherit (package-source python-3)) - (patches (append (origin-patches (package-source python-3)) - (search-patches "python-CVE-2018-14647.patch"))))))) - ;; Current major version. (define-public python python-3)