From owner-svn-ports-all@freebsd.org Tue Nov 24 20:49:01 2020 Return-Path: Delivered-To: svn-ports-all@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 627CB468E7B; Tue, 24 Nov 2020 20:49:01 +0000 (UTC) (envelope-from sunpoet@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 4Cgbj86tNmz3DkV; Tue, 24 Nov 2020 20:49:00 +0000 (UTC) (envelope-from sunpoet@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 8B66725234; Tue, 24 Nov 2020 20:48:57 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0AOKmvhP029789; Tue, 24 Nov 2020 20:48:57 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0AOKmvAr029788; Tue, 24 Nov 2020 20:48:57 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <202011242048.0AOKmvAr029788@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Tue, 24 Nov 2020 20:48:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r556193 - in head/security/libfido2: . files X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: in head/security/libfido2: . files X-SVN-Commit-Revision: 556193 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Nov 2020 20:49:01 -0000 Author: sunpoet Date: Tue Nov 24 20:48:56 2020 New Revision: 556193 URL: https://svnweb.freebsd.org/changeset/ports/556193 Log: Skip libcrypto.pc when using SSL from base system - Bump PORTREVISION for package change Differential Revision: https://reviews.freebsd.org/D27289 Submitted by: bdrewery Modified: head/security/libfido2/Makefile head/security/libfido2/files/patch-CMakeLists.txt Modified: head/security/libfido2/Makefile ============================================================================== --- head/security/libfido2/Makefile Tue Nov 24 20:48:52 2020 (r556192) +++ head/security/libfido2/Makefile Tue Nov 24 20:48:56 2020 (r556193) @@ -3,6 +3,7 @@ PORTNAME= libfido2 PORTVERSION= 1.5.0 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= https://developers.yubico.com/libfido2/Releases/ @@ -24,4 +25,12 @@ PLIST_SUB= PORTVERSION=${PORTVERSION} OPTIONS_DEFINE= DOCS -.include +.include + +post-patch: +# we do not ship libcrypto.pc in base system +.if ${SSL_DEFAULT} == base + @${REINPLACE_CMD} -e '/libcrypto/d' ${WRKSRC}/CMakeLists.txt ${WRKSRC}/src/libfido2.pc.in +.endif + +.include Modified: head/security/libfido2/files/patch-CMakeLists.txt ============================================================================== --- head/security/libfido2/files/patch-CMakeLists.txt Tue Nov 24 20:48:52 2020 (r556192) +++ head/security/libfido2/files/patch-CMakeLists.txt Tue Nov 24 20:48:56 2020 (r556193) @@ -1,14 +1,6 @@ --- CMakeLists.txt.orig 2020-09-01 07:17:43 UTC +++ CMakeLists.txt -@@ -72,7 +72,6 @@ if(MSVC) - else() - include(FindPkgConfig) - pkg_search_module(CBOR libcbor) -- pkg_search_module(CRYPTO libcrypto) - - # XXX workaround libcbor's missing .pc file - if(NOT CBOR_FOUND) -@@ -177,8 +176,8 @@ endif() +@@ -177,8 +177,8 @@ endif() add_definitions(-DTLS=${TLS})