From owner-freebsd-ports-bugs@FreeBSD.ORG Wed May 18 10:50:02 2005 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9471016A4CE for ; Wed, 18 May 2005 10:50:02 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 346EA43DC9 for ; Wed, 18 May 2005 10:50:02 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j4IAo2lh084170 for ; Wed, 18 May 2005 10:50:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j4IAo2la084169; Wed, 18 May 2005 10:50:02 GMT (envelope-from gnats) Resent-Date: Wed, 18 May 2005 10:50:02 GMT Resent-Message-Id: <200505181050.j4IAo2la084169@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, vd@datamax.bg Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0B65D16A4CE for ; Wed, 18 May 2005 10:47:30 +0000 (GMT) Received: from jengal.datamax.bg (jengal.datamax.bg [82.103.104.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 43A7543D9E for ; Wed, 18 May 2005 10:47:29 +0000 (GMT) (envelope-from vd@datamax.bg) Received: from sinanica.bg.datamax (sinanica.bg.datamax [192.168.10.1]) by jengal.datamax.bg (Postfix) with QMQP id A861E87F8 for ; Wed, 18 May 2005 13:47:27 +0300 (EEST) Received: (nullmailer pid 6999 invoked by uid 1004); Wed, 18 May 2005 10:47:28 -0000 Message-Id: <20050518104728.GA6961@sinanica.bg.datamax> Date: Wed, 18 May 2005 13:47:28 +0300 From: Vasil Dimov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/81195: Update port: ftp/curl to 7.14.0, add GnuTLS support X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: vd@datamax.bg List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 May 2005 10:50:02 -0000 >Number: 81195 >Category: ports >Synopsis: Update port: ftp/curl to 7.14.0, add GnuTLS support >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: Wed May 18 10:50:01 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Vasil Dimov >Release: FreeBSD 5.4-STABLE i386 >Organization: DataMax >Environment: System: FreeBSD sinanica.bg.datamax 5.4-STABLE FreeBSD 5.4-STABLE #6: Tue May 10 12:46:25 EEST 2005 root@sinanica.bg.datamax:/usr/obj/usr/src/sys/SINANICA-SMP i386 >Description: Update ftp/curl from 7.13.1 to 7.14.0, which has several bugfixes and some new features like GnuTLS instead of OpenSSL. >How-To-Repeat: >Fix: --- curl_update-13-14.diff begins here --- diff -urN curl.orig/Makefile curl/Makefile --- curl.orig/Makefile Mon Mar 14 22:33:30 2005 +++ curl/Makefile Wed May 18 13:36:17 2005 @@ -6,8 +6,7 @@ # PORTNAME= curl -PORTVERSION= 7.13.1 -PORTREVISION= 1 +PORTVERSION= 7.14.0 CATEGORIES= ftp ipv6 www MASTER_SITES= http://curl.haxx.se/download/ \ ${MASTER_SITE_SOURCEFORGE} \ @@ -49,6 +48,11 @@ GNU_CONFIGURE= yes USE_BZIP2= yes + +.if defined(WITH_GNUTLS) +WITHOUT_SSL= yes +.endif + .if !defined(WITHOUT_SSL) USE_OPENSSL= yes .endif @@ -57,9 +61,20 @@ .if !defined(WITHOUT_SSL) CONFIGURE_ARGS= --with-ssl=${OPENSSLBASE} -PLIST_SUB+= SSL="" .else CONFIGURE_ARGS= --without-ssl +.endif + +.if defined(WITH_GNUTLS) +LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls +CONFIGURE_ARGS+=--with-gnutls=${LOCALBASE} +.else +CONFIGURE_ARGS+=--without-gnutls +.endif + +.if !defined(WITHOUT_SSL) || defined(WITH_GNUTLS) +PLIST_SUB+= SSL="" +.else PLIST_SUB+= SSL="@comment " .endif diff -urN curl.orig/distinfo curl/distinfo --- curl.orig/distinfo Thu Mar 24 17:03:27 2005 +++ curl/distinfo Wed May 18 11:44:01 2005 @@ -1,2 +1,2 @@ -MD5 (curl-7.13.1.tar.bz2) = d673f68dbab2553acdbfb5435bd1cd48 -SIZE (curl-7.13.1.tar.bz2) = 1860688 +MD5 (curl-7.14.0.tar.bz2) = 46ce665e47d37fce1a0bad935cce58a9 +SIZE (curl-7.14.0.tar.bz2) = 1920305 diff -urN curl.orig/files/patch-tests::runtests.pl curl/files/patch-tests::runtests.pl --- curl.orig/files/patch-tests::runtests.pl Thu Mar 24 17:03:27 2005 +++ curl/files/patch-tests::runtests.pl Wed May 18 11:51:29 2005 @@ -1,11 +1,11 @@ ---- tests/runtests.pl.orig Sat Mar 12 03:40:30 2005 -+++ tests/runtests.pl Sat Mar 12 03:40:39 2005 +--- tests/runtests.pl.orig Wed May 18 11:50:16 2005 ++++ tests/runtests.pl Wed May 18 11:50:32 2005 @@ -29,7 +29,7 @@ @INC=(@INC, $ENV{'srcdir'}, "."); require "getpart.pm"; # array functions -require "valgrind.pm"; # valgrind report parser +#require "valgrind.pm"; # valgrind report parser + require "ftp.pm"; my $srcdir = $ENV{'srcdir'} || '.'; - my $HOSTIP="127.0.0.1"; diff -urN curl.orig/pkg-plist curl/pkg-plist --- curl.orig/pkg-plist Thu Mar 24 17:03:27 2005 +++ curl/pkg-plist Wed May 18 12:31:50 2005 @@ -70,6 +70,7 @@ %%PORTDOCS%%%%DOCSDIR%%/examples/multi-post.c %%PORTDOCS%%%%DOCSDIR%%/examples/multi-single.c %%PORTDOCS%%%%DOCSDIR%%/examples/multithread.c +%%PORTDOCS%%%%DOCSDIR%%/examples/opensslthreadlock.c %%PORTDOCS%%%%DOCSDIR%%/examples/persistant.c %%PORTDOCS%%%%DOCSDIR%%/examples/post-callback.c %%PORTDOCS%%%%DOCSDIR%%/examples/postit2.c --- curl_update-13-14.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: