Revision: 5299 Author: pebender Date: Wed Aug 12 19:48:30 2009 Log: - Updated package net/curl.
http://code.google.com/p/minimyth/source/detail?r=5299 Added: /trunk/gar-minimyth/script/net/curl/files/curl-7.19.6-tftp_tx.patch /trunk/gar-minimyth/script/net/curl/files/curl-7.19.6.patch.gar Deleted: /trunk/gar-minimyth/script/net/curl/files/curl-7.19.5-tftp_tx.patch /trunk/gar-minimyth/script/net/curl/files/curl-7.19.5.patch.gar Modified: /trunk/gar-minimyth/html/minimyth/document-changelog.txt /trunk/gar-minimyth/script/net/curl/Makefile /trunk/gar-minimyth/script/net/curl/checksums ======================================= --- /dev/null +++ /trunk/gar-minimyth/script/net/curl/files/curl-7.19.6-tftp_tx.patch Wed Aug 12 19:48:30 2009 @@ -0,0 +1,22 @@ +diff -Naur curl-7.19.6-old/lib/tftp.c curl-7.19.6-new/lib/tftp.c +--- curl-7.19.6-old/lib/tftp.c 2009-08-12 01:19:39.000000000 -0700 ++++ curl-7.19.6-new/lib/tftp.c 2009-08-12 19:32:46.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); + } + } ======================================= --- /dev/null +++ /trunk/gar-minimyth/script/net/curl/files/curl-7.19.6.patch.gar Wed Aug 12 19:48:30 2009 @@ -0,0 +1,34 @@ +diff -Naur curl-7.19.6-old/curl-config.in curl-7.19.6-new/curl-config.in +--- curl-7.19.6-old/curl-config.in 2009-08-12 19:32:36.000000000 -0700 ++++ curl-7.19.6-new/curl-config.in 2009-08-12 19:33:19.000000000 -0700 +@@ -122,19 +122,11 @@ + ;; + + --cflags) +- if test "x...@includedir@" = "X/usr/include"; then +- echo "" +- else +- echo "-...@includedir@" +- fi ++ echo "" + ;; + + --libs) +- if test "x...@libdir@" != "X/usr/lib" -a "x...@libdir@" != "X/usr/lib64"; then +- CURLLIBDIR="-...@libdir@ " +- else +- CURLLIBDIR="" +- fi ++ CURLLIBDIR="" + if test "x...@require_lib_deps@" = "Xyes"; then + echo ${CURLLIBDIR}-lcurl @LDFLAGS@ @LIBCURL_LIBS@ @LIBS@ + else +@@ -143,7 +135,7 @@ + ;; + + --static-libs) +- echo @libdir@/libcu...@libext@ @LDFLAGS@ @LIBCURL_LIBS@ @LIBS@ ++ echo @GAR_DESTDIR@@libdir@/libcu...@libext@ @LDFLAGS@ @LIBCURL_LIBS@ @LIBS@ + ;; + + *) ======================================= --- /trunk/gar-minimyth/script/net/curl/files/curl-7.19.5-tftp_tx.patch Mon May 18 16:50:16 2009 +++ /dev/null @@ -1,22 +0,0 @@ -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); - } - } ======================================= --- /trunk/gar-minimyth/script/net/curl/files/curl-7.19.5.patch.gar Mon May 18 14:59:18 2009 +++ /dev/null @@ -1,34 +0,0 @@ -diff -Naur curl-7.19.5-old/curl-config.in curl-7.19.5-new/curl-config.in ---- curl-7.19.5-old/curl-config.in 2009-03-20 05:42:29.000000000 -0700 -+++ curl-7.19.5-new/curl-config.in 2009-05-18 14:51:36.000000000 -0700 -@@ -122,19 +122,11 @@ - ;; - - --cflags) -- if test "x...@includedir@" = "X/usr/include"; then -- echo "" -- else -- echo "-...@includedir@" -- fi -+ echo "" - ;; - - --libs) -- if test "x...@libdir@" != "X/usr/lib" -a "x...@libdir@" != "X/usr/lib64"; then -- CURLLIBDIR="-...@libdir@ " -- else -- CURLLIBDIR="" -- fi -+ CURLLIBDIR="" - if test "x...@require_lib_deps@" = "Xyes"; then - echo ${CURLLIBDIR}-lcurl @LDFLAGS@ @LIBCURL_LIBS@ @LIBS@ - else -@@ -143,7 +135,7 @@ - ;; - - --static-libs) -- echo @libdir@/libcu...@libext@ @LDFLAGS@ @LIBCURL_LIBS@ @LIBS@ -+ echo @GAR_DESTDIR@@libdir@/libcu...@libext@ @LDFLAGS@ @LIBCURL_LIBS@ @LIBS@ - ;; - - *) ======================================= --- /trunk/gar-minimyth/html/minimyth/document-changelog.txt Wed Aug 12 19:20:35 2009 +++ /trunk/gar-minimyth/html/minimyth/document-changelog.txt Wed Aug 12 19:48:30 2009 @@ -17,6 +17,7 @@ Updated packages Updated disk/hdparm. + Updated net/curl. Updated xorg-7.4/pixman. Updated xorg-7.4/randr. ======================================= --- /trunk/gar-minimyth/script/net/curl/Makefile Mon May 18 16:50:16 2009 +++ /trunk/gar-minimyth/script/net/curl/Makefile Wed Aug 12 19:48:30 2009 @@ -1,5 +1,5 @@ GARNAME = curl -GARVERSION = 7.19.5 +GARVERSION = 7.19.6 CATEGORIES = net MASTER_SITES = http://curl.haxx.se/download/ DISTFILES = $(DISTNAME).tar.bz2 @@ -20,6 +20,7 @@ --disable-debug \ --enable-optimize \ --enable-warnings \ + --disable-curldebug \ --enable-largefile \ --enable-shared \ --disable-static \ ======================================= --- /trunk/gar-minimyth/script/net/curl/checksums Mon May 18 16:50:16 2009 +++ /trunk/gar-minimyth/script/net/curl/checksums Wed Aug 12 19:48:30 2009 @@ -1,3 +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 +8402c1f654c51ad7287aad57c3aa79be download/curl-7.19.6.tar.bz2 +775bda14129cbd07ea264849d14ef537 download/curl-7.19.6-tftp_tx.patch +559e3e292d18796067ba4356c3b512ce download/curl-7.19.6.patch.gar --~--~---------~--~----~------------~-------~--~----~ 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 -~----------~----~----~----~------~----~------~--~---
