diff options
| -rw-r--r-- | dev/scripts/builders/build.lib.params.sh | 5 | ||||
| -rwxr-xr-x | dev/scripts/builders/build.lib.sh | 16 | ||||
| -rw-r--r-- | lib/archives/clamav-0.103.6.tar.gz | bin | 0 -> 16491761 bytes | |||
| -rw-r--r-- | lib/archives/clamav-0.105.0.tar.gz | bin | 0 -> 28765652 bytes |
4 files changed, 10 insertions, 11 deletions
diff --git a/dev/scripts/builders/build.lib.params.sh b/dev/scripts/builders/build.lib.params.sh index b48c4882..11a12320 100644 --- a/dev/scripts/builders/build.lib.params.sh +++ b/dev/scripts/builders/build.lib.params.sh @@ -13,9 +13,8 @@ PCRE="pcre2-10.31" BZIP2="bzip2-1.0.8" DSPAM="dspam-3.10.2" GEOIP="GeoIP-1.4.8" -#CLAMAV="clamav-0.104.2" -CLAMAV="clamav-0.103.5" -#CLAMAV="clamav-0.102.3" +#CLAMAV="clamav-0.105.0" +CLAMAV="clamav-0.103.6" MARIADB="mariadb-connector-c-2.3.7" CHECKER="check-0.11.0" OPENSSL="openssl-1.0.2u" diff --git a/dev/scripts/builders/build.lib.sh b/dev/scripts/builders/build.lib.sh index 45c3f721..ebccba62 100755 --- a/dev/scripts/builders/build.lib.sh +++ b/dev/scripts/builders/build.lib.sh @@ -1328,29 +1328,29 @@ clamav() { # Output the version number and not the git commit hash. cat "$M_PATCHES/clamav/"version_0984.patch | patch -p1 --verbose &>> "$M_LOGS/clamav.txt"; error - elif [[ $CLAMAV =~ "clamav-0.103.5" ]]; then + elif [[ $CLAMAV =~ ^clamav-0.103.[5-6]$ ]]; then # Add the shutdown and clean up functions and fix the rar library dynamic loading logic. - cat "$M_PATCHES/clamav/"shutdown_rarload_01035.patch | patch -p1 --verbose &>> "$M_LOGS/clamav.txt"; error + cat "$M_PATCHES/clamav/"shutdown_rarload_01035.patch | patch -p1 --fuzz=100 --verbose &>> "$M_LOGS/clamav.txt"; error # Add the ability to dictate the CA bundle file location when running freshclam. - cat "$M_PATCHES/clamav/"freshclam_cafile_option_01035.patch | patch -p1 --verbose &>> "$M_LOGS/clamav.txt"; error + cat "$M_PATCHES/clamav/"freshclam_cafile_option_01035.patch | patch -p1 --fuzz=100 --verbose &>> "$M_LOGS/clamav.txt"; error # Output the version number and not the git commit hash. - cat "$M_PATCHES/clamav/"version_0984.patch | patch -p1 --verbose &>> "$M_LOGS/clamav.txt"; error + cat "$M_PATCHES/clamav/"version_0984.patch | patch -p1 --fuzz=100 --verbose &>> "$M_LOGS/clamav.txt"; error # Fixes pattern matching and logic bugs in the clamd unit test, so we avoid check failures on some the affected platforms. - cat "$M_PATCHES/clamav/"check_clamd_fixes_01035.patch | patch -p1 --verbose &>> "$M_LOGS/clamav.txt"; error + cat "$M_PATCHES/clamav/"check_clamd_fixes_01035.patch | patch -p1 --fuzz=100 --verbose &>> "$M_LOGS/clamav.txt"; error # Applied to most recent version. else # Add the shutdown and clean up functions and fix the rar library dynamic loading logic. - cat "$M_PATCHES/clamav/"shutdown_rarload_01042.patch | patch -p1 --verbose &>> "$M_LOGS/clamav.txt"; error + cat "$M_PATCHES/clamav/"shutdown_rarload_01042.patch | patch -p1 --fuzz=100 --verbose &>> "$M_LOGS/clamav.txt"; error # Add the ability to dictate the CA bundle file location when running freshclam. - cat "$M_PATCHES/clamav/"freshclam_cafile_option_01042.patch | patch -p1 --verbose &>> "$M_LOGS/clamav.txt"; error + cat "$M_PATCHES/clamav/"freshclam_cafile_option_01042.patch | patch -p1 --fuzz=100 --verbose &>> "$M_LOGS/clamav.txt"; error # Output the version number and not the git commit hash. - cat "$M_PATCHES/clamav/"version_0984.patch | patch -p1 --verbose &>> "$M_LOGS/clamav.txt"; error + cat "$M_PATCHES/clamav/"version_0984.patch | patch -p1 --fuzz=100 --verbose &>> "$M_LOGS/clamav.txt"; error # These fixes may not be required with 0.104.2. # Fixes pattern matching and logic bugs in the clamd unit test, so we avoid check failures on some the affected platforms. diff --git a/lib/archives/clamav-0.103.6.tar.gz b/lib/archives/clamav-0.103.6.tar.gz Binary files differnew file mode 100644 index 00000000..385c5779 --- /dev/null +++ b/lib/archives/clamav-0.103.6.tar.gz diff --git a/lib/archives/clamav-0.105.0.tar.gz b/lib/archives/clamav-0.105.0.tar.gz Binary files differnew file mode 100644 index 00000000..2f93d6bf --- /dev/null +++ b/lib/archives/clamav-0.105.0.tar.gz |