Attachment #94246 for bug #132358

Lines 6-12 Link Here

(-)b/ftp/curl/Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= curl	8	PORTNAME= curl
9	PORTVERSION= 7.19.2	9	PORTVERSION= 7.19.4
10	CATEGORIES= ftp ipv6 www	10	CATEGORIES= ftp ipv6 www
11	MASTER_SITES= http://curl.haxx.se/download/ \	11	MASTER_SITES= http://curl.haxx.se/download/ \
12	${MASTER_SITE_SOURCEFORGE} \	12	${MASTER_SITE_SOURCEFORGE} \

Lines 1-3 Link Here

(-)b/ftp/curl/distinfo (-3 / +3 lines)
1	MD5 (curl-7.19.2.tar.bz2) = 3a461b145a4a31fe7d5a44684e7fbdbc	1	MD5 (curl-7.19.4.tar.bz2) = 2734167c1e5f7ce6be99b75d2d371d85
2	SHA256 (curl-7.19.2.tar.bz2) = 60091fe65ad3aed9b5151cb4e8fcfaf56567c5ae705fdf4246854625eb91c272	2	SHA256 (curl-7.19.4.tar.bz2) = fb3436280dedbc8f8141d3841a5964c4491dd6457bc5b7123854aed0b794be86
3	SIZE (curl-7.19.2.tar.bz2) = 2168458	3	SIZE (curl-7.19.4.tar.bz2) = 2296879




--- configure.orig	2009-02-13 17:25:53.000000000 +0300
+++ configure	2009-03-06 12:26:56.000000000 +0300
@@ -23435,7 +23435,7 @@
@@ -32237,8 +32237,10 @@
         PKGTEST="no"
     PREFIX_OPENSSL=$OPT_SSL
     LIB_OPENSSL="$PREFIX_OPENSSL/lib$libsuff"
-    if  "$PREFIX_OPENSSL" != "/usr"  ; then
+    if [ "$PREFIX_OPENSSL" != "/usr" ] ; then
       LDFLAGS="$LDFLAGS -L$LIB_OPENSSL"
       CPPFLAGS="$CPPFLAGS -I$PREFIX_OPENSSL/include"
     fi
   esac
 




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 -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 @@
 <p class="level0"><a name="--post301"></a><span class="nroffip">--post301</span> 
 <p class="level1">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) 
 <p class="level0"><a name="--post302"></a><span class="nroffip">--post302</span> 
-<p class="level1">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) 
+<p class="level1">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) 
 <p class="level0"><a name="--proxy-anyauth"></a><span class="nroffip">--proxy-anyauth</span> 
 <p class="level1">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) 
 <p class="level0"><a name="--proxy-basic"></a><span class="nroffip">--proxy-basic</span> 




--- 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 @@
     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 @@
                                  bool *done) /* see description above */
 {
   CURLcode result;

   /* 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 */




--- 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 @@
@@ -4313,31 +4313,32 @@
              (-1 == create_dir_hierarchy(outfile, config->errors)))
             return CURLE_WRITE_ERROR;
 

           }
           else {
             outs.stream = NULL; /* open when needed */
@@ -5429,6 +5430,10 @@
 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 @@
       idx++;
   }
 

Lines 161-166 libdata/pkgconfig/libcurl.pc Link Here

(-)b/ftp/curl/pkg-plist (-1 / +1 lines)
161	%%PORTDOCS%%%%EXAMPLESDIR%%/curlgtk.c	161	%%PORTDOCS%%%%EXAMPLESDIR%%/curlgtk.c
162	%%PORTDOCS%%%%EXAMPLESDIR%%/curlx.c	162	%%PORTDOCS%%%%EXAMPLESDIR%%/curlx.c
163	%%PORTDOCS%%%%EXAMPLESDIR%%/debug.c	163	%%PORTDOCS%%%%EXAMPLESDIR%%/debug.c
		164	%%PORTDOCS%%%%EXAMPLESDIR%%/evhiperfifo.c
164	%%PORTDOCS%%%%EXAMPLESDIR%%/fileupload.c	165	%%PORTDOCS%%%%EXAMPLESDIR%%/fileupload.c
165	%%PORTDOCS%%%%EXAMPLESDIR%%/fopen.c	166	%%PORTDOCS%%%%EXAMPLESDIR%%/fopen.c
166	%%PORTDOCS%%%%EXAMPLESDIR%%/ftpget.c	167	%%PORTDOCS%%%%EXAMPLESDIR%%/ftpget.c
167	-

Return to bug 132358

Lines 1-14 Link Here

(-)b/ftp/curl/files/patch-configure (-11 / +8 lines)
1	diff -urN -x .svn ../../vendor/curl/configure ./configure	1	--- configure.orig 2009-02-13 17:25:53.000000000 +0300
2	--- ../../vendor/curl/configure 2008-11-02 00:09:51.000000000 +0200	2	+++ configure 2009-03-06 12:26:56.000000000 +0300
3	+++ ./configure 2009-01-21 16:12:08.000000000 +0200	3	@@ -23435,7 +23435,7 @@
4	@@ -32237,8 +32237,10 @@
5	PKGTEST="no"	4	PKGTEST="no"
6	PREFIX_OPENSSL=$OPT_SSL	5	PREFIX_OPENSSL=$OPT_SSL
7	LIB_OPENSSL="$PREFIX_OPENSSL/lib$libsuff"	6	LIB_OPENSSL="$PREFIX_OPENSSL/lib$libsuff"
8	+ if ! [ "$PREFIX_OPENSSL" = "/usr" ]; then	7	- if "$PREFIX_OPENSSL" != "/usr" ; then
9	LDFLAGS="$LDFLAGS -L$LIB_OPENSSL"	8	+ if [ "$PREFIX_OPENSSL" != "/usr" ] ; then
10	CPPFLAGS="$CPPFLAGS -I$PREFIX_OPENSSL/include/openssl -I$PREFIX_OPENSSL/include"	9	LDFLAGS="$LDFLAGS -L$LIB_OPENSSL"
11	+ fi	10	CPPFLAGS="$CPPFLAGS -I$PREFIX_OPENSSL/include"
12	;;	11	fi
13	esac
14

Removed Link Here

(-)a/ftp/curl/files/patch-docs::curl.1 (-12 lines)
1	diff -urN -x .svn ../../vendor/curl/docs/curl.1 ./docs/curl.1
2	--- ../../vendor/curl/docs/curl.1 2008-10-29 23:15:24.000000000 +0200
3	+++ ./docs/curl.1 2009-01-21 16:12:19.000000000 +0200
4	@@ -875,7 +875,7 @@
5	Tells curl to respect RFC 2616/10.3.2 and not convert POST requests into GET
6	requests when following a 302 redirection. The non-RFC behaviour is ubiquitous
7	in web browsers, so curl does the conversion by default to maintain
8	-consistency. However, a server may requires a POST to remain a POST after such
9	+consistency. However, a server may require a POST to remain a POST after such
10	a redirection. This option is meaningful only when using \fI-L/--location\fP
11	(Added in 7.19.1)
12	.IP "--proxy-anyauth"

Removed Link Here

(-)a/ftp/curl/files/patch-docs::curl.html (-12 lines)
1	diff -urN -x .svn ../../vendor/curl/docs/curl.html ./docs/curl.html
2	--- ../../vendor/curl/docs/curl.html 2008-11-05 14:00:48.000000000 +0200
3	+++ ./docs/curl.html 2009-01-21 16:12:12.000000000 +0200
4	@@ -362,7 +362,7 @@
5	<p class="level0"><a name="--post301"></a><span class="nroffip">--post301</span>
6	<p class="level1">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)
7	<p class="level0"><a name="--post302"></a><span class="nroffip">--post302</span>
8	-<p class="level1">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)
9	+<p class="level1">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)
10	<p class="level0"><a name="--proxy-anyauth"></a><span class="nroffip">--proxy-anyauth</span>
11	<p class="level1">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)
12	<p class="level0"><a name="--proxy-basic"></a><span class="nroffip">--proxy-basic</span>

Lines 1-24 Link Here

(-)b/ftp/curl/files/patch-lib::ftp.c (-39 / +3 lines)
1	--- ../../../tags/curl-7.19.2-stock/lib/ftp.c 2009-01-23 18:11:47.000000000 +0200	1	--- lib/ftp.c.orig 2009-02-20 11:17:17.000000000 +0300
2	+++ lib/ftp.c 2009-01-26 03:31:07.000000000 +0200	2	+++ lib/ftp.c 2009-03-06 12:42:07.000000000 +0300
3	@@ -1901,7 +1901,7 @@	3	@@ -3055,7 +3055,7 @@
4	result = CURLE_COULDNT_CONNECT;
5	break;
6	}
7	-#ifndef CURL_DISABLE_HTTP
8	+#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_PROXY)
9	if(conn->bits.tunnel_proxy && conn->bits.httpproxy) {
10	/* FIX: this MUST wait for a proper connect first if 'connected' is
11	* FALSE */
12	@@ -1927,7 +1927,7 @@
13	if(CURLE_OK != result)
14	return result;
15	}
16	-#endif /* CURL_DISABLE_HTTP */
17	+#endif /* CURL_DISABLE_HTTP \|\| CURL_DISABLE_PROXY */
18
19	state(conn, FTP_STOP); /* this phase is completed */
20
21	@@ -3056,7 +3056,7 @@
22	bool done) / see description above */	4	bool done) / see description above */
23	{	5	{
24	CURLcode result;	6	CURLcode result;
Lines 27-47 Link Here
27	/* for FTP over HTTP proxy */	9	/* for FTP over HTTP proxy */
28	struct HTTP http_proxy;	10	struct HTTP http_proxy;
29	struct FTP *ftp_save;	11	struct FTP *ftp_save;
30	@@ -3079,7 +3079,7 @@
31
32	ftpc->response_time = RESP_TIMEOUT; /* set default response time-out */
33
34	-#ifndef CURL_DISABLE_HTTP
35	+#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_PROXY)
36	if(conn->bits.tunnel_proxy && conn->bits.httpproxy) {
37	/* BLOCKING */
38	/* We want "seamless" FTP operations through HTTP proxy tunnel */
39	@@ -3102,7 +3102,7 @@
40	if(CURLE_OK != result)
41	return result;
42	}
43	-#endif /* CURL_DISABLE_HTTP */
44	+#endif /* CURL_DISABLE_HTTP \|\| CURL_DISABLE_PROXY */
45
46	if(conn->protocol & PROT_FTPS) {
47	/* BLOCKING */

Lines 1-7 Link Here

(-)b/ftp/curl/files/patch-src::main.c (-29 / +4 lines)
1	diff -urN -x .svn ../../vendor/curl/src/main.c ./src/main.c	1	--- src/main.c.orig 2009-02-17 12:10:21.000000000 +0300
2	--- ../../vendor/curl/src/main.c 2008-10-29 00:12:02.000000000 +0200	2	+++ src/main.c 2009-03-06 12:42:56.000000000 +0300
3	+++ ./src/main.c 2009-01-21 16:12:11.000000000 +0200	3	@@ -4355,31 +4355,32 @@
4	@@ -4313,31 +4313,32 @@
5	(-1 == create_dir_hierarchy(outfile, config->errors)))	4	(-1 == create_dir_hierarchy(outfile, config->errors)))
6	return CURLE_WRITE_ERROR;	5	return CURLE_WRITE_ERROR;
7		6
Lines 52-82 diff -urN -x .svn ../../vendor/curl/src/main.c ./src/main.c Link Here
52	}	51	}
53	else {	52	else {
54	outs.stream = NULL; /* open when needed */	53	outs.stream = NULL; /* open when needed */
55	@@ -5288,12 +5289,13 @@	54	@@ -5429,6 +5430,10 @@
56	static const char *
57	msdosify (const char *file_name)
58	{
59	- static char dos_name[PATH_MAX*2];
60	+ static char dos_name[PATH_MAX + 16];
61	static const char illegal_chars_dos[] = ".+, ;=[]\|<>\\\":?*";
62	static const char *illegal_chars_w95 = &illegal_chars_dos[8];
63	int idx, dot_idx;
64	const char *s = file_name;
65	char *d = dos_name;
66	+ char *dlimit = dos_name + PATH_MAX;
67	const char *illegal_aliens = illegal_chars_dos;
68	size_t len = sizeof (illegal_chars_dos) - 1;
69	int lfn = 0;
70	@@ -5314,7 +5316,7 @@
71	d++ = s++;
72	}
73
74	- for (idx = 0, dot_idx = -1; *s; s++, d++) {
75	+ for (idx = 0, dot_idx = -1; *s && d < dlimit; s++, d++) {
76	if (memchr (illegal_aliens, *s, len)) {
77	/* Dots are special: DOS doesn't allow them as the leading character,
78	and a file name cannot have more than a single dot. We leave the
79	@@ -5371,6 +5373,10 @@
80	idx++;	55	idx++;
81	}	56	}
82		57