From 42366b35c3f9f8dc8b059d3369b8196a4b832c18 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Wed, 21 Dec 2016 14:56:34 +0100
Subject: gnu: curl: Update replacement to 7.52.0 [fixes
 CVE-2016-{9586,9952,9953}].

* gnu/packages/curl.scm (curl)[replacement]: Update to 7.52.0.
(curl-7.51.0): Replace with ...
(curl-7.52.0): ... this.
---
 gnu/packages/curl.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'gnu/packages/curl.scm')

diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index 790f542a52..3e32a5905a 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -40,7 +40,7 @@ (define-module (gnu packages curl)
 (define-public curl
   (package
    (name "curl")
-   (replacement curl-7.51.0)
+   (replacement curl-7.52.0)
    (version "7.50.3")
    (source (origin
             (method url-fetch)
@@ -121,15 +121,15 @@ (define-public curl
                                   "See COPYING in the distribution."))
    (home-page "http://curl.haxx.se/")))
 
-(define curl-7.51.0
+(define curl-7.52.0
   (package
     (inherit curl)
     (source
-      (let ((version "7.51.0"))
+      (let ((version "7.52.0"))
         (origin
           (method url-fetch)
           (uri (string-append "https://curl.haxx.se/download/curl-"
                               version ".tar.lzma"))
           (sha256
            (base32
-            "0605f28m2kxjcxrcfcv1ja353gv167lwyxjc3xizqbwppdmmzvwy")))))))
+            "1hh9w3dwc84c84y15pwc415jfqfhjdjk45k4f5yn5j3jgi613w68")))))))
-- 
cgit v1.2.3


From c8c385a04a01c0c9b8d70fe18fd97d6c6531caea Mon Sep 17 00:00:00 2001
From: Leo Famulari <leo@famulari.name>
Date: Wed, 21 Dec 2016 11:50:17 -0500
Subject: Revert "gnu: curl: Update replacement to 7.52.0 [fixes
 CVE-2016-{9586,9952,9953}]."

The curl maintainers said this about 7.52.0:

"Attention! We will release a patch update within a few days to fix a
serious security problem found in curl 7.52.0. You may consider holding
off until then."

This message was displayed at <https://curl.haxx.se/download.html> on
2016-12-21.

This reverts commit 42366b35c3f9f8dc8b059d3369b8196a4b832c18.
---
 gnu/packages/curl.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'gnu/packages/curl.scm')

diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index 3e32a5905a..790f542a52 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -40,7 +40,7 @@ (define-module (gnu packages curl)
 (define-public curl
   (package
    (name "curl")
-   (replacement curl-7.52.0)
+   (replacement curl-7.51.0)
    (version "7.50.3")
    (source (origin
             (method url-fetch)
@@ -121,15 +121,15 @@ (define-public curl
                                   "See COPYING in the distribution."))
    (home-page "http://curl.haxx.se/")))
 
-(define curl-7.52.0
+(define curl-7.51.0
   (package
     (inherit curl)
     (source
-      (let ((version "7.52.0"))
+      (let ((version "7.51.0"))
         (origin
           (method url-fetch)
           (uri (string-append "https://curl.haxx.se/download/curl-"
                               version ".tar.lzma"))
           (sha256
            (base32
-            "1hh9w3dwc84c84y15pwc415jfqfhjdjk45k4f5yn5j3jgi613w68")))))))
+            "0605f28m2kxjcxrcfcv1ja353gv167lwyxjc3xizqbwppdmmzvwy")))))))
-- 
cgit v1.2.3


From 14251e30c44f7d7b3894ff5dcdad05980bb84109 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Fri, 23 Dec 2016 15:24:55 +0100
Subject: gnu: curl: Update replacement to 7.52.1 [fixes CVE-2016-{9586,9594}].

* gnu/packages/curl.scm (curl)[replacement]: Update to 7.52.1.
[home-page]: Use HTTPS.
(curl-7.51.0): Replace with ...
(curl-7.52.1): ... this.
---
 gnu/packages/curl.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'gnu/packages/curl.scm')

diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index 790f542a52..7329d870de 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -40,7 +40,7 @@ (define-module (gnu packages curl)
 (define-public curl
   (package
    (name "curl")
-   (replacement curl-7.51.0)
+   (replacement curl-7.52.1)
    (version "7.50.3")
    (source (origin
             (method url-fetch)
@@ -119,17 +119,17 @@ (define-public curl
 tunneling, and so on.")
    (license (license:non-copyleft "file://COPYING"
                                   "See COPYING in the distribution."))
-   (home-page "http://curl.haxx.se/")))
+   (home-page "https://curl.haxx.se/")))
 
-(define curl-7.51.0
+(define curl-7.52.1
   (package
     (inherit curl)
     (source
-      (let ((version "7.51.0"))
+      (let ((version "7.52.1"))
         (origin
           (method url-fetch)
           (uri (string-append "https://curl.haxx.se/download/curl-"
                               version ".tar.lzma"))
           (sha256
            (base32
-            "0605f28m2kxjcxrcfcv1ja353gv167lwyxjc3xizqbwppdmmzvwy")))))))
+            "0r937wplchjxifxqqcjxd9rzp6l9rqqdfjn41x1y4djrh95nsa24")))))))
-- 
cgit v1.2.3