From 4d1a35fabcb59ebd745a478b0dc54fc2c6ad5ae1 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 9 Mar 2016 15:17:12 +0100 Subject: gnu: perl: Incorporate patch for CVE-2016-2381. * gnu/packages/perl.scm (perl)[source]: Add "perl-CVE-2016-2381.patch". [replacement]: Remove. (perl-fixed): Remove. --- gnu/packages/perl.scm | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) (limited to 'gnu/packages/perl.scm') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index d67870f462..b2d96ab398 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -37,7 +37,6 @@ (define-public perl ;; Yeah, Perl... It is required early in the bootstrap process by Linux. (package - (replacement perl-fixed) (name "perl") (version "5.22.1") (source (origin @@ -53,7 +52,8 @@ "perl-source-date-epoch.patch" "perl-deterministic-ordering.patch" "perl-no-build-time.patch" - "perl-CVE-2015-8607.patch"))))) + "perl-CVE-2015-8607.patch" + "perl-CVE-2016-2381.patch"))))) (build-system gnu-build-system) (arguments '(#:tests? #f @@ -115,28 +115,6 @@ (home-page "http://www.perl.org/") (license gpl1+))) ; or "Artistic" -(define perl-fixed - (package - (inherit perl) - (replacement #f) - (source - (let ((name "perl") (version "5.22.1")) - (origin - (method url-fetch) - (uri (string-append "http://www.cpan.org/src/5.0/perl-" - version ".tar.gz")) - (sha256 - (base32 - "09wg24w5syyafyv87l6z8pxwz4bjgcdj996bx5844k6m9445sirb")) - (patches (map search-patch - '("perl-no-sys-dirs.patch" - "perl-autosplit-default-time.patch" - "perl-source-date-epoch.patch" - "perl-deterministic-ordering.patch" - "perl-no-build-time.patch" - "perl-CVE-2015-8607.patch" - "perl-CVE-2016-2381.patch")))))))) - (define-public perl-algorithm-c3 (package (name "perl-algorithm-c3") -- cgit 1.4.1