diff options
Diffstat (limited to 'ftp/curl')
| -rw-r--r-- | ftp/curl/Makefile | 3 | ||||
| -rw-r--r-- | ftp/curl/distinfo | 6 | ||||
| -rw-r--r-- | ftp/curl/files/patch-configure | 14 | ||||
| -rw-r--r-- | ftp/curl/files/patch-docs::libcurl::libcurl-tutorial.3 | 13 | ||||
| -rw-r--r-- | ftp/curl/files/patch-docs::libcurl::libcurl-tutorial.html | 13 | ||||
| -rw-r--r-- | ftp/curl/files/patch-include::curl::curl.h | 22 | ||||
| -rw-r--r-- | ftp/curl/files/patch-lib::ftp.c | 13 | ||||
| -rw-r--r-- | ftp/curl/files/patch-lib::nss.c | 13 | ||||
| -rw-r--r-- | ftp/curl/pkg-plist | 2 |
9 files changed, 68 insertions, 31 deletions
diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile index 8625ab5fda7..56de549af32 100644 --- a/ftp/curl/Makefile +++ b/ftp/curl/Makefile @@ -6,7 +6,7 @@ # PORTNAME= curl -PORTVERSION= 7.19.4 +PORTVERSION= 7.19.5 CATEGORIES= ftp ipv6 www MASTER_SITES= http://curl.haxx.se/download/ \ ${MASTER_SITE_SOURCEFORGE} \ @@ -37,6 +37,7 @@ MAN3= curl_easy_cleanup.3 curl_easy_duphandle.3 \ curl_multi_fdset.3 curl_multi_info_read.3 curl_multi_init.3 \ curl_multi_perform.3 curl_multi_remove_handle.3 \ curl_multi_setopt.3 curl_multi_socket.3 \ + curl_multi_socket_action.3 \ curl_multi_strerror.3 curl_multi_timeout.3 \ curl_share_cleanup.3 curl_share_init.3 \ curl_share_setopt.3 curl_share_strerror.3 curl_slist_append.3 \ diff --git a/ftp/curl/distinfo b/ftp/curl/distinfo index 89defda21dc..f01ccf23cb2 100644 --- a/ftp/curl/distinfo +++ b/ftp/curl/distinfo @@ -1,3 +1,3 @@ -MD5 (curl-7.19.4.tar.bz2) = 2734167c1e5f7ce6be99b75d2d371d85 -SHA256 (curl-7.19.4.tar.bz2) = fb3436280dedbc8f8141d3841a5964c4491dd6457bc5b7123854aed0b794be86 -SIZE (curl-7.19.4.tar.bz2) = 2296879 +MD5 (curl-7.19.5.tar.bz2) = 426d161661dce70c8ea9ad8f553363a3 +SHA256 (curl-7.19.5.tar.bz2) = 05ad84a9c8d340917370f357ad9fdce5ea595deb11f4cb70f946fa48c7b02cd0 +SIZE (curl-7.19.5.tar.bz2) = 2298238 diff --git a/ftp/curl/files/patch-configure b/ftp/curl/files/patch-configure deleted file mode 100644 index 154e8d57106..00000000000 --- a/ftp/curl/files/patch-configure +++ /dev/null @@ -1,14 +0,0 @@ -Do not needlessly add /usr/include and /usr/lib to the compiler and -linker flags if the base system OpenSSL is used. - ---- a/configure -+++ b/configure -@@ -23435,7 +23435,7 @@ - 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 diff --git a/ftp/curl/files/patch-docs::libcurl::libcurl-tutorial.3 b/ftp/curl/files/patch-docs::libcurl::libcurl-tutorial.3 new file mode 100644 index 00000000000..f33c20ea172 --- /dev/null +++ b/ftp/curl/files/patch-docs::libcurl::libcurl-tutorial.3 @@ -0,0 +1,13 @@ +Fix a typo. + +--- a/docs/libcurl/libcurl-tutorial.3 ++++ b/docs/libcurl/libcurl-tutorial.3 +@@ -754,7 +754,7 @@ + + - Read the Javascript code and rewrite the same logic in another language. + +-- Implement a Javascript interpreted, people have successfully used the ++- Implement a Javascript interpreter, people have successfully used the + Mozilla Javascript engine in the past. + + - Ask your admins to stop this, for a static proxy setup or similar. diff --git a/ftp/curl/files/patch-docs::libcurl::libcurl-tutorial.html b/ftp/curl/files/patch-docs::libcurl::libcurl-tutorial.html new file mode 100644 index 00000000000..47d7c7bb4b6 --- /dev/null +++ b/ftp/curl/files/patch-docs::libcurl::libcurl-tutorial.html @@ -0,0 +1,13 @@ +Fix a typo. + +--- a/docs/libcurl/libcurl-tutorial.html ++++ b/docs/libcurl/libcurl-tutorial.html +@@ -329,7 +329,7 @@ + <p class="level1">libcurl has no means to interpret or evaluate Javascript and thus it doesn't support this. If you get yourself in a position where you face this nasty invention, the following advice have been mentioned and used in the past: + <p class="level1">- Depending on the Javascript complexity, write up a script that translates it to another language and execute that. + <p class="level1">- Read the Javascript code and rewrite the same logic in another language. +-<p class="level1">- Implement a Javascript interpreted, people have successfully used the Mozilla Javascript engine in the past. ++<p class="level1">- Implement a Javascript interpreter, people have successfully used the Mozilla Javascript engine in the past. + <p class="level1">- Ask your admins to stop this, for a static proxy setup or similar. + <p class="level1"><a name="Persistence"></a><h2 class="nroffsh">Persistence Is The Way to Happiness</h2> + <p class="level0"> diff --git a/ftp/curl/files/patch-include::curl::curl.h b/ftp/curl/files/patch-include::curl::curl.h new file mode 100644 index 00000000000..5d13f2ecdfe --- /dev/null +++ b/ftp/curl/files/patch-include::curl::curl.h @@ -0,0 +1,22 @@ +Fix two minor grammatical errors in comments. + +--- a/include/curl/curl.h ++++ b/include/curl/curl.h +@@ -186,7 +186,7 @@ + size_t nitems, + void *outstream); + +-/* this is the return codes for the seek callbacks */ ++/* those are the return codes for the seek callbacks */ + #define CURL_SEEKFUNC_OK 0 + #define CURL_SEEKFUNC_FAIL 1 /* fail the entire transfer */ + #define CURL_SEEKFUNC_CANTSEEK 2 /* tell libcurl seeking can't be done, so +@@ -1516,7 +1516,7 @@ + * DESCRIPTION + * + * curl_global_init() should be invoked exactly once for each application that +- * uses libcurl and before any call of other libcurl function. ++ * uses libcurl and before any call of other libcurl functions. + * + * This function is not thread-safe! + */ diff --git a/ftp/curl/files/patch-lib::ftp.c b/ftp/curl/files/patch-lib::ftp.c deleted file mode 100644 index 640d0c116eb..00000000000 --- a/ftp/curl/files/patch-lib::ftp.c +++ /dev/null @@ -1,13 +0,0 @@ -Handle CURL_DISABLE_PROXY properly. - ---- a/lib/ftp.c -+++ b/lib/ftp.c -@@ -3055,7 +3055,7 @@ - bool *done) /* see description above */ - { - CURLcode result; --#ifndef CURL_DISABLE_HTTP -+#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_PROXY) - /* for FTP over HTTP proxy */ - struct HTTP http_proxy; - struct FTP *ftp_save; diff --git a/ftp/curl/files/patch-lib::nss.c b/ftp/curl/files/patch-lib::nss.c new file mode 100644 index 00000000000..c8d57ead0e1 --- /dev/null +++ b/ftp/curl/files/patch-lib::nss.c @@ -0,0 +1,13 @@ +Fix a typo in a comment. + +--- a/lib/nss.c ++++ b/lib/nss.c +@@ -157,7 +157,7 @@ + #endif + }; + +-/* following ciphers are new in NSS 3.4 and not enabled by default, therefor ++/* following ciphers are new in NSS 3.4 and not enabled by default, therefore + they are enabled explicitly */ + static const int enable_ciphers_by_default[] = { + TLS_DHE_DSS_WITH_AES_128_CBC_SHA, diff --git a/ftp/curl/pkg-plist b/ftp/curl/pkg-plist index 7dc4e1abbcb..461ead9bb63 100644 --- a/ftp/curl/pkg-plist +++ b/ftp/curl/pkg-plist @@ -111,6 +111,8 @@ libdata/pkgconfig/libcurl.pc %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_setopt.pdf %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_socket.html %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_socket.pdf +%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_socket_action.html +%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_socket_action.pdf %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_strerror.html %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_strerror.pdf %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_timeout.html |