Date: Wed, 26 Jun 2002 13:54:34 +0800 (CST) From: Ying-Chih Kuo <yckuo@yckuo.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: roam@FreeBSD.org Subject: ports/39873: upgrade curl version Message-ID: <20020626055434.DABD99E3@home.yckuo.org>
next in thread | raw e-mail | index | archive | help
>Number: 39873 >Category: ports >Synopsis: upgrade curl version >Confidential: no >Severity: critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Jun 25 23:00:05 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Ying-Chih Kuo >Release: FreeBSD 4.6-RELEASE i386 >Organization: FreeBSD Server >Environment: FreeBSD yckuo.org 4.6-RELEASE FreeBSD 4.6-RELEASE #0: Wed Jun 19 23:07:32 CST 2002 root@yckuo.org:/usr/src/sys/compile/YCKUO.ORG i386 >Description: This is a update for ftp/curl port & upgrade to 7.9.8. >How-To-Repeat: >Fix: --- curl-port begins here --- diff -ruN curl.orig/Makefile curl/Makefile --- curl.orig/Makefile Wed Jun 26 10:51:29 2002 +++ curl/Makefile Wed Jun 26 13:22:42 2002 @@ -6,8 +6,8 @@ # PORTNAME= curl -PORTVERSION= 7.9.7 -PORTREVISION= 2 +PORTVERSION= 7.9.8 +PORTREVISION= 0 CATEGORIES= ftp ipv6 www MASTER_SITES= http://curl.haxx.se/download/ \ http://download.sourceforge.net/curl/ \ diff -ruN curl.orig/distinfo curl/distinfo --- curl.orig/distinfo Wed May 22 00:08:46 2002 +++ curl/distinfo Wed Jun 26 11:03:01 2002 @@ -1 +1 @@ -MD5 (curl-7.9.7.tar.bz2) = 7dcf405cbac544c5f486620311eafb2b +MD5 (curl-7.9.8.tar.bz2) = 9f29e398d36050816fc4759d4837eb65 diff -ruN curl.orig/files/CVS/Entries curl/files/CVS/Entries --- curl.orig/files/CVS/Entries Thu Jan 1 08:00:00 1970 +++ curl/files/CVS/Entries Wed Jun 26 10:51:29 2002 @@ -0,0 +1,6 @@ +/patch-lib::ftp.c/1.1/Fri Jun 7 00:19:38 2002// +/patch-lib::ldap.c/1.1/Fri Jun 7 00:19:38 2002// +/patch-src::writeout.c/1.1/Tue May 21 16:08:47 2002// +/patch-configure/1.1/Mon Jun 24 16:03:00 2002// +/patch-lib::hostip.c/1.1/Mon Jun 24 16:03:00 2002// +D diff -ruN curl.orig/files/CVS/Repository curl/files/CVS/Repository --- curl.orig/files/CVS/Repository Thu Jan 1 08:00:00 1970 +++ curl/files/CVS/Repository Fri Jun 21 16:33:00 2002 @@ -0,0 +1 @@ +ports/ftp/curl/files diff -ruN curl.orig/files/CVS/Root curl/files/CVS/Root --- curl.orig/files/CVS/Root Thu Jan 1 08:00:00 1970 +++ curl/files/CVS/Root Fri Jun 21 16:33:00 2002 @@ -0,0 +1 @@ +/usr/local/CVSup diff -ruN curl.orig/files/patch-configure curl/files/patch-configure --- curl.orig/files/patch-configure Tue Jun 25 00:03:00 2002 +++ curl/files/patch-configure Wed Jun 26 11:29:47 2002 @@ -1,6 +1,6 @@ ---- configure.curl Mon Jun 24 17:23:46 2002 -+++ configure Mon Jun 24 17:24:10 2002 -@@ -9868,8 +9868,10 @@ +--- configure.orig Tue Jun 11 23:16:54 2002 ++++ configure Wed Jun 26 11:13:31 2002 +@@ -10027,8 +10027,10 @@ EXTRA_SSL= ;; *) EXTRA_SSL=$OPT_SSL @@ -10,4 +10,4 @@ + fi ;; esac - + diff -ruN curl.orig/files/patch-lib::ftp.c curl/files/patch-lib::ftp.c --- curl.orig/files/patch-lib::ftp.c Fri Jun 7 08:19:38 2002 +++ curl/files/patch-lib::ftp.c Thu Jan 1 08:00:00 1970 @@ -1,27 +0,0 @@ ---- lib/ftp.c.orig Thu Jun 6 17:12:12 2002 -+++ lib/ftp.c Thu Jun 6 17:13:28 2002 -@@ -1067,13 +1067,13 @@ - } - freeaddrinfo(res); - if (portsock < 0) { -- failf(data, strerror(errno)); -+ failf(data, "%s", strerror(errno)); - return CURLE_FTP_PORT_FAILED; - } - - sslen = sizeof(ss); - if (getsockname(portsock, sa, &sslen) < 0) { -- failf(data, strerror(errno)); -+ failf(data, "%s", strerror(errno)); - return CURLE_FTP_PORT_FAILED; - } - -@@ -1370,7 +1370,7 @@ - - for (modeoff = (data->set.ftp_use_epsv?0:1); - mode[modeoff]; modeoff++) { -- result = Curl_ftpsendf(conn, mode[modeoff]); -+ result = Curl_ftpsendf(conn, "%s", mode[modeoff]); - if(result) - return result; - nread = Curl_GetFTPResponse(buf, conn, &ftpcode); diff -ruN curl.orig/files/patch-lib::hostip.c curl/files/patch-lib::hostip.c --- curl.orig/files/patch-lib::hostip.c Tue Jun 25 00:03:00 2002 +++ curl/files/patch-lib::hostip.c Thu Jan 1 08:00:00 1970 @@ -1,33 +0,0 @@ ---- lib/hostip.c.orig Mon Jun 24 17:05:50 2002 -+++ lib/hostip.c Mon Jun 24 17:05:54 2002 -@@ -360,7 +360,7 @@ - * - * Keith McGuigan - * 10/3/2001 */ --static struct hostent* pack_hostent(char** buf, struct hostent* orig) -+static struct hostent* pack_hostent(char** buf, struct hostent* orig, int pass) - { - char* bufptr; - struct hostent* copy; -@@ -427,8 +427,9 @@ - } - copy->h_addr_list[i] = NULL; - -- *buf=(char *)realloc(*buf, (int)bufptr-(int)(*buf)); -- return copy; -+ if (pass == 0) -+ *buf=(char *)realloc(*buf, (int)bufptr-(int)(*buf)); -+ return *buf; - } - #endif - -@@ -623,7 +624,8 @@ - /* we make a copy of the hostent right now, right here, as the - static one we got a pointer to might get removed when we don't - want/expect that */ -- h = pack_hostent(&buf, h); -+ pack_hostent(&buf, h, 0); -+ h = pack_hostent(&buf, h, 1); - *bufp=(char *)buf; - } - #endif diff -ruN curl.orig/files/patch-lib::ldap.c curl/files/patch-lib::ldap.c --- curl.orig/files/patch-lib::ldap.c Fri Jun 7 08:19:38 2002 +++ curl/files/patch-lib::ldap.c Thu Jan 1 08:00:00 1970 @@ -1,11 +0,0 @@ ---- lib/ldap.c.orig Thu Jun 6 17:14:16 2002 -+++ lib/ldap.c Thu Jun 6 17:14:24 2002 -@@ -147,7 +147,7 @@ - int ldaptext; - struct SessionHandle *data=conn->data; - -- infof(data, "LDAP: %s %s\n", data->change.url); -+ infof(data, "LDAP: %s\n", data->change.url); - - DynaOpen(); - if (libldap == NULL) { diff -ruN curl.orig/files/patch-src::writeout.c curl/files/patch-src::writeout.c --- curl.orig/files/patch-src::writeout.c Wed May 22 00:08:47 2002 +++ curl/files/patch-src::writeout.c Thu Jan 1 08:00:00 1970 @@ -1,10 +0,0 @@ ---- src/writeout.c.orig Tue May 21 18:27:28 2002 -+++ src/writeout.c Tue May 21 18:27:36 2002 -@@ -27,6 +27,7 @@ - #include <string.h> - - #ifdef HAVE_SYS_SELECT_H -+#include <sys/types.h> - #include <sys/select.h> - #endif - --- curl-port ends here --- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020626055434.DABD99E3>