From nobody Mon Oct 16 16:49:12 2023 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 4S8NP44cPpz4xZKn; Mon, 16 Oct 2023 16:49:12 +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 4S8NP4456nz3S0l; Mon, 16 Oct 2023 16:49:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697474952; 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=B0zCx7WuWYKOeBAoFyGLPxr8hqN/Vl2MmS67aQTU/po=; b=IhdI0I5+srMD/09IuUslaV4okxywl1QeP5oAuaeJjm0/NA23CPHTDoZJ3kBl3rLwTr4a3w 3hBb0vc1MHqzib0oqFV5XPuKln7J9O42aQWvmSErEOruqhvtapwA8L3PtQBr7JX5E/PUxR 8FHQ1hqr1VjFM2MU3zVVUIHbKzvgRbzpJUhKcuPDy+FM1dCwZMWSPsF6HZvH0B/11HQ0Jn JntsgG73ZN6QD09D/yv2StnSgAYVBVStDcP1h7dSTwBWJasv/SL0hdrvp+1lcdEyfciLwT NdPad6ddOChMhHhXQdXphcj5Gxz0cTNFVmFQDs5SkCYDmqI/K0fEblt7ne/H7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697474952; a=rsa-sha256; cv=none; b=f5adu7opZzznEIQvS3Hrv0ka9wfsSQjr6s3jbHAXh+QIM/pDCKWkhuByGkbrcm/a6Gyq0B NEG+ZHNRfbncXG+rnVI0d4KCXQrR1Bah3gdOgdURY5Xb/+eRIMRj5DpgeCPQFQ5hwZGlsZ H1Jmh0oHuVczbcFNPTKjuuUTSrRFDEvnI7eyD7H761bX0I3FHmYd/wxFTNQBcMAl+DE3Ki l32ysMnHt2wNgl1eb1021SoCEbvKf57E0ZS+td+nK+LfVMAUn7UMlYZ9ugUbVNn/LZnjdo d42v43xoo3wBxf1+Wae8qDUWKq1kBX6j9g8GjKxo3z0Fnk8Owvkz29IBDXILug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697474952; 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=B0zCx7WuWYKOeBAoFyGLPxr8hqN/Vl2MmS67aQTU/po=; b=yOp1nnlw8LJBG66DGp6453zsnE79N7dlAqieB/Yv2PJoLsZ0lr2WTaOmlim/SziHMksbEk XxEy4JJUTLlWUFCdXdYy0MH6PpUJgre1wLmLOXNIOse2jyE6WamOIjWdh0JPfpzPyBbcug Xv+crnwoFT82b9r8Ko9TX1+4+omkb8WssPjHNtbYT4xP78YAKzhT/u5ScZ6HgbnGWYTJYg NPFvXMEBitDF8ixVQLN0Xeu5xqIhaULiT1mn4doLDy46zplMTacZpX7dIabPEGNAl3hG8b Aa7uGN4y4eJ3ZY6gjuVSb7I4JLZjomwoPSBg6CNC5hsNQVzyuOHsiLQ9nIBF5A== 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 4S8NP439qgznyb; Mon, 16 Oct 2023 16:49:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39GGnCr1011988; Mon, 16 Oct 2023 16:49:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GGnCbj011985; Mon, 16 Oct 2023 16:49:12 GMT (envelope-from git) Date: Mon, 16 Oct 2023 16:49:12 GMT Message-Id: <202310161649.39GGnCbj011985@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: 2a1f1b7c3664 - main - security/libfido2: Simplified Makefile 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: 2a1f1b7c3664cde187ac5b507b6a5a1ba18a1daf Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=2a1f1b7c3664cde187ac5b507b6a5a1ba18a1daf commit 2a1f1b7c3664cde187ac5b507b6a5a1ba18a1daf Author: Po-Chuan Hsieh AuthorDate: 2023-10-16 16:48:54 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-10-16 16:48:54 +0000 security/libfido2: Simplified Makefile OPENSSL_API_COMPAT=0x10101000L can be set unconditionally. from CMakeLists.txt: if(CRYPTO_VERSION VERSION_GREATER_EQUAL 3.0) add_definitions(-DOPENSSL_API_COMPAT=0x10100000L) endif() PR: 273909 --- security/libfido2/Makefile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/security/libfido2/Makefile b/security/libfido2/Makefile index d80bbc263fca..3e2c3597dd39 100644 --- a/security/libfido2/Makefile +++ b/security/libfido2/Makefile @@ -15,6 +15,7 @@ LIB_DEPENDS= libcbor.so:devel/libcbor USES= cmake compiler:c11 pathfix pkgconfig ssl +CFLAGS+= -DOPENSSL_API_COMPAT=0x10101000L CMAKE_OFF= FUZZ LIBFUZZER NFC_LINUX USE_HIDAPI USE_WINHELLO CMAKE_ON= BUILD_EXAMPLES BUILD_MANPAGES BUILD_SHARED_LIBS BUILD_STATIC_LIBS BUILD_TOOLS @@ -29,8 +30,4 @@ OPTIONS_DEFINE= DOCS EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-openssl .endif -.if ${SSL_DEFAULT} == openssl -CFLAGS+= -DOPENSSL_API_COMPAT=0x10100000L -.endif - .include