all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#28702] [PATCH] gnu: curl: Update replacement to 7.56.0. [security fixes]
@ 2017-10-04 15:01 Kei Kebreau
  2017-10-04 15:24 ` Kei Kebreau
  2017-10-04 21:33 ` [bug#28702] " Marius Bakke
  0 siblings, 2 replies; 5+ messages in thread
From: Kei Kebreau @ 2017-10-04 15:01 UTC (permalink / raw)
  To: 28702; +Cc: Kei Kebreau

Fixes CVE-2017-1000254.
See <https://curl.haxx.se/docs/adv_20171004.html> for details.

* gnu/packages/curl.scm (curl)[replacement]: Update to 7.56.0.
(curl-7.55.0): Rename to ...
(curl-7.56.0): ... this.
[arguments]: Remove 'fix-Makefile' phase.
---
 gnu/packages/curl.scm | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index 23606b481..552df5dc3 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -126,25 +126,12 @@ tunneling, and so on.")
 (define-public curl-7.55.0
   (package
     (inherit curl)
-    (version "7.55.0")
+    (version "7.56.0")
     (source
       (origin
         (method url-fetch)
         (uri (string-append "https://curl.haxx.se/download/curl-"
                             version ".tar.xz"))
-        (patches (search-patches "curl-bounds-check.patch"))
         (sha256
          (base32
-          "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)))))))))
+          "0wni3zkw7jyrwgwkqnrkf2x2b7c78wsp7p4z6a246hz9l367nhrj"))))))
-- 
2.14.2

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [bug#28702] [PATCH] gnu: curl: Update replacement to 7.56.0. [security fixes]
  2017-10-04 15:01 [bug#28702] [PATCH] gnu: curl: Update replacement to 7.56.0. [security fixes] Kei Kebreau
@ 2017-10-04 15:24 ` Kei Kebreau
  2017-10-04 16:37   ` bug#28703: " Kei Kebreau
  2017-10-04 21:33 ` [bug#28702] " Marius Bakke
  1 sibling, 1 reply; 5+ messages in thread
From: Kei Kebreau @ 2017-10-04 15:24 UTC (permalink / raw)
  To: 28702; +Cc: Kei Kebreau

Fixes CVE-2017-1000254.
See <https://curl.haxx.se/docs/adv_20171004.html> for details.

* gnu/packages/curl.scm (curl)[replacement]: Update to 7.56.0.
(curl-7.55.0): Rename to ...
(curl-7.56.0): ... this.
[arguments]: Remove 'fix-Makefile' phase.
---
 gnu/packages/curl.scm | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index 23606b481..ef1b6c74b 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -42,7 +42,7 @@
 (define-public curl
   (package
    (name "curl")
-   (replacement curl-7.55.0)
+   (replacement curl-7.56.0)
    (version "7.54.1")
    (source (origin
             (method url-fetch)
@@ -123,28 +123,15 @@ tunneling, and so on.")
                                   "See COPYING in the distribution."))
    (home-page "https://curl.haxx.se/")))
 
-(define-public curl-7.55.0
+(define-public curl-7.56.0
   (package
     (inherit curl)
-    (version "7.55.0")
+    (version "7.56.0")
     (source
       (origin
         (method url-fetch)
         (uri (string-append "https://curl.haxx.se/download/curl-"
                             version ".tar.xz"))
-        (patches (search-patches "curl-bounds-check.patch"))
         (sha256
          (base32
-          "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)))))))))
+          "0wni3zkw7jyrwgwkqnrkf2x2b7c78wsp7p4z6a246hz9l367nhrj"))))))
-- 
2.14.2

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* bug#28703: [PATCH] gnu: curl: Update replacement to 7.56.0. [security fixes]
  2017-10-04 15:24 ` Kei Kebreau
@ 2017-10-04 16:37   ` Kei Kebreau
  0 siblings, 0 replies; 5+ messages in thread
From: Kei Kebreau @ 2017-10-04 16:37 UTC (permalink / raw)
  To: 28703-done

[-- Attachment #1: Type: text/plain, Size: 39 bytes --]

Unintentional duplicate of bug #28702.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [bug#28702] [PATCH] gnu: curl: Update replacement to 7.56.0. [security fixes]
  2017-10-04 15:01 [bug#28702] [PATCH] gnu: curl: Update replacement to 7.56.0. [security fixes] Kei Kebreau
  2017-10-04 15:24 ` Kei Kebreau
@ 2017-10-04 21:33 ` Marius Bakke
  2017-10-04 23:38   ` bug#28702: " Kei Kebreau
  1 sibling, 1 reply; 5+ messages in thread
From: Marius Bakke @ 2017-10-04 21:33 UTC (permalink / raw)
  To: Kei Kebreau, 28702

[-- Attachment #1: Type: text/plain, Size: 1060 bytes --]

Kei Kebreau <kkebreau@posteo.net> writes:

> Fixes CVE-2017-1000254.
> See <https://curl.haxx.se/docs/adv_20171004.html> for details.
>
> * gnu/packages/curl.scm (curl)[replacement]: Update to 7.56.0.
> (curl-7.55.0): Rename to ...
> (curl-7.56.0): ... this.
> [arguments]: Remove 'fix-Makefile' phase.
> ---
>  gnu/packages/curl.scm | 17 ++---------------
>  1 file changed, 2 insertions(+), 15 deletions(-)
>
> diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
> index 23606b481..552df5dc3 100644
> --- a/gnu/packages/curl.scm
> +++ b/gnu/packages/curl.scm
> @@ -126,25 +126,12 @@ tunneling, and so on.")
>  (define-public curl-7.55.0
>    (package
>      (inherit curl)
> -    (version "7.55.0")
> +    (version "7.56.0")
>      (source
>        (origin
>          (method url-fetch)
>          (uri (string-append "https://curl.haxx.se/download/curl-"
>                              version ".tar.xz"))
> -        (patches (search-patches "curl-bounds-check.patch"))

Please also delete this file and update gnu/local.mk.

LGTM otherwise, thanks!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread

* bug#28702: [PATCH] gnu: curl: Update replacement to 7.56.0. [security fixes]
  2017-10-04 21:33 ` [bug#28702] " Marius Bakke
@ 2017-10-04 23:38   ` Kei Kebreau
  0 siblings, 0 replies; 5+ messages in thread
From: Kei Kebreau @ 2017-10-04 23:38 UTC (permalink / raw)
  To: Marius Bakke; +Cc: 28702-done

[-- Attachment #1: Type: text/plain, Size: 1230 bytes --]

Marius Bakke <mbakke@fastmail.com> writes:

> Kei Kebreau <kkebreau@posteo.net> writes:
>
>> Fixes CVE-2017-1000254.
>> See <https://curl.haxx.se/docs/adv_20171004.html> for details.
>>
>> * gnu/packages/curl.scm (curl)[replacement]: Update to 7.56.0.
>> (curl-7.55.0): Rename to ...
>> (curl-7.56.0): ... this.
>> [arguments]: Remove 'fix-Makefile' phase.
>> ---
>>  gnu/packages/curl.scm | 17 ++---------------
>>  1 file changed, 2 insertions(+), 15 deletions(-)
>>
>> diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
>> index 23606b481..552df5dc3 100644
>> --- a/gnu/packages/curl.scm
>> +++ b/gnu/packages/curl.scm
>> @@ -126,25 +126,12 @@ tunneling, and so on.")
>>  (define-public curl-7.55.0
>>    (package
>>      (inherit curl)
>> -    (version "7.55.0")
>> +    (version "7.56.0")
>>      (source
>>        (origin
>>          (method url-fetch)
>>          (uri (string-append "https://curl.haxx.se/download/curl-"
>>                              version ".tar.xz"))
>> -        (patches (search-patches "curl-bounds-check.patch"))
>
> Please also delete this file and update gnu/local.mk.
>
> LGTM otherwise, thanks!

Thanks for reviewing this.
Pushed to master as 46cf31868c1b12eec50bc9b8dda64604dd81f986.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2017-10-04 23:39 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-04 15:01 [bug#28702] [PATCH] gnu: curl: Update replacement to 7.56.0. [security fixes] Kei Kebreau
2017-10-04 15:24 ` Kei Kebreau
2017-10-04 16:37   ` bug#28703: " Kei Kebreau
2017-10-04 21:33 ` [bug#28702] " Marius Bakke
2017-10-04 23:38   ` bug#28702: " Kei Kebreau

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.