mirror/guix
mirror/guix
1
Fork 0
mirror of https://https.git.savannah.gnu.org/git/guix.git/ synced 2025-07-15 11:30:44 +02:00
Code Releases Activity

gnu: Python: Adjust grafts for core-updates merge.

Browse source 
This adjust the grafts from a55ebe2e3a and
90aeaee861 to apply to Python 2.7.15 and 3.7.0.

* gnu/packages/patches/python2-CVE-2018-1060.patch,
gnu/packages/patches/python2-CVE-2018-1061.patch: Delete files.
* gnu/local.mk (dist_patch_DATA): Remove them.
* gnu/packages/python.scm (python-2/fixed): Remove patches that are already
present in 2.7.15.
(python-3/fixed): Remove obsolete phase.
This commit is contained in:
Marius Bakke 2018-10-17 20:53:24 +02:00
parent d02bb02f7d
commit 16f14f63db
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
4 changed files with 2 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

16
gnu/packages/python.scm
View file

@ -323,9 +323,7 @@ data types.")
(inherit (package-source python-2))
(patches (append
(origin-patches (package-source python-2))
(search-patches "python2-CVE-2018-1060.patch"
"python2-CVE-2018-1061.patch"
"python2-CVE-2018-14647.patch"
(search-patches "python2-CVE-2018-14647.patch"
"python2-CVE-2018-1000802.patch")))))))
(define-public python2-called-python
@ -419,17 +417,7 @@ data types.")
(source (origin
(inherit (package-source python-3))
(patches (append (origin-patches (package-source python-3))
(search-patches "python-CVE-2018-14647.patch")))))
(arguments
(substitute-keyword-arguments (package-arguments python-3)
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'delete-broken-test
(lambda _
;; Delete test which fails on recent kernels:
;; <https://bugs.python.org/issue34587>.
(delete-file "Lib/test/test_socket.py")
#t))))))))
(search-patches "python-CVE-2018-14647.patch")))))))
;; Current major version.
(define-public python python-3)