From: Marius Bakke <mbakke@fastmail.com>
To: Leo Famulari <leo@famulari.name>,
28027@debbugs.gnu.org, me@tobias.gr, ng0@infotropique.org
Subject: [bug#28027] curl security update [was Re: bug#28027: gnURL 7.55.0]
Date: Wed, 09 Aug 2017 23:55:32 +0200 [thread overview]
Message-ID: <871sok4d9n.fsf@fastmail.com> (raw)
In-Reply-To: <20170809192008.GA31762@jasmine.lan>
[-- Attachment #1.1: Type: text/plain, Size: 1083 bytes --]
Leo Famulari <leo@famulari.name> writes:
> On Wed, Aug 09, 2017 at 02:50:07PM -0400, Leo Famulari wrote:
>> On Wed, Aug 09, 2017 at 01:48:42PM -0400, Leo Famulari wrote:
>> > On Wed, Aug 09, 2017 at 06:25:39PM +0200, Tobias Geerinckx-Rice wrote:
>> > > ng0 wrote on 09/08/17 at 18:00:
>> > > > From 13129d51ac4dd5ac7f5e7b74997297139a40be12 Mon Sep 17 00:00:00 2001
>> > > > From: ng0 <ng0@infotropique.org>
>> > > > Date: Wed, 9 Aug 2017 15:58:43 +0000
>> > > > Subject: [PATCH] gnu: gnurl: Update to 7.55.0.
>> > > >
>> > > > * gnu/packages/gnunet.scm (gnurl): Update to 7.55.0.
>> > >
>> > > Thanks! Pushed as 28e12d6c81cef2aca7f792f3c99037a649faa9b0.
>> >
>> > Great! Can somebody also update the curl replacement?
>>
>> Actually, I'll do it :)
>
> With the attached patch, it fails to build, because the man 3 pages
> aren't built and thus can't be copied into the doc output. I'm not sure
> what's going on :/
It seems our worked collided again. :-)
I 'ported' the earlier patch to master and will push it shortly if there
are no objections:
[-- Attachment #1.2: 0001-gnu-curl-Replace-with-7.55.0-security-fixes.patch --]
[-- Type: text/x-patch, Size: 2854 bytes --]
From 6f9bbbafd4cc857c2b093f3cced6df2e45f56aab Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Wed, 9 Aug 2017 21:04:04 +0200
Subject: [PATCH] gnu: curl: Replace with 7.55.0 [security fixes].
Fixes CVE-2017-1000099, CVE-2017-1000100, and CVE-2017-100101.
See <https://curl.haxx.se/docs/security.html> for details.
* gnu/packages/curl.scm (curl)[replacement]: New field.
(curl-7.55.0): New variable.
---
gnu/packages/curl.scm | 24 +++++++++++++++++++-----
1 file changed, 19 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index a9f219b62..d6e32e438 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2015 Tomáš Čech <sleep_walker@suse.cz>
;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -24,6 +25,7 @@
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix download)
+ #:use-module (guix utils)
#:use-module (guix build-system gnu)
#:use-module (gnu packages)
#:use-module (gnu packages compression)
@@ -40,7 +42,7 @@
(define-public curl
(package
(name "curl")
- (replacement curl-7.54.1)
+ (replacement curl-7.55.0)
(version "7.53.0")
(source (origin
(method url-fetch)
@@ -121,15 +123,27 @@ tunneling, and so on.")
"See COPYING in the distribution."))
(home-page "https://curl.haxx.se/")))
-(define curl-7.54.1
+(define-public curl-7.55.0
(package
(inherit curl)
- (version "7.54.1")
+ (version "7.55.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://curl.haxx.se/download/curl-"
- version ".tar.lzma"))
+ version ".tar.xz"))
(sha256
(base32
- "0vnv3cz0s1l5cjby86hm0x6pgzqijmdm97qa9q5px200956z6yib"))))))
+ "1785vxi0jamiv9d1wr1l45g0fm9ircxdfyfzf7ld8zv0z0i8bmfd"))))
+ (arguments
+ `(,@(substitute-keyword-arguments (package-arguments curl)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (add-before 'install 'fix-Makefile
+ ;; Fix a regression in 7.55.0 where docs are not installed.
+ ;; https://github.com/curl/curl/commit/a7bbbb7c368c6096802007f61f19a02e9d75285b
+ (lambda _
+ (substitute* "Makefile"
+ (("install-data-hook:\n")
+ "install-data-hook:\n\tcd docs/libcurl && $(MAKE) install\n"))
+ #t)))))))))
--
2.14.0
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
next prev parent reply other threads:[~2017-08-09 21:56 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-09 16:00 [bug#28027] gnURL 7.55.0 ng0
2017-08-09 16:25 ` bug#28027: " Tobias Geerinckx-Rice
2017-08-09 17:48 ` [bug#28027] curl security update [was Re: bug#28027: gnURL 7.55.0] Leo Famulari
2017-08-09 18:50 ` Leo Famulari
2017-08-09 19:20 ` Leo Famulari
2017-08-09 20:05 ` ng0
2017-08-09 20:22 ` Marius Bakke
2017-08-09 21:55 ` Marius Bakke [this message]
2017-08-09 19:54 ` ng0
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=871sok4d9n.fsf@fastmail.com \
--to=mbakke@fastmail.com \
--cc=28027@debbugs.gnu.org \
--cc=leo@famulari.name \
--cc=me@tobias.gr \
--cc=ng0@infotropique.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).