Revision: 5781 Author: pebender Date: Wed Nov 4 16:50:36 2009 Log: - Updated package net/curl.
http://code.google.com/p/minimyth/source/detail?r=5781 Added: /trunk/gar-minimyth/script/net/curl/files/curl-7.19.7-tftp_tx.patch /trunk/gar-minimyth/script/net/curl/files/curl-7.19.7.patch.gar Deleted: /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 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.7-tftp_tx.patch Wed Nov 4 16:50:36 2009 @@ -0,0 +1,22 @@ +diff -Naur curl-7.19.7-old/lib/tftp.c curl-7.19.7-new/lib/tftp.c +--- curl-7.19.7-old/lib/tftp.c 2009-08-12 01:19:39.000000000 -0700 ++++ curl-7.19.7-new/lib/tftp.c 2009-11-04 06:41:15.000000000 -0800 +@@ -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.7.patch.gar Wed Nov 4 16:50:36 2009 @@ -0,0 +1,34 @@ +diff -Naur curl-7.19.7-old/curl-config.in curl-7.19.7-new/curl-config.in +--- curl-7.19.7-old/curl-config.in 2009-11-04 06:41:06.000000000 -0800 ++++ curl-7.19.7-new/curl-config.in 2009-11-04 06:42:10.000000000 -0800 +@@ -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.6-tftp_tx.patch Wed Aug 12 19:48:30 2009 +++ /dev/null @@ -1,22 +0,0 @@ -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); - } - } ======================================= --- /trunk/gar-minimyth/script/net/curl/files/curl-7.19.6.patch.gar Wed Aug 12 19:48:30 2009 +++ /dev/null @@ -1,34 +0,0 @@ -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/html/minimyth/document-changelog.txt Wed Nov 4 16:33:13 2009 +++ /trunk/gar-minimyth/html/minimyth/document-changelog.txt Wed Nov 4 16:50:36 2009 @@ -33,3 +33,4 @@ Updated devel/glibc. Updated devel/glibc-crtobjs. Updated devel/glibc-headers. + Updated net/curl. ======================================= --- /trunk/gar-minimyth/script/net/curl/Makefile Thu Sep 17 20:02:23 2009 +++ /trunk/gar-minimyth/script/net/curl/Makefile Wed Nov 4 16:50:36 2009 @@ -1,5 +1,5 @@ GARNAME = curl -GARVERSION = 7.19.6 +GARVERSION = 7.19.7 CATEGORIES = net MASTER_SITES = http://curl.haxx.se/download/ DISTFILES = $(DISTNAME).tar.bz2 @@ -51,13 +51,13 @@ --without-gssapi \ --with-ssl \ --with-zlib \ - --without-libssh2 \ --without-egd-socket \ --with-random="$(rootdir)/dev/urandom" \ --without-gnutls \ --without-nss \ --with-ca-bundle="$(sysconfdir)/ssl/certs/ca-bundle.crt" \ --without-ca-path \ + --without-libssh2 \ --without-libidn include ../../gar.mk ======================================= --- /trunk/gar-minimyth/script/net/curl/checksums Wed Aug 12 19:48:30 2009 +++ /trunk/gar-minimyth/script/net/curl/checksums Wed Nov 4 16:50:36 2009 @@ -1,3 +1,3 @@ -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 +79a8fbb2eed5464b97bdf94bee109380 download/curl-7.19.7.tar.bz2 +a162c2433139336f863a39bd9fd40c1a download/curl-7.19.7-tftp_tx.patch +8b32318f70c01202b503e93be86aa962 download/curl-7.19.7.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 -~----------~----~----~----~------~----~------~--~---
