diff options
author | wiz <wiz@pkgsrc.org> | 2009-01-28 06:56:16 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2009-01-28 06:56:16 +0000 |
commit | 79d474cf8c74139ebc4bb6b50ba7bf979a17b9af (patch) | |
tree | fbffcecc607eae2b27713b25b5710551267e6bbe /www/p5-WWW-Curl | |
parent | 14a5489c0faed0e697a1c33de10bf115cbb5b4eb (diff) | |
download | pkgsrc-79d474cf8c74139ebc4bb6b50ba7bf979a17b9af.tar.gz |
remove unneeded patch.
Diffstat (limited to 'www/p5-WWW-Curl')
-rw-r--r-- | www/p5-WWW-Curl/distinfo | 3 | ||||
-rw-r--r-- | www/p5-WWW-Curl/patches/patch-aa | 86 |
2 files changed, 1 insertions, 88 deletions
diff --git a/www/p5-WWW-Curl/distinfo b/www/p5-WWW-Curl/distinfo index f7852952962..2fa354e8744 100644 --- a/www/p5-WWW-Curl/distinfo +++ b/www/p5-WWW-Curl/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.4 2009/01/08 13:22:24 wiz Exp $ +$NetBSD: distinfo,v 1.5 2009/01/28 06:56:16 wiz Exp $ SHA1 (WWW-Curl-4.05.tar.gz) = 1d0eb6d4f1d9c29d8035fc94a6c0811f6c79fc59 RMD160 (WWW-Curl-4.05.tar.gz) = af4333bf95e4435eeb1a3180844dc47624d417e9 Size (WWW-Curl-4.05.tar.gz) = 40162 bytes -SHA1 (patch-aa) = ddfb9426e704e5abd632e35b2278b547efb8c3b3 diff --git a/www/p5-WWW-Curl/patches/patch-aa b/www/p5-WWW-Curl/patches/patch-aa deleted file mode 100644 index f75c5ad1764..00000000000 --- a/www/p5-WWW-Curl/patches/patch-aa +++ /dev/null @@ -1,86 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2006/12/20 13:28:59 obache Exp $ - -Support removed PASSWD callback (dropped in curl 7.10.8). -http://cool.haxx.se/cvs.cgi/curl-perl/Curl.xs.diff?r1=1.3&r2=1.4 - ---- Curl.xs.orig 2003-04-22 12:18:45.000000000 +0000 -+++ Curl.xs -@@ -101,10 +101,13 @@ static perl_curl_easy_callback_code call - return CALLBACK_PROGRESS; - break; - -+/* PASSWD callback dropped in 7.10.8 */ -+#if (LIBCURL_VERSION_NUM<0x070A08) - case CURLOPT_PASSWDFUNCTION: - case CURLOPT_PASSWDDATA: - return CALLBACK_PASSWD; - break; -+#endif - } - croak("Bad callback index requested\n"); - return CALLBACK_LAST; -@@ -194,11 +197,13 @@ static perl_curl_form * perl_curl_form_n - - static void perl_curl_form_delete(perl_curl_form *self) - { -+#if 0 - #if LIBCURL_VERSION_NUM >= 0x070900 - if (self->post) { - curl_formfree(self->post); - } - #endif -+#endif - Safefree(self); - } - -@@ -536,15 +541,18 @@ curl_easy_init(...) - curl_easy_setopt(self->curl, CURLOPT_READFUNCTION, read_callback_func); - curl_easy_setopt(self->curl, CURLOPT_HEADERFUNCTION, header_callback_func); - curl_easy_setopt(self->curl, CURLOPT_PROGRESSFUNCTION, progress_callback_func); -+#if (LIBCURL_VERSION_NUM<0x070A08) - curl_easy_setopt(self->curl, CURLOPT_PASSWDFUNCTION, passwd_callback_func); -+#endif - - /* set our own object as the context for all curl callbacks */ - curl_easy_setopt(self->curl, CURLOPT_FILE, self); - curl_easy_setopt(self->curl, CURLOPT_INFILE, self); - curl_easy_setopt(self->curl, CURLOPT_WRITEHEADER, self); - curl_easy_setopt(self->curl, CURLOPT_PROGRESSDATA, self); -+#if (LIBCURL_VERSION_NUM<0x070A08) - curl_easy_setopt(self->curl, CURLOPT_PASSWDDATA, self); -- -+#endif - /* we always collect this, in case it's wanted */ - curl_easy_setopt(self->curl, CURLOPT_ERRORBUFFER, self->errbuf); - -@@ -580,8 +588,9 @@ curl_easy_duphandle(self) - curl_easy_setopt(clone->curl, CURLOPT_INFILE, clone); - curl_easy_setopt(clone->curl, CURLOPT_WRITEHEADER, clone); - curl_easy_setopt(clone->curl, CURLOPT_PROGRESSDATA, clone); -+#if (LIBCURL_VERSION_NUM<0x070A08) - curl_easy_setopt(clone->curl, CURLOPT_PASSWDDATA, clone); -- -+#endif - /* we always collect this, in case it's wanted */ - curl_easy_setopt(clone->curl, CURLOPT_ERRORBUFFER, clone->errbuf); - -@@ -617,7 +626,9 @@ curl_easy_setopt(self, option, value) - case CURLOPT_INFILE: - case CURLOPT_WRITEHEADER: - case CURLOPT_PROGRESSDATA: -+#if (LIBCURL_VERSION_NUM<0x070A08) - case CURLOPT_PASSWDDATA: -+#endif - perl_curl_easy_register_callback(self,&(self->callback_ctx[callback_index(option)]),value); - break; - -@@ -626,7 +637,9 @@ curl_easy_setopt(self, option, value) - case CURLOPT_READFUNCTION: - case CURLOPT_HEADERFUNCTION: - case CURLOPT_PROGRESSFUNCTION: -+#if (LIBCURL_VERSION_NUM<0x070A08) - case CURLOPT_PASSWDFUNCTION: -+#endif - perl_curl_easy_register_callback(self,&(self->callback[callback_index(option)]),value); - break; - |