01/02: gnu: sssd: Fix build with cURL >= 7.62.0.

[guix-commits]

mbakke pushed a commit to branch staging
in repository guix.

commit 33eb63da646706380f74ac710740f12a0f0a7a8c
Author: Marius Bakke <address@hidden>
Date:   Wed Dec 26 12:25:29 2018 +0100

    gnu: sssd: Fix build with cURL >= 7.62.0.
    
    * gnu/packages/patches/sssd-curl-compat.patch: New file.
    * gnu/local.mk (dist_patch_DATA): Add it.
    * gnu/packages/sssd.scm (sssd)[source](patches): Use it.
---
 gnu/local.mk                                |  1 +
 gnu/packages/patches/sssd-curl-compat.patch | 18 ++++++++++++++++++
 gnu/packages/sssd.scm                       |  1 +
 3 files changed, 20 insertions(+)

diff --git a/gnu/local.mk b/gnu/local.mk
index 3f59ee0..a4507f5 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1156,6 +1156,7 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/soundconverter-remove-gconf-dependency.patch    \
   %D%/packages/patches/soundtouch-CVE-2018-14044-14045.patch   \
   %D%/packages/patches/soundtouch-CVE-2018-1000223.patch       \
+  %D%/packages/patches/sssd-curl-compat.patch                  \
   %D%/packages/patches/steghide-fixes.patch                    \
   %D%/packages/patches/superlu-dist-scotchmetis.patch          \
   %D%/packages/patches/swig-guile-gc.patch                     \
diff --git a/gnu/packages/patches/sssd-curl-compat.patch 
b/gnu/packages/patches/sssd-curl-compat.patch
new file mode 100644
index 0000000..ecab737
--- /dev/null
+++ b/gnu/packages/patches/sssd-curl-compat.patch
@@ -0,0 +1,18 @@
+Fix build with curl >= 7.62.  Patch taken from upstream:
+
+https://pagure.io/SSSD/sssd/c/4d3841ca379afc01184453ba45ab3e75ffec60da?branch=sssd-1-16
+
+diff --git a/src/util/tev_curl.c b/src/util/tev_curl.c
+index 6a7a580..d70a429 100644
+--- a/src/util/tev_curl.c
++++ b/src/util/tev_curl.c
+@@ -97,7 +97,9 @@ static errno_t curl_code2errno(CURLcode crv)
+         return ETIMEDOUT;
+     case CURLE_SSL_ISSUER_ERROR:
+     case CURLE_SSL_CACERT_BADFILE:
++#if LIBCURL_VERSION_NUM < 0x073e00
+     case CURLE_SSL_CACERT:
++#endif
+     case CURLE_SSL_CERTPROBLEM:
+         return ERR_INVALID_CERT;
+ 
diff --git a/gnu/packages/sssd.scm b/gnu/packages/sssd.scm
index 0ff94cd..75ce7c8 100644
--- a/gnu/packages/sssd.scm
+++ b/gnu/packages/sssd.scm
@@ -86,6 +86,7 @@ fundamental object types for C.")
               (method url-fetch)
               (uri (string-append "http://releases.pagure.org/SSSD/sssd/";
                                   "sssd-" version ".tar.gz"))
+              (patches (search-patches "sssd-curl-compat.patch"))
               (sha256
                (base32
                 "032ppk57qs1lnvz7pb7lw9ldwm9i1yagh9fzgqgn6na3bg61ynzy"))))