pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

edbrowse: Fix the build with curl 7.62.0



Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Sun Nov 4 10:43:03 2018 +0100
Changeset:	4b505924b98b94fbd7c097264a4254dd7b6f4a08

Modified Files:
	edbrowse/distinfo
Added Files:
	edbrowse/patches/patch-src_http.c

Log Message:
edbrowse: Fix the build with curl 7.62.0

CURLE_SSL_CACERT in curl-7.62.0 was deprecated in favour of a
unified error code.

From upstream commit 5d2b9e21fdf019f461ebe62738d615428d5db963.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4b505924b98b94fbd7c097264a4254dd7b6f4a08

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 edbrowse/distinfo                 |  1 +
 edbrowse/patches/patch-src_http.c | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+)

diffs:
diff --git a/edbrowse/distinfo b/edbrowse/distinfo
index 62aabee0a8..39727a457d 100644
--- a/edbrowse/distinfo
+++ b/edbrowse/distinfo
@@ -5,3 +5,4 @@ RMD160 (edbrowse-3.7.4.tar.gz) = eb62948767144f67e1bb790e4e6e2c128300a112
 SHA512 (edbrowse-3.7.4.tar.gz) = 79b2b450b6f54f3d74b7c722f223b3340b3ddfa1cbff2d69adcd1cd4ffb76b78a812a35a053cf224a74543020ef8423cd68eafa9a277451245d383065fb1595d
 Size (edbrowse-3.7.4.tar.gz) = 765794 bytes
 SHA1 (patch-CMakeLists.txt) = 0c69e43f680cc2ddec42802d7ac1b7a3ef669e4a
+SHA1 (patch-src_http.c) = 7389ac4c3b67cacde586363e536d860f1b05fc67
diff --git a/edbrowse/patches/patch-src_http.c b/edbrowse/patches/patch-src_http.c
new file mode 100644
index 0000000000..afaf19743f
--- /dev/null
+++ b/edbrowse/patches/patch-src_http.c
@@ -0,0 +1,21 @@
+$NetBSD$
+
+Backport patch from upstream (commit 5d2b9e21fdf019f461ebe62738d615428d5db963)
+to fix build with curl 7.62.0.
+
+From CHANGES:
+ssl: deprecate CURLE_SSL_CACERT in favour of a unified error code
+     Long live CURLE_PEER_FAILED_VERIFICATION
+
+--- src/http.c.orig	2018-06-27 17:42:33.000000000 +0000
++++ src/http.c
+@@ -1555,7 +1555,9 @@ void ebcurl_setError(CURLcode curlret, c
+ 		break;
+ 
+ 	case CURLE_PEER_FAILED_VERIFICATION:
++#if LIBCURL_VERSION_NUM < 0x073e00
+ 	case CURLE_SSL_CACERT:
++#endif
+ 		(*fn) (MSG_NoCertify, host);
+ 		break;
+ 


Home | Main Index | Thread Index | Old Index