From vd@datamax.bg  Mon Mar  6 10:06:00 2006
Return-Path: <vd@datamax.bg>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 743C816A420;
	Mon,  6 Mar 2006 10:06:00 +0000 (GMT)
	(envelope-from vd@datamax.bg)
Received: from jengal.datamax.bg (jengal.datamax.bg [82.103.104.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7BA4243D64;
	Mon,  6 Mar 2006 10:05:59 +0000 (GMT)
	(envelope-from vd@datamax.bg)
Received: from qlovarnika.bg.datamax (qlovarnika.bg.datamax [192.168.10.2])
	by jengal.datamax.bg (Postfix) with SMTP id 56FFDB857;
	Mon,  6 Mar 2006 12:05:58 +0200 (EET)
Received: (nullmailer pid 98432 invoked by uid 1002);
	Mon, 06 Mar 2006 10:05:58 -0000
Message-Id: <20060306100558.GA98415@qlovarnika.bg.datamax>
Date: Mon, 6 Mar 2006 12:05:58 +0200
From: Vasil Dimov <vd@FreeBSD.org>
Reply-To: vd@FreeBSD.org
To: FreeBSD-gnats-submit@freebsd.org
Cc: roam@freebsd.org
Subject: Update port: ftp/curl to 7.15.2
X-Send-Pr-Version: 3.113

>Number:         94134
>Category:       ports
>Synopsis:       Update port: ftp/curl to 7.15.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    roam
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 06 10:10:05 GMT 2006
>Closed-Date:    Mon Mar 20 13:01:42 GMT 2006
>Last-Modified:  Mon Mar 20 13:01:42 GMT 2006
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->roam 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Mar 6 10:12:11 UTC 2006 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=94134 
State-Changed-From-To: open->analyzed 
State-Changed-By: roam 
State-Changed-When: Mon Mar 13 09:35:14 UTC 2006 
State-Changed-Why:  
I'll take care of that after the freeze.  Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=94134 
State-Changed-From-To: analyzed->closed 
State-Changed-By: vd 
State-Changed-When: Mon Mar 20 13:01:09 UTC 2006 
State-Changed-Why:  
Superseded by ports/94727, which has been committed 

http://www.freebsd.org/cgi/query-pr.cgi?pr=94134 
>Unformatted:
