Date: Mon, 6 Mar 2006 12:05:58 +0200 From: Vasil Dimov <vd@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: roam@FreeBSD.org Subject: ports/94134: Update port: ftp/curl to 7.15.2 Message-ID: <20060306100558.GA98415@qlovarnika.bg.datamax> Resent-Message-ID: <200603061010.k26AA5xG081980@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 94134
>Category: ports
>Synopsis: Update port: ftp/curl to 7.15.2
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon Mar 06 10:10:05 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Vasil Dimov
>Release: FreeBSD 6.0-STABLE amd64
>Organization:
DataMax
>Environment:
>Description:
Update ftp/curl from 7.15.1 to 7.15.2 -
* added support for SOCKS4
* support for Gopher protocol dropped
* other changes and a lot of bugfixes
This patch does not apply on the new version:
--- files/patch-src::main.c ---
[...]
- long filetime;
+ time_t filetime;
curl_easy_getinfo(curl, CURLINFO_FILETIME, &filetime);
[...]
--- files/patch-src::main.c ---
Syncing it is easy but I think it should be removed because
according to curl_easy_getinfo(3) the proper type for the `filetime'
variable is `long':
[...]
CURLINFO_FILETIME
Pass a pointer to a long to receive the remote time of the
[...]
And `filetime' it is correcly typecast'd to `time_t' when used
afterwards.
Tested in 4, 5 and 6 i386 tinderbox and `make test' on 6 amd64
>How-To-Repeat:
>Fix:
--- curl_7.15.1-7.15.2.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/ftp/curl/Makefile,v
retrieving revision 1.76
diff -u -r1.76 Makefile
--- Makefile 9 Jan 2006 16:34:15 -0000 1.76
+++ Makefile 6 Mar 2006 10:03:49 -0000
@@ -6,8 +6,7 @@
#
PORTNAME= curl
-PORTVERSION= 7.15.1
-PORTREVISION= 1
+PORTVERSION= 7.15.2
CATEGORIES= ftp ipv6 www
MASTER_SITES= http://curl.haxx.se/download/ \
${MASTER_SITE_SOURCEFORGE} \
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/ftp/curl/distinfo,v
retrieving revision 1.43
diff -u -r1.43 distinfo
--- distinfo 9 Dec 2005 12:10:41 -0000 1.43
+++ distinfo 6 Mar 2006 10:03:49 -0000
@@ -1,3 +1,3 @@
-MD5 (curl-7.15.1.tar.bz2) = d330d48580bfade58c82d4f295f171f0
-SHA256 (curl-7.15.1.tar.bz2) = 8b1ea75a91ef7d1e00086865eba9a4cf8baefcb212ce451a61348e00b8756324
-SIZE (curl-7.15.1.tar.bz2) = 1437950
+MD5 (curl-7.15.2.tar.bz2) = 6c08e7891fe0db49af65fd10abfd69b1
+SHA256 (curl-7.15.2.tar.bz2) = 5e856952b1e5ba802206e038b85da1791001c321a1a022a563639fa116222b2b
+SIZE (curl-7.15.2.tar.bz2) = 1460095
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/ftp/curl/pkg-plist,v
retrieving revision 1.18
diff -u -r1.18 pkg-plist
--- pkg-plist 9 Dec 2005 12:10:41 -0000 1.18
+++ pkg-plist 6 Mar 2006 10:03:49 -0000
@@ -83,6 +83,7 @@
%%PORTDOCS%%%%DOCSDIR%%/examples/simple.c
%%PORTDOCS%%%%DOCSDIR%%/examples/simplepost.c
%%PORTDOCS%%%%DOCSDIR%%/examples/simplessl.c
+%%PORTDOCS%%%%DOCSDIR%%/examples/synctime.c
%%PORTDOCS%%%%DOCSDIR%%/index.html
%%PORTDOCS%%%%DOCSDIR%%/libcurl/Makefile
%%PORTDOCS%%%%DOCSDIR%%/libcurl/Makefile.am
Index: files/patch-src::main.c
===================================================================
RCS file: files/patch-src::main.c
diff -N files/patch-src::main.c
--- files/patch-src::main.c 13 Dec 2003 08:32:10 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- src/main.c.orig Wed Dec 10 15:14:31 2003
-+++ src/main.c Wed Dec 10 15:14:48 2003
-@@ -3350,7 +3350,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;
--- curl_7.15.1-7.15.2.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060306100558.GA98415>