[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/14: gnu: python2: Incorporate grafted changes.
From: |
guix-commits |
Subject: |
03/14: gnu: python2: Incorporate grafted changes. |
Date: |
Thu, 7 Feb 2019 18:02:42 -0500 (EST) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 027250f1a65f5500a68687a32e444f424bda7fda
Author: Marius Bakke <address@hidden>
Date: Thu Feb 7 21:22:21 2019 +0100
gnu: python2: Incorporate grafted changes.
* gnu/packages/python.scm (python-2.7)[source](patches): Add
python2-CVE-2018-14647.patch and python2-CVE-2018-1000802.patch.
[replacement]: Remove field.
(python-2/fixed): Remove variable.
---
gnu/packages/python.scm | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 69b8b3f..87b80f9 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -95,7 +95,6 @@
(package
(name "python2")
(version "2.7.15")
- (replacement python-2/fixed)
(source
(origin
(method url-fetch)
@@ -108,7 +107,9 @@
"python-2-deterministic-build-info.patch"
"python-2.7-site-prefixes.patch"
"python-2.7-source-date-epoch.patch"
- "python-2.7-adjust-tests.patch"))
+ "python-2.7-adjust-tests.patch"
+ "python2-CVE-2018-14647.patch"
+ "python2-CVE-2018-1000802.patch"))
(modules '((guix build utils)))
;; suboptimal to delete failing tests here, but if we delete them in the
;; arguments then we need to make sure to strip out that phase when it
@@ -266,16 +267,6 @@ data types.")
;; Current 2.x version.
(define-public python-2 python-2.7)
-(define python-2/fixed
- (package
- (inherit python-2)
- (source (origin
- (inherit (package-source python-2))
- (patches (append
- (origin-patches (package-source python-2))
- (search-patches "python2-CVE-2018-14647.patch"
- "python2-CVE-2018-1000802.patch")))))))
-
(define-public python2-called-python
;; Both 2.x and 3.x used to be called "python". In commit
;; a7714d42de2c3082f3609d1e63c83d703fb39cf9 (March 2018), we renamed the
- branch core-updates updated (8ad8568 -> df2bf40), guix-commits, 2019/02/07
- 01/14: gnu: file: Incorporate grafted changes., guix-commits, 2019/02/07
- 02/14: gnu: sqlite: Remove graft for 3.26.0., guix-commits, 2019/02/07
- 03/14: gnu: python2: Incorporate grafted changes.,
guix-commits <=
- 05/14: gnu: bison: Update to 3.3.2., guix-commits, 2019/02/07
- 07/14: gnu: binutils: Update to 2.32., guix-commits, 2019/02/07
- 04/14: gnu: libarchive: Remove graft for 3.3.3., guix-commits, 2019/02/07
- 13/14: gnu: libxml2: Update to 2.9.9., guix-commits, 2019/02/07
- 10/14: gnu: pcre2: Update to 10.32., guix-commits, 2019/02/07
- 11/14: gnu: python: Update to 3.7.2., guix-commits, 2019/02/07
- 12/14: gnu: openssl: Update to 1.0.2q., guix-commits, 2019/02/07
- 14/14: gnu: libxslt: Update to 1.1.33., guix-commits, 2019/02/07
- 06/14: gnu: mpfr: Update to 4.0.2., guix-commits, 2019/02/07
- 09/14: gnu: mit-krb5: Update to 1.17., guix-commits, 2019/02/07