01/01: gnu: curl: Update to 7.40.0.

[Mark H. Weaver]

mhw pushed a commit to branch core-updates
in repository guix.

commit 74d72608b35e1840a4e784b3a901e17d4f495dc1
Author: Mark H Weaver <address@hidden>
Date:   Sun Jan 11 09:43:22 2015 -0500

    gnu: curl: Update to 7.40.0.
    
    * gnu/packages/patches/curl-gss-api-fix.patch: New file.
    * gnu-system.am (dist_patch_DATA): Add it.
    * gnu/packages/curl.scm (curl): Update to 7.40.0.  Add patch.
---
 gnu-system.am                               |    1 +
 gnu/packages/curl.scm                       |    6 +++-
 gnu/packages/patches/curl-gss-api-fix.patch |   38 +++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/gnu-system.am b/gnu-system.am
index 70e347d..73d45a7 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -348,6 +348,7 @@ dist_patch_DATA =                                           
\
   gnu/packages/patches/cpio-gets-undeclared.patch              \
   gnu/packages/patches/cssc-gets-undeclared.patch               \
   gnu/packages/patches/cssc-missing-include.patch               \
+  gnu/packages/patches/curl-gss-api-fix.patch                  \
   gnu/packages/patches/cursynth-wave-rand.patch                        \
   gnu/packages/patches/dbus-localstatedir.patch                        \
   gnu/packages/patches/diffutils-gets-undeclared.patch         \
diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index f595e72..8792ddc 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013, 2014 Andreas Enge <address@hidden>
+;;; Copyright © 2015 Mark H Weaver <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -36,14 +37,15 @@
 (define-public curl
   (package
    (name "curl")
-   (version "7.37.1")
+   (version "7.40.0")
    (source (origin
             (method url-fetch)
             (uri (string-append "http://curl.haxx.se/download/curl-";
                                 version ".tar.lzma"))
             (sha256
              (base32
-              "10yfh4hy8wbkj43la238hg6h8i9wyp1cvvk8kl0giac1020imn5d"))))
+              "1a15fdc26b3vwwmchzzpd3l1hfyhx06dn7b6lkikqd7kgwvg5ps7"))
+            (patches (list (search-patch "curl-gss-api-fix.patch")))))
    (build-system gnu-build-system)
    (inputs `(("gnutls" ,gnutls)
              ("gss" ,gss)
diff --git a/gnu/packages/patches/curl-gss-api-fix.patch 
b/gnu/packages/patches/curl-gss-api-fix.patch
new file mode 100644
index 0000000..ea838ae
--- /dev/null
+++ b/gnu/packages/patches/curl-gss-api-fix.patch
@@ -0,0 +1,38 @@
+Copied from upstream:
+https://github.com/bagder/curl/commit/5c0e66d63214e0306197c5a3f162441e074f3401.patch
+
+From 5c0e66d63214e0306197c5a3f162441e074f3401 Mon Sep 17 00:00:00 2001
+From: Steve Holme <address@hidden>
+Date: Thu, 8 Jan 2015 19:23:53 +0000
+Subject: [PATCH] sasl_gssapi: Fixed build on NetBSD with built-in GSS-API
+
+Bug: http://curl.haxx.se/bug/view.cgi?id=1469
+Reported-by: Thomas Klausner
+---
+ lib/curl_sasl_gssapi.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/lib/curl_sasl_gssapi.c b/lib/curl_sasl_gssapi.c
+index 6dda0e9..a50646a 100644
+--- a/lib/curl_sasl_gssapi.c
++++ b/lib/curl_sasl_gssapi.c
+@@ -6,6 +6,7 @@
+  *                             \___|\___/|_| \_\_____|
+  *
+  * Copyright (C) 2014, Steve Holme, <address@hidden>.
++ * Copyright (C) 2015, Daniel Stenberg, <address@hidden>, et al.
+  *
+  * This software is licensed as described in the file COPYING, which
+  * you should have received as part of this distribution. The terms
+@@ -126,7 +127,7 @@ CURLcode Curl_sasl_create_gssapi_user_message(struct 
SessionHandle *data,
+ 
+     /* Import the SPN */
+     gss_major_status = gss_import_name(&gss_minor_status, &spn_token,
+-                                       gss_nt_service_name, &krb5->spn);
++                                       GSS_C_NT_HOSTBASED_SERVICE, 
&krb5->spn);
+     if(GSS_ERROR(gss_major_status)) {
+       Curl_gss_log_error(data, gss_minor_status, "gss_import_name() failed: 
");
+ 
+-- 
+2.2.1
+