From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50938) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dm0wp-0004Y2-0G for guix-patches@gnu.org; Sun, 27 Aug 2017 13:02:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dm0wl-0003o3-09 for guix-patches@gnu.org; Sun, 27 Aug 2017 13:02:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:49377) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dm0wk-0003nt-SZ for guix-patches@gnu.org; Sun, 27 Aug 2017 13:02:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dm0wk-0004S7-Fj for guix-patches@gnu.org; Sun, 27 Aug 2017 13:02:02 -0400 Subject: [bug#28252] curl: Update replacement to 7.55.1. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:50830) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dm0wC-0004UE-Hm for guix-patches@gnu.org; Sun, 27 Aug 2017 13:01:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dm0w8-0003bN-Mg for guix-patches@gnu.org; Sun, 27 Aug 2017 13:01:28 -0400 Received: from aibo.runbox.com ([91.220.196.211]:43742) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dm0w8-0003al-Eo for guix-patches@gnu.org; Sun, 27 Aug 2017 13:01:24 -0400 Received: from [10.9.9.210] (helo=mailfront10.runbox.com) by mailtransmit02.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1dm0w2-0004GI-Ld for guix-patches@gnu.org; Sun, 27 Aug 2017 19:01:18 +0200 Received: from 62-210-105-116.rev.poneytelecom.eu ([62.210.105.116] helo=localhost) by mailfront10.runbox.com with esmtpsa (uid:892961 ) (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) id 1dm0vS-00057s-Q3 for guix-patches@gnu.org; Sun, 27 Aug 2017 19:00:43 +0200 Date: Sun, 27 Aug 2017 17:00:40 +0000 From: ng0 Message-ID: <20170827170040.q4d3356igrdsvx34@abyayala> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="5yrm5m5sqtq6bj4q" Content-Disposition: inline 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: 28252@debbugs.gnu.org --5yrm5m5sqtq6bj4q Content-Type: multipart/mixed; boundary="gxdv7ku22okdjy7l" Content-Disposition: inline --gxdv7ku22okdjy7l Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Bugfix release, for us that means dropping an included patch and the doc building is fixed. --=20 ng0 GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588 GnuPG: https://n0is.noblogs.org/my-keys https://www.infotropique.org https://krosos.org --gxdv7ku22okdjy7l Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0001-gnu-curl-Update-replacement-to-7.55.1.patch" Content-Transfer-Encoding: quoted-printable =46rom cb395cc58bd98b597ab670e0ea249833028744a5 Mon Sep 17 00:00:00 2001 =46rom: ng0 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 =3D \ %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 =C2=A9 2015 Ludovic Court=C3=A8s ;;; Copyright =C2=A9 2016, 2017 Leo Famulari ;;; Copyright =C2=A9 2017 Marius Bakke +;;; Copyright =C2=A9 2017 ng0 ;;; ;;; 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/"))) =20 -(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 installe= d. - ;; https://github.com/curl/curl/commit/a7bbbb7c368c609680= 2007f61f19a02e9d75285b - (lambda _ - (substitute* "Makefile" - (("install-data-hook:\n") - "install-data-hook:\n\tcd docs/libcurl && $(MAKE) in= stall\n")) - #t))))))))) + "1dvbcwcar3dv488h9378hy145ma3ws2fwpbr6mgszd7chipcmbry")))))) diff --git a/gnu/packages/patches/curl-bounds-check.patch b/gnu/packages/pa= tches/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/45a560390c4356bcb81d933bbbb229c8ea2acb= 63 - -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 ch= ar *str, long max) - num =3D strtod(str, &endptr); - if(errno =3D=3D ERANGE) - return PARAM_NUMBER_TOO_LARGE; -- if((long)num > max) { -+ if(num > max) { - /* too large */ - return PARAM_NUMBER_TOO_LARGE; - } --=20 2.14.1 --gxdv7ku22okdjy7l-- --5yrm5m5sqtq6bj4q Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEqIyK3RKYKNfqwC5S4i+bv+40hYgFAlmi+rgACgkQ4i+bv+40 hYj+xQ//T71Zqi1M7m3UtOK6RBwb2g6PdgejzlhOZ67YgaZY5sSu3NkZZe6zfFsI hVaLt8MNaBuRqOdmcIu4UWVnZJbwrInOUCdyYMqJRV7SjzMyefnyGCX9cNw2OoMp k2LR94TMlA16vkV4C/IeUtI1q5ir7wEpbCH00dwynDvd5ObFv4kE1KuuuwNU6X5X 0lu1gR0LN+nWIKcALAP+nE4gOve1kMztW7aVlPb7UN5jObHfCD+A/ehjfEj6ET/d ujMz+ZLRMTx139RKE+/sZVfFLwnO0divcGFjpxt9A2nOzVGNOO3sfA1xJdXfD0JL 8fy31tYgMxpPVCyEtS0BatFe8CnVcCsBrHvVFXLZwYGSJq/m0XhNU1DtDB7FrCpY 1hgpxzkWBzkiEQYgNgbAicoPBPvEavD/EdE4/iRNwkKP38Gwmtl7mcXS4lsi/dgV t+SEpNxrKHtwilKxdVPIjvbzHzLtavOVOztD8p8irJe3G8M4ExcMoPT6w28ZDP/u llsMT3HbF5PUd+RYXWP1b+kbyWUZ+7NqH4szPScPieLS+z5XF3uJsJ4iz4eMRvru R9tprOp9mT/fs+tUfrV+MNdT1LKX6zNhbuUhOh5/EtHrzTpRocNgzJ0m4a9R0UGU AR/HwoxG/ss1ef3Byg02wG2vWrDUC3hS85oUJmqknooipD4GQQo= =NZe1 -----END PGP SIGNATURE----- --5yrm5m5sqtq6bj4q--