[arch-commits] Commit in lib32-libcurl-gnutls/trunk (2 files)

[Christian Hesse]

    Date: Wednesday, October 4, 2017 @ 10:12:55
  Author: eworm
Revision: 261442

upgpkg: lib32-libcurl-gnutls 7.56.0-1

new upstream release, including security fixes

https://security.archlinux.org/CVE-2017-1000254

Modified:
  lib32-libcurl-gnutls/trunk/PKGBUILD
Deleted:
  lib32-libcurl-gnutls/trunk/0001-vtls-s-SSLEAY-OPENSSL.patch

----------------------------------+
 0001-vtls-s-SSLEAY-OPENSSL.patch |   39 -------------------------------------
 PKGBUILD                         |   10 ++++-----
 2 files changed, 5 insertions(+), 44 deletions(-)

Deleted: 0001-vtls-s-SSLEAY-OPENSSL.patch
===================================================================
--- 0001-vtls-s-SSLEAY-OPENSSL.patch	2017-10-04 10:10:57 UTC (rev 261441)
+++ 0001-vtls-s-SSLEAY-OPENSSL.patch	2017-10-04 10:12:55 UTC (rev 261442)
@@ -1,39 +0,0 @@
-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-10-04 10:10:57 UTC (rev 261441)
+++ PKGBUILD	2017-10-04 10:12:55 UTC (rev 261442)
@@ -3,7 +3,7 @@
 # Contributor: Lizao (Larry) Li <lzlarryli at gmail.com>
 
 pkgname=lib32-libcurl-gnutls
-pkgver=7.54.1
+pkgver=7.56.0
 pkgrel=1
 pkgdesc='An URL retrieval library'
 arch=('x86_64')
@@ -15,7 +15,7 @@
 options=('strip')
 source=("https://curl.haxx.se/download/curl-${pkgver}.tar.gz"{,.asc})
 validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2') # Daniel Stenberg
-sha256sums=('cd404b808b253512dafec4fed0fb2cc98370d818a7991826c3021984fc27f9d0'
+sha256sums=('f1bc17a7e5662dbd8d4029750a6dbdb72a55cf95826a270ab388b05075526104'
             'SKIP')
 
 build() {
@@ -48,10 +48,10 @@
 
   make -C lib DESTDIR="${pkgdir}" install
 
-  mv "${pkgdir}"/usr/lib32/libcurl{,-gnutls}.so.4.4.0
+  mv "${pkgdir}"/usr/lib32/libcurl{,-gnutls}.so.4.5.0
   rm "${pkgdir}"/usr/lib32/libcurl.{a,so}*
-  for version in 3 4 4.0.0 4.1.0 4.2.0 4.3.0; do
-    ln -s libcurl-gnutls.so.4.4.0 "${pkgdir}"/usr/lib32/libcurl-gnutls.so.${version}
+  for version in 3 4 4.0.0 4.1.0 4.2.0 4.3.0 4.4.0; do
+    ln -s libcurl-gnutls.so.4.5.0 "${pkgdir}"/usr/lib32/libcurl-gnutls.so.${version}
   done
 
   install -dm 755 "${pkgdir}"/usr/share/licenses