From nobody Fri Jul 21 17:20:20 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 4R6xC84C1Kz4nwDw; Fri, 21 Jul 2023 17:20:20 +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 4R6xC83GDvz3PnY; Fri, 21 Jul 2023 17:20:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689960020; 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=xwKeVw3JGYPDSAY31lVNEUPu80PFmiCx3IR6ckD+gZI=; b=UKqQUfX41P7jVXjBMgIORSWAhcZGQifuJ+Kc7dE2bfp29U79xmBQsaGwJML34KevTGFZIs /u/mXhY03F4tq8n5gcG/+h6FTRUFed9zyCqL63zj/VIaf0mXSPmFtUw8PI/F30yXkq/ffS /VakhbKAmqIX7LAfuFwqcIuDNBfHZutw6LE3f9W+iEzzxRq6Jh3tmCp+cjRLG/oRZtVPnQ biDJtIpb4jpYoybfvVY3Iz/SlcMZ1KQp5AFuAlLRMaDWP4ZntMYvDcovohDZ8GhctNZ9KG j1KAjOkuuA2USBKh/1Ti0G+70YRF9Pw+Sdg4LkSBAeB5smXeRHi0Hil6FRNZQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689960020; 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=xwKeVw3JGYPDSAY31lVNEUPu80PFmiCx3IR6ckD+gZI=; b=F7D3jfCAkJgnYWULl9DwQrn4JZbB18TWh3SreFTid/Hw7gd9M/fblbsx5Egt4VHik+ONpP YD52MoCFSq75iMq0MaeaikeN7Jyvw5JJ1g+VVnwJPVAQP/wc0HUan65tskbyRdcXCpU0s3 OmIEI2eLd2qE3ZoOsW3rp91WgaSFHwsvcVmtTszs1g9wL3Mz48a6mmTxlH7LC1NhV2tBDJ XbqOsDV/eABBW3AyMLFa9GoxD3fhfsPel1COGs+XG4ahxxY+igyhlF7paIEnckiAX8bpSM ldilEip6UOsTqIdDdIT/VoTsbY7EUViis1ZjHX3MQm7Y966FGUBatGDPf4Yu5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689960020; a=rsa-sha256; cv=none; b=VBcrlvDPZ7i4b3t7xOtcPY7X8Z5xYgjYXL/vok4H97tHvdVLnZaFkvsnc0RRNx5L2bDsIR Uv7TANMy5TljBQN2A/OiVvNB8bPKpOmVQ2xI/Qemr7MFD2wtWvUvDbAyduiKIDFSW8BGfI DgwCvyw/dg3vUgPcXFAJbHAoeDZJJweWlZowm+gVwS79ST3mcGkeLGgcmG9B8Ic7xH/xet /dOtRe/J8SwoEkwExzQL4rxgicLzf185VEZpZaqoUAUuC/2HV1PsMuxNgu/E3ZclKZRCrF 8V6FFrqisY5LztF/5WYlJDsnVqGSCCu+YWZkLL7wcPu7Cw8YFGKzVFQiFoJU5g== 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 4R6xC82D3YzLl7; Fri, 21 Jul 2023 17:20:20 +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 36LHKKdR084546; Fri, 21 Jul 2023 17:20:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36LHKK29084545; Fri, 21 Jul 2023 17:20:20 GMT (envelope-from git) Date: Fri, 21 Jul 2023 17:20:20 GMT Message-Id: <202307211720.36LHKK29084545@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 54aa044064f6 - main - security/git-crypt: Fix build with openssl3 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: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 54aa044064f6b7100dde8828007462bf8ca37ee8 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=54aa044064f6b7100dde8828007462bf8ca37ee8 commit 54aa044064f6b7100dde8828007462bf8ca37ee8 Author: Muhammad Moinur Rahman AuthorDate: 2023-07-21 17:18:36 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-07-21 17:20:05 +0000 security/git-crypt: Fix build with openssl3 Approved by: portmgr (blanket) Sponsored by: The FreeBSD Foundation --- security/git-crypt/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/security/git-crypt/Makefile b/security/git-crypt/Makefile index ab35a8b53881..c34a05ed9814 100644 --- a/security/git-crypt/Makefile +++ b/security/git-crypt/Makefile @@ -11,9 +11,6 @@ WWW= https://www.agwa.name/projects/git-crypt/ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN_SSL= openssl30 openssl31 -BROKEN_SSL_REASON= error: field has incomplete type 'HMAC_CTX' - RUN_DEPENDS= git:devel/git \ gpg:security/gnupg @@ -40,6 +37,10 @@ CXXFLAGS+= -I${OPENSSLINC} LDFLAGS+= -L${OPENSSLLIB} .endif +.if ( ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400092 && ${SSL_DEFAULT} == base ) || ${SSL_DEFAULT:Mopenssl3*} +CXXFLAGS+= -DOPENSSL_API_COMPAT=0x30000000L" +.endif + post-extract: @${GREP} -Rl '"gpg"' ${WRKSRC} |${XARGS} ${REINPLACE_CMD} -e 's,"gpg","${LOCALBASE}/bin/gpg",' @${GREP} -Rl '"git"' ${WRKSRC} |${XARGS} ${REINPLACE_CMD} -e 's,"git","${LOCALBASE}/bin/git",'