diff options
author | kris <kris@FreeBSD.org> | 2003-06-16 02:50:28 +0000 |
---|---|---|
committer | kris <kris@FreeBSD.org> | 2003-06-16 02:50:28 +0000 |
commit | cf04213c4256abf2ce2d5a5bfce422d34faf7b32 (patch) | |
tree | d2f69db3dd0f1fbdc308fc92053a84068a9803a7 | |
parent | 538e9112e2bf614593d0fbc30b1c19bbe6f91209 (diff) | |
download | FreeBSD-ports-cf04213c4256abf2ce2d5a5bfce422d34faf7b32.zip FreeBSD-ports-cf04213c4256abf2ce2d5a5bfce422d34faf7b32.tar.gz |
Fix LP64 bugs and bump PORTREVISION. This still detects the bogus
gethostbyaddr_r() "implementation" in libc, which may be causing problems
in certain cases.
-rw-r--r-- | ftp/curl/Makefile | 1 | ||||
-rw-r--r-- | ftp/curl/files/patch-lib::ftp.c | 11 | ||||
-rw-r--r-- | ftp/curl/files/patch-lib::hostip.c | 16 | ||||
-rw-r--r-- | ftp/curl/files/patch-lib::urldata.h | 11 | ||||
-rw-r--r-- | ftp/curl/files/patch-src::main.c | 11 |
5 files changed, 50 insertions, 0 deletions
diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile index 8961a1c..cffbe28 100644 --- a/ftp/curl/Makefile +++ b/ftp/curl/Makefile @@ -7,6 +7,7 @@ PORTNAME= curl PORTVERSION= 7.10.5 +PORTREVISION= 1 CATEGORIES= ftp ipv6 www MASTER_SITES= http://curl.haxx.se/download/ \ ${MASTER_SITE_SOURCEFORGE} \ diff --git a/ftp/curl/files/patch-lib::ftp.c b/ftp/curl/files/patch-lib::ftp.c new file mode 100644 index 0000000..dfe9ead --- /dev/null +++ b/ftp/curl/files/patch-lib::ftp.c @@ -0,0 +1,11 @@ +--- lib/ftp.c.orig Tue May 13 23:31:00 2003 ++++ lib/ftp.c Sun Jun 15 18:57:27 2003 +@@ -2055,7 +2055,7 @@ + struct tm buffer; + tm = (struct tm *)localtime_r(&data->info.filetime, &buffer); + #else +- tm = localtime((unsigned long *)&data->info.filetime); ++ tm = localtime((time_t *)&data->info.filetime); + #endif + /* format: "Tue, 15 Nov 1994 12:45:26 GMT" */ + strftime(buf, BUFSIZE-1, "Last-Modified: %a, %d %b %Y %H:%M:%S GMT\r\n", diff --git a/ftp/curl/files/patch-lib::hostip.c b/ftp/curl/files/patch-lib::hostip.c new file mode 100644 index 0000000..d913c91 --- /dev/null +++ b/ftp/curl/files/patch-lib::hostip.c @@ -0,0 +1,16 @@ +--- lib/hostip.c.orig Tue May 13 05:12:17 2003 ++++ lib/hostip.c Sun Jun 15 18:44:13 2003 +@@ -497,11 +497,11 @@ + + /* now, shrink the allocated buffer to the size we actually need, which + most often is only a fraction of the original alloc */ +- newbuf=(char *)realloc(*buf, (int)bufptr-(int)(*buf)); ++ newbuf=(char *)realloc(*buf, (int)(bufptr-*buf)); + + /* if the alloc moved, we need to adjust things again */ + if(newbuf != *buf) +- hostcache_fixoffset((struct hostent*)newbuf, (int)newbuf-(int)*buf); ++ hostcache_fixoffset((struct hostent*)newbuf, (int)(newbuf-*buf)); + + /* setup the return */ + *buf = newbuf; diff --git a/ftp/curl/files/patch-lib::urldata.h b/ftp/curl/files/patch-lib::urldata.h new file mode 100644 index 0000000..27d02fe --- /dev/null +++ b/ftp/curl/files/patch-lib::urldata.h @@ -0,0 +1,11 @@ +--- lib/urldata.h.orig Fri May 9 00:39:29 2003 ++++ lib/urldata.h Sun Jun 15 18:57:46 2003 +@@ -501,7 +501,7 @@ + struct PureInfo { + int httpcode; + int httpversion; +- long filetime; /* If requested, this is might get set. Set to -1 if ++ time_t filetime; /* If requested, this is might get set. Set to -1 if + the time was unretrievable */ + long header_size; /* size of read header(s) in bytes */ + long request_size; /* the amount of bytes sent in the request(s) */ diff --git a/ftp/curl/files/patch-src::main.c b/ftp/curl/files/patch-src::main.c new file mode 100644 index 0000000..52aa287 --- /dev/null +++ b/ftp/curl/files/patch-src::main.c @@ -0,0 +1,11 @@ +--- src/main.c.orig Mon May 12 05:45:57 2003 ++++ src/main.c Sun Jun 15 18:58:50 2003 +@@ -3011,7 +3011,7 @@ + closed, as is done above here */ + if(config->remote_time && outs.filename) { + /* as libcurl if we got a time. Pretty please */ +- long filetime; ++ time_t filetime; + curl_easy_getinfo(curl, CURLINFO_FILETIME, &filetime); + if(filetime >= 0) { + struct utimbuf times; |