From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Sep 2 09:00:18 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B18F81065693 for ; Wed, 2 Sep 2009 09:00:17 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id EB4378FC0C for ; Wed, 2 Sep 2009 09:00:16 +0000 (UTC) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n8290GsM016731 for ; Wed, 2 Sep 2009 09:00:16 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n8290Go3016730; Wed, 2 Sep 2009 09:00:16 GMT (envelope-from gnats) Resent-Date: Wed, 2 Sep 2009 09:00:16 GMT Resent-Message-Id: <200909020900.n8290Go3016730@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, Peter Wullinger Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D63BA106566B for ; Wed, 2 Sep 2009 08:52:33 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id C590E8FC15 for ; Wed, 2 Sep 2009 08:52:33 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n828qXRm083871 for ; Wed, 2 Sep 2009 08:52:33 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id n828qXuO083868; Wed, 2 Sep 2009 08:52:33 GMT (envelope-from nobody) Message-Id: <200909020852.n828qXuO083868@www.freebsd.org> Date: Wed, 2 Sep 2009 08:52:33 GMT From: Peter Wullinger To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/138473: [patch] Support for libgcrypt in libssh2 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2009 09:00:18 -0000 >Number: 138473 >Category: ports >Synopsis: [patch] Support for libgcrypt in libssh2 >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 Sep 02 09:00:16 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Peter Wullinger >Release: 7.2-STABLE >Organization: - >Environment: >Description: libssh2 supports building against OpenSSL as well as libgcrypt. The FreeBSD port currently only supports building against OpenSSL. This sometimes causes trouble (e.g. ftp/curl), when dependent libraries need support for the one or the other selectively. The patch below adds a knob "WITH_GCRYPT" to the security/libssh2 port, making it possible to select the crypto library to use at build time. >How-To-Repeat: >Fix: Apply attached patch, rebuild libssh2 port. # cd /usr/ports # patch < patch.txt # cd security/libssh2 # make Patch attached with submission follows: --- security/libssh2/Makefile.orig 2009-08-18 00:57:46.000000000 +0200 +++ security/libssh2/Makefile 2009-09-02 10:43:00.000000000 +0200 @@ -7,7 +7,7 @@ PORTNAME= libssh2 PORTVERSION= 1.2 -PORTEPOCH= 2 +PORTEPOCH= 3 CATEGORIES= security devel MASTER_SITES= http://www.libssh2.org/download/ \ http://redundancy.redundancy.org/mirror/ @@ -15,10 +15,21 @@ MAINTAINER= lx@FreeBSD.org COMMENT= A library implementing the SSH2 protocol -USE_OPENSSL= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes +OPTIONS = GCRYPT "Use libgcrypt instead of OpenSSL" off + +.include + +.if defined(WITH_GCRYPT) +LIB_DEPENDS+= gcrypt:${PORTSDIR}/security/libgcrypt +CONFIGURE_ARGS+= --with-libgcrypt -with-libgcrypt-prefix=${PREFIX} --without-openssl +CONFIGURE_ENV= CFLAGS=-I${PREFIX}/include LDFLAGS=-L${PREFIX}/lib +.else +USE_OPENSSL= yes +.endif + PLIST_FILES= include/libssh2.h \ include/libssh2_publickey.h \ include/libssh2_sftp.h \ @@ -126,4 +137,4 @@ @${REINPLACE_CMD} -e 's|SHLIB_SUFFIX_NAME@ |SHLIB_SUFFIX_NAME@.0 |g' \ ${WRKSRC}/src/Makefile.in -.include +.include >Release-Note: >Audit-Trail: >Unformatted: