Package: release.debian.org User: release.debian....@packages.debian.org Usertags: pu Tags: bullseye Severity: normal
This is an long overdue update to the clamav package. It is a stable update provided by upstream. From their changelog: - Fix logical signature "Intermediates" feature. - Relax constraints on slightly malformed zip archives that contain overlapping file entries. 0.103.7 is the current LTS release. The code diff is eual vs the buster package. It would be nice if this could become part of -updates. Sebastian
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8d42d3c..b910470 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,7 @@ string(TIMESTAMP TODAY "%Y%m%d") set(VERSION_SUFFIX "") project( ClamAV - VERSION "0.103.6" + VERSION "0.103.7" DESCRIPTION "ClamAV open source email, web, and end-point anti-virus toolkit." ) set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) diff --git a/NEWS.md b/NEWS.md index 66570e7..4595141 100644 --- a/NEWS.md +++ b/NEWS.md @@ -3,6 +3,17 @@ Note: This file refers to the source tarball. Things described here may differ slightly from the binary packages. +## 0.103.7 + +ClamAV 0.103.7 is a critical patch release with the following fixes: + +- Upgrade the vendored UnRAR library to version 6.1.7. + +- Fix logical signature "Intermediates" feature. + +- Relax constraints on slightly malformed zip archives that contain overlapping + file entries. + ## 0.103.6 ClamAV 0.103.6 is a critical patch release with the following fixes: diff --git a/configure b/configure index 59bf5dd..9f9a4f5 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for ClamAV 0.103.6. +# Generated by GNU Autoconf 2.69 for ClamAV 0.103.7. # # Report bugs to <https://github.com/Cisco-Talos/clamav/issues>. # @@ -592,8 +592,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='ClamAV' PACKAGE_TARNAME='clamav' -PACKAGE_VERSION='0.103.6' -PACKAGE_STRING='ClamAV 0.103.6' +PACKAGE_VERSION='0.103.7' +PACKAGE_STRING='ClamAV 0.103.7' PACKAGE_BUGREPORT='https://github.com/Cisco-Talos/clamav/issues' PACKAGE_URL='https://www.clamav.net/' @@ -1606,7 +1606,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ClamAV 0.103.6 to adapt to many kinds of systems. +\`configure' configures ClamAV 0.103.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1687,7 +1687,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ClamAV 0.103.6:";; + short | recursive ) echo "Configuration of ClamAV 0.103.7:";; esac cat <<\_ACEOF --enable-dependency-tracking @@ -1922,7 +1922,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ClamAV configure 0.103.6 +ClamAV configure 0.103.7 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2550,7 +2550,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ClamAV $as_me 0.103.6, which was +It was created by ClamAV $as_me 0.103.7, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4308,7 +4308,7 @@ fi # Define the identity of the package. PACKAGE='clamav' - VERSION='0.103.6' + VERSION='0.103.7' # Some tools Automake needs. @@ -6036,7 +6036,7 @@ esac $as_echo "#define PACKAGE PACKAGE_NAME" >>confdefs.h -VERSION="0.103.6" +VERSION="0.103.7" major=`echo $PACKAGE_VERSION |cut -d. -f1 | sed -e "s/^0-9//g"` minor=`echo $PACKAGE_VERSION |cut -d. -f2 | sed -e "s/^0-9//g"` @@ -31896,7 +31896,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ClamAV $as_me 0.103.6, which was +This file was extended by ClamAV $as_me 0.103.7, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -31963,7 +31963,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -ClamAV config.status 0.103.6 +ClamAV config.status 0.103.7 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -34813,7 +34813,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ClamAV $as_me 0.103.6, which was +This file was extended by ClamAV $as_me 0.103.7, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -34880,7 +34880,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -ClamAV config.status 0.103.6 +ClamAV config.status 0.103.7 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 9829ea3..561c4f9 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ([2.59]) dnl For a release change [devel] to the real version [0.xy] dnl also change VERSION below -AC_INIT([ClamAV], [0.103.6], [https://github.com/Cisco-Talos/clamav/issues], [clamav], [https://www.clamav.net/]) +AC_INIT([ClamAV], [0.103.7], [https://github.com/Cisco-Talos/clamav/issues], [clamav], [https://www.clamav.net/]) dnl put configure auxiliary into config AC_CONFIG_AUX_DIR([config]) diff --git a/debian/.git-dpm b/debian/.git-dpm index 468dc5b..47bf279 100644 --- a/debian/.git-dpm +++ b/debian/.git-dpm @@ -1,8 +1,8 @@ # see git-dpm(1) from git-dpm package -dbab766c81312b2a8cbd37258a5a3510c4e98085 -dbab766c81312b2a8cbd37258a5a3510c4e98085 -75754d0f4c00d0ac0864e2a506bfc1d977d55d00 -75754d0f4c00d0ac0864e2a506bfc1d977d55d00 -clamav_0.103.6+dfsg.orig.tar.xz -6212705bf2cb168a55f76ae4cab31fa40909aed8 -7135300 +f2466c7aaf6e140ea150e0f219c86594f3bc04cb +f2466c7aaf6e140ea150e0f219c86594f3bc04cb +d1ea680af611ee417616ec3d8615a0e67a495795 +d1ea680af611ee417616ec3d8615a0e67a495795 +clamav_0.103.7+dfsg.orig.tar.xz +f0708e3df3a432def23c384d28fb3a4628efcfd5 +7136624 diff --git a/debian/changelog b/debian/changelog index c540f6f..5210a94 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +clamav (0.103.7+dfsg-0+deb11u1) bullseye; urgency=medium + + * Import 0.103.7 + - Update symbol file. + + -- Sebastian Andrzej Siewior <sebast...@breakpoint.cc> Sun, 21 Aug 2022 21:28:52 +0200 + clamav (0.103.6+dfsg-0+deb11u1) bullseye; urgency=medium * Import 0.103.6 diff --git a/debian/libclamav9.symbols b/debian/libclamav9.symbols index 7faf5b4..50c8cd8 100644 --- a/debian/libclamav9.symbols +++ b/debian/libclamav9.symbols @@ -1,20 +1,20 @@ libclamav.so.9 libclamav9 #MINVER# * Build-Depends-Package: libclamav-dev - CLAMAV_PRIVATE@CLAMAV_PRIVATE 0.103.6 + CLAMAV_PRIVATE@CLAMAV_PRIVATE 0.103.7 CLAMAV_PUBLIC@CLAMAV_PUBLIC 0.101.0 - __cli_strcasestr@CLAMAV_PRIVATE 0.103.6 - __cli_strndup@CLAMAV_PRIVATE 0.103.6 - __cli_strnlen@CLAMAV_PRIVATE 0.103.6 - __cli_strnstr@CLAMAV_PRIVATE 0.103.6 - base64Flush@CLAMAV_PRIVATE 0.103.6 - blobAddData@CLAMAV_PRIVATE 0.103.6 - blobCreate@CLAMAV_PRIVATE 0.103.6 - blobDestroy@CLAMAV_PRIVATE 0.103.6 - cl_ASN1_GetTimeT@CLAMAV_PRIVATE 0.103.6 + __cli_strcasestr@CLAMAV_PRIVATE 0.103.7 + __cli_strndup@CLAMAV_PRIVATE 0.103.7 + __cli_strnlen@CLAMAV_PRIVATE 0.103.7 + __cli_strnstr@CLAMAV_PRIVATE 0.103.7 + base64Flush@CLAMAV_PRIVATE 0.103.7 + blobAddData@CLAMAV_PRIVATE 0.103.7 + blobCreate@CLAMAV_PRIVATE 0.103.7 + blobDestroy@CLAMAV_PRIVATE 0.103.7 + cl_ASN1_GetTimeT@CLAMAV_PRIVATE 0.103.7 cl_always_gen_section_hash@CLAMAV_PUBLIC 0.101.0 - cl_base64_decode@CLAMAV_PRIVATE 0.103.6 - cl_base64_encode@CLAMAV_PRIVATE 0.103.6 - cl_cleanup_crypto@CLAMAV_PRIVATE 0.103.6 + cl_base64_decode@CLAMAV_PRIVATE 0.103.7 + cl_base64_encode@CLAMAV_PRIVATE 0.103.7 + cl_cleanup_crypto@CLAMAV_PRIVATE 0.103.7 cl_countsigs@CLAMAV_PUBLIC 0.101.0 cl_cvdfree@CLAMAV_PUBLIC 0.101.0 cl_cvdhead@CLAMAV_PUBLIC 0.101.0 @@ -54,21 +54,21 @@ libclamav.so.9 libclamav9 #MINVER# cl_fmap_close@CLAMAV_PUBLIC 0.101.0 cl_fmap_open_handle@CLAMAV_PUBLIC 0.101.0 cl_fmap_open_memory@CLAMAV_PUBLIC 0.101.0 - cl_get_pkey_file@CLAMAV_PRIVATE 0.103.6 - cl_get_x509_from_mem@CLAMAV_PRIVATE 0.103.6 - cl_hash_data@CLAMAV_PRIVATE 0.103.6 + cl_get_pkey_file@CLAMAV_PRIVATE 0.103.7 + cl_get_x509_from_mem@CLAMAV_PRIVATE 0.103.7 + cl_hash_data@CLAMAV_PRIVATE 0.103.7 cl_hash_destroy@CLAMAV_PUBLIC 0.101.0 - cl_hash_file_fd@CLAMAV_PRIVATE 0.103.6 - cl_hash_file_fd_ctx@CLAMAV_PRIVATE 0.103.6 - cl_hash_file_fp@CLAMAV_PRIVATE 0.103.6 + cl_hash_file_fd@CLAMAV_PRIVATE 0.103.7 + cl_hash_file_fd_ctx@CLAMAV_PRIVATE 0.103.7 + cl_hash_file_fp@CLAMAV_PRIVATE 0.103.7 cl_hash_init@CLAMAV_PUBLIC 0.101.0 cl_init@CLAMAV_PUBLIC 0.101.0 - cl_initialize_crypto@CLAMAV_PRIVATE 0.103.6 + cl_initialize_crypto@CLAMAV_PRIVATE 0.103.7 cl_load@CLAMAV_PUBLIC 0.101.0 - cl_load_cert@CLAMAV_PRIVATE 0.103.6 - cl_load_crl@CLAMAV_PRIVATE 0.103.6 + cl_load_cert@CLAMAV_PRIVATE 0.103.7 + cl_load_crl@CLAMAV_PRIVATE 0.103.7 cl_retdbdir@CLAMAV_PUBLIC 0.101.0 - cl_retflevel@CLAMAV_PUBLIC 0.103.6 + cl_retflevel@CLAMAV_PUBLIC 0.103.7 cl_retver@CLAMAV_PUBLIC 0.101.0 cl_scandesc@CLAMAV_PUBLIC 0.101.0 cl_scandesc_callback@CLAMAV_PUBLIC 0.101.0 @@ -76,196 +76,196 @@ libclamav.so.9 libclamav9 #MINVER# cl_scanfile_callback@CLAMAV_PUBLIC 0.101.0 cl_scanmap_callback@CLAMAV_PUBLIC 0.101.0 cl_set_clcb_msg@CLAMAV_PUBLIC 0.101.0 - cl_sha1@CLAMAV_PRIVATE 0.103.6 - cl_sha256@CLAMAV_PRIVATE 0.103.6 - cl_sign_data@CLAMAV_PRIVATE 0.103.6 - cl_sign_data_keyfile@CLAMAV_PRIVATE 0.103.6 - cl_sign_file_fd@CLAMAV_PRIVATE 0.103.6 - cl_sign_file_fp@CLAMAV_PRIVATE 0.103.6 + cl_sha1@CLAMAV_PRIVATE 0.103.7 + cl_sha256@CLAMAV_PRIVATE 0.103.7 + cl_sign_data@CLAMAV_PRIVATE 0.103.7 + cl_sign_data_keyfile@CLAMAV_PRIVATE 0.103.7 + cl_sign_file_fd@CLAMAV_PRIVATE 0.103.7 + cl_sign_file_fp@CLAMAV_PRIVATE 0.103.7 cl_statchkdir@CLAMAV_PUBLIC 0.101.0 cl_statfree@CLAMAV_PUBLIC 0.101.0 cl_statinidir@CLAMAV_PUBLIC 0.101.0 cl_strerror@CLAMAV_PUBLIC 0.101.0 cl_update_hash@CLAMAV_PUBLIC 0.101.0 - cl_validate_certificate_chain@CLAMAV_PRIVATE 0.103.6 - cl_validate_certificate_chain_ts_dir@CLAMAV_PRIVATE 0.103.6 - cl_verify_signature@CLAMAV_PRIVATE 0.103.6 - cl_verify_signature_fd@CLAMAV_PRIVATE 0.103.6 - cl_verify_signature_fd_x509@CLAMAV_PRIVATE 0.103.6 - cl_verify_signature_fd_x509_keyfile@CLAMAV_PRIVATE 0.103.6 - cl_verify_signature_hash@CLAMAV_PRIVATE 0.103.6 - cl_verify_signature_hash_x509@CLAMAV_PRIVATE 0.103.6 - cl_verify_signature_hash_x509_keyfile@CLAMAV_PRIVATE 0.103.6 - cl_verify_signature_x509@CLAMAV_PRIVATE 0.103.6 - cl_verify_signature_x509_keyfile@CLAMAV_PRIVATE 0.103.6 - cli_ac_buildtrie@CLAMAV_PRIVATE 0.103.6 - cli_ac_chklsig@CLAMAV_PRIVATE 0.103.6 - cli_ac_free@CLAMAV_PRIVATE 0.103.6 - cli_ac_freedata@CLAMAV_PRIVATE 0.103.6 - cli_ac_init@CLAMAV_PRIVATE 0.103.6 - cli_ac_initdata@CLAMAV_PRIVATE 0.103.6 - cli_ac_scanbuff@CLAMAV_PRIVATE 0.103.6 - cli_basename@CLAMAV_PRIVATE 0.103.6 - cli_bm_free@CLAMAV_PRIVATE 0.103.6 - cli_bm_init@CLAMAV_PRIVATE 0.103.6 - cli_bm_scanbuff@CLAMAV_PRIVATE 0.103.6 - cli_build_regex_list@CLAMAV_PRIVATE 0.103.6 - cli_bytecode_context_alloc@CLAMAV_PRIVATE 0.103.6 - cli_bytecode_context_clear@CLAMAV_PRIVATE 0.103.6 - cli_bytecode_context_destroy@CLAMAV_PRIVATE 0.103.6 - cli_bytecode_context_getresult_int@CLAMAV_PRIVATE 0.103.6 - cli_bytecode_context_set_trace@CLAMAV_PRIVATE 0.103.6 - cli_bytecode_context_setfile@CLAMAV_PRIVATE 0.103.6 - cli_bytecode_context_setfuncid@CLAMAV_PRIVATE 0.103.6 - cli_bytecode_context_setparam_int@CLAMAV_PRIVATE 0.103.6 - cli_bytecode_context_setparam_ptr@CLAMAV_PRIVATE 0.103.6 - cli_bytecode_debug@CLAMAV_PRIVATE 0.103.6 - cli_bytecode_debug_printsrc@CLAMAV_PRIVATE 0.103.6 - cli_bytecode_describe@CLAMAV_PRIVATE 0.103.6 - cli_bytecode_destroy@CLAMAV_PRIVATE 0.103.6 - cli_bytecode_done@CLAMAV_PRIVATE 0.103.6 - cli_bytecode_init@CLAMAV_PRIVATE 0.103.6 - cli_bytecode_load@CLAMAV_PRIVATE 0.103.6 - cli_bytecode_prepare2@CLAMAV_PRIVATE 0.103.6 - cli_bytecode_printversion@CLAMAV_PRIVATE 0.103.6 - cli_bytecode_run@CLAMAV_PRIVATE 0.103.6 - cli_bytefunc_describe@CLAMAV_PRIVATE 0.103.6 - cli_byteinst_describe@CLAMAV_PRIVATE 0.103.6 - cli_bytetype_describe@CLAMAV_PRIVATE 0.103.6 - cli_bytevalue_describe@CLAMAV_PRIVATE 0.103.6 - cli_calloc@CLAMAV_PRIVATE 0.103.6 - cli_check_auth_header@CLAMAV_PRIVATE 0.103.6 - cli_chomp@CLAMAV_PRIVATE 0.103.6 - cli_codepage_to_utf8@CLAMAV_PRIVATE 0.103.6 - cli_ctime@CLAMAV_PRIVATE 0.103.6 - cli_cvdunpack@CLAMAV_PRIVATE 0.103.6 - cli_dbgmsg_internal@CLAMAV_PRIVATE 0.103.6 - cli_dconf_init@CLAMAV_PRIVATE 0.103.6 - cli_debug_flag@CLAMAV_PRIVATE 0.103.6 - cli_detect_environment@CLAMAV_PRIVATE 0.103.6 - cli_disasm_one@CLAMAV_PRIVATE 0.103.6 - cli_errmsg@CLAMAV_PRIVATE 0.103.6 - cli_filecopy@CLAMAV_PRIVATE 0.103.6 - cli_free_vba_project@CLAMAV_PRIVATE 0.103.6 - cli_ftw@CLAMAV_PRIVATE 0.103.6 - cli_genhash_pe@CLAMAV_PRIVATE 0.103.6 - cli_gentemp@CLAMAV_PRIVATE 0.103.6 - cli_gentemp_with_prefix@CLAMAV_PRIVATE 0.103.6 - cli_gentempfd@CLAMAV_PRIVATE 0.103.6 - cli_get_filepath_from_filedesc@CLAMAV_PRIVATE 0.103.6 - cli_gettmpdir@CLAMAV_PRIVATE 0.103.6 - cli_hashfile@CLAMAV_PRIVATE 0.103.6 - cli_hashset_destroy@CLAMAV_PRIVATE 0.103.6 - cli_hashstream@CLAMAV_PRIVATE 0.103.6 - cli_hex2str@CLAMAV_PRIVATE 0.103.6 - cli_hex2ui@CLAMAV_PRIVATE 0.103.6 - cli_initroots@CLAMAV_PRIVATE 0.103.6 - cli_isnumber@CLAMAV_PRIVATE 0.103.6 - cli_js_destroy@CLAMAV_PRIVATE 0.103.6 - cli_js_init@CLAMAV_PRIVATE 0.103.6 - cli_js_output@CLAMAV_PRIVATE 0.103.6 - cli_js_parse_done@CLAMAV_PRIVATE 0.103.6 - cli_js_process_buffer@CLAMAV_PRIVATE 0.103.6 - cli_ldbtokenize@CLAMAV_PRIVATE 0.103.6 - cli_malloc@CLAMAV_PRIVATE 0.103.6 - cli_memstr@CLAMAV_PRIVATE 0.103.6 - cli_ole2_extract@CLAMAV_PRIVATE 0.103.6 - cli_parse_add@CLAMAV_PRIVATE 0.103.6 - cli_pcre_build@CLAMAV_PRIVATE 0.103.6 - cli_pcre_freeoff@CLAMAV_PRIVATE 0.103.6 - cli_pcre_init@CLAMAV_PRIVATE 0.103.6 - cli_pcre_perf_events_destroy@CLAMAV_PRIVATE 0.103.6 - cli_pcre_perf_print@CLAMAV_PRIVATE 0.103.6 - cli_pcre_recaloff@CLAMAV_PRIVATE 0.103.6 - cli_pcre_scanbuf@CLAMAV_PRIVATE 0.103.6 - cli_ppt_vba_read@CLAMAV_PRIVATE 0.103.6 - cli_printcxxver@CLAMAV_PRIVATE 0.103.6 - cli_readn@CLAMAV_PRIVATE 0.103.6 - cli_realloc@CLAMAV_PRIVATE 0.103.6 - cli_realpath@CLAMAV_PRIVATE 0.103.6 - cli_regcomp@CLAMAV_PRIVATE 0.103.6 - cli_regex2suffix@CLAMAV_PRIVATE 0.103.6 - cli_regexec@CLAMAV_PRIVATE 0.103.6 - cli_regfree@CLAMAV_PRIVATE 0.103.6 - cli_rmdirs@CLAMAV_PRIVATE 0.103.6 - cli_rndnum@CLAMAV_PRIVATE 0.103.6 - cli_sanitize_filepath@CLAMAV_PRIVATE 0.103.6 - cli_scan_buff@CLAMAV_PRIVATE 0.103.6 - cli_scan_fmap@CLAMAV_PRIVATE 0.103.6 - cli_sigopts_handler@CLAMAV_PRIVATE 0.103.6 - cli_sigperf_events_destroy@CLAMAV_PRIVATE 0.103.6 - cli_sigperf_print@CLAMAV_PRIVATE 0.103.6 - cli_str2hex@CLAMAV_PRIVATE 0.103.6 - cli_strbcasestr@CLAMAV_PRIVATE 0.103.6 - cli_strdup@CLAMAV_PRIVATE 0.103.6 - cli_strerror@CLAMAV_PRIVATE 0.103.6 - cli_strlcat@CLAMAV_PRIVATE 0.103.6 - cli_strlcpy@CLAMAV_PRIVATE 0.103.6 - cli_strntoul@CLAMAV_PRIVATE 0.103.6 - cli_strrcpy@CLAMAV_PRIVATE 0.103.6 - cli_strtok@CLAMAV_PRIVATE 0.103.6 - cli_strtokbuf@CLAMAV_PRIVATE 0.103.6 - cli_strtokenize@CLAMAV_PRIVATE 0.103.6 - cli_textbuffer_append_normalize@CLAMAV_PRIVATE 0.103.6 - cli_unescape@CLAMAV_PRIVATE 0.103.6 - cli_unlink@CLAMAV_PRIVATE 0.103.6 - cli_url_canon@CLAMAV_PRIVATE 0.103.6 - cli_utf16_to_utf8@CLAMAV_PRIVATE 0.103.6 - cli_utf16toascii@CLAMAV_PRIVATE 0.103.6 - cli_vba_inflate@CLAMAV_PRIVATE 0.103.6 - cli_vba_readdir@CLAMAV_PRIVATE 0.103.6 - cli_versig2@CLAMAV_PRIVATE 0.103.6 - cli_versig@CLAMAV_PRIVATE 0.103.6 - cli_warnmsg@CLAMAV_PRIVATE 0.103.6 - cli_wm_decrypt_macro@CLAMAV_PRIVATE 0.103.6 - cli_wm_readdir@CLAMAV_PRIVATE 0.103.6 - cli_writen@CLAMAV_PRIVATE 0.103.6 - decodeLine@CLAMAV_PRIVATE 0.103.6 - disasmbuf@CLAMAV_PRIVATE 0.103.6 - fmap@CLAMAV_PRIVATE 0.103.6 - fmap_dump_to_file@CLAMAV_PRIVATE 0.103.6 - fmap_duplicate@CLAMAV_PRIVATE 0.103.6 - free_duplicate_fmap@CLAMAV_PRIVATE 0.103.6 - get_fpu_endian@CLAMAV_PRIVATE 0.103.6 - have_clamjit@CLAMAV_PRIVATE 0.103.6 - have_rar@CLAMAV_PRIVATE 0.103.6 - html_normalise_map@CLAMAV_PRIVATE 0.103.6 - html_normalise_mem@CLAMAV_PRIVATE 0.103.6 - html_screnc_decode@CLAMAV_PRIVATE 0.103.6 - html_tag_arg_free@CLAMAV_PRIVATE 0.103.6 - init_domainlist@CLAMAV_PRIVATE 0.103.6 - init_regex_list@CLAMAV_PRIVATE 0.103.6 - init_whitelist@CLAMAV_PRIVATE 0.103.6 - is_regex_ok@CLAMAV_PRIVATE 0.103.6 - load_regex_matcher@CLAMAV_PRIVATE 0.103.6 + cl_validate_certificate_chain@CLAMAV_PRIVATE 0.103.7 + cl_validate_certificate_chain_ts_dir@CLAMAV_PRIVATE 0.103.7 + cl_verify_signature@CLAMAV_PRIVATE 0.103.7 + cl_verify_signature_fd@CLAMAV_PRIVATE 0.103.7 + cl_verify_signature_fd_x509@CLAMAV_PRIVATE 0.103.7 + cl_verify_signature_fd_x509_keyfile@CLAMAV_PRIVATE 0.103.7 + cl_verify_signature_hash@CLAMAV_PRIVATE 0.103.7 + cl_verify_signature_hash_x509@CLAMAV_PRIVATE 0.103.7 + cl_verify_signature_hash_x509_keyfile@CLAMAV_PRIVATE 0.103.7 + cl_verify_signature_x509@CLAMAV_PRIVATE 0.103.7 + cl_verify_signature_x509_keyfile@CLAMAV_PRIVATE 0.103.7 + cli_ac_buildtrie@CLAMAV_PRIVATE 0.103.7 + cli_ac_chklsig@CLAMAV_PRIVATE 0.103.7 + cli_ac_free@CLAMAV_PRIVATE 0.103.7 + cli_ac_freedata@CLAMAV_PRIVATE 0.103.7 + cli_ac_init@CLAMAV_PRIVATE 0.103.7 + cli_ac_initdata@CLAMAV_PRIVATE 0.103.7 + cli_ac_scanbuff@CLAMAV_PRIVATE 0.103.7 + cli_basename@CLAMAV_PRIVATE 0.103.7 + cli_bm_free@CLAMAV_PRIVATE 0.103.7 + cli_bm_init@CLAMAV_PRIVATE 0.103.7 + cli_bm_scanbuff@CLAMAV_PRIVATE 0.103.7 + cli_build_regex_list@CLAMAV_PRIVATE 0.103.7 + cli_bytecode_context_alloc@CLAMAV_PRIVATE 0.103.7 + cli_bytecode_context_clear@CLAMAV_PRIVATE 0.103.7 + cli_bytecode_context_destroy@CLAMAV_PRIVATE 0.103.7 + cli_bytecode_context_getresult_int@CLAMAV_PRIVATE 0.103.7 + cli_bytecode_context_set_trace@CLAMAV_PRIVATE 0.103.7 + cli_bytecode_context_setfile@CLAMAV_PRIVATE 0.103.7 + cli_bytecode_context_setfuncid@CLAMAV_PRIVATE 0.103.7 + cli_bytecode_context_setparam_int@CLAMAV_PRIVATE 0.103.7 + cli_bytecode_context_setparam_ptr@CLAMAV_PRIVATE 0.103.7 + cli_bytecode_debug@CLAMAV_PRIVATE 0.103.7 + cli_bytecode_debug_printsrc@CLAMAV_PRIVATE 0.103.7 + cli_bytecode_describe@CLAMAV_PRIVATE 0.103.7 + cli_bytecode_destroy@CLAMAV_PRIVATE 0.103.7 + cli_bytecode_done@CLAMAV_PRIVATE 0.103.7 + cli_bytecode_init@CLAMAV_PRIVATE 0.103.7 + cli_bytecode_load@CLAMAV_PRIVATE 0.103.7 + cli_bytecode_prepare2@CLAMAV_PRIVATE 0.103.7 + cli_bytecode_printversion@CLAMAV_PRIVATE 0.103.7 + cli_bytecode_run@CLAMAV_PRIVATE 0.103.7 + cli_bytefunc_describe@CLAMAV_PRIVATE 0.103.7 + cli_byteinst_describe@CLAMAV_PRIVATE 0.103.7 + cli_bytetype_describe@CLAMAV_PRIVATE 0.103.7 + cli_bytevalue_describe@CLAMAV_PRIVATE 0.103.7 + cli_calloc@CLAMAV_PRIVATE 0.103.7 + cli_check_auth_header@CLAMAV_PRIVATE 0.103.7 + cli_chomp@CLAMAV_PRIVATE 0.103.7 + cli_codepage_to_utf8@CLAMAV_PRIVATE 0.103.7 + cli_ctime@CLAMAV_PRIVATE 0.103.7 + cli_cvdunpack@CLAMAV_PRIVATE 0.103.7 + cli_dbgmsg_internal@CLAMAV_PRIVATE 0.103.7 + cli_dconf_init@CLAMAV_PRIVATE 0.103.7 + cli_debug_flag@CLAMAV_PRIVATE 0.103.7 + cli_detect_environment@CLAMAV_PRIVATE 0.103.7 + cli_disasm_one@CLAMAV_PRIVATE 0.103.7 + cli_errmsg@CLAMAV_PRIVATE 0.103.7 + cli_filecopy@CLAMAV_PRIVATE 0.103.7 + cli_free_vba_project@CLAMAV_PRIVATE 0.103.7 + cli_ftw@CLAMAV_PRIVATE 0.103.7 + cli_genhash_pe@CLAMAV_PRIVATE 0.103.7 + cli_gentemp@CLAMAV_PRIVATE 0.103.7 + cli_gentemp_with_prefix@CLAMAV_PRIVATE 0.103.7 + cli_gentempfd@CLAMAV_PRIVATE 0.103.7 + cli_get_filepath_from_filedesc@CLAMAV_PRIVATE 0.103.7 + cli_gettmpdir@CLAMAV_PRIVATE 0.103.7 + cli_hashfile@CLAMAV_PRIVATE 0.103.7 + cli_hashset_destroy@CLAMAV_PRIVATE 0.103.7 + cli_hashstream@CLAMAV_PRIVATE 0.103.7 + cli_hex2str@CLAMAV_PRIVATE 0.103.7 + cli_hex2ui@CLAMAV_PRIVATE 0.103.7 + cli_initroots@CLAMAV_PRIVATE 0.103.7 + cli_isnumber@CLAMAV_PRIVATE 0.103.7 + cli_js_destroy@CLAMAV_PRIVATE 0.103.7 + cli_js_init@CLAMAV_PRIVATE 0.103.7 + cli_js_output@CLAMAV_PRIVATE 0.103.7 + cli_js_parse_done@CLAMAV_PRIVATE 0.103.7 + cli_js_process_buffer@CLAMAV_PRIVATE 0.103.7 + cli_ldbtokenize@CLAMAV_PRIVATE 0.103.7 + cli_malloc@CLAMAV_PRIVATE 0.103.7 + cli_memstr@CLAMAV_PRIVATE 0.103.7 + cli_ole2_extract@CLAMAV_PRIVATE 0.103.7 + cli_parse_add@CLAMAV_PRIVATE 0.103.7 + cli_pcre_build@CLAMAV_PRIVATE 0.103.7 + cli_pcre_freeoff@CLAMAV_PRIVATE 0.103.7 + cli_pcre_init@CLAMAV_PRIVATE 0.103.7 + cli_pcre_perf_events_destroy@CLAMAV_PRIVATE 0.103.7 + cli_pcre_perf_print@CLAMAV_PRIVATE 0.103.7 + cli_pcre_recaloff@CLAMAV_PRIVATE 0.103.7 + cli_pcre_scanbuf@CLAMAV_PRIVATE 0.103.7 + cli_ppt_vba_read@CLAMAV_PRIVATE 0.103.7 + cli_printcxxver@CLAMAV_PRIVATE 0.103.7 + cli_readn@CLAMAV_PRIVATE 0.103.7 + cli_realloc@CLAMAV_PRIVATE 0.103.7 + cli_realpath@CLAMAV_PRIVATE 0.103.7 + cli_regcomp@CLAMAV_PRIVATE 0.103.7 + cli_regex2suffix@CLAMAV_PRIVATE 0.103.7 + cli_regexec@CLAMAV_PRIVATE 0.103.7 + cli_regfree@CLAMAV_PRIVATE 0.103.7 + cli_rmdirs@CLAMAV_PRIVATE 0.103.7 + cli_rndnum@CLAMAV_PRIVATE 0.103.7 + cli_sanitize_filepath@CLAMAV_PRIVATE 0.103.7 + cli_scan_buff@CLAMAV_PRIVATE 0.103.7 + cli_scan_fmap@CLAMAV_PRIVATE 0.103.7 + cli_sigopts_handler@CLAMAV_PRIVATE 0.103.7 + cli_sigperf_events_destroy@CLAMAV_PRIVATE 0.103.7 + cli_sigperf_print@CLAMAV_PRIVATE 0.103.7 + cli_str2hex@CLAMAV_PRIVATE 0.103.7 + cli_strbcasestr@CLAMAV_PRIVATE 0.103.7 + cli_strdup@CLAMAV_PRIVATE 0.103.7 + cli_strerror@CLAMAV_PRIVATE 0.103.7 + cli_strlcat@CLAMAV_PRIVATE 0.103.7 + cli_strlcpy@CLAMAV_PRIVATE 0.103.7 + cli_strntoul@CLAMAV_PRIVATE 0.103.7 + cli_strrcpy@CLAMAV_PRIVATE 0.103.7 + cli_strtok@CLAMAV_PRIVATE 0.103.7 + cli_strtokbuf@CLAMAV_PRIVATE 0.103.7 + cli_strtokenize@CLAMAV_PRIVATE 0.103.7 + cli_textbuffer_append_normalize@CLAMAV_PRIVATE 0.103.7 + cli_unescape@CLAMAV_PRIVATE 0.103.7 + cli_unlink@CLAMAV_PRIVATE 0.103.7 + cli_url_canon@CLAMAV_PRIVATE 0.103.7 + cli_utf16_to_utf8@CLAMAV_PRIVATE 0.103.7 + cli_utf16toascii@CLAMAV_PRIVATE 0.103.7 + cli_vba_inflate@CLAMAV_PRIVATE 0.103.7 + cli_vba_readdir@CLAMAV_PRIVATE 0.103.7 + cli_versig2@CLAMAV_PRIVATE 0.103.7 + cli_versig@CLAMAV_PRIVATE 0.103.7 + cli_warnmsg@CLAMAV_PRIVATE 0.103.7 + cli_wm_decrypt_macro@CLAMAV_PRIVATE 0.103.7 + cli_wm_readdir@CLAMAV_PRIVATE 0.103.7 + cli_writen@CLAMAV_PRIVATE 0.103.7 + decodeLine@CLAMAV_PRIVATE 0.103.7 + disasmbuf@CLAMAV_PRIVATE 0.103.7 + fmap@CLAMAV_PRIVATE 0.103.7 + fmap_dump_to_file@CLAMAV_PRIVATE 0.103.7 + fmap_duplicate@CLAMAV_PRIVATE 0.103.7 + free_duplicate_fmap@CLAMAV_PRIVATE 0.103.7 + get_fpu_endian@CLAMAV_PRIVATE 0.103.7 + have_clamjit@CLAMAV_PRIVATE 0.103.7 + have_rar@CLAMAV_PRIVATE 0.103.7 + html_normalise_map@CLAMAV_PRIVATE 0.103.7 + html_normalise_mem@CLAMAV_PRIVATE 0.103.7 + html_screnc_decode@CLAMAV_PRIVATE 0.103.7 + html_tag_arg_free@CLAMAV_PRIVATE 0.103.7 + init_domainlist@CLAMAV_PRIVATE 0.103.7 + init_regex_list@CLAMAV_PRIVATE 0.103.7 + init_whitelist@CLAMAV_PRIVATE 0.103.7 + is_regex_ok@CLAMAV_PRIVATE 0.103.7 + load_regex_matcher@CLAMAV_PRIVATE 0.103.7 lsig_sub_matched@CLAMAV_PUBLIC 0.101.0 - messageCreate@CLAMAV_PRIVATE 0.103.6 - messageDestroy@CLAMAV_PRIVATE 0.103.6 - mpool_calloc@CLAMAV_PRIVATE 0.103.6 - mpool_create@CLAMAV_PRIVATE 0.103.6 - mpool_destroy@CLAMAV_PRIVATE 0.103.6 - mpool_free@CLAMAV_PRIVATE 0.103.6 - mpool_getstats@CLAMAV_PRIVATE 0.103.6 - phishingScan@CLAMAV_PRIVATE 0.103.6 - phishing_done@CLAMAV_PRIVATE 0.103.6 - phishing_init@CLAMAV_PRIVATE 0.103.6 - regex_list_add_pattern@CLAMAV_PRIVATE 0.103.6 - regex_list_done@CLAMAV_PRIVATE 0.103.6 - regex_list_match@CLAMAV_PRIVATE 0.103.6 - tableCreate@CLAMAV_PRIVATE 0.103.6 - tableDestroy@CLAMAV_PRIVATE 0.103.6 - tableFind@CLAMAV_PRIVATE 0.103.6 - tableInsert@CLAMAV_PRIVATE 0.103.6 - tableIterate@CLAMAV_PRIVATE 0.103.6 - tableRemove@CLAMAV_PRIVATE 0.103.6 - tableUpdate@CLAMAV_PRIVATE 0.103.6 - text_normalize_init@CLAMAV_PRIVATE 0.103.6 - text_normalize_map@CLAMAV_PRIVATE 0.103.6 - text_normalize_reset@CLAMAV_PRIVATE 0.103.6 - uniq_add@CLAMAV_PRIVATE 0.103.6 - uniq_free@CLAMAV_PRIVATE 0.103.6 - uniq_get@CLAMAV_PRIVATE 0.103.6 - uniq_init@CLAMAV_PRIVATE 0.103.6 + messageCreate@CLAMAV_PRIVATE 0.103.7 + messageDestroy@CLAMAV_PRIVATE 0.103.7 + mpool_calloc@CLAMAV_PRIVATE 0.103.7 + mpool_create@CLAMAV_PRIVATE 0.103.7 + mpool_destroy@CLAMAV_PRIVATE 0.103.7 + mpool_free@CLAMAV_PRIVATE 0.103.7 + mpool_getstats@CLAMAV_PRIVATE 0.103.7 + phishingScan@CLAMAV_PRIVATE 0.103.7 + phishing_done@CLAMAV_PRIVATE 0.103.7 + phishing_init@CLAMAV_PRIVATE 0.103.7 + regex_list_add_pattern@CLAMAV_PRIVATE 0.103.7 + regex_list_done@CLAMAV_PRIVATE 0.103.7 + regex_list_match@CLAMAV_PRIVATE 0.103.7 + tableCreate@CLAMAV_PRIVATE 0.103.7 + tableDestroy@CLAMAV_PRIVATE 0.103.7 + tableFind@CLAMAV_PRIVATE 0.103.7 + tableInsert@CLAMAV_PRIVATE 0.103.7 + tableIterate@CLAMAV_PRIVATE 0.103.7 + tableRemove@CLAMAV_PRIVATE 0.103.7 + tableUpdate@CLAMAV_PRIVATE 0.103.7 + text_normalize_init@CLAMAV_PRIVATE 0.103.7 + text_normalize_map@CLAMAV_PRIVATE 0.103.7 + text_normalize_reset@CLAMAV_PRIVATE 0.103.7 + uniq_add@CLAMAV_PRIVATE 0.103.7 + uniq_free@CLAMAV_PRIVATE 0.103.7 + uniq_get@CLAMAV_PRIVATE 0.103.7 + uniq_init@CLAMAV_PRIVATE 0.103.7 libfreshclam.so.2 libclamav9 #MINVER# FRESHCLAM_PRIVATE@FRESHCLAM_PRIVATE 0.103.0 FRESHCLAM_PUBLIC@FRESHCLAM_PUBLIC 0.102.1 diff --git a/debian/patches/Add-support-for-LLVM-3.7.patch b/debian/patches/Add-support-for-LLVM-3.7.patch index ca734b6..c96e86a 100644 --- a/debian/patches/Add-support-for-LLVM-3.7.patch +++ b/debian/patches/Add-support-for-LLVM-3.7.patch @@ -1,4 +1,4 @@ -From 2d58c75f1f386b3adbd2fe28022522d45d04e8c6 Mon Sep 17 00:00:00 2001 +From 37bc5a950e181590ad7bdf2f82ae898ab221ce22 Mon Sep 17 00:00:00 2001 From: Andreas Cadhalpun <andreas.cadhal...@googlemail.com> Date: Fri, 14 Oct 2016 20:24:39 +0200 Subject: Add support for LLVM 3.7 diff --git a/debian/patches/Add-support-for-LLVM-3.8.patch b/debian/patches/Add-support-for-LLVM-3.8.patch index 57e54f7..0e7bb0c 100644 --- a/debian/patches/Add-support-for-LLVM-3.8.patch +++ b/debian/patches/Add-support-for-LLVM-3.8.patch @@ -1,4 +1,4 @@ -From fd59841c7269e0f0df27e9fe615de63ab8b05e0b Mon Sep 17 00:00:00 2001 +From d31322fab1bcab1cbfbff067d60fbafd366754f0 Mon Sep 17 00:00:00 2001 From: Andreas Cadhalpun <andreas.cadhal...@googlemail.com> Date: Fri, 14 Oct 2016 20:24:48 +0200 Subject: Add support for LLVM 3.8 diff --git a/debian/patches/Add-support-for-LLVM-3.9.patch b/debian/patches/Add-support-for-LLVM-3.9.patch index e945313..f363807 100644 --- a/debian/patches/Add-support-for-LLVM-3.9.patch +++ b/debian/patches/Add-support-for-LLVM-3.9.patch @@ -1,4 +1,4 @@ -From dbab766c81312b2a8cbd37258a5a3510c4e98085 Mon Sep 17 00:00:00 2001 +From f2466c7aaf6e140ea150e0f219c86594f3bc04cb Mon Sep 17 00:00:00 2001 From: Andreas Cadhalpun <andreas.cadhal...@googlemail.com> Date: Fri, 14 Oct 2016 20:24:56 +0200 Subject: Add support for LLVM 3.9 diff --git a/debian/patches/Change-paths-in-sample-conf-file-to-match-Debian.patch b/debian/patches/Change-paths-in-sample-conf-file-to-match-Debian.patch index f6eec47..a3caadc 100644 --- a/debian/patches/Change-paths-in-sample-conf-file-to-match-Debian.patch +++ b/debian/patches/Change-paths-in-sample-conf-file-to-match-Debian.patch @@ -1,4 +1,4 @@ -From cf08cd90568253de1932a8e125b00ff2ffc26e3a Mon Sep 17 00:00:00 2001 +From d2848f79496bd791bd6bbd2a36ac476152d39432 Mon Sep 17 00:00:00 2001 From: Scott Kitterman <sc...@kitterman.com> Date: Mon, 10 Mar 2014 19:20:18 -0400 Subject: Change paths in sample conf file to match Debian diff --git a/debian/patches/add-support-for-system-tomsfastmath.patch b/debian/patches/add-support-for-system-tomsfastmath.patch index cef95cd..83bf88f 100644 --- a/debian/patches/add-support-for-system-tomsfastmath.patch +++ b/debian/patches/add-support-for-system-tomsfastmath.patch @@ -1,4 +1,4 @@ -From 0827b641063cdca6a13cf4e4f6ea6f546ec327cb Mon Sep 17 00:00:00 2001 +From 39d775fad03362db330857fef23678f2c4d4c389 Mon Sep 17 00:00:00 2001 From: Andreas Cadhalpun <andreas.cadhal...@googlemail.com> Date: Wed, 11 Mar 2015 20:03:15 +0100 Subject: add support for system tomsfastmath @@ -14,7 +14,7 @@ Patch-Name: add-support-for-system-tomsfastmath.patch create mode 100644 m4/reorganization/libs/tomsfastmath.m4 diff --git a/configure.ac b/configure.ac -index d418ee9..9829ea3 100644 +index f58e4eb..561c4f9 100644 --- a/configure.ac +++ b/configure.ac @@ -98,6 +98,7 @@ m4_include([m4/reorganization/libs/libmspack.m4]) @@ -34,10 +34,10 @@ index d418ee9..9829ea3 100644 # Yep, downgrading the compiler avoids the bug too: # 4.0.x, and 4.1.0 are the known buggy versions diff --git a/libclamav/Makefile.am b/libclamav/Makefile.am -index 526ad56..7a5185e 100644 +index 14dd631..1f0c123 100644 --- a/libclamav/Makefile.am +++ b/libclamav/Makefile.am -@@ -588,6 +588,7 @@ libclamav_la_SOURCES += yara_arena.c \ +@@ -587,6 +587,7 @@ libclamav_la_SOURCES += yara_arena.c \ yara_clam.h endif @@ -45,7 +45,7 @@ index 526ad56..7a5185e 100644 libclamav_la_SOURCES += bignum.h\ bignum_fast.h\ tomsfastmath/addsub/fp_add.c\ -@@ -672,6 +673,11 @@ libclamav_la_SOURCES += bignum.h\ +@@ -671,6 +672,11 @@ libclamav_la_SOURCES += bignum.h\ tomsfastmath/sqr/fp_sqr_comba_small_set.c\ tomsfastmath/sqr/fp_sqrmod.c diff --git a/debian/patches/clamd_dont_depend_on_clamav_demon_socket.patch b/debian/patches/clamd_dont_depend_on_clamav_demon_socket.patch index f654718..67ad307 100644 --- a/debian/patches/clamd_dont_depend_on_clamav_demon_socket.patch +++ b/debian/patches/clamd_dont_depend_on_clamav_demon_socket.patch @@ -1,4 +1,4 @@ -From e9ff8d69c35916f759e726c02aadbd2cd5e68678 Mon Sep 17 00:00:00 2001 +From f3544ce92e1b0712d7fbaa6db5e868d6e79c7c0f Mon Sep 17 00:00:00 2001 From: Sebastian Andrzej Siewior <sebast...@breakpoint.cc> Date: Thu, 11 Aug 2016 21:54:10 +0200 Subject: clamd: don't depend on clamav-demon.socket diff --git a/debian/rules b/debian/rules index cf665f0..a13f873 100755 --- a/debian/rules +++ b/debian/rules @@ -88,7 +88,7 @@ endif fi;\ done; \ # Check for library features which may have been upgraded. - if ! grep -q "CL_FLEVEL 127" libclamav/others.h ; then \ + if ! grep -q "CL_FLEVEL 128" libclamav/others.h ; then \ echo "cl_retflevel needs boosting in symbol file"; \ touch debian/exit; \ fi; diff --git a/libclamav/Makefile.am b/libclamav/Makefile.am index 7a5185e..1f0c123 100644 --- a/libclamav/Makefile.am +++ b/libclamav/Makefile.am @@ -57,7 +57,6 @@ libclamunrar_la_SOURCES = \ ../libclamunrar/global.cpp \ ../libclamunrar/hash.cpp \ ../libclamunrar/headers.cpp \ - ../libclamunrar/isnt.cpp \ ../libclamunrar/list.cpp \ ../libclamunrar/match.cpp \ ../libclamunrar/options.cpp \ diff --git a/libclamav/Makefile.in b/libclamav/Makefile.in index acad10f..f2811d4 100644 --- a/libclamav/Makefile.in +++ b/libclamav/Makefile.in @@ -648,21 +648,20 @@ am__libclamunrar_la_SOURCES_DIST = ../libclamunrar/archive.cpp \ ../libclamunrar/filestr.cpp ../libclamunrar/find.cpp \ ../libclamunrar/getbits.cpp ../libclamunrar/global.cpp \ ../libclamunrar/hash.cpp ../libclamunrar/headers.cpp \ - ../libclamunrar/isnt.cpp ../libclamunrar/list.cpp \ - ../libclamunrar/match.cpp ../libclamunrar/options.cpp \ - ../libclamunrar/pathfn.cpp ../libclamunrar/qopen.cpp \ - ../libclamunrar/rar.cpp ../libclamunrar/rarvm.cpp \ - ../libclamunrar/rawread.cpp ../libclamunrar/rdwrfn.cpp \ - ../libclamunrar/recvol.cpp ../libclamunrar/resource.cpp \ - ../libclamunrar/rijndael.cpp ../libclamunrar/rs.cpp \ - ../libclamunrar/rs16.cpp ../libclamunrar/scantree.cpp \ - ../libclamunrar/secpassword.cpp ../libclamunrar/sha1.cpp \ - ../libclamunrar/sha256.cpp ../libclamunrar/smallfn.cpp \ - ../libclamunrar/strfn.cpp ../libclamunrar/strlist.cpp \ - ../libclamunrar/system.cpp ../libclamunrar/threadpool.cpp \ - ../libclamunrar/timefn.cpp ../libclamunrar/ui.cpp \ - ../libclamunrar/unicode.cpp ../libclamunrar/unpack.cpp \ - ../libclamunrar/volume.cpp + ../libclamunrar/list.cpp ../libclamunrar/match.cpp \ + ../libclamunrar/options.cpp ../libclamunrar/pathfn.cpp \ + ../libclamunrar/qopen.cpp ../libclamunrar/rar.cpp \ + ../libclamunrar/rarvm.cpp ../libclamunrar/rawread.cpp \ + ../libclamunrar/rdwrfn.cpp ../libclamunrar/recvol.cpp \ + ../libclamunrar/resource.cpp ../libclamunrar/rijndael.cpp \ + ../libclamunrar/rs.cpp ../libclamunrar/rs16.cpp \ + ../libclamunrar/scantree.cpp ../libclamunrar/secpassword.cpp \ + ../libclamunrar/sha1.cpp ../libclamunrar/sha256.cpp \ + ../libclamunrar/smallfn.cpp ../libclamunrar/strfn.cpp \ + ../libclamunrar/strlist.cpp ../libclamunrar/system.cpp \ + ../libclamunrar/threadpool.cpp ../libclamunrar/timefn.cpp \ + ../libclamunrar/ui.cpp ../libclamunrar/unicode.cpp \ + ../libclamunrar/unpack.cpp ../libclamunrar/volume.cpp @ENABLE_UNRAR_TRUE@am_libclamunrar_la_OBJECTS = \ @ENABLE_UNRAR_TRUE@ ../libclamunrar/libclamunrar_la-archive.lo \ @ENABLE_UNRAR_TRUE@ ../libclamunrar/libclamunrar_la-arcread.lo \ @@ -685,7 +684,6 @@ am__libclamunrar_la_SOURCES_DIST = ../libclamunrar/archive.cpp \ @ENABLE_UNRAR_TRUE@ ../libclamunrar/libclamunrar_la-global.lo \ @ENABLE_UNRAR_TRUE@ ../libclamunrar/libclamunrar_la-hash.lo \ @ENABLE_UNRAR_TRUE@ ../libclamunrar/libclamunrar_la-headers.lo \ -@ENABLE_UNRAR_TRUE@ ../libclamunrar/libclamunrar_la-isnt.lo \ @ENABLE_UNRAR_TRUE@ ../libclamunrar/libclamunrar_la-list.lo \ @ENABLE_UNRAR_TRUE@ ../libclamunrar/libclamunrar_la-match.lo \ @ENABLE_UNRAR_TRUE@ ../libclamunrar/libclamunrar_la-options.lo \ @@ -1184,7 +1182,6 @@ EXTRA_DIST = c++/Makefile.nollvm.in $(am__append_4) regex/engine.c \ @ENABLE_UNRAR_TRUE@ ../libclamunrar/global.cpp \ @ENABLE_UNRAR_TRUE@ ../libclamunrar/hash.cpp \ @ENABLE_UNRAR_TRUE@ ../libclamunrar/headers.cpp \ -@ENABLE_UNRAR_TRUE@ ../libclamunrar/isnt.cpp \ @ENABLE_UNRAR_TRUE@ ../libclamunrar/list.cpp \ @ENABLE_UNRAR_TRUE@ ../libclamunrar/match.cpp \ @ENABLE_UNRAR_TRUE@ ../libclamunrar/options.cpp \ @@ -2091,9 +2088,6 @@ libclammspack.la: $(libclammspack_la_OBJECTS) $(libclammspack_la_DEPENDENCIES) $ ../libclamunrar/libclamunrar_la-headers.lo: \ ../libclamunrar/$(am__dirstamp) \ ../libclamunrar/$(DEPDIR)/$(am__dirstamp) -../libclamunrar/libclamunrar_la-isnt.lo: \ - ../libclamunrar/$(am__dirstamp) \ - ../libclamunrar/$(DEPDIR)/$(am__dirstamp) ../libclamunrar/libclamunrar_la-list.lo: \ ../libclamunrar/$(am__dirstamp) \ ../libclamunrar/$(DEPDIR)/$(am__dirstamp) @@ -2279,7 +2273,6 @@ libclamunrar_iface.la: $(libclamunrar_iface_la_OBJECTS) $(libclamunrar_iface_la_ @AMDEP_TRUE@@am__include@ @am__quote@../libclamunrar/$(DEPDIR)/libclamunrar_la-global.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../libclamunrar/$(DEPDIR)/libclamunrar_la-hash.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../libclamunrar/$(DEPDIR)/libclamunrar_la-headers.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@../libclamunrar/$(DEPDIR)/libclamunrar_la-isnt.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../libclamunrar/$(DEPDIR)/libclamunrar_la-list.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../libclamunrar/$(DEPDIR)/libclamunrar_la-match.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../libclamunrar/$(DEPDIR)/libclamunrar_la-options.Plo@am__quote@ @@ -4659,13 +4652,6 @@ libclamav_nocxx_la-bytecode_nojit.lo: bytecode_nojit.c @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamunrar_la_CXXFLAGS) $(CXXFLAGS) -c -o ../libclamunrar/libclamunrar_la-headers.lo `test -f '../libclamunrar/headers.cpp' || echo '$(srcdir)/'`../libclamunrar/headers.cpp -../libclamunrar/libclamunrar_la-isnt.lo: ../libclamunrar/isnt.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamunrar_la_CXXFLAGS) $(CXXFLAGS) -MT ../libclamunrar/libclamunrar_la-isnt.lo -MD -MP -MF ../libclamunrar/$(DEPDIR)/libclamunrar_la-isnt.Tpo -c -o ../libclamunrar/libclamunrar_la-isnt.lo `test -f '../libclamunrar/isnt.cpp' || echo '$(srcdir)/'`../libclamunrar/isnt.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ../libclamunrar/$(DEPDIR)/libclamunrar_la-isnt.Tpo ../libclamunrar/$(DEPDIR)/libclamunrar_la-isnt.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='../libclamunrar/isnt.cpp' object='../libclamunrar/libclamunrar_la-isnt.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamunrar_la_CXXFLAGS) $(CXXFLAGS) -c -o ../libclamunrar/libclamunrar_la-isnt.lo `test -f '../libclamunrar/isnt.cpp' || echo '$(srcdir)/'`../libclamunrar/isnt.cpp - ../libclamunrar/libclamunrar_la-list.lo: ../libclamunrar/list.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamunrar_la_CXXFLAGS) $(CXXFLAGS) -MT ../libclamunrar/libclamunrar_la-list.lo -MD -MP -MF ../libclamunrar/$(DEPDIR)/libclamunrar_la-list.Tpo -c -o ../libclamunrar/libclamunrar_la-list.lo `test -f '../libclamunrar/list.cpp' || echo '$(srcdir)/'`../libclamunrar/list.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ../libclamunrar/$(DEPDIR)/libclamunrar_la-list.Tpo ../libclamunrar/$(DEPDIR)/libclamunrar_la-list.Plo diff --git a/libclamav/bytecode_api.h b/libclamav/bytecode_api.h index 1255d34..0296dde 100644 --- a/libclamav/bytecode_api.h +++ b/libclamav/bytecode_api.h @@ -152,6 +152,7 @@ enum FunctionalityLevels { FUNC_LEVEL_0103_4 = 125, /**< LibClamAV release 0.103.4 */ FUNC_LEVEL_0103_5 = 126, /**< LibClamAV release 0.103.5 */ FUNC_LEVEL_0103_6 = 127, /**< LibClamAV release 0.103.6 */ + FUNC_LEVEL_0103_7 = 128, /**< LibClamAV release 0.103.7 */ }; /** diff --git a/libclamav/matcher.c b/libclamav/matcher.c index c64e34c..9a87899 100644 --- a/libclamav/matcher.c +++ b/libclamav/matcher.c @@ -791,7 +791,9 @@ cl_error_t cli_scan_desc(int desc, cli_ctx *ctx, cli_file_t ftype, uint8_t ftonl static int intermediates_eval(cli_ctx *ctx, struct cli_ac_lsig *ac_lsig) { uint32_t i, icnt = ac_lsig->tdb.intermediates[0]; - int32_t j = -1; + + // -1 is the deepest layer (the current layer), so we start at -2, which is the first ancestor + int32_t j = -2; if (ctx->recursion_level < icnt) return 0; diff --git a/libclamav/others.h b/libclamav/others.h index b75c020..71daf55 100644 --- a/libclamav/others.h +++ b/libclamav/others.h @@ -73,7 +73,7 @@ * in re-enabling affected modules. */ -#define CL_FLEVEL 127 +#define CL_FLEVEL 128 #define CL_FLEVEL_DCONF CL_FLEVEL #define CL_FLEVEL_SIGTOOL CL_FLEVEL diff --git a/libclamav/unzip.c b/libclamav/unzip.c index 0efd18f..2ac1b7f 100644 --- a/libclamav/unzip.c +++ b/libclamav/unzip.c @@ -62,6 +62,10 @@ #define ZIP_MAGIC_FILE_BEGIN_SPLIT_OR_SPANNED (0x08074b50) // clang-format on +// Non-malicious zips in enterprise critical JAR-ZIPs have been observed with a 1-byte overlap. +// The goal with overlap detection is to alert on non-recursive zip bombs, so this tiny overlap isn't a concern. +// We'll allow a 2-byte overlap so we don't alert on such zips. +#define ZIP_RECORD_OVERLAP_FUDGE_FACTOR 2 #define ZIP_MAX_NUM_OVERLAPPING_FILES 5 #define ZIP_CRC32(r, c, b, l) \ @@ -1098,16 +1102,24 @@ cl_error_t index_the_central_directory( prev_record = &(zip_catalogue[index - 1]); curr_record = &(zip_catalogue[index]); + uint32_t prev_record_size = prev_record->local_header_size + prev_record->compressed_size; + uint32_t curr_record_size = curr_record->local_header_size + curr_record->compressed_size; + uint32_t prev_record_end; + uint32_t curr_record_end; + /* Check for integer overflow in 32bit size & offset values */ - if ((UINT32_MAX - (prev_record->local_header_size + prev_record->compressed_size) < prev_record->local_header_offset) || - (UINT32_MAX - (curr_record->local_header_size + curr_record->compressed_size) < curr_record->local_header_offset)) { + if ((UINT32_MAX - prev_record_size < prev_record->local_header_offset) || + (UINT32_MAX - curr_record_size < curr_record->local_header_offset)) { cli_dbgmsg("cli_unzip: Integer overflow detected; invalid data sizes in zip file headers.\n"); status = CL_EFORMAT; goto done; } - if (((curr_record->local_header_offset >= prev_record->local_header_offset) && (curr_record->local_header_offset < prev_record->local_header_offset + prev_record->local_header_size + prev_record->compressed_size)) || - ((prev_record->local_header_offset >= curr_record->local_header_offset) && (prev_record->local_header_offset < curr_record->local_header_offset + curr_record->local_header_size + curr_record->compressed_size))) { + prev_record_end = prev_record->local_header_offset + prev_record_size; + curr_record_end = curr_record->local_header_offset + curr_record_size; + + if (((curr_record->local_header_offset >= prev_record->local_header_offset) && (curr_record->local_header_offset + ZIP_RECORD_OVERLAP_FUDGE_FACTOR < prev_record_end)) || + ((prev_record->local_header_offset >= curr_record->local_header_offset) && (prev_record->local_header_offset + ZIP_RECORD_OVERLAP_FUDGE_FACTOR < curr_record_end))) { /* Overlapping file detected */ num_overlapping_files++; @@ -1117,7 +1129,7 @@ cl_error_t index_the_central_directory( cli_dbgmsg("cli_unzip: Ignoring duplicate file entry @ 0x%x.\n", curr_record->local_header_offset); } else { cli_dbgmsg("cli_unzip: Overlapping files detected.\n"); - cli_dbgmsg(" previous file end: %u\n", prev_record->local_header_offset + prev_record->local_header_size + prev_record->compressed_size); + cli_dbgmsg(" previous file end: %u\n", prev_record_end); cli_dbgmsg(" current file start: %u\n", curr_record->local_header_offset); if (ZIP_MAX_NUM_OVERLAPPING_FILES < num_overlapping_files) { diff --git a/libclamav/version.h b/libclamav/version.h index ef73eee..8a4b283 100644 --- a/libclamav/version.h +++ b/libclamav/version.h @@ -1 +1 @@ -#define REPO_VERSION "devel-a92fbc754" +#define REPO_VERSION "devel-11aaa24dd" diff --git a/m4/reorganization/version.m4 b/m4/reorganization/version.m4 index 31d3ba7..8d66596 100644 --- a/m4/reorganization/version.m4 +++ b/m4/reorganization/version.m4 @@ -3,7 +3,7 @@ dnl During active development, set: VERSION="<version>-devel-`date +%Y%m%d`" dnl For beta, set: VERSION="<version>-beta" dnl For release candidate, set: VERSION="<version>-rc" dnl For release, set: VERSION="<version>" -VERSION="0.103.6" +VERSION="0.103.7" major=`echo $PACKAGE_VERSION |cut -d. -f1 | sed -e "s/[^0-9]//g"` minor=`echo $PACKAGE_VERSION |cut -d. -f2 | sed -e "s/[^0-9]//g"`