From ba8a717a2fec6d183400f0f6c15da6237248e0ca Mon Sep 17 00:00:00 2001 From: sunpoet Date: Fri, 16 Jun 2017 13:59:30 +0000 Subject: MFH: r443658 Update to 7.54.1 Changes: https://curl.haxx.se/changes.html Security: 9314058e-5204-11e7-b712-b1a44a034d72 Approved by: ports-secteam (zi) --- ftp/curl/Makefile | 2 +- ftp/curl/distinfo | 6 +++--- ftp/curl/files/patch-configure | 24 ++++++++++++------------ ftp/curl/files/patch-src-tool_operate.c | 8 ++++---- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile index 196562b..b448c18 100644 --- a/ftp/curl/Makefile +++ b/ftp/curl/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= curl -PORTVERSION= 7.54.0 +PORTVERSION= 7.54.1 CATEGORIES= ftp net www MASTER_SITES= http://curl.haxx.se/download/ \ LOCAL/sunpoet diff --git a/ftp/curl/distinfo b/ftp/curl/distinfo index afb5ef0..a1ee4a5 100644 --- a/ftp/curl/distinfo +++ b/ftp/curl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1492694896 -SHA256 (curl-7.54.0.tar.lzma) = cd6aa6039f13e0b06e0a93e1b93754f6dc07f444812bb6c32be75a8f28c4070a -SIZE (curl-7.54.0.tar.lzma) = 2084912 +TIMESTAMP = 1497527215 +SHA256 (curl-7.54.1.tar.lzma) = 2b7af34d4900887e0b4e0a9f545b9511ff774d07151ae4976485060d3e1bdb6e +SIZE (curl-7.54.1.tar.lzma) = 2101798 diff --git a/ftp/curl/files/patch-configure b/ftp/curl/files/patch-configure index 86d89fe..3b494ad 100644 --- a/ftp/curl/files/patch-configure +++ b/ftp/curl/files/patch-configure @@ -6,9 +6,9 @@ Forwarded: not-needed Author: Peter Pentchev Last-Update: 2010-12-19 ---- configure.orig 2013-10-12 20:24:48 UTC +--- configure.orig 2017-06-14 06:10:57 UTC +++ configure -@@ -3611,9 +3611,10 @@ $as_echo "$as_me: LIBS note: LIBS should +@@ -4149,9 +4149,10 @@ $as_echo "$as_me: LIBS note: LIBS should -I*) xc_bad_var_ldflags=yes ;; @@ -22,7 +22,7 @@ Last-Update: 2010-12-19 esac done if test $xc_bad_var_ldflags = yes; then -@@ -3683,9 +3684,10 @@ $as_echo "$as_me: $xc_bad_var_msg librar +@@ -4221,9 +4222,10 @@ $as_echo "$as_me: $xc_bad_var_msg librar xc_bad_var_cflags=no for xc_word in $CFLAGS; do case "$xc_word" in @@ -36,7 +36,7 @@ Last-Update: 2010-12-19 -U*) xc_bad_var_cflags=yes ;; -@@ -16960,6 +16962,8 @@ $as_echo "$as_me: WARNING: compiler opti +@@ -17982,6 +17984,8 @@ $as_echo "$as_me: WARNING: compiler opti tmp_CFLAGS="$CFLAGS" tmp_CPPFLAGS="$CPPFLAGS" @@ -45,7 +45,7 @@ Last-Update: 2010-12-19 ac_var_stripped="" for word1 in $tmp_CFLAGS; do ac_var_strip_word="no" -@@ -16990,6 +16994,7 @@ $as_echo "$as_me: WARNING: compiler opti +@@ -18012,6 +18016,7 @@ $as_echo "$as_me: WARNING: compiler opti done tmp_CPPFLAGS="$ac_var_stripped" squeeze tmp_CPPFLAGS @@ -53,7 +53,7 @@ Last-Update: 2010-12-19 # if test "$want_debug" = "yes"; then -@@ -17207,6 +17212,8 @@ $as_echo "$honor_optimize_option" >&6; } +@@ -18229,6 +18234,8 @@ $as_echo "$honor_optimize_option" >&6; } # if test "$honor_optimize_option" = "yes"; then @@ -62,7 +62,7 @@ Last-Update: 2010-12-19 ac_var_stripped="" for word1 in $tmp_CFLAGS; do ac_var_strip_word="no" -@@ -17237,6 +17244,7 @@ $as_echo "$honor_optimize_option" >&6; } +@@ -18259,6 +18266,7 @@ $as_echo "$honor_optimize_option" >&6; } done tmp_CPPFLAGS="$ac_var_stripped" squeeze tmp_CPPFLAGS @@ -70,7 +70,7 @@ Last-Update: 2010-12-19 if test "$want_optimize" = "yes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts optimizer enabling options" >&5 -@@ -25050,29 +25059,30 @@ $as_echo "found" >&6; } +@@ -26661,30 +26669,30 @@ $as_echo "found" >&6; } ;; off) LIB_RTMP="-lrtmp" @@ -79,11 +79,11 @@ Last-Update: 2010-12-19 + DIR_RTMP="" ;; *) - PREFIX_RTMP=$OPT_LIBRTMP -+ LIB_RTMP="-lrtmp" + LIB_RTMP="-lrtmp" + LD_RTMP="-L${PREFIX_RTMP}/lib$libsuff" + CPP_RTMP="-I${PREFIX_RTMP}/include" + DIR_RTMP="${PREFIX_RTMP}/lib$libsuff" + PREFIX_RTMP=$OPT_LIBRTMP ;; esac @@ -110,7 +110,7 @@ Last-Update: 2010-12-19 cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -39613,9 +39623,10 @@ $as_echo "$as_me: LIBS note: LIBS should +@@ -41279,9 +41287,10 @@ $as_echo "$as_me: LIBS note: LIBS should -I*) xc_bad_var_ldflags=yes ;; @@ -124,7 +124,7 @@ Last-Update: 2010-12-19 esac done if test $xc_bad_var_ldflags = yes; then -@@ -39685,9 +39696,10 @@ $as_echo "$as_me: $xc_bad_var_msg librar +@@ -41351,9 +41360,10 @@ $as_echo "$as_me: $xc_bad_var_msg librar xc_bad_var_cflags=no for xc_word in $CFLAGS; do case "$xc_word" in diff --git a/ftp/curl/files/patch-src-tool_operate.c b/ftp/curl/files/patch-src-tool_operate.c index 5a51465..693ebd0 100644 --- a/ftp/curl/files/patch-src-tool_operate.c +++ b/ftp/curl/files/patch-src-tool_operate.c @@ -1,6 +1,6 @@ ---- src/tool_operate.c.orig 2013-07-31 20:53:34 UTC +--- src/tool_operate.c.orig 2017-06-09 09:57:41 UTC +++ src/tool_operate.c -@@ -589,20 +589,7 @@ static CURLcode operate_do(struct Global +@@ -654,20 +654,7 @@ static CURLcode operate_do(struct Global DEBUGASSERT(!outs.filename); } @@ -22,7 +22,7 @@ #ifdef __VMS /* open file for output, forcing VMS output format into stream mode which is needed for stat() call above to always work. */ -@@ -610,7 +597,8 @@ static CURLcode operate_do(struct Global +@@ -675,7 +662,8 @@ static CURLcode operate_do(struct Global "ctx=stm", "rfm=stmlf", "rat=cr", "mrs=0"); #else /* open file for output: */ @@ -32,7 +32,7 @@ #endif if(!file) { helpf(global->errors, "Can't open '%s'!\n", outfile); -@@ -619,6 +607,19 @@ static CURLcode operate_do(struct Global +@@ -684,6 +672,19 @@ static CURLcode operate_do(struct Global } outs.fopened = TRUE; outs.stream = file; -- cgit v1.1