From nobody Sun Oct 08 15:31:01 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 4S3R2Y4M55z4wJYY; Sun, 8 Oct 2023 15:31:01 +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 4S3R2Y3qF1z3K3R; Sun, 8 Oct 2023 15:31:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696779061; 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=AJhejs0T9vdO1z4USvU8gIUmV4UftLyQ49ZLFLQ21Ek=; b=uTQG44+apSKpAlE3DwhyHLPqVKuut2W//5ZG/lgLxVXM5Ueu5KdunTpTgiL+cv+iVKuNw5 OjiBuScCTr5pydM7r+YG7jKLgVjZKSD5yxTOYMXw0OeH8lajfAiTK+GyG7ecSisgUol9Jv kTBuj29X8PWe3KsjJHztCOvjEYq8sKzfBwprcNu5VT1C/T+x7QT1jA/JyNcoIcmiqeXcdf PzUovi2OX2p8msv6w8IKLl3+4SgIU+LR8ul6rb4TEBAm263DONOKhDKL75mDA0fIgheZqv WxLzLGn9FeCQ1Fn8KZHlPd2MaQFoLI3Al0nV+tcZeylSqQ8BbGORH6jaF9ws5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696779061; a=rsa-sha256; cv=none; b=AOYP6ZuoQFoEKGqRdOp/CPO5TMhmhRXJ3PN1qwem+545ZNraMOiAmZ6X+7Jf5Le+haeqPG vLXyMsLJ4IjxdkTl/tSgcfD5lncDMRziV36zcpscgxDYILtTNEzgih8X2WIKpaJBJMqRIT 7tySNPLcxxpc8kJTbHNKoe5/s9zhfBTrp17Azhx7O6SsrRO0zGmd406eOqmOwADI6gLsX8 ukMmiIRPbbeQS7ql9tgC7SgJ8dkyXWQ7lgVdwF6gez7IeOrPOGu5iObdJ6/XFGL9L32pi8 u5oVUrVZMe3SGgSTLdyIJ2owmVPjuIjqNV+6Y+kvHpDvkg1D8yvlTx1Din+7jw== 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=1696779061; 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=AJhejs0T9vdO1z4USvU8gIUmV4UftLyQ49ZLFLQ21Ek=; b=GgQBwqswK3G1/JCZlzSHz95Op5kxQxrMjbmY2Rbp7Xmngy8hfEyuN/vLqxMkGtwXX2bsG/ 5Kfz8DGvFKTQierNpVVU7TriUM5sIHkIzk8+0cWLqXTD1GEtdZRiLcYDC0zV2BhiuPFlQg dayddLvlEXmNKCYimoDBEcQPfx5oRyZraIzctSvlCIYd3sWE/eDZLyeje5asLhZyJ0gbaI rAUyQsQKIejUUHNEhJ/SOWh0VIua9qU/zofb6ZzVlC5vtRUhAZfSPDvyWGcaDGl8J0SeUp Zvp5eKTs1NvSJaglDzFg2KZ5kJyPspS4L6EBsSTEQMfhKnHZwbsUgwYCL7VgJQ== 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 4S3R2Y2tysz3nH; Sun, 8 Oct 2023 15:31:01 +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 398FV1RH000226; Sun, 8 Oct 2023 15:31:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 398FV1Zg000223; Sun, 8 Oct 2023 15:31:01 GMT (envelope-from git) Date: Sun, 8 Oct 2023 15:31:01 GMT Message-Id: <202310081531.398FV1Zg000223@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: 0881e594ac8e - main - security/clamav: fix build with lld 17 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: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0881e594ac8e167686c389f9f7db7c98126718b7 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=0881e594ac8e167686c389f9f7db7c98126718b7 commit 0881e594ac8e167686c389f9f7db7c98126718b7 Author: Dimitry Andric AuthorDate: 2023-10-07 14:37:39 +0000 Commit: Dimitry Andric CommitDate: 2023-10-08 15:29:00 +0000 security/clamav: fix build with lld 17 Building security/clamav with lld 17 results in the following link errors: ld: error: version script assignment of 'CLAMAV_PRIVATE' to symbol 'cli_cvdunpack' failed: symbol not defined ld: error: version script assignment of 'CLAMAV_PRIVATE' to symbol 'cli_dbgmsg_internal' failed: symbol not defined ld: error: version script assignment of 'CLAMAV_PRIVATE' to symbol 'init_domainlist' failed: symbol not defined ld: error: version script assignment of 'CLAMAV_PRIVATE' to symbol 'init_whitelist' failed: symbol not defined ld: error: version script assignment of 'CLAMAV_PRIVATE' to symbol 'cli_parse_add' failed: symbol not defined ld: error: version script assignment of 'CLAMAV_PRIVATE' to symbol 'cli_bytecode_context_clear' failed: symbol not defined cc: error: linker command failed with exit code 1 (use -v to see invocation) Most of the mentioned symbols no longer exist anywhere in clamav's source code, except 'cli_cvdunpack', but it is a static function so it is not visible to external consumers. Remove all the undefined symbols from the linker version script to fix the build. PR: 274332 Approved by: yasu (maintainer) MFH: 2023Q4 --- .../clamav/files/patch-libclamav_libclamav.map | 44 ++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/security/clamav/files/patch-libclamav_libclamav.map b/security/clamav/files/patch-libclamav_libclamav.map new file mode 100644 index 000000000000..76af5aa3229c --- /dev/null +++ b/security/clamav/files/patch-libclamav_libclamav.map @@ -0,0 +1,44 @@ +--- libclamav/libclamav.map.orig 2023-08-26 22:00:24 UTC ++++ libclamav/libclamav.map +@@ -95,7 +95,6 @@ CLAMAV_PRIVATE { + cli_strlcat; + cli_strlcpy; + cli_strntoul; +- cli_cvdunpack; + cli_regcomp; + cli_regexec; + cli_regfree; +@@ -112,7 +111,6 @@ CLAMAV_PRIVATE { + cli_ole2_extract; + cli_errmsg; + cli_debug_flag; +- cli_dbgmsg_internal; + cli_vba_readdir; + cli_vba_inflate; + cli_ppt_vba_read; +@@ -161,8 +159,6 @@ CLAMAV_PRIVATE { + regex_list_match; + cli_hashset_destroy; + phishing_init; +- init_domainlist; +- init_whitelist; + phishing_done; + blobCreate; + blobAddData; +@@ -184,7 +180,6 @@ CLAMAV_PRIVATE { + cli_ac_free; + cli_ac_chklsig; + cli_sigopts_handler; +- cli_parse_add; + cli_bm_init; + cli_bm_scanbuff; + cli_bm_free; +@@ -224,7 +219,7 @@ CLAMAV_PRIVATE { + cli_bytecode_context_setparam_ptr; + cli_bytecode_context_setfile; + cli_bytecode_context_getresult_int; +- cli_bytecode_context_clear; ++ + cli_bytecode_init; + cli_bytecode_done; + cli_bytecode_debug;