[arch-commits] Commit in curl/trunk (0001-vtls-s-SSLEAY-OPENSSL.patch PKGBUILD)

[Christian Hesse]

    Date: Wednesday, December 28, 2016 @ 07:20:32
  Author: eworm
Revision: 284923

upgpkg: curl 7.52.1-2

include patch: "vtls: s/SSLEAY/OPENSSL" (upstream commit a7b38c9d, FS#52287)

Added:
  curl/trunk/0001-vtls-s-SSLEAY-OPENSSL.patch
Modified:
  curl/trunk/PKGBUILD

----------------------------------+
 0001-vtls-s-SSLEAY-OPENSSL.patch |   39 +++++++++++++++++++++++++++++++++++++
 PKGBUILD                         |   14 ++++++++++---
 2 files changed, 50 insertions(+), 3 deletions(-)

Added: 0001-vtls-s-SSLEAY-OPENSSL.patch
===================================================================
--- 0001-vtls-s-SSLEAY-OPENSSL.patch	                        (rev 0)
+++ 0001-vtls-s-SSLEAY-OPENSSL.patch	2016-12-28 07:20:32 UTC (rev 284923)
@@ -0,0 +1,39 @@
+From a7b38c9dc98481e4a5fc37e51a8690337c674dfb Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <daniel at haxx.se>
+Date: Mon, 26 Dec 2016 00:06:33 +0100
+Subject: vtls: s/SSLEAY/OPENSSL
+
+Fixed an old leftover use of the USE_SSLEAY define which would make a
+socket get removed from the applications sockets to monitor when the
+multi_socket API was used, leading to timeouts.
+
+Bug: #1174
+---
+ lib/vtls/vtls.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c
+index b808e1c..707f24b 100644
+--- a/lib/vtls/vtls.c
++++ b/lib/vtls/vtls.c
+@@ -484,7 +484,7 @@ void Curl_ssl_close_all(struct Curl_easy *data)
+   curlssl_close_all(data);
+ }
+ 
+-#if defined(USE_SSLEAY) || defined(USE_GNUTLS) || defined(USE_SCHANNEL) || \
++#if defined(USE_OPENSSL) || defined(USE_GNUTLS) || defined(USE_SCHANNEL) || \
+     defined(USE_DARWINSSL) || defined(USE_NSS)
+ /* This function is for OpenSSL, GnuTLS, darwinssl, and schannel only. */
+ int Curl_ssl_getsock(struct connectdata *conn, curl_socket_t *socks,
+@@ -518,7 +518,7 @@ int Curl_ssl_getsock(struct connectdata *conn,
+   (void)numsocks;
+   return GETSOCK_BLANK;
+ }
+-/* USE_SSLEAY || USE_GNUTLS || USE_SCHANNEL || USE_DARWINSSL || USE_NSS */
++/* USE_OPENSSL || USE_GNUTLS || USE_SCHANNEL || USE_DARWINSSL || USE_NSS */
+ #endif
+ 
+ void Curl_ssl_close(struct connectdata *conn, int sockindex)
+-- 
+cgit v1.1
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-12-28 06:53:22 UTC (rev 284922)
+++ PKGBUILD	2016-12-28 07:20:32 UTC (rev 284923)
@@ -7,7 +7,7 @@
 
 pkgname=curl
 pkgver=7.52.1
-pkgrel=1
+pkgrel=2
 pkgdesc="An URL retrieval utility and library"
 arch=('i686' 'x86_64')
 url="https://curl.haxx.se"
@@ -16,13 +16,21 @@
 provides=('libcurl.so')
 options=('strip' 'debug')
 source=("https://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
-        curlbuild.h)
+        'curlbuild.h'
+        '0001-vtls-s-SSLEAY-OPENSSL.patch')
 sha512sums=('414c3daa2754172f6fb645b3669d15f621fd248488d88666312963275c19c70d2b0c3b3bcb8d8aa8db6d504a59cb846dd2003ec38080d06caba6dfa8eb2d52ed'
             'SKIP'
-            '4e71366c3faaab76a6e438fcc484fb1ce16b2ae84eefa176879cf164e8fb0b04e4a355384e66a1137e9641e95041ee573553b43da98ec92820696d7256beb4f5')
+            '4e71366c3faaab76a6e438fcc484fb1ce16b2ae84eefa176879cf164e8fb0b04e4a355384e66a1137e9641e95041ee573553b43da98ec92820696d7256beb4f5'
+            'fb094c61e63a2de9e573c7bcf79d5af04dbaaf136eb0da84c4ddb81a233505c8f20d4761e7f518b8859e176206bd35b252476d00e45291e3e626e43e4dac4a6d')
 validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2'   # Daniel Stenberg
               '914C533DF9B2ADA2204F586D78E11C6B279D5C91')  # Daniel Stenberg (old key)
 
+prepare() {
+  cd "$pkgname-$pkgver"
+
+  patch -Np1 -i "$srcdir/0001-vtls-s-SSLEAY-OPENSSL.patch"
+}
+
 build() {
   cd "$pkgname-$pkgver"