Date: Tuesday, January 3, 2017 @ 14:06:22 Author: alucryd Revision: 204791
archrelease: copy trunk to community-i686, community-x86_64 Added: libcurl-gnutls/repos/community-i686/0001-vtls-s-SSLEAY-OPENSSL.patch (from rev 204790, libcurl-gnutls/trunk/0001-vtls-s-SSLEAY-OPENSSL.patch) libcurl-gnutls/repos/community-i686/PKGBUILD (from rev 204790, libcurl-gnutls/trunk/PKGBUILD) libcurl-gnutls/repos/community-x86_64/0001-vtls-s-SSLEAY-OPENSSL.patch (from rev 204790, libcurl-gnutls/trunk/0001-vtls-s-SSLEAY-OPENSSL.patch) libcurl-gnutls/repos/community-x86_64/PKGBUILD (from rev 204790, libcurl-gnutls/trunk/PKGBUILD) Deleted: libcurl-gnutls/repos/community-i686/PKGBUILD libcurl-gnutls/repos/community-x86_64/PKGBUILD ---------------------------------------------------+ /PKGBUILD | 128 ++++++++++++++++++++ community-i686/0001-vtls-s-SSLEAY-OPENSSL.patch | 39 ++++++ community-i686/PKGBUILD | 56 -------- community-x86_64/0001-vtls-s-SSLEAY-OPENSSL.patch | 39 ++++++ community-x86_64/PKGBUILD | 56 -------- 5 files changed, 206 insertions(+), 112 deletions(-) Copied: libcurl-gnutls/repos/community-i686/0001-vtls-s-SSLEAY-OPENSSL.patch (from rev 204790, libcurl-gnutls/trunk/0001-vtls-s-SSLEAY-OPENSSL.patch) =================================================================== --- community-i686/0001-vtls-s-SSLEAY-OPENSSL.patch (rev 0) +++ community-i686/0001-vtls-s-SSLEAY-OPENSSL.patch 2017-01-03 14:06:22 UTC (rev 204791) @@ -0,0 +1,39 @@ +From a7b38c9dc98481e4a5fc37e51a8690337c674dfb Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg <dan...@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 + Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2017-01-03 14:06:11 UTC (rev 204790) +++ community-i686/PKGBUILD 2017-01-03 14:06:22 UTC (rev 204791) @@ -1,56 +0,0 @@ -# $Id$ -# Maintainer: Maxime Gauduin <aluc...@archlinux.org> -# Contributor: Lizao (Larry) Li <lzlarr...@gmail.com> - -pkgname=libcurl-gnutls -pkgver=7.51.0 -pkgrel=1 -pkgdesc='An URL retrieval library' -arch=('i686' 'x86_64') -url='https://curl.haxx.se' -license=('MIT') -depends=('curl' 'glibc' 'gnutls' 'nettle' 'zlib' - 'libssh2.so') -options=('strip') -source=("https://curl.haxx.se/download/curl-${pkgver}.tar.gz"{,.asc}) -validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2') # Daniel Stenberg -sha256sums=('65b5216a6fbfa72f547eb7706ca5902d7400db9868269017a8888aa91d87977c' - 'SKIP') - -build() { - cd curl-${pkgver} - - ./configure \ - --prefix='/usr' \ - --disable-ldap \ - --disable-ldaps \ - --disable-manual \ - --disable-versioned-symbols \ - --enable-ipv6 \ - --enable-threaded-resolver \ - --without-gssapi \ - --without-libidn \ - --without-ssl \ - --with-gnutls='/usr' \ - --with-random='/dev/urandom' \ - --with-ca-bundle='/etc/ssl/certs/ca-certificates.crt' - - make -C lib -} - -package() { - cd curl-${pkgver} - - make -C lib DESTDIR="${pkgdir}" install - - mv "${pkgdir}"/usr/lib/libcurl{,-gnutls}.so.4.4.0 - rm "${pkgdir}"/usr/lib/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/lib/libcurl-gnutls.so.${version} - done - - install -dm 755 "${pkgdir}"/usr/share/licenses - ln -s curl "${pkgdir}"/usr/share/licenses/libcurl-gnutls -} - -# vim: ts=2 sw=2 et: Copied: libcurl-gnutls/repos/community-i686/PKGBUILD (from rev 204790, libcurl-gnutls/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2017-01-03 14:06:22 UTC (rev 204791) @@ -0,0 +1,64 @@ +# $Id$ +# Maintainer: Maxime Gauduin <aluc...@archlinux.org> +# Contributor: Lizao (Larry) Li <lzlarr...@gmail.com> + +pkgname=libcurl-gnutls +pkgver=7.52.1 +pkgrel=1 +pkgdesc='An URL retrieval library' +arch=('i686' 'x86_64') +url='https://curl.haxx.se' +license=('MIT') +depends=('curl' 'glibc' 'gnutls' 'libpsl' 'nettle' 'zlib' + 'libssh2.so') +options=('strip') +source=("https://curl.haxx.se/download/curl-${pkgver}.tar.gz"{,.asc} + '0001-vtls-s-SSLEAY-OPENSSL.patch') +validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2') # Daniel Stenberg +sha256sums=('a8984e8b20880b621f61a62d95ff3c0763a3152093a9f9ce4287cfd614add6ae' + 'SKIP' + 'a850c761e5fd1c312328a0168c9ce2eefbf9a96f960c5db9e6e4812693379b49') + +prepare() { + cd curl-${pkgver} + + patch -Np1 -i ../0001-vtls-s-SSLEAY-OPENSSL.patch +} + +build() { + cd curl-${pkgver} + + ./configure \ + --prefix='/usr' \ + --disable-ldap \ + --disable-ldaps \ + --disable-manual \ + --disable-versioned-symbols \ + --enable-ipv6 \ + --enable-threaded-resolver \ + --without-gssapi \ + --without-libidn \ + --without-ssl \ + --with-gnutls='/usr' \ + --with-random='/dev/urandom' \ + --with-ca-bundle='/etc/ssl/certs/ca-certificates.crt' + + make -C lib +} + +package() { + cd curl-${pkgver} + + make -C lib DESTDIR="${pkgdir}" install + + mv "${pkgdir}"/usr/lib/libcurl{,-gnutls}.so.4.4.0 + rm "${pkgdir}"/usr/lib/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/lib/libcurl-gnutls.so.${version} + done + + install -dm 755 "${pkgdir}"/usr/share/licenses + ln -s curl "${pkgdir}"/usr/share/licenses/libcurl-gnutls +} + +# vim: ts=2 sw=2 et: Copied: libcurl-gnutls/repos/community-x86_64/0001-vtls-s-SSLEAY-OPENSSL.patch (from rev 204790, libcurl-gnutls/trunk/0001-vtls-s-SSLEAY-OPENSSL.patch) =================================================================== --- community-x86_64/0001-vtls-s-SSLEAY-OPENSSL.patch (rev 0) +++ community-x86_64/0001-vtls-s-SSLEAY-OPENSSL.patch 2017-01-03 14:06:22 UTC (rev 204791) @@ -0,0 +1,39 @@ +From a7b38c9dc98481e4a5fc37e51a8690337c674dfb Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg <dan...@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 + Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2017-01-03 14:06:11 UTC (rev 204790) +++ community-x86_64/PKGBUILD 2017-01-03 14:06:22 UTC (rev 204791) @@ -1,56 +0,0 @@ -# $Id$ -# Maintainer: Maxime Gauduin <aluc...@archlinux.org> -# Contributor: Lizao (Larry) Li <lzlarr...@gmail.com> - -pkgname=libcurl-gnutls -pkgver=7.51.0 -pkgrel=1 -pkgdesc='An URL retrieval library' -arch=('i686' 'x86_64') -url='https://curl.haxx.se' -license=('MIT') -depends=('curl' 'glibc' 'gnutls' 'nettle' 'zlib' - 'libssh2.so') -options=('strip') -source=("https://curl.haxx.se/download/curl-${pkgver}.tar.gz"{,.asc}) -validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2') # Daniel Stenberg -sha256sums=('65b5216a6fbfa72f547eb7706ca5902d7400db9868269017a8888aa91d87977c' - 'SKIP') - -build() { - cd curl-${pkgver} - - ./configure \ - --prefix='/usr' \ - --disable-ldap \ - --disable-ldaps \ - --disable-manual \ - --disable-versioned-symbols \ - --enable-ipv6 \ - --enable-threaded-resolver \ - --without-gssapi \ - --without-libidn \ - --without-ssl \ - --with-gnutls='/usr' \ - --with-random='/dev/urandom' \ - --with-ca-bundle='/etc/ssl/certs/ca-certificates.crt' - - make -C lib -} - -package() { - cd curl-${pkgver} - - make -C lib DESTDIR="${pkgdir}" install - - mv "${pkgdir}"/usr/lib/libcurl{,-gnutls}.so.4.4.0 - rm "${pkgdir}"/usr/lib/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/lib/libcurl-gnutls.so.${version} - done - - install -dm 755 "${pkgdir}"/usr/share/licenses - ln -s curl "${pkgdir}"/usr/share/licenses/libcurl-gnutls -} - -# vim: ts=2 sw=2 et: Copied: libcurl-gnutls/repos/community-x86_64/PKGBUILD (from rev 204790, libcurl-gnutls/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2017-01-03 14:06:22 UTC (rev 204791) @@ -0,0 +1,64 @@ +# $Id$ +# Maintainer: Maxime Gauduin <aluc...@archlinux.org> +# Contributor: Lizao (Larry) Li <lzlarr...@gmail.com> + +pkgname=libcurl-gnutls +pkgver=7.52.1 +pkgrel=1 +pkgdesc='An URL retrieval library' +arch=('i686' 'x86_64') +url='https://curl.haxx.se' +license=('MIT') +depends=('curl' 'glibc' 'gnutls' 'libpsl' 'nettle' 'zlib' + 'libssh2.so') +options=('strip') +source=("https://curl.haxx.se/download/curl-${pkgver}.tar.gz"{,.asc} + '0001-vtls-s-SSLEAY-OPENSSL.patch') +validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2') # Daniel Stenberg +sha256sums=('a8984e8b20880b621f61a62d95ff3c0763a3152093a9f9ce4287cfd614add6ae' + 'SKIP' + 'a850c761e5fd1c312328a0168c9ce2eefbf9a96f960c5db9e6e4812693379b49') + +prepare() { + cd curl-${pkgver} + + patch -Np1 -i ../0001-vtls-s-SSLEAY-OPENSSL.patch +} + +build() { + cd curl-${pkgver} + + ./configure \ + --prefix='/usr' \ + --disable-ldap \ + --disable-ldaps \ + --disable-manual \ + --disable-versioned-symbols \ + --enable-ipv6 \ + --enable-threaded-resolver \ + --without-gssapi \ + --without-libidn \ + --without-ssl \ + --with-gnutls='/usr' \ + --with-random='/dev/urandom' \ + --with-ca-bundle='/etc/ssl/certs/ca-certificates.crt' + + make -C lib +} + +package() { + cd curl-${pkgver} + + make -C lib DESTDIR="${pkgdir}" install + + mv "${pkgdir}"/usr/lib/libcurl{,-gnutls}.so.4.4.0 + rm "${pkgdir}"/usr/lib/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/lib/libcurl-gnutls.so.${version} + done + + install -dm 755 "${pkgdir}"/usr/share/licenses + ln -s curl "${pkgdir}"/usr/share/licenses/libcurl-gnutls +} + +# vim: ts=2 sw=2 et: