commit 043d42efa69e459cbd5ee4dfa363d4b4fb9d6d98 Author: Danny Rawlins <monster.romster@gmail.com> Date: Thu Feb 9 12:57:08 2017 +1100 curl-32: initial import diff --git a/curl-32/.32bit b/curl-32/.32bit new file mode 100644 index 0000000..e69de29 diff --git a/curl-32/.footprint b/curl-32/.footprint new file mode 100644 index 0000000..36cc8ba --- /dev/null +++ b/curl-32/.footprint @@ -0,0 +1,9 @@ +drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/lib32/ +-rw-r--r-- root/root usr/lib32/libcurl.a +-rwxr-xr-x root/root usr/lib32/libcurl.la +lrwxrwxrwx root/root usr/lib32/libcurl.so -> libcurl.so.4.4.0 +lrwxrwxrwx root/root usr/lib32/libcurl.so.4 -> libcurl.so.4.4.0 +-rwxr-xr-x root/root usr/lib32/libcurl.so.4.4.0 +drwxr-xr-x root/root usr/lib32/pkgconfig/ +-rw-r--r-- root/root usr/lib32/pkgconfig/libcurl.pc diff --git a/curl-32/.md5sum b/curl-32/.md5sum new file mode 100644 index 0000000..0ee13bf --- /dev/null +++ b/curl-32/.md5sum @@ -0,0 +1,2 @@ +e71496f422359ccb7783fe495569541a 0002-vtls-s-SSLEAY-OPENSSL.patch +ddbd157359bc8a9174e11b151254b264 curl-7.52.1.tar.lzma diff --git a/curl-32/0002-vtls-s-SSLEAY-OPENSSL.patch b/curl-32/0002-vtls-s-SSLEAY-OPENSSL.patch new file mode 100644 index 0000000..386dfe1 --- /dev/null +++ b/curl-32/0002-vtls-s-SSLEAY-OPENSSL.patch @@ -0,0 +1,39 @@ +From a7b38c9dc98481e4a5fc37e51a8690337c674dfb Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg <daniel@haxx.se> +Date: Mon, 26 Dec 2016 00:06:33 +0100 +Subject: [PATCH 02/76] 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 b808e1c5f..707f24b02 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) +-- +2.11.0 + diff --git a/curl-32/Pkgfile b/curl-32/Pkgfile new file mode 100644 index 0000000..1c9cf25 --- /dev/null +++ b/curl-32/Pkgfile @@ -0,0 +1,25 @@ +# Description: A tool for transfering files with URL syntax +# Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu +# URL: https://curl.haxx.se/ +# Depends on: openssl-32 zlib-32 curl + +name=curl-32 +version=7.52.1 +release=1 +source=(https://curl.haxx.se/download/${name%-*}-$version.tar.lzma 0002-vtls-s-SSLEAY-OPENSSL.patch) + +build() { + cd ${name%-*}-$version + patch -p1 -i $SRC/0002-vtls-s-SSLEAY-OPENSSL.patch + ./configure --prefix=/usr \ + --libdir=/usr/lib32 \ + --enable-ipv6 \ + --without-libidn \ + --without-cyassl \ + --enable-threaded-resolver \ + --with-ca-bundle=/etc/ssl/cert.pem + make + make DESTDIR=$PKG install + + rm -r $PKG/usr/{bin,include,share/aclocal,share/man,share} +}