From nobody Tue Sep 12 11:55:33 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 4RlMTy0NYdz4tYbL; Tue, 12 Sep 2023 11:55:34 +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 4RlMTx6vwMz3RyJ; Tue, 12 Sep 2023 11:55:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694519734; 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=ruNeqFvTkmvnshRngbR2mmYiakyuq4DwaMNV/us9DIk=; b=crzX3SiXm6hwOoNPgOuh4Q9wU0CmvQPvZk1bETWFi4UGqC2eC5l6/DNw8CHWyddHl4bEwW RKkm2Z3Xq1NseiUPw4t+GC6Mjzw2/8KDfq2lF839gf33/mcBKX7nFQ/BwkwnlioyU33ekz QjKkf9nP6lQtht6cfSuTyYexE6qy4167e0p2p6uScJ68mvQzYo7qqTJGId8RNueQ+clL+S R4coMYy8yIzbrIySY4bzZoIXNckxDbFHbFYLR1sQAa2TKqdaIBUoW8+gDVC0lFI8bUM3c/ Dupkq1C5zVVqC35C7kB+1s2sEcToxPke4OcphYeqEsF8WVXE3v1BI3uJR+dFfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694519734; a=rsa-sha256; cv=none; b=Dvu1F1fll2zaggGTEeIxms+qVLg5gFzB78MHK64bcixhuliA2csHyR3VUqPbEI7rKHK6zR 4F98jMSKZO+G6xMBjd5sRYZ3gXGrMPvczg33DKlYtkmTZdEmOhvZW/APr/CJJDTumq0rS4 YIueW+tkxy7b1qWiUa829lA2FSaxtQc8IXPh1zfUqzPn4qTCxtJaSqK89tgQKRvwF62h5m LStnFstmvpxkgck87Clwj9jSaUmzNIB/NC9mlCcfP+KgBlS/to2++pJh5kPu1gIaknAbD3 gm29f5yoUcd/QYKSDAc1rCAZtdZ9iHIlNTyWbOKLEN8cSciBxuHXO5aCHeT5vQ== 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=1694519734; 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=ruNeqFvTkmvnshRngbR2mmYiakyuq4DwaMNV/us9DIk=; b=EmQIN9Flw/r/azlhX8jD2n+IJis+bU3zcpgAcFSBoPPz5hdyzK7Dlb2v644YmldVid5fzP rikqf4+6MxBjrZR9fyNHm6MXaiGJ2t7CYJBzx1e/spDeyidTAAuEw6y6AoiM2zFWwmBxQ0 MBNA87jOvE40nkVY/B219B/LM3j2+/56UMH7VM/X04OjSIpwVqf3lzfPh+XP+RIfko7kRY wmhjSomLCtmsPXzcgJZ7scPLpiImt+UhLwis3cUHd3/JjnFJeCx/ACoe+1muobEFUSbF1x i3LibM+AYut81NMUHgi9ATZGKMSdYSMcFRQqJ6hqRf7D1bKaZs9k5M4jyYkDcA== 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 4RlMTx5tYTzWTF; Tue, 12 Sep 2023 11:55:33 +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 38CBtXeC086410; Tue, 12 Sep 2023 11:55:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CBtXb9086407; Tue, 12 Sep 2023 11:55:33 GMT (envelope-from git) Date: Tue, 12 Sep 2023 11:55:33 GMT Message-Id: <202309121155.38CBtXb9086407@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yasuhiro Kimura Subject: git: 0146693b1a61 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 0146693b1a61ab6410b0009c11b7a69406c0aa27 Auto-Submitted: auto-generated The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=0146693b1a61ab6410b0009c11b7a69406c0aa27 commit 0146693b1a61ab6410b0009c11b7a69406c0aa27 Author: Yasuhiro Kimura AuthorDate: 2023-09-12 11:39:21 +0000 Commit: Yasuhiro Kimura CommitDate: 2023-09-12 11:54:14 +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 --- 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 b19a48847caa..58b1554f0953 100644 --- a/security/clamav-lts/Makefile +++ b/security/clamav-lts/Makefile @@ -24,7 +24,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 d03fa06b777f..a97925200d41 100644 --- a/security/clamav/Makefile +++ b/security/clamav/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