maintenance update to 7.49.0

This commit is contained in:
naddy 2016-05-28 20:05:21 +00:00
parent e79b96a0b8
commit 461ba70d0d
4 changed files with 8 additions and 25 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.117 2016/04/05 19:33:21 naddy Exp $
# $OpenBSD: Makefile,v 1.118 2016/05/28 20:05:21 naddy Exp $
COMMENT= get files from FTP, Gopher, HTTP or HTTPS servers
VERSION= 7.48.0
VERSION= 7.49.0
DISTNAME= curl-${VERSION}
SHARED_LIBS= curl 25.4 # 8.0
SHARED_LIBS= curl 25.5 # 8.0
CATEGORIES= net
HOMEPAGE= https://curl.haxx.se/

View File

@ -1,2 +1,2 @@
SHA256 (curl-7.48.0.tar.lzma) = 33ZMpmOmWJKA/WrArbJAUe8mz+/vJEUfKPmetzOIlNY=
SIZE (curl-7.48.0.tar.lzma) = 5924818
SHA256 (curl-7.49.0.tar.lzma) = 6wco3xySJPi4mU1Ii9qd3QrmeUhWWatpoTuR7zV1Xcs=
SIZE (curl-7.49.0.tar.lzma) = 5985374

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-lib_vtls_openssl_c,v 1.1 2016/04/05 19:33:21 naddy Exp $
upstream commit 240cd84b494e0ffee8ad261c43b927d246cf6be1
--- lib/vtls/openssl.c.orig Tue Mar 22 08:15:38 2016
+++ lib/vtls/openssl.c Mon Mar 28 18:20:55 2016
@@ -95,7 +95,8 @@
#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
#define HAVE_ERR_REMOVE_THREAD_STATE 1
-#if (OPENSSL_VERSION_NUMBER >= 0x10100004L)
+#if (OPENSSL_VERSION_NUMBER >= 0x10100004L) && \
+ !defined(LIBRESSL_VERSION_NUMBER)
/* OpenSSL 1.1.0-pre4 removed the argument! */
#define HAVE_ERR_REMOVE_THREAD_STATE_NOARG 1
#endif

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.37 2016/04/05 19:33:21 naddy Exp $
@comment $OpenBSD: PLIST,v 1.38 2016/05/28 20:05:21 naddy Exp $
@bin bin/curl
bin/curl-config
include/curl/
@ -94,6 +94,7 @@ lib/pkgconfig/libcurl.pc
@man man/man3/CURLOPT_CONNECTTIMEOUT.3
@man man/man3/CURLOPT_CONNECTTIMEOUT_MS.3
@man man/man3/CURLOPT_CONNECT_ONLY.3
@man man/man3/CURLOPT_CONNECT_TO.3
@man man/man3/CURLOPT_CONV_FROM_NETWORK_FUNCTION.3
@man man/man3/CURLOPT_CONV_FROM_UTF8_FUNCTION.3
@man man/man3/CURLOPT_CONV_TO_NETWORK_FUNCTION.3
@ -269,6 +270,7 @@ lib/pkgconfig/libcurl.pc
@man man/man3/CURLOPT_STREAM_DEPENDS.3
@man man/man3/CURLOPT_STREAM_DEPENDS_E.3
@man man/man3/CURLOPT_STREAM_WEIGHT.3
@man man/man3/CURLOPT_TCP_FASTOPEN.3
@man man/man3/CURLOPT_TCP_KEEPALIVE.3
@man man/man3/CURLOPT_TCP_KEEPIDLE.3
@man man/man3/CURLOPT_TCP_KEEPINTVL.3
@ -358,6 +360,3 @@ lib/pkgconfig/libcurl.pc
@man man/man3/libcurl.3
share/aclocal/
share/aclocal/libcurl.m4
share/zsh/
share/zsh/site-functions/
share/zsh/site-functions/_curl