From owner-svn-ports-head@freebsd.org Sat Aug 8 05:17:02 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2EF983A118B; Sat, 8 Aug 2020 05:17:02 +0000 (UTC) (envelope-from novel@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BNr7f0Pg8z4Lx8; Sat, 8 Aug 2020 05:17:02 +0000 (UTC) (envelope-from novel@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E622E23993; Sat, 8 Aug 2020 05:17:01 +0000 (UTC) (envelope-from novel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0785H1NG012844; Sat, 8 Aug 2020 05:17:01 GMT (envelope-from novel@FreeBSD.org) Received: (from novel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0785H1u4012843; Sat, 8 Aug 2020 05:17:01 GMT (envelope-from novel@FreeBSD.org) Message-Id: <202008080517.0785H1u4012843@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: novel set sender to novel@FreeBSD.org using -f From: Roman Bogorodskiy Date: Sat, 8 Aug 2020 05:17:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r544360 - head/security/libssh2 X-SVN-Group: ports-head X-SVN-Commit-Author: novel X-SVN-Commit-Paths: head/security/libssh2 X-SVN-Commit-Revision: 544360 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Aug 2020 05:17:02 -0000 Author: novel Date: Sat Aug 8 05:17:01 2020 New Revision: 544360 URL: https://svnweb.freebsd.org/changeset/ports/544360 Log: security/libssh2: fix the GCRYPT option The port uses the old crypto configure flags: --with-libgcrypt and --with-openssl. These flags are no longer supported. Besides from the obvious effect of the actual port configuration not matching user intent, it also produces incorrect pkg-config file for the given set of dependencies, and other ports that depend on libssh2 fail when it's configured with GCRYPT=on. Fix by using the proper configure arguments: --with-crypto=libgcrypt and --with-crypto=openssl. PR: 248164 Submitted by: dgilbert@eicat.ca (bug report), James French (patch) Approved by: maintainer timeout Modified: head/security/libssh2/Makefile Modified: head/security/libssh2/Makefile ============================================================================== --- head/security/libssh2/Makefile Sat Aug 8 04:45:58 2020 (r544359) +++ head/security/libssh2/Makefile Sat Aug 8 05:17:01 2020 (r544360) @@ -3,7 +3,7 @@ PORTNAME= libssh2 PORTVERSION= 1.9.0 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 3 CATEGORIES= security devel MASTER_SITES= https://www.libssh2.org/download/ \ @@ -27,8 +27,8 @@ TRACE_DESC= Enable debug packet traces TRACE_CONFIGURE_ENABLE= debug GCRYPT_LIB_DEPENDS= libgcrypt.so:security/libgcrypt -GCRYPT_CONFIGURE_ON= --with-libgcrypt -GCRYPT_CONFIGURE_OFF= --with-openssl +GCRYPT_CONFIGURE_ON= --with-crypto=libgcrypt +GCRYPT_CONFIGURE_OFF= --with-crypto=openssl GCRYPT_CPPFLAGS= -I${LOCALBASE}/include GCRYPT_LIBS= -L${LOCALBASE}/lib GCRYPT_USES_OFF= ssl