From nobody Sat Apr 16 04:21:29 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id AA5565D6EFD; Sat, 16 Apr 2022 04:21:31 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KgKlF5s0Bz3Lsm; Sat, 16 Apr 2022 04:21:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650082890; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gGAeDwSiwgjNjTtoTHB0/BGsDXd3dUcJRh6MhrcKY3U=; b=NuSqgWNUaYWm2T427vgpTqcaPbUUG97zUdBbCtrJntC4zj0Xc5jSC+AeOQ6ak/y2bsszEs uwEgo1LFaa/+mImvyP6nNP/c/RdFJw0/sBP7Z1prPvwRjusFf+Xi3b7gEV/wUylx+0MGXm tDc90TqHPKgqB1Q2oklGAgVDL8Cuki5D+eXFvTPTfxZDeIThq2brspjiyIY5c7jquQcTcQ PT7eVcm7kcJg60+zqCIKiOkgG78hpc6aDQk3djRnUPkCQ5g8NlLqDLCLWtW0ZNzf8OMKvE ByXs468noDCX7pNzPx31gPugs8rxupX9o7RWxmHfxNoboGwxP36qrJuMuIjC6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7CD6A22D56; Sat, 16 Apr 2022 04:21:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23G4LTC7001889; Sat, 16 Apr 2022 04:21:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23G4LTtK001888; Sat, 16 Apr 2022 04:21:29 GMT (envelope-from git) Date: Sat, 16 Apr 2022 04:21:29 GMT Message-Id: <202204160421.23G4LTtK001888@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 3c39406e8270 - main - security/libfido2: Convert REINPLACE_CMD to patch file List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3c39406e827036f4b97d754db64beb343c988f02 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650082890; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gGAeDwSiwgjNjTtoTHB0/BGsDXd3dUcJRh6MhrcKY3U=; b=v2KLl4DSnHjLCH7KXPFsks/hJHjVkkT3mxdlXXRXgqhZ4/yIu996J8S+5LTNGv/AMQG9ng uP7kd8cazjoqNeq4fIWX0LreWHlaU8EFl41y11gPSSx7oQ5s8UY/kQxbrCJ8Zah9vs4UEt XQItNVHqw+OlNY1oRbfpTfda9hq1ZtVWegxYBApOuQ4MDCzrvjJkbvHBd3RGDrEG4dSs9Q rQo5W+TKEQrvLchDdj3hhV1IW62RrD9QXaxjK6fMrwBTSNiuzstAEfaC+/Cd5hkpe2hq5f m0hDGOjY1uVjXpNMM2UUvMCyQBdz4vYU89F2XscqbwOols9MP7WCIOf5wvjAAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650082890; a=rsa-sha256; cv=none; b=vJFh5Wnz8lWi9tyTsIopDw5bRvd5Gq4nmomUr6BwYRQutFpIC6WYHeDDzkrJ2eL4qUy25o ck9fZAjXRqFmM+7MfwH+z3/MEAPM+JINhcGiDJEvUEQ9FUrp0BtTTcrufFzIqqrY3imj/n XqMIgiqcHmGLcJVU4TALvLAszfwk3HdJ/PtqCUHEXlxkja4z2kj8fKMM2ByWH/zoc6p1dg XdRc2LzUfvSTCFxDn4sqa4zHQPQ51yW5WpK94HsekJ1riVU8HXiE9v8zqCxD8u5aL22its 2aDEEZk7BTNm6OAS3TwrBOQHPGS3ZbL3zWoTIFB3D1G2AFhwdikP+iag82JfKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=3c39406e827036f4b97d754db64beb343c988f02 commit 3c39406e827036f4b97d754db64beb343c988f02 Author: Po-Chuan Hsieh AuthorDate: 2022-04-16 03:56:22 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-04-16 04:19:10 +0000 security/libfido2: Convert REINPLACE_CMD to patch file --- security/libfido2/Makefile | 3 +-- security/libfido2/files/extra-patch-openssl | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/security/libfido2/Makefile b/security/libfido2/Makefile index 1f7a5c424597..ecd68835e1af 100644 --- a/security/libfido2/Makefile +++ b/security/libfido2/Makefile @@ -24,10 +24,9 @@ OPTIONS_DEFINE= DOCS .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 +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-openssl .endif .include diff --git a/security/libfido2/files/extra-patch-openssl b/security/libfido2/files/extra-patch-openssl new file mode 100644 index 000000000000..6cab9adce02d --- /dev/null +++ b/security/libfido2/files/extra-patch-openssl @@ -0,0 +1,26 @@ +--- CMakeLists.txt.orig 2022-01-17 12:42:03 UTC ++++ CMakeLists.txt +@@ -196,14 +196,10 @@ if(MSVC) + else() + include(FindPkgConfig) + pkg_search_module(CBOR libcbor) +- pkg_search_module(CRYPTO libcrypto) + pkg_search_module(ZLIB zlib) + + if(NOT CBOR_FOUND AND NOT HAVE_CBOR_H) + message(FATAL_ERROR "could not find libcbor") +- endif() +- if(NOT CRYPTO_FOUND AND NOT HAVE_OPENSSLV_H) +- message(FATAL_ERROR "could not find libcrypto") + endif() + if(NOT ZLIB_FOUND) + message(FATAL_ERROR "could not find zlib") +--- src/libfido2.pc.in.orig 2022-01-17 12:42:03 UTC ++++ src/libfido2.pc.in +@@ -7,6 +7,5 @@ Name: @PROJECT_NAME@ + Description: A FIDO2 library + URL: https://github.com/yubico/libfido2 + Version: @FIDO_VERSION@ +-Requires: libcrypto + Libs: -L${libdir} -lfido2 + Cflags: -I${includedir}