Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 11 Sep 2006 10:48:53 +0300
From:      Vasil Dimov <vd@FreeBSD.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        roam@FreeBSD.org
Subject:   ports/103126: Update port: ftp/curl to 7.15.5
Message-ID:  <20060911074853.GA28687@qlovarnika.bg.datamax>
Resent-Message-ID: <200609110750.k8B7oTOx041282@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         103126
>Category:       ports
>Synopsis:       Update port: ftp/curl to 7.15.5
>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 Sep 11 07:50:29 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Vasil Dimov
>Release:        FreeBSD 6.1-STABLE amd64
>Organization:
N/A
>Environment:

System: FreeBSD qlovarnika.bg.datamax 6.1-STABLE FreeBSD 6.1-STABLE #0: Thu Jun 29 09:02:15 EEST 2006     root@qlovarnika.bg.datamax:/usr/obj/usr/src/sys/QLOVARNIKA  amd64

>Description:

* Update ftp/curl from 7.15.4 to 7.15.5
* Switch to USE_LDCONFIG
* Add 2 new entries to MAN3 and sort it
* Add regression-test target. It is commented because it requires Perl.

Results from the test in a 6.1/i386 tinderbox:

OK (304 out of 304, remaining: 00:00)
TESTDONE: 281 tests out of 281 reported OK: 100%
TESTDONE: 304 tests were considered during 196 seconds.
TESTINFO: 23 tests were skipped due to these restraints:
TESTINFO: "no stunnel" 8 times (300, 301, 302, 303, 304, 305, 306, 509)
TESTINFO: "failed starting FTP-ipv6 server" 4 times (252, 253, 254, 255)
TESTINFO: "failed starting IPv6 HTTP server" 4 times (240, 241, 242, 263)
TESTINFO: "curl lacks idn support" 1 times (165)
TESTINFO: "curl lacks netrc_debug support" 6 times (130, 131, 132, 133, 134, 257)

>How-To-Repeat:

>Fix:

--- curl-7.15.4-7.15.5.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/ftp/curl/Makefile,v
retrieving revision 1.80
diff -u -r1.80 Makefile
--- Makefile	14 Jul 2006 07:11:59 -0000	1.80
+++ Makefile	11 Sep 2006 07:42:51 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	curl
-PORTVERSION=	7.15.4
+PORTVERSION=	7.15.5
 CATEGORIES=	ftp ipv6 www
 MASTER_SITES=	http://curl.haxx.se/download/ \
 		${MASTER_SITE_SOURCEFORGE} \
@@ -24,10 +24,11 @@
 		curl_easy_init.3 curl_easy_perform.3 curl_easy_reset.3 \
 		curl_easy_setopt.3 curl_easy_strerror.3 curl_easy_unescape.3 \
 		curl_escape.3 \
-		curl_unescape.3 curl_formadd.3 curl_formfree.3 curl_free.3 \
+		curl_formadd.3 curl_formfree.3 curl_formget.3 curl_free.3 \
 		curl_getdate.3 curl_getenv.3 curl_global_init.3 \
 		curl_global_init_mem.3 curl_global_cleanup.3 curl_mprintf.3 \
-		curl_multi_add_handle.3 curl_multi_cleanup.3 \
+		curl_multi_add_handle.3 curl_multi_assign.3 \
+		curl_multi_cleanup.3 \
 		curl_multi_fdset.3 curl_multi_info_read.3 curl_multi_init.3 \
 		curl_multi_perform.3 curl_multi_remove_handle.3 \
 		curl_multi_setopt.3 curl_multi_socket.3 \
@@ -35,10 +36,11 @@
 		curl_share_cleanup.3 curl_share_init.3 \
 		curl_share_setopt.3 curl_share_strerror.3 curl_slist_append.3 \
 		curl_slist_free_all.3 curl_strequal.3 curl_version.3 \
-		curl_version_info.3 libcurl.3 libcurl-easy.3 libcurl-errors.3 \
+		curl_version_info.3 curl_unescape.3 libcurl.3 libcurl-easy.3 \
+		libcurl-errors.3 \
 		libcurl-multi.3 libcurl-share.3 libcurl-tutorial.3
 
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 SHLIB_VER=	3
 
 MAKE_ENV=	SHLIB_VER="${SHLIB_VER}"
@@ -49,6 +51,9 @@
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--mandir=${PREFIX}/man
 
+# necessary for the test
+#USE_PERL5_BUILD=	yes
+
 OPTIONS=	CARES "Asynchronous DNS resolution via c-ares" off \
 		CURL_DEBUG "Enable curl diagnostic output" off \
 		GNUTLS "Use GNU TLS if WITHOUT_SSL is specified" off \
@@ -145,4 +150,6 @@
 test:	build
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} LC_ALL=C ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test
 
+#regression-test: test
+
 .include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/ftp/curl/distinfo,v
retrieving revision 1.45
diff -u -r1.45 distinfo
--- distinfo	13 Jul 2006 08:54:03 -0000	1.45
+++ distinfo	11 Sep 2006 07:42:51 -0000
@@ -1,3 +1,3 @@
-MD5 (curl-7.15.4.tar.bz2) = d9345a55c8bc67eafcd37fa1b728e00e
-SHA256 (curl-7.15.4.tar.bz2) = 11521127e175eb633c046a2c6ed11f97e81816d3aec9e8cac560763457a8e623
-SIZE (curl-7.15.4.tar.bz2) = 1519792
+MD5 (curl-7.15.5.tar.bz2) = 594142c7d53bbdd988e8cef6354eeeff
+SHA256 (curl-7.15.5.tar.bz2) = 2980815e53f4caeafc5e35d183d9379bcaaec49f759be1a4ac628cfb6c392fe0
+SIZE (curl-7.15.5.tar.bz2) = 1543007
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/ftp/curl/pkg-plist,v
retrieving revision 1.20
diff -u -r1.20 pkg-plist
--- pkg-plist	13 Jul 2006 08:54:03 -0000	1.20
+++ pkg-plist	11 Sep 2006 07:42:51 -0000
@@ -129,6 +129,9 @@
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formfree.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formfree.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formfree.pdf
+%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formget.3
+%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formget.html
+%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formget.pdf
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_free.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_free.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_free.pdf
@@ -153,6 +156,9 @@
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_add_handle.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_add_handle.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_add_handle.pdf
+%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_assign.3
+%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_assign.html
+%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_assign.pdf
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_cleanup.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_cleanup.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_cleanup.pdf
--- curl-7.15.4-7.15.5.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?20060911074853.GA28687>