nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: perl: Ungraft version 5.26.2. 

* gnu/packages/perl.scm (perl): Update to 5.26.2.
[replacement]: Ungraft.
(perl-5.26.2, perl/fixed): Remove variables.
This commit is contained in:
Tobias Geerinckx-Rice 2018-06-11 21:01:45 +02:00
parent 4f3958dacb
commit f1799efb31
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 2 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
gnu/packages/perl.scm
View File

@ -44,7 +44,6 @@
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system perl) #:use-module (guix build-system perl)
#:use-module (guix utils) ;substitute-keyword-arguments for perl-5.26.2
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages freedesktop) #:use-module (gnu packages freedesktop)
@ -61,15 +60,14 @@
;; Yeah, Perl... It is required early in the bootstrap process by Linux. ;; Yeah, Perl... It is required early in the bootstrap process by Linux.
(package (package
(name "perl") (name "perl")
(version "5.26.1") (version "5.26.2")
(replacement perl/fixed)
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://cpan/src/5.0/perl-" (uri (string-append "mirror://cpan/src/5.0/perl-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1p81wwvr5jb81m41d07kfywk5gvbk0axdrnvhc2aghcdbr4alqz7")) "03gpnxx1g6hvlh0v4aqx00580h787sfywp1vlvw64q2xcbm9qbsp"))
(patches (search-patches (patches (search-patches
"perl-file-path-CVE-2017-6512.patch" "perl-file-path-CVE-2017-6512.patch"
"perl-no-sys-dirs.patch" "perl-no-sys-dirs.patch"
@ -160,39 +158,6 @@
(home-page "http://www.perl.org/") (home-page "http://www.perl.org/")
(license gpl1+))) ; or "Artistic" (license gpl1+))) ; or "Artistic"
;; Fixes CVE-2018-6797, CVE-2018-6798, and CVE-2018-6913.
;; See <https://metacpan.org/changes/release/SHAY/perl-5.26.2>.
(define perl-5.26.2
(package
(inherit perl)
(version "5.26.2")
(source (origin
(inherit (package-source perl))
(uri (string-append "mirror://cpan/src/5.0/perl-"
version ".tar.gz"))
(sha256
(base32
"03gpnxx1g6hvlh0v4aqx00580h787sfywp1vlvw64q2xcbm9qbsp"))))))
;; When grafting perl, complications arise when the replacement perl has a
;; different version number than the original. So, here we create a version
;; of perl-5.26.2 that thinks it is version 5.26.1. See
;; <https://bugs.gnu.org/31210> and <https://bugs.gnu.org/31216>.
(define perl/fixed
(package
(inherit perl-5.26.2)
(version "5.26.1")
(arguments
(substitute-keyword-arguments (package-arguments perl-5.26.2)
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'revert-perl-subversion
(lambda _
(substitute* "patchlevel.h"
(("^#define PERL_SUBVERSION 2")
"#define PERL_SUBVERSION 1"))
#t))))))))
(define-public perl-algorithm-c3 (define-public perl-algorithm-c3
(package (package
(name "perl-algorithm-c3") (name "perl-algorithm-c3")