Date: Sun, 8 Oct 2023 15:31:01 GMT From: Dimitry Andric <dim@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 0881e594ac8e - main - security/clamav: fix build with lld 17 Message-ID: <202310081531.398FV1Zg000223@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=0881e594ac8e167686c389f9f7db7c98126718b7 commit 0881e594ac8e167686c389f9f7db7c98126718b7 Author: Dimitry Andric <dim@FreeBSD.org> AuthorDate: 2023-10-07 14:37:39 +0000 Commit: Dimitry Andric <dim@FreeBSD.org> 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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202310081531.398FV1Zg000223>