Attachment 166302 Details for Bug 206759 – patch

[patch] patch

curl.diff (text/plain), 17.29 KB, created by Kurt Jaeger on 2016-01-30 14:55:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kurt Jaeger

Created: 2016-01-30 14:55:32 UTC

Size: 17.29 KB

patch

obsolete

>diff -r -u -N ftp/curl/Makefile ../../home/pi/myp/ftp/curl/Makefile
>--- ftp/curl/Makefile	2016-01-17 21:30:58.722858000 +0100
>+++ ../../home/pi/myp/ftp/curl/Makefile	2016-01-30 12:52:01.430622000 +0100
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/ftp/curl/Makefile 406316 2016-01-17 13:08:15Z sunpoet $
> 
> PORTNAME=	curl
>-PORTVERSION=	7.46.0
>-PORTREVISION=	2
>+PORTVERSION=	7.47.0
> CATEGORIES=	ftp www
> MASTER_SITES=	http://curl.haxx.se/download/ \
> 		LOCAL/sunpoet
>diff -r -u -N ftp/curl/distinfo ../../home/pi/myp/ftp/curl/distinfo
>--- ftp/curl/distinfo	2015-12-05 21:30:11.112295000 +0100
>+++ ../../home/pi/myp/ftp/curl/distinfo	2016-01-30 12:53:01.345207000 +0100
>@@ -1,2 +1,2 @@
>-SHA256 (curl-7.46.0.tar.lzma) = fe854a0dedf0a89da72aa1725d8ff66285b613d366a88f14681dacd824024087
>-SIZE (curl-7.46.0.tar.lzma) = 2864645
>+SHA256 (curl-7.47.0.tar.lzma) = f7789a806fef4e24ec3d4b70ca86ff145243bf19d03ab0eb5c64f18f1b2748d8
>+SIZE (curl-7.47.0.tar.lzma) = 2878783
>diff -r -u -N ftp/curl/files/patch-configure ../../home/pi/myp/ftp/curl/files/patch-configure
>--- ftp/curl/files/patch-configure	2015-08-01 00:43:36.581930000 +0200
>+++ ../../home/pi/myp/ftp/curl/files/patch-configure	2016-01-30 15:47:08.595314000 +0100
>@@ -6,9 +6,9 @@
> Author: Peter Pentchev <roam@FreeBSD.org>
> Last-Update: 2010-12-19
> 
>---- configure.orig	2013-10-12 20:24:48 UTC
>+--- configure.orig	2016-01-17 22:59:12 UTC
> +++ configure
>-@@ -3611,9 +3611,10 @@ $as_echo "$as_me: LIBS note: LIBS should
>+@@ -3709,9 +3709,10 @@ $as_echo "$as_me: LIBS note: LIBS should
>        -I*)
>          xc_bad_var_ldflags=yes
>          ;;
>@@ -22,7 +22,7 @@
>      esac
>    done
>    if test $xc_bad_var_ldflags = yes; then
>-@@ -3683,9 +3684,10 @@ $as_echo "$as_me: $xc_bad_var_msg librar
>+@@ -3781,9 +3782,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,199 @@
>        -U*)
>          xc_bad_var_cflags=yes
>          ;;
>-@@ -16960,6 +16962,8 @@ $as_echo "$as_me: WARNING: compiler opti
>+@@ -12389,7 +12391,7 @@ $as_echo_n "checking whether the $compil
>+   hardcode_minus_L=no
>+   hardcode_shlibpath_var=unsupported
>+   inherit_rpath=no
>+-  link_all_deplibs=unknown
>++  link_all_deplibs=no
>+   module_cmds=
>+   module_expsym_cmds=
>+   old_archive_from_new_cmds=
>+@@ -12658,7 +12660,7 @@ _LT_EOF
>+ 	wlarc=
>+       else
>+ 	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>+-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
>++	archive_expsym_cmds='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script $wl$lib-ver -o $lib'
>+       fi
>+       ;;
>+ 
>+@@ -12677,7 +12679,7 @@ _LT_EOF
>+ _LT_EOF
>+       elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
>+ 	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>+-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
>++	archive_expsym_cmds='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script $wl$lib-ver -o $lib'
>+       else
>+ 	ld_shlibs=no
>+       fi
>+@@ -12706,7 +12708,7 @@ _LT_EOF
>+ 	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
>+ 	    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
>+ 	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>+-	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
>++	    archive_expsym_cmds='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script $wl$lib-ver -o $lib'
>+ 	  else
>+ 	    ld_shlibs=no
>+ 	  fi
>+@@ -12724,7 +12726,7 @@ _LT_EOF
>+     *)
>+       if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
>+ 	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>+-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
>++	archive_expsym_cmds='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script $wl$lib-ver -o $lib'
>+       else
>+ 	ld_shlibs=no
>+       fi
>+@@ -13310,7 +13312,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >
>+ 	hardcode_direct_absolute=yes
>+ 	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
>+ 	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
>+-	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
>++	  archive_expsym_cmds='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-version-script,$lib-ver'
>+ 	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
>+ 	  export_dynamic_flag_spec='${wl}-E'
>+ 	else
>+@@ -14088,7 +14090,7 @@ freebsd* | dragonfly*)
>+   version_type=freebsd-$objformat
>+   case $version_type in
>+     freebsd-elf*)
>+-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
>++      library_names_spec='$libname$release$shared_ext$versuffix  $libname$release$shared_ext$major	 $libname$shared_ext'			 soname_spec='$libname$release$shared_ext$major'
>+       need_version=no
>+       need_lib_prefix=no
>+       ;;
>+@@ -15156,7 +15158,7 @@ striplib=
>+ old_striplib=
>+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
>+ $as_echo_n "checking whether stripping libraries is possible... " >&6; }
>+-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
>++if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "strip" >/dev/null; then
>+   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
>+   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
>+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
>+@@ -15550,10 +15552,10 @@ esac
>+   #
>+   flags_dbg_all="unknown"
>+   flags_dbg_yes="unknown"
>+-  flags_dbg_off="unknown"
>++  flags_dbg_off=""
>+   flags_opt_all="unknown"
>+   flags_opt_yes="unknown"
>+-  flags_opt_off="unknown"
>++  flags_opt_off=""
>+   #
>+   flags_prefer_cppflags="no"
>+   #
>+@@ -15650,7 +15652,7 @@ $as_echo "yes" >&6; }
>+     flags_dbg_off=""
>+     flags_opt_all="-O -O0 -O1 -O2 -O3 -O4"
>+     flags_opt_yes="-O1"
>+-    flags_opt_off="-O0"
>++    flags_opt_off=""
>+   else
>+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
>+ $as_echo "no" >&6; }
>+@@ -15705,10 +15707,10 @@ $as_echo "yes" >&6; }
>+     compiler_id="HP_UX_C"
>+     flags_dbg_all="-g -s"
>+     flags_dbg_yes="-g"
>+-    flags_dbg_off="-s"
>++    flags_dbg_off=""
>+     flags_opt_all="-O +O0 +O1 +O2 +O3 +O4"
>+     flags_opt_yes="+O2"
>+-    flags_opt_off="+O0"
>++    flags_opt_off=""
>+   else
>+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
>+ $as_echo "no" >&6; }
>+@@ -15773,7 +15775,7 @@ $as_echo "yes" >&6; }
>+     flags_opt_all="$flags_opt_all -qoptimize=4"
>+     flags_opt_all="$flags_opt_all -qoptimize=5"
>+     flags_opt_yes="-O2"
>+-    flags_opt_off="-qnooptimize"
>++    flags_opt_off=""
>+     flags_prefer_cppflags="yes"
>+   else
>+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
>+@@ -15874,7 +15876,7 @@ rm -f conftest.err conftest.i conftest.$
>+       flags_dbg_off=""
>+       flags_opt_all="-O -O0 -O1 -O2 -O3 -Os"
>+       flags_opt_yes="-O2"
>+-      flags_opt_off="-O0"
>++      flags_opt_off=""
>+     else
>+       compiler_id="INTEL_WINDOWS_C"
>+       flags_dbg_all="/ZI /Zi /zI /zi /ZD /Zd /zD /zd /Z7 /z7 /Oy /Oy-"
>+@@ -15886,10 +15888,10 @@ rm -f conftest.err conftest.i conftest.$
>+       flags_dbg_all="$flags_dbg_all /debug:semantic_stepping"
>+       flags_dbg_all="$flags_dbg_all /debug:extended"
>+       flags_dbg_yes="/Zi /Oy-"
>+-      flags_dbg_off="/debug:none /Oy-"
>++      flags_dbg_off=""
>+       flags_opt_all="/O /O0 /O1 /O2 /O3 /Od /Og /Og- /Oi /Oi-"
>+       flags_opt_yes="/O2"
>+-      flags_opt_off="/Od"
>++      flags_opt_off=""
>+     fi
>+   else
>+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
>+@@ -15959,7 +15961,7 @@ $as_echo "yes" >&6; }
>+     flags_dbg_off=""
>+     flags_opt_all="-O -O0 -O1 -O2 -Os -O3 -O4"
>+     flags_opt_yes="-Os"
>+-    flags_opt_off="-O0"
>++    flags_opt_off=""
>+   else
>+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
>+ $as_echo "no" >&6; }
>+@@ -16029,7 +16031,7 @@ $as_echo "yes" >&6; }
>+     flags_dbg_off=""
>+     flags_opt_all="-O -O0 -O1 -O2 -O3 -Os"
>+     flags_opt_yes="-O2"
>+-    flags_opt_off="-O0"
>++    flags_opt_off=""
>+ 
>+       if test -z "$SED"; then
>+     as_fn_error $? "SED not set. Cannot continue without SED being set." "$LINENO" 5
>+@@ -16267,7 +16269,7 @@ $as_echo "yes" >&6; }
>+     flags_dbg_off=""
>+     flags_opt_all="-O -O0 -O1 -O2 -O3 -Ofast"
>+     flags_opt_yes="-O2"
>+-    flags_opt_off="-O0"
>++    flags_opt_off=""
>+   else
>+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
>+ $as_echo "no" >&6; }
>+@@ -16367,7 +16369,7 @@ $as_echo "yes" >&6; }
>+     flags_dbg_off=""
>+     flags_opt_all="-O -O0 -O1 -O2 -O3 -Ofast"
>+     flags_opt_yes="-O2"
>+-    flags_opt_off="-O0"
>++    flags_opt_off=""
>+   else
>+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
>+ $as_echo "no" >&6; }
>+@@ -16422,7 +16424,7 @@ $as_echo "yes" >&6; }
>+     compiler_id="SUNPRO_C"
>+     flags_dbg_all="-g -s"
>+     flags_dbg_yes="-g"
>+-    flags_dbg_off="-s"
>++    flags_dbg_off=""
>+     flags_opt_all="-O -xO -xO1 -xO2 -xO3 -xO4 -xO5"
>+     flags_opt_yes="-xO2"
>+     flags_opt_off=""
>+@@ -16582,7 +16584,7 @@ rm -f conftest.err conftest.i conftest.$
>+       flags_dbg_off=""
>+       flags_opt_all="-O0 -O1 -O2 -O3"
>+       flags_opt_yes="-O2"
>+-      flags_opt_off="-O0"
>++      flags_opt_off=""
>+     else
>+       compiler_id="WATCOM_WINDOWS_C"
>+       flags_dbg_all=""
>+@@ -16909,6 +16911,8 @@ $as_echo "$as_me: WARNING: compiler opti
>      tmp_CFLAGS="$CFLAGS"
>      tmp_CPPFLAGS="$CPPFLAGS"
>  
>@@ -45,7 +237,7 @@
>      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
>+@@ -16939,6 +16943,7 @@ $as_echo "$as_me: WARNING: compiler opti
>    done
>      tmp_CPPFLAGS="$ac_var_stripped"
>    squeeze tmp_CPPFLAGS
>@@ -53,7 +245,7 @@
>  
>      #
>      if test "$want_debug" = "yes"; then
>-@@ -17207,6 +17212,8 @@ $as_echo "$honor_optimize_option" >&6; }
>+@@ -17156,6 +17161,8 @@ $as_echo "$honor_optimize_option" >&6; }
>      #
>      if test "$honor_optimize_option" = "yes"; then
>  
>@@ -62,7 +254,7 @@
>      ac_var_stripped=""
>    for word1 in $tmp_CFLAGS; do
>      ac_var_strip_word="no"
>-@@ -17237,6 +17244,7 @@ $as_echo "$honor_optimize_option" >&6; }
>+@@ -17186,6 +17193,7 @@ $as_echo "$honor_optimize_option" >&6; }
>    done
>      tmp_CPPFLAGS="$ac_var_stripped"
>    squeeze tmp_CPPFLAGS
>@@ -70,7 +262,7 @@
>  
>        if test "$want_optimize" = "yes"; then
>          { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts optimizer enabling options" >&5
>-@@ -21417,7 +21425,8 @@ if test "$curl_ssl_msg" = "$init_ssl_msg
>+@@ -21407,7 +21415,8 @@ rm -f core conftest.err conftest.$ac_obj
>          PKGTEST="no"
>      PREFIX_OPENSSL=$OPT_SSL
>  
>@@ -80,7 +272,25 @@
>      { $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
>-@@ -25050,29 +25059,30 @@ $as_echo "found" >&6; }
>+@@ -24088,7 +24097,7 @@ $as_echo "found" >&6; }
>+         fi
>+       fi
>+     else
>+-      NSS_PCDIR="$OPT_NSS/lib/pkgconfig"
>++      NSS_PCDIR="$OPT_NSS/libdata/pkgconfig"
>+       if test -f "$NSS_PCDIR/nss.pc"; then
>+ 
>+     if test -n "$PKG_CONFIG"; then
>+@@ -24791,7 +24800,7 @@ $as_echo "found" >&6; }
>+     fi
>+ 
>+   else
>+-        LIBMETALINK_PCDIR="$OPT_LIBMETALINK/lib/pkgconfig"
>++        LIBMETALINK_PCDIR="$OPT_LIBMETALINK/libdata/pkgconfig"
>+     { $as_echo "$as_me:${as_lineno-$LINENO}: PKG_CONFIG_LIBDIR will be set to \"$LIBMETALINK_PCDIR\"" >&5
>+ $as_echo "$as_me: PKG_CONFIG_LIBDIR will be set to \"$LIBMETALINK_PCDIR\"" >&6;}
>+     if test -f "$LIBMETALINK_PCDIR/libmetalink.pc"; then
>+@@ -25427,29 +25436,30 @@ $as_echo "found" >&6; }
>      ;;
>    off)
>          LIB_RTMP="-lrtmp"
>@@ -120,7 +330,25 @@
>  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
>  /* end confdefs.h.  */
>  
>-@@ -39613,9 +39623,10 @@ $as_echo "$as_me: LIBS note: LIBS should
>+@@ -26215,7 +26225,7 @@ case "$OPT_H2" in
>+     ;;
>+   *)
>+         want_h2="yes"
>+-    want_h2_path="$withval/lib/pkgconfig"
>++    want_h2_path="$withval/libdata/pkgconfig"
>+     ;;
>+ esac
>+ 
>+@@ -31243,7 +31253,7 @@ $as_echo_n "checking if getaddrinfo is t
>+       freebsd[1234].* | freebsd5.[1234]*)
>+                 tst_tsafe_getaddrinfo="no"
>+         ;;
>+-      freebsd*)
>++dragonfly* |       freebsd*)
>+                 tst_tsafe_getaddrinfo="yes"
>+         ;;
>+       hpux[123456789].* | hpux10.* | hpux11.0* | hpux11.10*)
>+@@ -40030,9 +40040,10 @@ $as_echo "$as_me: LIBS note: LIBS should
>        -I*)
>          xc_bad_var_ldflags=yes
>          ;;
>@@ -134,7 +362,7 @@
>      esac
>    done
>    if test $xc_bad_var_ldflags = yes; then
>-@@ -39685,9 +39696,10 @@ $as_echo "$as_me: $xc_bad_var_msg librar
>+@@ -40102,9 +40113,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 -r -u -N ftp/curl/files/patch-docs_examples_getredirect.c ../../home/pi/myp/ftp/curl/files/patch-docs_examples_getredirect.c
>--- ftp/curl/files/patch-docs_examples_getredirect.c	1970-01-01 01:00:00.000000000 +0100
>+++ ../../home/pi/myp/ftp/curl/files/patch-docs_examples_getredirect.c	2016-01-30 15:47:08.599334000 +0100
>@@ -0,0 +1,11 @@
>+--- docs/examples/getredirect.c.orig	2016-01-30 14:46:57 UTC
>++++ docs/examples/getredirect.c
>+@@ -48,7 +48,7 @@ int main(void)
>+     else {
>+       res = curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &response_code);
>+       if((res == CURLE_OK) &&
>+-         ((code / 100) != 3)) {
>++         ((response_code / 100) != 3)) {
>+         /* a redirect implies a 3xx response code */
>+         fprintf(stderr, "Not a redirect.\n");
>+       }
>diff -r -u -N ftp/curl/files/patch-lib-hostcheck.h ../../home/pi/myp/ftp/curl/files/patch-lib-hostcheck.h
>--- ftp/curl/files/patch-lib-hostcheck.h	2015-08-01 00:43:36.583325000 +0200
>+++ ../../home/pi/myp/ftp/curl/files/patch-lib-hostcheck.h	2016-01-30 15:47:08.605475000 +0100
>@@ -1,4 +1,4 @@
>---- lib/hostcheck.h.orig	2013-09-08 22:11:15 UTC
>+--- lib/hostcheck.h.orig	2015-11-27 15:00:14 UTC
> +++ lib/hostcheck.h
> @@ -23,6 +23,7 @@
>   ***************************************************************************/
>diff -r -u -N ftp/curl/files/patch-lib-url.c ../../home/pi/myp/ftp/curl/files/patch-lib-url.c
>--- ftp/curl/files/patch-lib-url.c	2015-08-01 00:43:36.584021000 +0200
>+++ ../../home/pi/myp/ftp/curl/files/patch-lib-url.c	2016-01-30 15:47:08.611619000 +0100
>@@ -3,9 +3,9 @@
> Author: Peter Pentchev <roam@FreeBSD.org>
> Last-Update: 2010-12-18
> 
>---- lib/url.c.orig	2015-04-22 05:55:54 UTC
>+--- lib/url.c.orig	2016-01-27 07:23:39 UTC
> +++ lib/url.c
>-@@ -659,6 +659,10 @@ CURLcode Curl_open(struct SessionHandle 
>+@@ -673,6 +673,10 @@ CURLcode Curl_open(struct SessionHandle 
>      data->progress.flags |= PGRS_HIDE;
>      data->state.current_speed = -1; /* init to negative == impossible */
>  
>diff -r -u -N ftp/curl/files/patch-src-tool_operate.c ../../home/pi/myp/ftp/curl/files/patch-src-tool_operate.c
>--- ftp/curl/files/patch-src-tool_operate.c	2015-08-01 00:43:36.582625000 +0200
>+++ ../../home/pi/myp/ftp/curl/files/patch-src-tool_operate.c	2016-01-30 15:47:08.617702000 +0100
>@@ -1,6 +1,6 @@
>---- src/tool_operate.c.orig	2013-07-31 20:53:34 UTC
>+--- src/tool_operate.c.orig	2016-01-27 07:23:39 UTC
> +++ src/tool_operate.c
>-@@ -589,20 +589,7 @@ static CURLcode operate_do(struct Global
>+@@ -600,20 +600,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
>+@@ -621,7 +608,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
>+@@ -630,6 +618,19 @@ static CURLcode operate_do(struct Global
>              }
>              outs.fopened = TRUE;
>              outs.stream = file;

Actions: View | Diff

Attachments on bug 206759: 166302 | 166305