Author: pebender
Date: Mon May 18 16:50:16 2009
New Revision: 4783
Added:
trunk/gar-minimyth/script/net/curl/files/curl-7.19.5-tftp_tx.patch
Modified:
trunk/gar-minimyth/script/net/curl/Makefile
trunk/gar-minimyth/script/net/curl/checksums
Log:
- Fixed cURL TFTP upload error.
Modified: trunk/gar-minimyth/script/net/curl/Makefile
==============================================================================
--- trunk/gar-minimyth/script/net/curl/Makefile (original)
+++ trunk/gar-minimyth/script/net/curl/Makefile Mon May 18 16:50:16 2009
@@ -3,7 +3,7 @@
CATEGORIES = net
MASTER_SITES = http://curl.haxx.se/download/
DISTFILES = $(DISTNAME).tar.bz2
-PATCHFILES = $(DISTNAME).patch.gar
+PATCHFILES = $(DISTNAME)-tftp_tx.patch $(DISTNAME).patch.gar
LICENSE = MIT
DESCRIPTION =
Modified: trunk/gar-minimyth/script/net/curl/checksums
==============================================================================
--- trunk/gar-minimyth/script/net/curl/checksums (original)
+++ trunk/gar-minimyth/script/net/curl/checksums Mon May 18 16:50:16 2009
@@ -1,2 +1,3 @@
426d161661dce70c8ea9ad8f553363a3 download/curl-7.19.5.tar.bz2
+6b28e8fc0f0ce89be156a3a087188e6f download/curl-7.19.5-tftp_tx.patch
672f7fa2729845e406eef1d8daa4439d download/curl-7.19.5.patch.gar
Added: trunk/gar-minimyth/script/net/curl/files/curl-7.19.5-tftp_tx.patch
==============================================================================
--- (empty file)
+++ trunk/gar-minimyth/script/net/curl/files/curl-7.19.5-tftp_tx.patch Mon
May 18 16:50:16 2009
@@ -0,0 +1,22 @@
+diff -Naur curl-7.19.5-old/lib/tftp.c curl-7.19.5-new/lib/tftp.c
+--- curl-7.19.5-old/lib/tftp.c 2009-05-10 14:18:28.000000000 -0700
++++ curl-7.19.5-new/lib/tftp.c 2009-05-18 16:41:59.000000000 -0700
+@@ -387,11 +387,14 @@
+ long tsize = 0;
+
+ tsize = strtol( value, NULL, 10 );
+- if(!tsize) {
+- failf(data, "invalid tsize value in OACK packet");
+- return CURLE_TFTP_ILLEGAL;
++ if(state->state == TFTP_STATE_RX)
++ {
++ if(!tsize) {
++ failf(data, "invalid tsize value in OACK packet");
++ return CURLE_TFTP_ILLEGAL;
++ }
++ Curl_pgrsSetDownloadSize(data, tsize);
+ }
+- Curl_pgrsSetDownloadSize(data, tsize);
+ infof(data, "%s (%d)\n", "tsize parsed from OACK", tsize);
+ }
+ }
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"minimyth-commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/minimyth-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
