diff --git a/security/clamav/Makefile b/security/clamav/Makefile index bf12fd04af2e..d8ecd4304ea2 100644 --- a/security/clamav/Makefile +++ b/security/clamav/Makefile @@ -1,140 +1,139 @@ PORTNAME= clamav -DISTVERSION= 1.2.0 -PORTREVISION= 2 +DISTVERSION= 1.2.1 PORTEPOCH= 1 CATEGORIES= security MASTER_SITES= https://www.clamav.net/downloads/production/ MAINTAINER= yasu@FreeBSD.org COMMENT= Open-source (GPL) anti-virus engine (Regular Feature Release) WWW= https://www.clamav.net/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING.txt BUILD_DEPENDS= ${RUST_DEFAULT}>=1.56.0:lang/${RUST_DEFAULT} LIB_DEPENDS= libcurl.so:ftp/curl \ libjson-c.so:devel/json-c \ libmspack.so:archivers/libmspack \ libpcre2-8.so:devel/pcre2 USES= cmake cpe gnome iconv ncurses pkgconfig ssl USE_GNOME= libxml2 USE_LDCONFIG= yes USE_RC_SUBR= clamav-clamd clamav-freshclam 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 CONFLICTS_INSTALL= clamav-lts SUB_FILES= pkg-message SUB_LIST+= CHMOD=${CHMOD} \ CHOWN=${CHOWN} \ CLAMAV_CLAMD_PIDFILE=${_CLAMAV_CLAMD_PIDFILE} \ CLAMAV_CLAMD_SOCKET=${_CLAMAV_CLAMD_SOCKET} \ CLAMAV_MILTER_SOCKET=${_CLAMAV_MILTER_SOCKET} \ CLAMAVGROUP=${_CLAMAVGROUP} \ CLAMAVUSER=${_CLAMAVUSER} \ DBDIR=${_DBDIR} \ LOGDIR=${_LOGDIR} \ RUNDIR=${_RUNDIR} USERS= ${_CLAMAVUSER} GROUPS= ${_CLAMAVGROUP} mail PLIST_SUB+= CLAMAVGROUP=${_CLAMAVGROUP} \ CLAMAVUSER=${_CLAMAVUSER} \ DBDIR=${_DBDIR} \ LOGDIR=${_LOGDIR} \ RUNDIR=${_RUNDIR} OPTIONS_DEFINE= ARC ARJ DOCS EXPERIMENTAL LHA MILTER STDERR TESTS UNRAR UNZOO OPTIONS_DEFAULT= ARC ARJ MILTER UNRAR UNZOO OPTIONS_SUB= yes ARC_DESC= Enable arch archives support ARJ_DESC= Enable arj archives support EXPERIMENTAL_DESC= Build experimental code LHA_DESC= Enable lha archives support MILTER_DESC= Compile the milter interface STDERR_DESC= Print logs to stderr instead of stdout TESTS_DESC= Build with test enabled (`make test` requires it) UNZOO_DESC= Enable zoo archives support ARC_RUN_DEPENDS= arc:archivers/arc ARJ_RUN_DEPENDS= arj:archivers/arj EXPERIMENTAL_CMAKE_BOOL= ENABLE_EXPERIMENTAL LHA_RUN_DEPENDS= lha:archivers/lha .if !exists(/usr/lib/libmilter.so) MILTER_LIB_DEPENDS= libmilter.so:mail/libmilter .endif MILTER_USE= RC_SUBR=clamav-milter .if !exists(/usr/lib/libmilter.so) MILTER_USE+= localbase .endif MILTER_CMAKE_BOOL= ENABLE_MILTER STDERR_EXTRA_PATCHES= ${FILESDIR}/extra-patch-common_output.c TESTS_BUILD_DEPENDS= ${LOCALBASE}/include/check.h:devel/check TESTS_USES= python:build TESTS_CMAKE_BOOL= ENABLE_TESTS UNRAR_CMAKE_BOOL= ENABLE_UNRAR UNZOO_RUN_DEPENDS= unzoo:archivers/unzoo _CLAMAVUSER?= clamav _CLAMAVGROUP?= clamav _CLAMAV_CLAMD_SOCKET?= ${_RUNDIR}/clamd.sock _CLAMAV_CLAMD_PIDFILE?= ${_RUNDIR}/clamd.pid _CLAMAV_MILTER_SOCKET?= ${_RUNDIR}/clmilter.sock _DBDIR= /var/db/clamav _LOGDIR= /var/log/clamav _RUNDIR= /var/run/clamav _SED_CONF= -E -e 's|^\#?(Example)$$|\#\1|' -e \ 's|^\#?((Update)?LogFile) .*/([a-z]+\.log)$$|\1 ${_LOGDIR}/\3|' \ -e 's|^\#?(PidFile) .*/([a-z\-]+\.pid)$$|\1 ${_RUNDIR}/\2|' -e \ 's|^\#?(LocalSocket) .*$$|\1 ${_CLAMAV_CLAMD_SOCKET}|' -e \ 's|^\#?(User) .*$$|\1 ${_CLAMAVUSER}|' -e \ 's|^\#?(AllowSupplementaryGroups).*$$|\1 yes|' -e \ 's|^\#?(ScanMail).*$$|\1 yes|' -e \ 's|^\#?(DatabaseDirectory) .*$$|\1 ${_DBDIR}|' -e \ 's|^\#?(DatabaseOwner) .*$$|\1 ${_CLAMAVUSER}|' -e \ 's|^\#?(FixStaleSocket).*$$|\1 yes|' -e \ 's|^\#?(NotifyClamd) .*$$|\1 ${PREFIX}/etc/clamd.conf|' -e \ 's|^\#?(MilterSocket) */tmp.*$$|\1 ${_CLAMAV_MILTER_SOCKET}|' \ -e 's|^\#?(ClamdSocket).*$$|\1 unix:${_CLAMAV_CLAMD_SOCKET}|' post-patch: @${REINPLACE_CMD} ${_SED_CONF} \ ${WRKSRC}/etc/clamd.conf.sample \ ${WRKSRC}/etc/freshclam.conf.sample \ ${WRKSRC}/etc/clamav-milter.conf.sample post-install: ${INSTALL_DATA} ${INSTALL_WRKSRC}/clamav-config.h ${STAGEDIR}${PREFIX}/include @${MKDIR} ${STAGEDIR}${_DBDIR} \ ${STAGEDIR}${_LOGDIR} \ ${STAGEDIR}${_RUNDIR} post-install-DOCS-on: ${MV} ${STAGEDIR}${PREFIX}/share/doc/ClamAV ${STAGEDIR}${DOCSDIR} post-install-DOCS-off: ${RM} -r ${STAGEDIR}${PREFIX}/share/doc/ClamAV pre-test-TESTS-off: @${ECHO_MSG} '******************************************************************' && \ ${ECHO_MSG} '***** You need to enable TESTS option to execute `make test` *****' && \ ${ECHO_MSG} '******************************************************************' && \ ${FALSE} .include diff --git a/security/clamav/distinfo b/security/clamav/distinfo index f9d38d6a8987..7166459fd63b 100644 --- a/security/clamav/distinfo +++ b/security/clamav/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1693277155 -SHA256 (clamav-1.2.0.tar.gz) = 97a192dffe141480b56cabf1063d79a9fc55cd59203241fa41bfc7a98a548020 -SIZE (clamav-1.2.0.tar.gz) = 41360851 +TIMESTAMP = 1698289226 +SHA256 (clamav-1.2.1.tar.gz) = 9a14fe870cbb8f5f79f668b789dca0f25cc6be22abe32f4f7d3677e4ee3935b0 +SIZE (clamav-1.2.1.tar.gz) = 42089565 diff --git a/security/clamav/files/patch-libclamav_libclamav.map b/security/clamav/files/patch-libclamav_libclamav.map deleted file mode 100644 index 76af5aa3229c..000000000000 --- a/security/clamav/files/patch-libclamav_libclamav.map +++ /dev/null @@ -1,44 +0,0 @@ ---- 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; diff --git a/security/clamav/pkg-plist b/security/clamav/pkg-plist index 4a5e4e3ed819..36cd0b24ac27 100644 --- a/security/clamav/pkg-plist +++ b/security/clamav/pkg-plist @@ -1,172 +1,173 @@ bin/clamav-config bin/clambc bin/clamconf bin/clamdscan bin/clamdtop bin/clamscan bin/clamsubmit bin/freshclam bin/sigtool include/clamav-config.h include/clamav-types.h include/clamav-version.h include/clamav.h include/libfreshclam.h lib/libclamav.so lib/libclamav.so.12 lib/libclamav.so.12.0.1 %%UNRAR%%lib/libclamunrar.so %%UNRAR%%lib/libclamunrar.so.12 %%UNRAR%%lib/libclamunrar.so.12.0.1 %%UNRAR%%lib/libclamunrar_iface.so %%UNRAR%%lib/libclamunrar_iface.so.12 %%UNRAR%%lib/libclamunrar_iface.so.12.0.1 lib/libfreshclam.so lib/libfreshclam.so.3 lib/libfreshclam.so.3.0.1 libdata/pkgconfig/libclamav.pc share/man/man1/clambc.1.gz share/man/man1/clamconf.1.gz share/man/man1/clamdscan.1.gz share/man/man1/clamdtop.1.gz share/man/man1/clamscan.1.gz share/man/man1/clamsubmit.1.gz share/man/man1/freshclam.1.gz share/man/man1/sigtool.1.gz share/man/man5/clamav-milter.conf.5.gz share/man/man5/clamd.conf.5.gz share/man/man5/freshclam.conf.5.gz share/man/man8/clamav-milter.8.gz share/man/man8/clamd.8.gz %%PORTDOCS%%%%DOCSDIR%%/html/404.html %%PORTDOCS%%%%DOCSDIR%%/html/FontAwesome/css/font-awesome.css %%PORTDOCS%%%%DOCSDIR%%/html/FontAwesome/fonts/FontAwesome.ttf %%PORTDOCS%%%%DOCSDIR%%/html/FontAwesome/fonts/fontawesome-webfont.eot %%PORTDOCS%%%%DOCSDIR%%/html/FontAwesome/fonts/fontawesome-webfont.svg %%PORTDOCS%%%%DOCSDIR%%/html/FontAwesome/fonts/fontawesome-webfont.ttf %%PORTDOCS%%%%DOCSDIR%%/html/FontAwesome/fonts/fontawesome-webfont.woff %%PORTDOCS%%%%DOCSDIR%%/html/FontAwesome/fonts/fontawesome-webfont.woff2 %%PORTDOCS%%%%DOCSDIR%%/html/Introduction.html %%PORTDOCS%%%%DOCSDIR%%/html/ace.js %%PORTDOCS%%%%DOCSDIR%%/html/appendix/Appendix.html %%PORTDOCS%%%%DOCSDIR%%/html/appendix/Authenticode.html %%PORTDOCS%%%%DOCSDIR%%/html/appendix/CvdPrivateMirror.html %%PORTDOCS%%%%DOCSDIR%%/html/appendix/FileTypes.html %%PORTDOCS%%%%DOCSDIR%%/html/appendix/FunctionalityLevels.html %%PORTDOCS%%%%DOCSDIR%%/html/appendix/Terminology.html %%PORTDOCS%%%%DOCSDIR%%/html/ayu-highlight.css %%PORTDOCS%%%%DOCSDIR%%/html/book.js %%PORTDOCS%%%%DOCSDIR%%/html/clipboard.min.js %%PORTDOCS%%%%DOCSDIR%%/html/community_resources/CommunityResources.html %%PORTDOCS%%%%DOCSDIR%%/html/community_resources/CompileClamAV_AmazonLinux2.txt %%PORTDOCS%%%%DOCSDIR%%/html/css/chrome.css %%PORTDOCS%%%%DOCSDIR%%/html/css/general.css %%PORTDOCS%%%%DOCSDIR%%/html/css/print.css %%PORTDOCS%%%%DOCSDIR%%/html/css/variables.css %%PORTDOCS%%%%DOCSDIR%%/html/editor.js %%PORTDOCS%%%%DOCSDIR%%/html/elasticlunr.min.js %%PORTDOCS%%%%DOCSDIR%%/html/faq/faq-cvd.html %%PORTDOCS%%%%DOCSDIR%%/html/faq/faq-eol.html %%PORTDOCS%%%%DOCSDIR%%/html/faq/faq-freshclam.html %%PORTDOCS%%%%DOCSDIR%%/html/faq/faq-ignore.html +%%PORTDOCS%%%%DOCSDIR%%/html/faq/faq-malware-fp-reports.html %%PORTDOCS%%%%DOCSDIR%%/html/faq/faq-misc.html %%PORTDOCS%%%%DOCSDIR%%/html/faq/faq-ml.html %%PORTDOCS%%%%DOCSDIR%%/html/faq/faq-pua.html %%PORTDOCS%%%%DOCSDIR%%/html/faq/faq-rust.html %%PORTDOCS%%%%DOCSDIR%%/html/faq/faq-safebrowsing.html %%PORTDOCS%%%%DOCSDIR%%/html/faq/faq-scan-alerts.html %%PORTDOCS%%%%DOCSDIR%%/html/faq/faq-troubleshoot.html %%PORTDOCS%%%%DOCSDIR%%/html/faq/faq-uninstall.html %%PORTDOCS%%%%DOCSDIR%%/html/faq/faq-upgrade.html %%PORTDOCS%%%%DOCSDIR%%/html/faq/faq-whichversion.html %%PORTDOCS%%%%DOCSDIR%%/html/faq/faq-win32.html %%PORTDOCS%%%%DOCSDIR%%/html/faq/faq.html %%PORTDOCS%%%%DOCSDIR%%/html/favicon.png %%PORTDOCS%%%%DOCSDIR%%/html/fonts/OPEN-SANS-LICENSE.txt %%PORTDOCS%%%%DOCSDIR%%/html/fonts/SOURCE-CODE-PRO-LICENSE.txt %%PORTDOCS%%%%DOCSDIR%%/html/fonts/fonts.css %%PORTDOCS%%%%DOCSDIR%%/html/fonts/open-sans-v17-all-charsets-300.woff2 %%PORTDOCS%%%%DOCSDIR%%/html/fonts/open-sans-v17-all-charsets-300italic.woff2 %%PORTDOCS%%%%DOCSDIR%%/html/fonts/open-sans-v17-all-charsets-600.woff2 %%PORTDOCS%%%%DOCSDIR%%/html/fonts/open-sans-v17-all-charsets-600italic.woff2 %%PORTDOCS%%%%DOCSDIR%%/html/fonts/open-sans-v17-all-charsets-700.woff2 %%PORTDOCS%%%%DOCSDIR%%/html/fonts/open-sans-v17-all-charsets-700italic.woff2 %%PORTDOCS%%%%DOCSDIR%%/html/fonts/open-sans-v17-all-charsets-800.woff2 %%PORTDOCS%%%%DOCSDIR%%/html/fonts/open-sans-v17-all-charsets-800italic.woff2 %%PORTDOCS%%%%DOCSDIR%%/html/fonts/open-sans-v17-all-charsets-italic.woff2 %%PORTDOCS%%%%DOCSDIR%%/html/fonts/open-sans-v17-all-charsets-regular.woff2 %%PORTDOCS%%%%DOCSDIR%%/html/fonts/source-code-pro-v11-all-charsets-500.woff2 %%PORTDOCS%%%%DOCSDIR%%/html/highlight.css %%PORTDOCS%%%%DOCSDIR%%/html/highlight.js %%PORTDOCS%%%%DOCSDIR%%/html/images/change-fork-name.png %%PORTDOCS%%%%DOCSDIR%%/html/images/cisco.png %%PORTDOCS%%%%DOCSDIR%%/html/images/clone-your-fork.png %%PORTDOCS%%%%DOCSDIR%%/html/images/create-a-fork.png %%PORTDOCS%%%%DOCSDIR%%/html/images/demon.png %%PORTDOCS%%%%DOCSDIR%%/html/images/flamegraph.svg %%PORTDOCS%%%%DOCSDIR%%/html/images/fork-is-behind.png %%PORTDOCS%%%%DOCSDIR%%/html/images/logo.png %%PORTDOCS%%%%DOCSDIR%%/html/images/new-git-workflow.png %%PORTDOCS%%%%DOCSDIR%%/html/images/old-git-workflow.png %%PORTDOCS%%%%DOCSDIR%%/html/index.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Development.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Development/Contribute.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Development/build-installer-packages.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Development/clamav-git-work-flow.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Development/code-coverage.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Development/development-builds.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Development/fuzzing-sanitizers.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Development/github-pr-basics.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Development/libclamav.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Development/performance-profiling.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Development/personal-forks.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Development/testing-pull-requests.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Development/tips-and-tricks.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Installing.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Installing/Add-clamav-user.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Installing/Community-projects.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Installing/Docker.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Installing/Installing-from-source-Unix-old.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Installing/Installing-from-source-Unix.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Installing/Installing-from-source-Windows.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Installing/Packages.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/OnAccess.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Signatures.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Signatures/AllowLists.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Signatures/AuthenticodeRules.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Signatures/BodySignatureFormat.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Signatures/BytecodeSignatures.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Signatures/ContainerMetadata.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Signatures/DatabaseInfo.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Signatures/DynamicConfig.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Signatures/EncryptedArchives.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Signatures/ExtendedSignatures.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Signatures/FileTypeMagic.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Signatures/HashSignatures.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Signatures/LogicalSignatures.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Signatures/PhishSigs.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Signatures/SignatureNames.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Signatures/YaraRules.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Usage.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Usage/Configuration.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Usage/ReportABug.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Usage/Scanning.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Usage/Services.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Usage/SignatureManagement.html %%PORTDOCS%%%%DOCSDIR%%/html/mark.min.js %%PORTDOCS%%%%DOCSDIR%%/html/mode-rust.js %%PORTDOCS%%%%DOCSDIR%%/html/print.html %%PORTDOCS%%%%DOCSDIR%%/html/searcher.js %%PORTDOCS%%%%DOCSDIR%%/html/searchindex.js %%PORTDOCS%%%%DOCSDIR%%/html/searchindex.json %%PORTDOCS%%%%DOCSDIR%%/html/theme-dawn.js %%PORTDOCS%%%%DOCSDIR%%/html/theme-tomorrow_night.js %%PORTDOCS%%%%DOCSDIR%%/html/tomorrow-night.css %%MILTER%%sbin/clamav-milter sbin/clamd @sample etc/clamd.conf.sample %%MILTER%%@sample etc/clamav-milter.conf.sample @sample etc/freshclam.conf.sample @dir(%%CLAMAVUSER%%,%%CLAMAVGROUP%%,0755) %%DBDIR%% @dir(%%CLAMAVUSER%%,%%CLAMAVGROUP%%,0755) %%LOGDIR%% @dir(%%CLAMAVUSER%%,%%CLAMAVGROUP%%,0755) %%RUNDIR%%