Updated bundled providers: ClamAV, Freetype, PNG, XML, LZO, UTF, ZLIB.

19 files changed, 62 insertions, 33 deletions

diff --git a/dev/scripts/builders/build.lib.params.sh b/dev/scripts/builders/build.lib.params.sh
index ab530788..5e24760d 100644
--- a/dev/scripts/builders/build.lib.params.sh
+++ b/dev/scripts/builders/build.lib.params.sh
@@ -1,32 +1,32 @@
 #!/bin/bash
 
 GD="gd-2.0.35"
-LZO="lzo-2.09"
-PNG="libpng-1.6.23"
+LZO="lzo-2.10"
+PNG="libpng-1.6.29"
 CURL="curl-7.23.1"
 SPF2="libspf2-1.2.10"
-XML2="libxml2-2.9.1"
+XML2="libxml2-2.9.3"
 DKIM="opendkim-2.10.3"
-ZLIB="zlib-1.2.8"
+ZLIB="zlib-1.2.11"
 JPEG="jpeg-9b"
 BZIP2="bzip2-1.0.6"
 DSPAM="dspam-3.10.2"
 MYSQL="mysql-5.1.73"
 GEOIP="GeoIP-1.4.8"
-CLAMAV="clamav-0.98.4"
+CLAMAV="clamav-0.99.2"
 CHECKER="check-0.11.0"
 OPENSSL="openssl-1.0.2l"
 GOOGTAP="gtest-tap-listener-0.5"
 GOOGTEST="googletest-release-1.7.0"
 JANSSON="jansson-2.2.1"
-UTF8PROC="utf8proc-2.0.1"
-FREETYPE="freetype-2.6.3"
+UTF8PROC="utf8proc-2.1.0"
+FREETYPE="freetype-2.6.5"
 MEMCACHED="libmemcached-1.0.18"
 TOKYOCABINET="tokyocabinet-1.4.48"
 
 XMLTS="xmlts20130923"
-XML2TEST="libxml2-tests-2.9.0"
-UTF8PROCTEST="utf8proc-data-2.0.1"
+XML2TEST="libxml2-tests-2.9.3"
+UTF8PROCTEST="utf8proc-data-2.1.0"
 
 M_SO="$M_PROJECT_ROOT/magmad.so"
 M_LOGS="$M_ROOT/logs"
diff --git a/dev/scripts/builders/build.lib.sh b/dev/scripts/builders/build.lib.sh
index b308624b..01a82942 100755
--- a/dev/scripts/builders/build.lib.sh
+++ b/dev/scripts/builders/build.lib.sh
@@ -1112,7 +1112,10 @@ clamav() {
 				cat "$M_PATCHES/clamav/"shutdown_rarload_0984.patch | patch -p1 --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 --verbose &>> "$M_LOGS/clamav.txt"; error 
+				
+				# Fix the zlib version check, so that 1.2.10+ doesn't trigger a spurious error.
+				cat "$M_PATCHES/clamav/"zlib_check_0992.patch | patch -p1 --verbose &>> "$M_LOGS/clamav.txt"; error
 			fi
 
 			# Fix reference conflict with libpng over the filename png.h.
@@ -1124,38 +1127,48 @@ clamav() {
 		;;
 		clamav-build)
 			cd "$M_SOURCES/clamav"; error
-			export CFLAGS="-fPIC -g3 -rdynamic -D_FORTIFY_SOURCE=2 -O2 -DGNU_SOURCE"
-			export CXXFLAGS="-fPIC -g3 -rdynamic -D_FORTIFY_SOURCE=2 -O2 -DGNU_SOURCE"
-			export CPPFLAGS="-fPIC -g3 -rdynamic -D_FORTIFY_SOURCE=2 -O2 -DGNU_SOURCE"
-			export CPPFLAGS="$CPPFLAGS \
-				-I$M_SOURCES/curl/include \
-				-I$M_SOURCES/openssl/include \
-				-I$M_SOURCES/zlib"
-			export LDFLAGS="\
-				-L$M_SOURCES/curl/lib -Wl,-rpath,$M_SOURCES/curl/lib\
-				-L$M_SOURCES/openssl -Wl,-rpath,$M_SOURCES/openssl\
-				-L$M_SOURCES/zlib -Wl,-rpath,$M_SOURCES/zlib"
-
-			# Note that at least in version 0.97 and 0.98, --disable-llvm breaks the unit tests.
-
-			./configure  \
-				--disable-llvm --with--disable-xml --enable-check --enable-static --disable-silent-rules --disable-libcurl \
-				--with-openssl="$M_SOURCES/openssl" --with-zlib="$M_SOURCES/zlib" --with-libcheck-prefix="$M_LOCAL" \
-				--with-libbz2-prefix="$M_SOURCES/bzip2" --prefix="$M_LOCAL"  --exec-prefix="$M_LOCAL"  --libdir="$M_LOCAL/lib" \
-				&>> "$M_LOGS/clamav.txt"; error
-
+			export CFLAGS="-fPIC -g3 -rdynamic -D_FORTIFY_SOURCE=2 -DGNU_SOURCE -I$M_LOCAL/include"
+			export CXXFLAGS="-fPIC -g3 -rdynamic -D_FORTIFY_SOURCE=2 -DGNU_SOURCE -I$M_LOCAL/include"
+			export CPPFLAGS="-fPIC -g3 -rdynamic -D_FORTIFY_SOURCE=2 -DGNU_SOURCE -I$M_LOCAL/include"
+			export LDFLAGS="-L$M_LOCAL/lib -Wl,-rpath,$M_LOCAL/lib"
+
+			# Note that at least in version 0.97 and 0.98, --disable-llvm breaks the unit tests. And with ClamAV 0.98.4
+			# Zlib 1.2.11 is mistaken for Zlib 1.2.1 and thus triggers an invalid security complaint.  
+#			if [[ $CLAMAV =~ "clamav-0.99."[0-9] ]]; then # 
+#				./configure  \
+#					--enable-check --enable-static --disable-yara --disable-mempool --disable-llvm --disable-zlib-vcheck \
+#					--with-openssl="$M_LOCAL" --with-zlib="$M_LOCAL" --with-xml="$M_LOCAL" --with-libcurl="$M_LOCAL" \
+#					--with-libbz2-prefix="$M_LOCAL" --with-libcheck-prefix="$M_LOCAL" \
+#					--prefix="$M_LOCAL" --exec-prefix="$M_LOCAL" --libdir="$M_LOCAL/lib" \
+#					&>> "$M_LOGS/clamav.txt"; error
+					
+#					--with-libcheck-prefix="$M_LOCAL" 
+				./configure  \
+					--enable-static --enable-shared --disable-check --disable-mempool --disable-llvm --disable-silent-rules \
+					--with-openssl="$M_LOCAL" --with-zlib="$M_LOCAL" --with-xml="$M_LOCAL" --with-libcurl="$M_LOCAL" \
+					--with-libbz2-prefix="$M_LOCAL"  \
+					--prefix="$M_LOCAL" --exec-prefix="$M_LOCAL" --libdir="$M_LOCAL/lib" \
+					&>> "$M_LOGS/clamav.txt"; error
+#			else 
+#				./configure  \
+#					--disable-llvm --with--disable-xml --enable-check --enable-static --disable-silent-rules --disable-libcurl \
+#					--with-openssl="$M_SOURCES/openssl" --with-zlib="$M_SOURCES/zlib" --with-libcheck-prefix="$M_LOCAL" \
+#					--with-libbz2-prefix="$M_SOURCES/bzip2" --prefix="$M_LOCAL"  --exec-prefix="$M_LOCAL"  --libdir="$M_LOCAL/lib" \
+#					&>> "$M_LOGS/clamav.txt"; error
+#				
+#			fi
 			unset CFLAGS; unset CXXFLAGS; unset CPPFLAGS
 
-			if [[ $CLAMAV =~ "clamav-0.9"[7-8]"."[1-9] ]]; then
+			if [[ $CLAMAV =~ "clamav-0.9"[7-9]"."[1-9] ]]; then
 				# The check3_clamd.sh script will fail if LLVM is disabled.
-				# Since were not currently using clamd, the offending check script is replaced.
+				# Since we are not currently using clamd, the offending check script is replaced.
 				# The exit value 77 indicates the check was skipped.
 				printf "\x23\x21/bin/bash\nexit 77\n" > "$M_SOURCES/clamav/unit_tests/check2_clamd.sh"; error
 				printf "\x23\x21/bin/bash\nexit 77\n" > "$M_SOURCES/clamav/unit_tests/check3_clamd.sh"; error
 				printf "\x23\x21/bin/bash\nexit 77\n" > "$M_SOURCES/clamav/unit_tests/check4_clamd.sh"; error
 			fi
 
-			make --jobs=4 &>> "$M_LOGS/clamav.txt"; error
+			make &>> "$M_LOGS/clamav.txt"; error
 			make install &>> "$M_LOGS/clamav.txt"; error
 		;;
 		clamav-check)
diff --git a/lib/archives/clamav-0.98.4.tar.gz b/lib/archives/clamav-0.99.2.tar.gz
index 5bdbb103..6eefaab5 100644
--- a/lib/archives/clamav-0.98.4.tar.gz
+++ b/lib/archives/clamav-0.99.2.tar.gz
diff --git a/lib/archives/freetype-2.6.3.tar.gz b/lib/archives/freetype-2.6.3.tar.gz
deleted file mode 100644
index d70da109..00000000
--- a/lib/archives/freetype-2.6.3.tar.gz
+++ /dev/null
diff --git a/lib/archives/freetype-2.6.5.tar.gz b/lib/archives/freetype-2.6.5.tar.gz
new file mode 100644
index 00000000..855cc519
--- /dev/null
+++ b/lib/archives/freetype-2.6.5.tar.gz
diff --git a/lib/archives/libpng-1.6.23.tar.gz b/lib/archives/libpng-1.6.23.tar.gz
deleted file mode 100644
index 19054acf..00000000
--- a/lib/archives/libpng-1.6.23.tar.gz
+++ /dev/null
diff --git a/lib/archives/libpng-1.6.29.tar.gz b/lib/archives/libpng-1.6.29.tar.gz
new file mode 100644
index 00000000..f781cc3d
--- /dev/null
+++ b/lib/archives/libpng-1.6.29.tar.gz
diff --git a/lib/archives/libxml2-2.9.1.tar.gz b/lib/archives/libxml2-2.9.1.tar.gz
deleted file mode 100644
index 7be13295..00000000
--- a/lib/archives/libxml2-2.9.1.tar.gz
+++ /dev/null
diff --git a/lib/archives/libxml2-2.9.3.tar.gz b/lib/archives/libxml2-2.9.3.tar.gz
new file mode 100644
index 00000000..5b5ff1b6
--- /dev/null
+++ b/lib/archives/libxml2-2.9.3.tar.gz
diff --git a/lib/archives/libxml2-tests-2.9.0.tar.gz b/lib/archives/libxml2-tests-2.9.0.tar.gz
deleted file mode 100644
index 236f7aab..00000000
--- a/lib/archives/libxml2-tests-2.9.0.tar.gz
+++ /dev/null
diff --git a/lib/archives/libxml2-tests-2.9.3.tar.gz b/lib/archives/libxml2-tests-2.9.3.tar.gz
new file mode 100644
index 00000000..02bf8565
--- /dev/null
+++ b/lib/archives/libxml2-tests-2.9.3.tar.gz
diff --git a/lib/archives/lzo-2.09.tar.gz b/lib/archives/lzo-2.09.tar.gz
deleted file mode 100644
index 80299d00..00000000
--- a/lib/archives/lzo-2.09.tar.gz
+++ /dev/null
diff --git a/lib/archives/lzo-2.10.tar.gz b/lib/archives/lzo-2.10.tar.gz
new file mode 100644
index 00000000..f3790583
--- /dev/null
+++ b/lib/archives/lzo-2.10.tar.gz
diff --git a/lib/archives/utf8proc-2.0.1.tar.gz b/lib/archives/utf8proc-2.0.1.tar.gz
deleted file mode 100644
index 867bddd5..00000000
--- a/lib/archives/utf8proc-2.0.1.tar.gz
+++ /dev/null
diff --git a/lib/archives/utf8proc-2.1.0.tar.gz b/lib/archives/utf8proc-2.1.0.tar.gz
new file mode 100644
index 00000000..db25ee83
--- /dev/null
+++ b/lib/archives/utf8proc-2.1.0.tar.gz
diff --git a/lib/archives/utf8proc-data-2.0.1.tar.gz b/lib/archives/utf8proc-data-2.1.0.tar.gz
index bbc2d707..f942def1 100644
--- a/lib/archives/utf8proc-data-2.0.1.tar.gz
+++ b/lib/archives/utf8proc-data-2.1.0.tar.gz
diff --git a/lib/archives/zlib-1.2.11.tar.gz b/lib/archives/zlib-1.2.11.tar.gz
new file mode 100644
index 00000000..7e75a8b8
--- /dev/null
+++ b/lib/archives/zlib-1.2.11.tar.gz
diff --git a/lib/archives/zlib-1.2.8.tar.gz b/lib/archives/zlib-1.2.8.tar.gz
deleted file mode 100644
index ed88885b..00000000
--- a/lib/archives/zlib-1.2.8.tar.gz
+++ /dev/null
diff --git a/lib/patches/clamav/zlib_check_0992.patch b/lib/patches/clamav/zlib_check_0992.patch
new file mode 100644
index 00000000..be0cd635
--- /dev/null
+++ b/lib/patches/clamav/zlib_check_0992.patch
@@ -0,0 +1,16 @@
+diff --git a/configure b/configure
+index 9bcd60b..5efad0d 100755
+--- a/configure
++++ b/configure
+@@ -18716,9 +18716,9 @@ then
+     as_fn_error $? "Please install zlib and zlib-devel packages" "$LINENO" 5
+ else
+ 
+-    vuln=`grep "ZLIB_VERSION \"1.2.0" $ZLIB_HOME/include/zlib.h`
++    vuln=`grep "ZLIB_VERSION \"1.2.0\"" $ZLIB_HOME/include/zlib.h`
+     if test -z "$vuln"; then
+-	vuln=`grep "ZLIB_VERSION \"1.2.1" $ZLIB_HOME/include/zlib.h`
++	vuln=`grep "ZLIB_VERSION \"1.2.1\"" $ZLIB_HOME/include/zlib.h`
+     fi
+ 
+     if test -n "$vuln"; then