From nobody Tue Sep 12 11:57:55 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 4RlMXh15y6z4tYrS; Tue, 12 Sep 2023 11:57:56 +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 4RlMXh0YrBz3Sxt; Tue, 12 Sep 2023 11:57:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694519876; 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=LkN6CcnTmDF5PAOcXtl6KjHjd1X0ivwKYZmeVWmHRKo=; b=lIeBpOIZSwuEf0Bfd+kP5wK718V5R/VTfzvnyXUgYU8/LnKbYHqdf87NnPE2G5hfL4+COP 2tjG4+/XnSFaFrbKCmlAu0iga1tA7zbjdhcrWasanNZs684jgOcOGzIhELTyItyYR7vRdh RSe9IBimCK2P2bzcYUsLtaRbYVV08np/8/ZhzJr6MObZ8J2nuP7R2FmPi7/Qa+TPArfaMT c62w6fXCKL8WtKf9ZooBh92qXKnLeXI6D3rMryJ/d4xA99vCd7c8dvObCD61kENjg+Sahd UXWWSFDV64AO/g9/LBZU+aHDBiOzoGQ80g9Kcnq9NNoi26L+OIUEWgdxFDqExw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694519876; a=rsa-sha256; cv=none; b=h7MJ5wCbI642XlG2dDhTKH/ku65wOveeWzxs4F6Hg58u7RVv/5aMdw31bcjPy5PsS5q6vA xKK39eU3P0ruJ3tbiNFQ4ggbfclXZyh0L0D77CBQ9kXWBdyj/6P6juwiNCWwa3+hXOQ6ev bow0lJWg5QBNX2NzHGT3ftgVLZ0/FlYsajoFs1VEHDCHPNj+0Q2TOB7FacUnRmczxUnVaT aAk2nOaXNdoMEAGob3fl3jNbjHAyooehmHfhJNTjHrW2+8UQG5hZOoU0n41sCazRsN7KK2 8qxPkrzpkdFewTvS+MyfbmPMjEyAnp9Qxh2NMWl8BQPFzurv0Jk6oKBPMMy+3A== 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=1694519876; 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=LkN6CcnTmDF5PAOcXtl6KjHjd1X0ivwKYZmeVWmHRKo=; b=d3ugBRFxxL58P1gn6jhHEVu4f7hYGtqoW+uOzoKl2JCkeydsnzUCU0XGXGqOOvHp+pY9XH YeH4LCWaWaFqhVCiPf5YcCW2vw/OpE7TWi7HjWAQM+LVuwVdSpcSazMTWxhVjs71yoHUxh FMNxyPwJ3BKYA9R+zkDjxiuUS3kMnngV7FYSXKZjTx4vjZ8ykVC727EPfVkbP13bZ5JNrv nPflWy6UmnjILMSh+Izmej774FRk2oik0uTlyqt5hvvjlhTBnQoGeij8oOf6O+ZlnczIAX RRahd//tYCBSLsroKeFLmkz7Rjrgh73kNW53lW7tzTUkbPvttevNykqyUswYjw== 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 4RlMXg6Z51zWjD; Tue, 12 Sep 2023 11:57:55 +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 38CBvtNE087146; Tue, 12 Sep 2023 11:57:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CBvtTL087143; Tue, 12 Sep 2023 11:57:55 GMT (envelope-from git) Date: Tue, 12 Sep 2023 11:57:55 GMT Message-Id: <202309121157.38CBvtTL087143@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yasuhiro Kimura Subject: git: 9bbfd2ca4a73 - 2023Q3 - security/{clamav,clamav-lts}: Fix build with non-default openssl setting 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: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q3 X-Git-Reftype: branch X-Git-Commit: 9bbfd2ca4a73abf419e99bc8b13dc3eecf8efaff Auto-Submitted: auto-generated The branch 2023Q3 has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=9bbfd2ca4a73abf419e99bc8b13dc3eecf8efaff commit 9bbfd2ca4a73abf419e99bc8b13dc3eecf8efaff Author: Yasuhiro Kimura AuthorDate: 2023-09-12 11:39:21 +0000 Commit: Yasuhiro Kimura CommitDate: 2023-09-12 11:57:34 +0000 security/{clamav,clamav-lts}: Fix build with non-default openssl setting Add arguments to CMAKE_ARGS that specify paths related to openssl so header files and libraies of selected openssl stack are used instead of the ones of base system. PR: 273659 Reported by: doctor@doctor.nl2k.ab.ca, Andrey Pevnev MFH: 2023Q3 (cherry picked from commit 0146693b1a61ab6410b0009c11b7a69406c0aa27) --- security/clamav-lts/Makefile | 6 +++++- security/clamav/Makefile | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/security/clamav-lts/Makefile b/security/clamav-lts/Makefile index d2c37efd35f8..8af9efaa992d 100644 --- a/security/clamav-lts/Makefile +++ b/security/clamav-lts/Makefile @@ -23,7 +23,11 @@ USE_GNOME= libxml2 USE_LDCONFIG= yes USE_RC_SUBR= clamav-clamd clamav-freshclam -CMAKE_ARGS= -DDATABASE_DIRECTORY:STRING=${_DBDIR} +CMAKE_ARGS= -DDATABASE_DIRECTORY:STRING=${_DBDIR} \ + -DOPENSSL_CRYPTO_LIBRARY=${OPENSSLLIB}/libcrypto.so \ + -DOPENSSL_INCLUDE_DIR=${OPENSSLINC} \ + -DOPENSSL_ROOT_DIR=${OPENSSLBASE} \ + -DOPENSSL_SSL_LIBRARY=${OPENSSLLIB}/libssl.so CMAKE_ON= ENABLE_EXTERNAL_MSPACK TEST_TARGET= check diff --git a/security/clamav/Makefile b/security/clamav/Makefile index 457e954fbcfc..9e7b029d948e 100644 --- a/security/clamav/Makefile +++ b/security/clamav/Makefile @@ -22,7 +22,11 @@ USE_GNOME= libxml2 USE_LDCONFIG= yes USE_RC_SUBR= clamav-clamd clamav-freshclam -CMAKE_ARGS= -DDATABASE_DIRECTORY:STRING=${_DBDIR} +CMAKE_ARGS= -DDATABASE_DIRECTORY:STRING=${_DBDIR} \ + -DOPENSSL_CRYPTO_LIBRARY=${OPENSSLLIB}/libcrypto.so \ + -DOPENSSL_INCLUDE_DIR=${OPENSSLINC} \ + -DOPENSSL_ROOT_DIR=${OPENSSLBASE} \ + -DOPENSSL_SSL_LIBRARY=${OPENSSLLIB}/libssl.so CMAKE_ON= ENABLE_EXTERNAL_MSPACK TEST_TARGET= check