Attachment 94246 Details for Bug 132358 – update-to-7.19.4.diff

[patch] update-to-7.19.4.diff

update-to-7.19.4.diff (text/plain), 9.88 KB, created by Eygene Ryabinkin on 2009-03-06 11:20:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Eygene Ryabinkin

Created: 2009-03-06 11:20:05 UTC

Size: 9.88 KB

patch

obsolete

>From d19c6c4fa9eb054a8dcc15c003fd08c20a1121f5 Mon Sep 17 00:00:00 2001
>From: Eygene Ryabinkin <rea-fbsd@codelabs.ru>
>Date: Fri, 6 Mar 2009 13:09:10 +0300
>
>Signed-off-by: Eygene Ryabinkin <rea-fbsd@codelabs.ru>
>---
> ftp/curl/Makefile | 2 +-
> ftp/curl/distinfo | 6 ++--
> ftp/curl/files/patch-configure | 19 ++++++---------
> ftp/curl/files/patch-docs::curl.1 | 12 ---------
> ftp/curl/files/patch-docs::curl.html | 12 ---------
> ftp/curl/files/patch-lib::ftp.c | 42 ++-------------------------------
> ftp/curl/files/patch-src::main.c | 33 +++-----------------------
> ftp/curl/pkg-plist | 1 +
> 8 files changed, 20 insertions(+), 107 deletions(-)
> delete mode 100644 ftp/curl/files/patch-docs::curl.1
> delete mode 100644 ftp/curl/files/patch-docs::curl.html
>
>diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
>index 925df08..4395b84 100644
>--- a/ftp/curl/Makefile
>+++ b/ftp/curl/Makefile
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	curl
>-PORTVERSION=	7.19.2
>+PORTVERSION=	7.19.4
> CATEGORIES=	ftp ipv6 www
> MASTER_SITES=	http://curl.haxx.se/download/ \
> 		${MASTER_SITE_SOURCEFORGE} \
>diff --git a/ftp/curl/distinfo b/ftp/curl/distinfo
>index e0af4ce..89defda 100644
>--- a/ftp/curl/distinfo
>+++ b/ftp/curl/distinfo
>@@ -1,3 +1,3 @@
>-MD5 (curl-7.19.2.tar.bz2) = 3a461b145a4a31fe7d5a44684e7fbdbc
>-SHA256 (curl-7.19.2.tar.bz2) = 60091fe65ad3aed9b5151cb4e8fcfaf56567c5ae705fdf4246854625eb91c272
>-SIZE (curl-7.19.2.tar.bz2) = 2168458
>+MD5 (curl-7.19.4.tar.bz2) = 2734167c1e5f7ce6be99b75d2d371d85
>+SHA256 (curl-7.19.4.tar.bz2) = fb3436280dedbc8f8141d3841a5964c4491dd6457bc5b7123854aed0b794be86
>+SIZE (curl-7.19.4.tar.bz2) = 2296879
>diff --git a/ftp/curl/files/patch-configure b/ftp/curl/files/patch-configure
>index 3d38f47..174926a 100644
>--- a/ftp/curl/files/patch-configure
>+++ b/ftp/curl/files/patch-configure
>@@ -1,14 +1,11 @@
>-diff -urN -x .svn ../../vendor/curl/configure ./configure
>---- ../../vendor/curl/configure	2008-11-02 00:09:51.000000000 +0200
>-+++ ./configure	2009-01-21 16:12:08.000000000 +0200
>-@@ -32237,8 +32237,10 @@
>+--- configure.orig	2009-02-13 17:25:53.000000000 +0300
>++++ configure	2009-03-06 12:26:56.000000000 +0300
>+@@ -23435,7 +23435,7 @@
> PKGTEST="no"
> PREFIX_OPENSSL=$OPT_SSL
> LIB_OPENSSL="$PREFIX_OPENSSL/lib$libsuff"
>-+ if ! [ "$PREFIX_OPENSSL" = "/usr" ]; then
>- LDFLAGS="$LDFLAGS -L$LIB_OPENSSL"
>- CPPFLAGS="$CPPFLAGS -I$PREFIX_OPENSSL/include/openssl -I$PREFIX_OPENSSL/include"
>-+ fi
>- ;;
>- esac
>- 
>+- if "$PREFIX_OPENSSL" != "/usr" ; then
>++ if [ "$PREFIX_OPENSSL" != "/usr" ] ; then
>+ LDFLAGS="$LDFLAGS -L$LIB_OPENSSL"
>+ CPPFLAGS="$CPPFLAGS -I$PREFIX_OPENSSL/include"
>+ fi
>diff --git a/ftp/curl/files/patch-docs::curl.1 b/ftp/curl/files/patch-docs::curl.1
>deleted file mode 100644
>index 456063b..0000000
>--- a/ftp/curl/files/patch-docs::curl.1
>+++ /dev/null
>@@ -1,12 +0,0 @@
>-diff -urN -x .svn ../../vendor/curl/docs/curl.1 ./docs/curl.1
>---- ../../vendor/curl/docs/curl.1	2008-10-29 23:15:24.000000000 +0200
>-+++ ./docs/curl.1	2009-01-21 16:12:19.000000000 +0200
>-@@ -875,7 +875,7 @@
>- Tells curl to respect RFC 2616/10.3.2 and not convert POST requests into GET
>- requests when following a 302 redirection. The non-RFC behaviour is ubiquitous
>- in web browsers, so curl does the conversion by default to maintain
>--consistency. However, a server may requires a POST to remain a POST after such
>-+consistency. However, a server may require a POST to remain a POST after such
>- a redirection. This option is meaningful only when using \fI-L/--location\fP
>- (Added in 7.19.1)
>- .IP "--proxy-anyauth"
>diff --git a/ftp/curl/files/patch-docs::curl.html b/ftp/curl/files/patch-docs::curl.html
>deleted file mode 100644
>index 5bd4b47..0000000
>--- a/ftp/curl/files/patch-docs::curl.html
>+++ /dev/null
>@@ -1,12 +0,0 @@
>-diff -urN -x .svn ../../vendor/curl/docs/curl.html ./docs/curl.html
>---- ../../vendor/curl/docs/curl.html	2008-11-05 14:00:48.000000000 +0200
>-+++ ./docs/curl.html	2009-01-21 16:12:12.000000000 +0200
>-@@ -362,7 +362,7 @@
>- <a name="--post301"></a>--post301 
>- Tells curl to respect RFC 2616/10.3.2 and not convert POST requests into GET requests when following a 301 redirection. The non-RFC behaviour is ubiquitous in web browsers, so curl does the conversion by default to maintain consistency. However, a server may require a POST to remain a POST after such a redirection. This option is meaningful only when using <a class="emphasis" href="#-L--location">-L/--location</a> (Added in 7.17.1) 
>- <a name="--post302"></a>--post302 
>--Tells curl to respect RFC 2616/10.3.2 and not convert POST requests into GET requests when following a 302 redirection. The non-RFC behaviour is ubiquitous in web browsers, so curl does the conversion by default to maintain consistency. However, a server may requires a POST to remain a POST after such a redirection. This option is meaningful only when using <a class="emphasis" href="#-L--location">-L/--location</a> (Added in 7.19.1) 
>-+Tells curl to respect RFC 2616/10.3.2 and not convert POST requests into GET requests when following a 302 redirection. The non-RFC behaviour is ubiquitous in web browsers, so curl does the conversion by default to maintain consistency. However, a server may require a POST to remain a POST after such a redirection. This option is meaningful only when using <a class="emphasis" href="#-L--location">-L/--location</a> (Added in 7.19.1) 
>- <a name="--proxy-anyauth"></a>--proxy-anyauth 
>- Tells curl to pick a suitable authentication method when communicating with the given proxy. This might cause an extra request/response round-trip. (Added in 7.13.2) 
>- <a name="--proxy-basic"></a>--proxy-basic 
>diff --git a/ftp/curl/files/patch-lib::ftp.c b/ftp/curl/files/patch-lib::ftp.c
>index d2a0b8e..d452480 100644
>--- a/ftp/curl/files/patch-lib::ftp.c
>+++ b/ftp/curl/files/patch-lib::ftp.c
>@@ -1,24 +1,6 @@
>---- ../../../tags/curl-7.19.2-stock/lib/ftp.c	2009-01-23 18:11:47.000000000 +0200
>-+++ lib/ftp.c	2009-01-26 03:31:07.000000000 +0200
>-@@ -1901,7 +1901,7 @@
>- result = CURLE_COULDNT_CONNECT;
>- break;
>- }
>--#ifndef CURL_DISABLE_HTTP
>-+#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_PROXY)
>- if(conn->bits.tunnel_proxy && conn->bits.httpproxy) {
>- /* FIX: this MUST wait for a proper connect first if 'connected' is
>- * FALSE */
>-@@ -1927,7 +1927,7 @@
>- if(CURLE_OK != result)
>- return result;
>- }
>--#endif /* CURL_DISABLE_HTTP */
>-+#endif /* CURL_DISABLE_HTTP || CURL_DISABLE_PROXY */
>- 
>- state(conn, FTP_STOP); /* this phase is completed */
>- 
>-@@ -3056,7 +3056,7 @@
>+--- lib/ftp.c.orig	2009-02-20 11:17:17.000000000 +0300
>++++ lib/ftp.c	2009-03-06 12:42:07.000000000 +0300
>+@@ -3055,7 +3055,7 @@
> bool *done) /* see description above */
> {
> CURLcode result;
>@@ -27,21 +9,3 @@
> /* for FTP over HTTP proxy */
> struct HTTP http_proxy;
> struct FTP *ftp_save;
>-@@ -3079,7 +3079,7 @@
>- 
>- ftpc->response_time = RESP_TIMEOUT; /* set default response time-out */
>- 
>--#ifndef CURL_DISABLE_HTTP
>-+#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_PROXY)
>- if(conn->bits.tunnel_proxy && conn->bits.httpproxy) {
>- /* BLOCKING */
>- /* We want "seamless" FTP operations through HTTP proxy tunnel */
>-@@ -3102,7 +3102,7 @@
>- if(CURLE_OK != result)
>- return result;
>- }
>--#endif /* CURL_DISABLE_HTTP */
>-+#endif /* CURL_DISABLE_HTTP || CURL_DISABLE_PROXY */
>- 
>- if(conn->protocol & PROT_FTPS) {
>- /* BLOCKING */
>diff --git a/ftp/curl/files/patch-src::main.c b/ftp/curl/files/patch-src::main.c
>index 5bb8942..0bfd0fb 100644
>--- a/ftp/curl/files/patch-src::main.c
>+++ b/ftp/curl/files/patch-src::main.c
>@@ -1,7 +1,6 @@
>-diff -urN -x .svn ../../vendor/curl/src/main.c ./src/main.c
>---- ../../vendor/curl/src/main.c	2008-10-29 00:12:02.000000000 +0200
>-+++ ./src/main.c	2009-01-21 16:12:11.000000000 +0200
>-@@ -4313,31 +4313,32 @@
>+--- src/main.c.orig	2009-02-17 12:10:21.000000000 +0300
>++++ src/main.c	2009-03-06 12:42:56.000000000 +0300
>+@@ -4355,31 +4355,32 @@
> (-1 == create_dir_hierarchy(outfile, config->errors)))
> return CURLE_WRITE_ERROR;
> 
>@@ -52,31 +51,7 @@ diff -urN -x .svn ../../vendor/curl/src/main.c ./src/main.c
> }
> else {
> outs.stream = NULL; /* open when needed */
>-@@ -5288,12 +5289,13 @@
>- static const char *
>- msdosify (const char *file_name)
>- {
>-- static char dos_name[PATH_MAX*2];
>-+ static char dos_name[PATH_MAX + 16];
>- static const char illegal_chars_dos[] = ".+, ;=[]|<>\\\":?*";
>- static const char *illegal_chars_w95 = &illegal_chars_dos[8];
>- int idx, dot_idx;
>- const char *s = file_name;
>- char *d = dos_name;
>-+ char *dlimit = dos_name + PATH_MAX;
>- const char *illegal_aliens = illegal_chars_dos;
>- size_t len = sizeof (illegal_chars_dos) - 1;
>- int lfn = 0;
>-@@ -5314,7 +5316,7 @@
>- *d++ = *s++;
>- }
>- 
>-- for (idx = 0, dot_idx = -1; *s; s++, d++) {
>-+ for (idx = 0, dot_idx = -1; *s && d < dlimit; s++, d++) {
>- if (memchr (illegal_aliens, *s, len)) {
>- /* Dots are special: DOS doesn't allow them as the leading character,
>- and a file name cannot have more than a single dot. We leave the
>-@@ -5371,6 +5373,10 @@
>+@@ -5429,6 +5430,10 @@
> idx++;
> }
> 
>diff --git a/ftp/curl/pkg-plist b/ftp/curl/pkg-plist
>index 5946037..99e68ce 100644
>--- a/ftp/curl/pkg-plist
>+++ b/ftp/curl/pkg-plist
>@@ -161,6 +161,7 @@ libdata/pkgconfig/libcurl.pc
> %%PORTDOCS%%%%EXAMPLESDIR%%/curlgtk.c
> %%PORTDOCS%%%%EXAMPLESDIR%%/curlx.c
> %%PORTDOCS%%%%EXAMPLESDIR%%/debug.c
>+%%PORTDOCS%%%%EXAMPLESDIR%%/evhiperfifo.c
> %%PORTDOCS%%%%EXAMPLESDIR%%/fileupload.c
> %%PORTDOCS%%%%EXAMPLESDIR%%/fopen.c
> %%PORTDOCS%%%%EXAMPLESDIR%%/ftpget.c
>-- 
>1.6.1

Actions: View | Diff

Attachments on bug 132358: 94246 | 94247