Subject: bug#28252: closed (Re: [bug#28252] curl: Update replacement to 7.55.1.)

From: [email-masked] (GNU bug Tracking System)
Date: Mon, 28 Aug 2017 21:24:02 +0000

Your bug report

#28252: curl: Update replacement to 7.55.1.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
28252: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=28252
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#28252] curl: Update replacement to 7.55.1.
From: Marius Bakke <[email-masked]>
To: ng0 <[email-masked]>
Cc: ng0 <[email-masked]>, [email-masked]
Date: Mon, 28 Aug 2017 23:23:36 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

ng0 <[email-masked]> writes:

> Marius Bakke transcribed 0.9K bytes:
>> ng0 <[email-masked]> writes:
>> 
>> > Bugfix release, for us that means dropping an included patch
>> > and the doc building is fixed.
>> 
>> I'd prefer not to graft bugfix releases.  Grafts are pretty expensive in
>> terms of CPU, bandwidth and disk space and really only meant for
>> security fixes.  Is it safe to skip this release?
>
> If you'd like to carry around extra patches and substitute
> phases. It fixes the build of the currently released-as-broken-building
> previous release.

I prefer saving resources over cosmetics in this case.  We already have
the most important fixes from this release, and removing some lines of
code is not worth grafting up to 2k new derivations on every Guix system
out there IMO.  Global warming, and all that.

Closing.

Subject: curl: Update replacement to 7.55.1.
From: ng0 <[email-masked]>
To: [email-masked]
Date: Sun, 27 Aug 2017 17:00:40 +0000
List-Id: <debbugs-submit.debbugs.gnu.org>

Bugfix release, for us that means dropping an included patch
and the doc building is fixed.
-- 
ng0
GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588
GnuPG: https://n0is.noblogs.org/my-keys
https://www.infotropique.org https://krosos.org
From cb395cc58bd98b597ab670e0ea249833028744a5 Mon Sep 17 00:00:00 2001
From: ng0 <[email-masked]>
Date: Sun, 27 Aug 2017 16:51:04 +0000
Subject: [PATCH] gnu: curl: Update replacement to 7.55.1.

* gnu/packages/curl.scm (curl)[replacement]: Update to 7.55.1.
(curl-7.55.0): Rename to ...
(curl-7.55.1): ... this.
[source]: Remove patch.
[arguments]: Remove it.
* gnu/packages/patches/curl-bounds-check.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
---
 gnu/local.mk                                 |  1 -
 gnu/packages/curl.scm                        | 22 +++++-----------------
 gnu/packages/patches/curl-bounds-check.patch | 19 -------------------
 3 files changed, 5 insertions(+), 37 deletions(-)
 delete mode 100644 gnu/packages/patches/curl-bounds-check.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index e3daa3c99..5650bc872 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -569,7 +569,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/crossmap-allow-system-pysam.patch	\
   %D%/packages/patches/csound-header-ordering.patch		\
   %D%/packages/patches/clucene-contribs-lib.patch               \
-  %D%/packages/patches/curl-bounds-check.patch			\
   %D%/packages/patches/cursynth-wave-rand.patch			\
   %D%/packages/patches/cvs-2017-12836.patch			\
   %D%/packages/patches/cyrus-sasl-CVE-2013-4122.patch		\
diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index 23606b481..e5bc13166 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2015 Ludovic Courtès <[email-masked]>
 ;;; Copyright © 2016, 2017 Leo Famulari <[email-masked]>
 ;;; Copyright © 2017 Marius Bakke <[email-masked]>
+;;; Copyright © 2017 ng0 <[email-masked]>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -42,7 +43,7 @@
 (define-public curl
   (package
    (name "curl")
-   (replacement curl-7.55.0)
+   (replacement curl-7.55.1)
    (version "7.54.1")
    (source (origin
             (method url-fetch)
@@ -123,28 +124,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.55.1
   (package
     (inherit curl)
-    (version "7.55.0")
+    (version "7.55.1")
     (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)))))))))
+          "1dvbcwcar3dv488h9378hy145ma3ws2fwpbr6mgszd7chipcmbry"))))))
diff --git a/gnu/packages/patches/curl-bounds-check.patch b/gnu/packages/patches/curl-bounds-check.patch
deleted file mode 100644
index 4b8ff6530..000000000
--- a/gnu/packages/patches/curl-bounds-check.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Fix test failure on some 32-bit platforms.
-
-Patch copied from upstream source repository:
-
-https://github.com/curl/curl/commit/45a560390c4356bcb81d933bbbb229c8ea2acb63
-
-diff --git a/src/tool_paramhlp.c b/src/tool_paramhlp.c
-index b9dedc989e..85c5e79a7e 100644
---- a/src/tool_paramhlp.c
-+++ b/src/tool_paramhlp.c
-@@ -218,7 +218,7 @@ static ParameterError str2double(double *val, const char *str, long max)
-     num = strtod(str, &endptr);
-     if(errno == ERANGE)
-       return PARAM_NUMBER_TOO_LARGE;
--    if((long)num > max) {
-+    if(num > max) {
-       /* too large */
-       return PARAM_NUMBER_TOO_LARGE;
-     }
-- 
2.14.1