<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/be6211631fbb94adc44e14c630b22c06bce18542">https://github.com/macports/macports-ports/commit/be6211631fbb94adc44e14c630b22c06bce18542</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new be62116 curl: Update to 7.62.0
</span>be62116 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit be6211631fbb94adc44e14c630b22c06bce18542
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Nov 2 08:54:29 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> curl: Update to 7.62.0
</span>---
net/curl/Portfile | 12 ++---
net/curl/files/libressl.patch | 76 -------------------------------
net/curl/files/patch-no-autodownload.diff | 6 +--
3 files changed, 8 insertions(+), 86 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/curl/Portfile b/net/curl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 61d73f8..3672f9e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/curl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/curl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
name curl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 7.61.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 7.62.0
</span> categories net www
platforms darwin freebsd
maintainers {ryandesign @ryandesign}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,9 +26,9 @@ set curl_distfile ${distfiles}
</span> distfiles ${curl_distfile}:curl
checksums ${curl_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 bb514580ff1d897b8759ce5a455fcd599f8963a0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3d5913d6a39bd22e68e34dff697fd6e4c3c81563f580c76fca2009315cd81891 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2360392
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 a8139e2e1e5af4bedeea329cac100490a8895ac9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 dab5643a5fe775ae92570b9f3df6b0ef4bc2a827a959361fb130c73b721275c1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2395476
</span>
if {${name} eq ${subport}} {
PortGroup muniversal 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,8 +41,6 @@ if {${name} eq ${subport}} {
</span> port:libpsl \
port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles libressl.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args --disable-silent-rules \
--enable-ipv6 \
--without-brotli \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -208,7 +206,7 @@ if {${name} eq ${subport}} {
</span> }
subport curl-ca-bundle {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span> categories net
license {MPL-2 LGPL-2.1+}
supported_archs noarch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/curl/files/libressl.patch b/net/curl/files/libressl.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 22dae7a..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/curl/files/libressl.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,76 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2a6b3cfacb..99e1ba34e3 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/vtls/openssl.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/vtls/openssl.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -117,15 +117,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define X509_get0_notBefore(x) X509_get_notBefore(x)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define X509_get0_notAfter(x) X509_get_notAfter(x)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define CONST_EXTS /* nope */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef LIBRESSL_VERSION_NUMBER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--static unsigned long OpenSSL_version_num(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return LIBRESSL_VERSION_NUMBER;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define OpenSSL_version_num() SSLeay()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if (OPENSSL_VERSION_NUMBER >= 0x1000200fL) && /* 1.0.2 or later */ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- !defined(LIBRESSL_VERSION_NUMBER)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3519,9 +3512,24 @@ static ssize_t ossl_recv(struct connectdata *conn, /* connection data */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static size_t Curl_ossl_version(char *buffer, size_t size)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int rc = -1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef OPENSSL_IS_BORINGSSL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return snprintf(buffer, size, OSSL_PACKAGE);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#else /* OPENSSL_IS_BORINGSSL */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* no version extraction method known */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif defined(LIBRESSL_VERSION_NUMBER)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const char *ver = OpenSSL_version(OPENSSL_VERSION);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(ver && !strncmp(ver, "LibreSSL ", 9) && ver[9]) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ char *partial = strdup(&ver[9]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(partial) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ char *p;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for(p = partial; *p; ++p) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(ISSPACE(*p))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *p = '_';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rc = snprintf(buffer, size, "%s/%s", OSSL_PACKAGE, partial);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ free(partial);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char sub[3];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unsigned long ssleay_value;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sub[2]='\0';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3546,14 +3554,20 @@ static size_t Curl_ossl_version(char *buffer, size_t size)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sub[0]='\0';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return snprintf(buffer, size, "%s/%lx.%lx.%lx%s",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- OSSL_PACKAGE,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (ssleay_value>>28)&0xf,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (ssleay_value>>20)&0xff,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (ssleay_value>>12)&0xff,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sub);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* OPENSSL_IS_BORINGSSL */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rc = snprintf(buffer, size, "%s/%lx.%lx.%lx%s",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ OSSL_PACKAGE,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (ssleay_value>>28)&0xf,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (ssleay_value>>20)&0xff,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (ssleay_value>>12)&0xff,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sub);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(0 < rc && (unsigned)rc < size)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return rc;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(!size)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ strncpy(buffer, OSSL_PACKAGE, size);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ buffer[size - 1] = '\0';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return strlen(buffer);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* can be called with data == NULL */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/curl/files/patch-no-autodownload.diff b/net/curl/files/patch-no-autodownload.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 8e2a5ab..64641d8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/curl/files/patch-no-autodownload.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/curl/files/patch-no-autodownload.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.orig 2017-06-14 06:13:06.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile 2017-07-25 15:30:42.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -144,7 +144,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.orig 2018-10-18 08:27:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2018-11-02 08:49:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -120,7 +120,7 @@
</span>
ca-bundle: lib/mk-ca-bundle.pl
@echo "generate a fresh ca-bundle.crt"
</pre><pre style='margin:0'>
</pre>