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

Levente Polyak anthraxx at archlinux.org
Tue Jan 3 15:25:06 UTC 2017


    Date: Tuesday, January 3, 2017 @ 15:25:06
  Author: anthraxx
Revision: 204806

upgpkg: lib32-curl 7.52.1-1 (bump + libpsl)

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

----------------------------------+
 0001-vtls-s-SSLEAY-OPENSSL.patch |   39 +++++++++++++++++++++++++++++++++++++
 PKGBUILD                         |   23 ++++++++++++++-------
 2 files changed, 54 insertions(+), 8 deletions(-)

Added: 0001-vtls-s-SSLEAY-OPENSSL.patch
===================================================================
--- 0001-vtls-s-SSLEAY-OPENSSL.patch	                        (rev 0)
+++ 0001-vtls-s-SSLEAY-OPENSSL.patch	2017-01-03 15:25:06 UTC (rev 204806)
@@ -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	2017-01-03 15:24:23 UTC (rev 204805)
+++ PKGBUILD	2017-01-03 15:25:06 UTC (rev 204806)
@@ -8,19 +8,26 @@
 
 pkgname=lib32-curl
 _pkgname=curl
-pkgver=7.51.0
+pkgver=7.52.1
 pkgrel=1
 pkgdesc="An URL retrieval utility and library (32-bit)"
 arch=('x86_64')
-url="http://curl.haxx.se"
+url="https://curl.haxx.se"
 license=('MIT')
-depends=('lib32-libssh2' 'lib32-krb5' 'lib32-zlib' "${_pkgname}")
-source=("https://curl.haxx.se/download/$_pkgname-$pkgver.tar.gz"{,.asc})
-sha512sums=('6bec021caa1befd16dd2a5221a22764b70c1bd5cf5d553eaa2cb980ef340129a0deb2f900dd9ef5c07f734f73abf0d6447eedb1f8803e16fe469d6271161fa67'
-            'SKIP')
+depends=('lib32-libssh2' 'lib32-krb5' 'lib32-libpsl' 'lib32-zlib' "${_pkgname}")
+source=("https://curl.haxx.se/download/$_pkgname-$pkgver.tar.gz"{,.asc}
+        0001-vtls-s-SSLEAY-OPENSSL.patch)
+sha512sums=('414c3daa2754172f6fb645b3669d15f621fd248488d88666312963275c19c70d2b0c3b3bcb8d8aa8db6d504a59cb846dd2003ec38080d06caba6dfa8eb2d52ed'
+            'SKIP'
+            'fb094c61e63a2de9e573c7bcf79d5af04dbaaf136eb0da84c4ddb81a233505c8f20d4761e7f518b8859e176206bd35b252476d00e45291e3e626e43e4dac4a6d')
 validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2'   # Daniel Stenberg
               '914C533DF9B2ADA2204F586D78E11C6B279D5C91')  # Daniel Stenberg (old key)
 
+prepare() {
+  cd curl-${pkgver}
+  patch -p1 < "${srcdir}/0001-vtls-s-SSLEAY-OPENSSL.patch" # FS#52287
+}
+
 build() {
   cd "$_pkgname-$pkgver"
 
@@ -27,7 +34,7 @@
   export CC="gcc -m32"
   export CXX="g++ -m32"
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-  
+
   ./configure \
       --prefix=/usr \
       --mandir=/usr/share/man \
@@ -52,7 +59,7 @@
   make DESTDIR="$pkgdir" install
 
   rm -rf "${pkgdir}"/usr/{share,bin}
-  
+
   # license
   install -d "$pkgdir/usr/share/licenses"
   ln -s "$_pkgname" "$pkgdir/usr/share/licenses/$pkgname"



More information about the arch-commits mailing list