Skip to content
GitLab
Explore
Sign in
Register
Commits on Source (2)
fix-curl-ftbfs.diff: Fix build with current curl. (Closes: #913403)
· aae66ab7
Timo Aaltonen
authored
Nov 23, 2018
aae66ab7
releasing package sssd version 1.16.3-3
· 2ca8cd26
Timo Aaltonen
authored
Dec 02, 2018
2ca8cd26
Show whitespace changes
Inline
Side-by-side
debian/changelog
View file @
2ca8cd26
sssd (1.16.3-3) unstable; urgency=medium
* fix-curl-ftbfs.diff: Fix build with current curl. (Closes: #913403)
* Rebuild with python3.7. (Closes: #915199, #915168)
-- Timo Aaltonen <tjaalton@debian.org> Sun, 02 Dec 2018 11:16:57 +0200
sssd (1.16.3-2) unstable; urgency=medium
[ Jeremy Bicha ]
...
...
debian/patches/fix-curl-ftbfs.diff
0 → 100644
View file @
2ca8cd26
commit 1ee12b05570fcfb8e4190c9ec704c5563138344d
Author: Lukas Slebodnik <lslebodn@redhat.com>
Date: Wed Nov 7 23:06:10 2018 +0000
UTIL: Fix compilation with curl 7.62.0
The macro CURLE_SSL_CACERT is deprecated in upstream curl
since commit 3f3b26d6feb0667714902e836af608094235fca2.
commit 3f3b26d6feb0667714902e836af608094235fca2
Author: Han Han <hhan@thousandeyes.com>
Date: Wed Aug 22 11:13:32 2018 -0700
ssl: deprecate CURLE_SSL_CACERT in favour of a unified error code
Long live CURLE_PEER_FAILED_VERIFICATION
sh$ git tag --contains 3f3b26d6feb0667714902e836af608094235fca2
curl-7_62_0
It was not removed. It is just an alias to
CURLE_PEER_FAILED_VERIFICATION which causes compile time failures in
switch/case.
./src/util/tev_curl.c: In function 'curl_code2errno':
./src/util/tev_curl.c:113:5: error: duplicate case value
case CURLE_PEER_FAILED_VERIFICATION:
^~~~
./src/util/tev_curl.c: 100:5: note: previously used here
case CURLE_SSL_CACERT:
^~~~
Merges: https://pagure.io/SSSD/sssd/pull-request/3878
Resolves:
https://pagure.io/SSSD/sssd/issue/3875
Reviewed-by: Sumit Bose <sbose@redhat.com>
diff --git a/src/util/tev_curl.c b/src/util/tev_curl.c
index 6a7a580d5..d70a42972 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;
debian/patches/series
View file @
2ca8cd26
#placeholder
fix-curl-ftbfs.diff