[Midnightbsd-cvs] mports [15630] 7.33.0 curl
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue Nov 26 23:24:42 EST 2013
Revision: 15630
http://svnweb.midnightbsd.org/mports/?rev=15630
Author: laffer1
Date: 2013-11-26 23:24:41 -0500 (Tue, 26 Nov 2013)
Log Message:
-----------
7.33.0 curl
Modified Paths:
--------------
trunk/ftp/curl/Makefile
trunk/ftp/curl/distinfo
trunk/ftp/curl/files/patch-configure
trunk/ftp/curl/files/patch-src-tool_operate.c
trunk/ftp/curl/pkg-plist
Removed Paths:
-------------
trunk/ftp/curl/files/patch-lib-ssluse.c
Property Changed:
----------------
trunk/ftp/curl/distinfo
trunk/ftp/curl/files/patch-configure
trunk/ftp/curl/pkg-plist
Modified: trunk/ftp/curl/Makefile
===================================================================
--- trunk/ftp/curl/Makefile 2013-11-27 04:14:35 UTC (rev 15629)
+++ trunk/ftp/curl/Makefile 2013-11-27 04:24:41 UTC (rev 15630)
@@ -1,7 +1,7 @@
# $MidnightBSD$
PORTNAME= curl
-PORTVERSION= 7.31.0
+PORTVERSION= 7.33.0
PORTREVISION= 0
CATEGORIES= ftp ipv6 www
MASTER_SITES= http://curl.haxx.se/download/ \
@@ -44,7 +44,7 @@
MANUAL README.netware README.win32 RESOURCES SSLCERTS THANKS \
TODO TheArtOfHttpScripting VERSIONS curl-config.html \
curl-config.pdf curl.html curl.pdf index.html
-MAN1= curl.1 curl-config.1 mk-ca-bundle.1
+MAN1= curl.1 curl-config.1
MAN3= curl_easy_cleanup.3 curl_easy_duphandle.3 curl_easy_escape.3 \
curl_easy_getinfo.3 curl_easy_init.3 curl_easy_pause.3 \
curl_easy_perform.3 curl_easy_recv.3 curl_easy_reset.3 \
Modified: trunk/ftp/curl/distinfo
===================================================================
--- trunk/ftp/curl/distinfo 2013-11-27 04:14:35 UTC (rev 15629)
+++ trunk/ftp/curl/distinfo 2013-11-27 04:24:41 UTC (rev 15630)
@@ -1,2 +1,2 @@
-SHA256 (curl-7.31.0.tar.lzma) = f3ff7ae7f642e7f38b0c51ff3563d6f9f4254f5b05d1bfa8a5386fc91c70f7e4
-SIZE (curl-7.31.0.tar.lzma) = 2172148
+SHA256 (curl-7.33.0.tar.lzma) = 17eaa3503d84b1aebc2fbf25b9649246f5cbd7c859a497c2aa42f04d0f83a046
+SIZE (curl-7.33.0.tar.lzma) = 2244539
Property changes on: trunk/ftp/curl/distinfo
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.11
\ No newline at end of property
Modified: trunk/ftp/curl/files/patch-configure
===================================================================
--- trunk/ftp/curl/files/patch-configure 2013-11-27 04:14:35 UTC (rev 15629)
+++ trunk/ftp/curl/files/patch-configure 2013-11-27 04:24:41 UTC (rev 15630)
@@ -6,19 +6,46 @@
Author: Peter Pentchev <roam at FreeBSD.org>
Last-Update: 2010-12-19
---- configure.orig 2013-02-06 17:47:26.000000000 +0800
-+++ configure 2013-02-18 18:25:16.000000000 +0800
-@@ -16651,6 +16651,9 @@
+--- configure.orig 2013-10-13 04:24:48.000000000 +0800
++++ configure 2013-10-16 01:59:07.369433723 +0800
+@@ -3550,9 +3550,10 @@
+ -I*)
+ xc_bad_var_ldflags=yes
+ ;;
+- -l* | --library=*)
+- xc_bad_var_ldflags=yes
+- ;;
++# Temporarily disable -l* flag check for SSP support (Mk/bsd.ssp.mk)
++# -l* | --library=*)
++# xc_bad_var_ldflags=yes
++# ;;
+ esac
+ done
+ if test $xc_bad_var_ldflags = yes; then
+@@ -3622,9 +3623,10 @@
+ xc_bad_var_cflags=no
+ for xc_word in $CFLAGS; do
+ case "$xc_word" in
+- -D*)
+- xc_bad_var_cflags=yes
+- ;;
++# Temporarily disable -D* flag check (PR/177401, PR/180944)
++# -D*)
++# xc_bad_var_cflags=yes
++# ;;
+ -U*)
+ xc_bad_var_cflags=yes
+ ;;
+@@ -16892,6 +16894,8 @@
tmp_CFLAGS="$CFLAGS"
tmp_CPPFLAGS="$CPPFLAGS"
-+# Do not remove the user-supplied debug flags in CFLAGS
-+# PR: 150854
++# Do not remove the user-supplied debug flags in CFLAGS (PR/150854)
+if false; then
ac_var_stripped=""
for word1 in $tmp_CFLAGS; do
ac_var_strip_word="no"
-@@ -16681,6 +16684,7 @@
+@@ -16922,6 +16926,7 @@
done
tmp_CPPFLAGS="$ac_var_stripped"
squeeze tmp_CPPFLAGS
@@ -26,17 +53,16 @@
#
if test "$want_debug" = "yes"; then
-@@ -16898,6 +16902,9 @@
+@@ -17139,6 +17144,8 @@
#
if test "$honor_optimize_option" = "yes"; then
-+# Do not remove the user-supplied optimization flags in CFLAGS
-+# PR: 150854
++# Do not remove the user-supplied optimization flags in CFLAGS (PR/150854)
+if false; then
ac_var_stripped=""
for word1 in $tmp_CFLAGS; do
ac_var_strip_word="no"
-@@ -16928,6 +16935,7 @@
+@@ -17169,6 +17176,7 @@
done
tmp_CPPFLAGS="$ac_var_stripped"
squeeze tmp_CPPFLAGS
@@ -44,7 +70,7 @@
if test "$want_optimize" = "yes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts optimizer enabling options" >&5
-@@ -21379,7 +21387,8 @@
+@@ -21336,7 +21344,8 @@
PKGTEST="no"
PREFIX_OPENSSL=$OPT_SSL
@@ -54,7 +80,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: PKG_CONFIG_LIBDIR will be set to \"$OPENSSL_PCDIR\"" >&5
$as_echo "$as_me: PKG_CONFIG_LIBDIR will be set to \"$OPENSSL_PCDIR\"" >&6;}
if test -f "$OPENSSL_PCDIR/openssl.pc"; then
-@@ -24725,29 +24734,30 @@
+@@ -24685,29 +24694,30 @@
;;
off)
LIB_RTMP="-lrtmp"
@@ -94,3 +120,31 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
+@@ -39180,9 +39190,10 @@
+ -I*)
+ xc_bad_var_ldflags=yes
+ ;;
+- -l* | --library=*)
+- xc_bad_var_ldflags=yes
+- ;;
++# Temporarily disable -l* flag check for SSP support (Mk/bsd.ssp.mk)
++# -l* | --library=*)
++# xc_bad_var_ldflags=yes
++# ;;
+ esac
+ done
+ if test $xc_bad_var_ldflags = yes; then
+@@ -39252,9 +39263,10 @@
+ xc_bad_var_cflags=no
+ for xc_word in $CFLAGS; do
+ case "$xc_word" in
+- -D*)
+- xc_bad_var_cflags=yes
+- ;;
++# Temporarily disable -D* flag check (PR/177401, PR/180944)
++# -D*)
++# xc_bad_var_cflags=yes
++# ;;
+ -U*)
+ xc_bad_var_cflags=yes
+ ;;
Property changes on: trunk/ftp/curl/files/patch-configure
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.7
\ No newline at end of property
Deleted: trunk/ftp/curl/files/patch-lib-ssluse.c
===================================================================
--- trunk/ftp/curl/files/patch-lib-ssluse.c 2013-11-27 04:14:35 UTC (rev 15629)
+++ trunk/ftp/curl/files/patch-lib-ssluse.c 2013-11-27 04:24:41 UTC (rev 15630)
@@ -1,28 +0,0 @@
---- lib/ssluse.c.orig
-+++ lib/ssluse.c
-@@ -2608,13 +2608,19 @@ static ssize_t ossl_recv(struct connectdata *conn, /* connection data */
- *curlcode = CURLE_AGAIN;
- return -1;
- default:
-- /* openssl/ssl.h says "look at error stack/return value/errno" */
-+ /* openssl/ssl.h for SSL_ERROR_SYSCALL says "look at error stack/return
-+ value/errno" */
-+ /* http://www.openssl.org/docs/crypto/ERR_get_error.html */
- sslerror = ERR_get_error();
-- failf(conn->data, "SSL read: %s, errno %d",
-- ERR_error_string(sslerror, error_buffer),
-- SOCKERRNO);
-- *curlcode = CURLE_RECV_ERROR;
-- return -1;
-+ if((nread < 0) || sslerror) {
-+ /* If the return code was negative or there actually is an error in the
-+ queue */
-+ failf(conn->data, "SSL read: %s, errno %d",
-+ ERR_error_string(sslerror, error_buffer),
-+ SOCKERRNO);
-+ *curlcode = CURLE_RECV_ERROR;
-+ return -1;
-+ }
- }
- }
- return nread;
Modified: trunk/ftp/curl/files/patch-src-tool_operate.c
===================================================================
--- trunk/ftp/curl/files/patch-src-tool_operate.c 2013-11-27 04:14:35 UTC (rev 15629)
+++ trunk/ftp/curl/files/patch-src-tool_operate.c 2013-11-27 04:24:41 UTC (rev 15630)
@@ -1,6 +1,6 @@
---- src/tool_operate.c.orig 2012-07-24 01:59:20.000000000 +0800
-+++ src/tool_operate.c 2012-09-22 20:54:44.439408357 +0800
-@@ -653,22 +653,10 @@
+--- src/tool_operate.c.orig 2013-08-01 04:53:34.000000000 +0800
++++ src/tool_operate.c 2013-08-17 18:25:00.139780776 +0800
+@@ -709,20 +709,7 @@
DEBUGASSERT(!outs.filename);
}
@@ -19,14 +19,20 @@
-
- if(config->resume_from) {
+ if(config->resume_from || config->resume_from_current) {
+ #ifdef __VMS
+ /* open file for output, forcing VMS output format into stream
+ mode which is needed for stat() call above to always work. */
+@@ -730,7 +717,8 @@
+ "ctx=stm", "rfm=stmlf", "rat=cr", "mrs=0");
+ #else
/* open file for output: */
- FILE *file = fopen(outfile, config->resume_from?"ab":"wb");
+ /* (always open for appending, it has no effect on new files) */
+ FILE *file = fopen(outfile, "ab");
+ #endif
if(!file) {
helpf(config->errors, "Can't open '%s'!\n", outfile);
- res = CURLE_WRITE_ERROR;
-@@ -676,6 +664,19 @@
+@@ -739,6 +727,19 @@
}
outs.fopened = TRUE;
outs.stream = file;
Modified: trunk/ftp/curl/pkg-plist
===================================================================
--- trunk/ftp/curl/pkg-plist 2013-11-27 04:14:35 UTC (rev 15629)
+++ trunk/ftp/curl/pkg-plist 2013-11-27 04:24:41 UTC (rev 15630)
@@ -16,6 +16,62 @@
lib/libcurl.so
lib/libcurl.so.7
libdata/pkgconfig/libcurl.pc
+man/man1/curl-config.1.gz
+man/man1/curl.1.gz
+man/man3/curl_easy_cleanup.3.gz
+man/man3/curl_easy_duphandle.3.gz
+man/man3/curl_easy_escape.3.gz
+man/man3/curl_easy_getinfo.3.gz
+man/man3/curl_easy_init.3.gz
+man/man3/curl_easy_pause.3.gz
+man/man3/curl_easy_perform.3.gz
+man/man3/curl_easy_recv.3.gz
+man/man3/curl_easy_reset.3.gz
+man/man3/curl_easy_send.3.gz
+man/man3/curl_easy_setopt.3.gz
+man/man3/curl_easy_strerror.3.gz
+man/man3/curl_easy_unescape.3.gz
+man/man3/curl_escape.3.gz
+man/man3/curl_formadd.3.gz
+man/man3/curl_formfree.3.gz
+man/man3/curl_formget.3.gz
+man/man3/curl_free.3.gz
+man/man3/curl_getdate.3.gz
+man/man3/curl_getenv.3.gz
+man/man3/curl_global_cleanup.3.gz
+man/man3/curl_global_init.3.gz
+man/man3/curl_global_init_mem.3.gz
+man/man3/curl_mprintf.3.gz
+man/man3/curl_multi_add_handle.3.gz
+man/man3/curl_multi_assign.3.gz
+man/man3/curl_multi_cleanup.3.gz
+man/man3/curl_multi_fdset.3.gz
+man/man3/curl_multi_info_read.3.gz
+man/man3/curl_multi_init.3.gz
+man/man3/curl_multi_perform.3.gz
+man/man3/curl_multi_remove_handle.3.gz
+man/man3/curl_multi_setopt.3.gz
+man/man3/curl_multi_socket.3.gz
+man/man3/curl_multi_socket_action.3.gz
+man/man3/curl_multi_strerror.3.gz
+man/man3/curl_multi_timeout.3.gz
+man/man3/curl_multi_wait.3.gz
+man/man3/curl_share_cleanup.3.gz
+man/man3/curl_share_init.3.gz
+man/man3/curl_share_setopt.3.gz
+man/man3/curl_share_strerror.3.gz
+man/man3/curl_slist_append.3.gz
+man/man3/curl_slist_free_all.3.gz
+man/man3/curl_strequal.3.gz
+man/man3/curl_unescape.3.gz
+man/man3/curl_version.3.gz
+man/man3/curl_version_info.3.gz
+man/man3/libcurl-easy.3.gz
+man/man3/libcurl-errors.3.gz
+man/man3/libcurl-multi.3.gz
+man/man3/libcurl-share.3.gz
+man/man3/libcurl-tutorial.3.gz
+man/man3/libcurl.3.gz
%%PORTDOCS%%%%DOCSDIR%%/BINDINGS
%%PORTDOCS%%%%DOCSDIR%%/BUGS
%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTE
@@ -203,6 +259,7 @@
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pop3s.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pop3slist.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/post-callback.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/postinmemory.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/postit2.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/progressfunc.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/resolve.c
Property changes on: trunk/ftp/curl/pkg-plist
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.7
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list