[arch-commits] Commit in edbrowse/trunk (PKGBUILD curl-7.62.patch)

[Evangelos Foutras]

    Date: Friday, January 11, 2019 @ 09:52:47
  Author: foutrelis
Revision: 422382

Fix build with curl >= 7.62

Added:
  edbrowse/trunk/curl-7.62.patch
Modified:
  edbrowse/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   11 +++++++++--
 curl-7.62.patch |   26 ++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-01-11 09:49:14 UTC (rev 422381)
+++ PKGBUILD	2019-01-11 09:52:47 UTC (rev 422382)
@@ -12,9 +12,16 @@
 url="http://edbrowse.org/"
 license=('GPL' 'MPL')
 depends=('duktape' 'tidy' 'curl' 'pcre')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/CMB/edbrowse/archive/v$pkgver.tar.gz")
-sha256sums=('ae7717c4c30297a01185ae2705fd55a7cd5f5484db05d5dfc02b7932b5766498')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/CMB/edbrowse/archive/v$pkgver.tar.gz"
+        curl-7.62.patch)
+sha256sums=('ae7717c4c30297a01185ae2705fd55a7cd5f5484db05d5dfc02b7932b5766498'
+            'b4eff80c296d5d1531255f3b0b9337efee06e070c4c7d92569517d853805bae7')
 
+prepare() {
+    cd "$pkgname-$pkgver"
+    patch -Np1 -i ../curl-7.62.patch
+}
+
 build() {
     cd "$pkgname-$pkgver"
     make CFLAGS="-I/usr/include/tidy" all

Added: curl-7.62.patch
===================================================================
--- curl-7.62.patch	                        (rev 0)
+++ curl-7.62.patch	2019-01-11 09:52:47 UTC (rev 422382)
@@ -0,0 +1,26 @@
+From 5d2b9e21fdf019f461ebe62738d615428d5db963 Mon Sep 17 00:00:00 2001
+From: Po-Chuan Hsieh <sunpoet at sunpoet.net>
+Date: Sat, 3 Nov 2018 18:11:14 +0800
+Subject: [PATCH] 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 | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/http.c b/src/http.c
+index 56eebab..ccafc8f 100644
+--- a/src/http.c
++++ b/src/http.c
+@@ -1557,7 +1557,9 @@ void ebcurl_setError(CURLcode curlret, const char *url, int action,
+ 		break;
+ 
+ 	case CURLE_PEER_FAILED_VERIFICATION:
++#if LIBCURL_VERSION_NUM < 0x073e00
+ 	case CURLE_SSL_CACERT:
++#endif
+ 		(*fn) (MSG_NoCertify, host);
+ 		break;
+