From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55073) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eOwXi-0007jv-91 for guix-patches@gnu.org; Tue, 12 Dec 2017 21:13:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eOwXf-0002RF-4u for guix-patches@gnu.org; Tue, 12 Dec 2017 21:13:06 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:50496) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eOwXf-0002RB-10 for guix-patches@gnu.org; Tue, 12 Dec 2017 21:13:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eOwXe-0006oh-K2 for guix-patches@gnu.org; Tue, 12 Dec 2017 21:13:02 -0500 Subject: [bug#29683] [PATCH] gnu: Erlang: Update to 20.1.7 [fixes CVE-2017-1000385]. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:55027) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eOwWx-00072J-L3 for guix-patches@gnu.org; Tue, 12 Dec 2017 21:12:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eOwWu-0002If-J3 for guix-patches@gnu.org; Tue, 12 Dec 2017 21:12:19 -0500 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:37289) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eOwWu-0002IQ-9Z for guix-patches@gnu.org; Tue, 12 Dec 2017 21:12:16 -0500 Received: from jasmine.lan (c-73-165-108-70.hsd1.pa.comcast.net [73.165.108.70]) by mail.messagingengine.com (Postfix) with ESMTPA id 7CA512420E for ; Tue, 12 Dec 2017 21:12:13 -0500 (EST) From: Leo Famulari Date: Tue, 12 Dec 2017 21:12:09 -0500 Message-Id: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 29683@debbugs.gnu.org * gnu/packages/erlang.scm (erlang): Update to 20.1.7 (native-inputs): Use version-major+minor in the URI of erlang-manpages. --- gnu/packages/erlang.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/erlang.scm b/gnu/packages/erlang.scm index 770ed715b..ff03c7bae 100644 --- a/gnu/packages/erlang.scm +++ b/gnu/packages/erlang.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Steve Sprang -;;; Copyright © 2016 Leo Famulari +;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2016, 2017 Pjotr Prins ;;; ;;; This file is part of GNU Guix. @@ -23,6 +23,7 @@ #:use-module (guix build-system gnu) #:use-module (guix download) #:use-module (guix packages) + #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages fontutils) @@ -35,7 +36,7 @@ (define-public erlang (package (name "erlang") - (version "20.1") + (version "20.1.7") (source (origin (method url-fetch) ;; The tarball from http://erlang.org/download contains many @@ -46,7 +47,7 @@ (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0r4g8ag7nlpw06y4c39fgcyccykj2sbyhv5jgp4qmrjci2ydgns8")) + "00pmngdyh1h088anmx6fbk085i93ajgk92rz7qsyhfc0lx0sm0a9")) (patches (search-patches "erlang-man-path.patch")))) (build-system gnu-build-system) (native-inputs @@ -59,7 +60,8 @@ ,(origin (method url-fetch) (uri (string-append "http://erlang.org/download/otp_doc_man_" - version ".tar.gz")) + (version-major+minor version) + ".tar.gz")) (sha256 (base32 "0ikvdpn4z7az6szg176l1r2yxhgs3msa3wgb3gmy45jkz0pzik05")))))) -- 2.15.1