Updated the bundled cURL, Freetype, JPEG, PNG, and libxml2 libraries.

14 files changed, 14 insertions, 14 deletions

diff --git a/dev/scripts/builders/build.lib.params.sh b/dev/scripts/builders/build.lib.params.sh
index 6ddfc147..fb07d7f2 100644
--- a/dev/scripts/builders/build.lib.params.sh
+++ b/dev/scripts/builders/build.lib.params.sh
@@ -2,13 +2,13 @@
 
 GD="libgd-2.2.5"
 LZO="lzo-2.10"
-PNG="libpng-1.6.35"
-CURL="curl-7.23.1"
+PNG="libpng-1.6.37"
+CURL="curl-7.70.0"
 SPF2="libspf2-1.2.10"
-XML2="libxml2-2.9.3"
+XML2="libxml2-2.9.10"
 DKIM="opendkim-2.10.3"
 ZLIB="zlib-1.2.11"
-JPEG="jpeg-9c"
+JPEG="jpeg-9d"
 PCRE="pcre2-10.31"
 BZIP2="bzip2-1.0.8"
 DSPAM="dspam-3.10.2"
@@ -21,12 +21,12 @@ GOOGTAP="gtest-tap-listener-0.5"
 GOOGTEST="googletest-release-1.7.0"
 JANSSON="jansson-2.2.1"
 UTF8PROC="utf8proc-2.5.0"
-FREETYPE="freetype-2.9.1"
+FREETYPE="freetype-2.10.2"
 MEMCACHED="libmemcached-1.0.18"
 TOKYOCABINET="tokyocabinet-1.4.48"
 
 XMLTS="xmlts20130923"
-XML2TEST="libxml2-tests-2.9.3"
+XML2TEST="libxml2-tests-2.9.10"
 UTF8PROCTEST="utf8proc-data-2.5.0"
 
 # Quickly add temporary compiler/linker flags to all builds, using these variables,
diff --git a/dev/scripts/builders/build.lib.sh b/dev/scripts/builders/build.lib.sh
index 5090dad0..f3d80f1c 100755
--- a/dev/scripts/builders/build.lib.sh
+++ b/dev/scripts/builders/build.lib.sh
@@ -621,8 +621,8 @@ curl() {
     ;;
     curl-prep)
       cd "$M_SOURCES/curl"; error
-      cat "$M_PATCHES/curl/"skip_test172-version7.23.1.patch | patch -p1 --verbose &>> "$M_LOGS/curl.txt"; error
       if [ "$CURL" == "curl-7.23.1" ]; then
+        cat "$M_PATCHES/curl/"skip_test172-version7.23.1.patch | patch -p1 --verbose &>> "$M_LOGS/curl.txt"; error
         cat "$M_PATCHES/curl/"7.23.1_curl_exec_perm_fix.patch | patch -p1 --verbose &>> "$M_LOGS/curl.txt"; error
         cat "$M_PATCHES/curl/"7.23.1_fix_ca_bundle_url.patch | patch -p1 --verbose &>> "$M_LOGS/curl.txt"; error  
       fi
@@ -647,9 +647,9 @@ curl() {
       fi
 
       export LDFLAGS="-L$M_LDPATH -Wl,-rpath,$M_LDPATH $M_LDFLAGS"
-      export CFLAGS="$M_SYM_INCLUDES -fPIC -g3 -rdynamic -D_FORTIFY_SOURCE=2 $M_CFLAGS"
-      export CXXFLAGS="$M_SYM_INCLUDES -fPIC -g3 -rdynamic -D_FORTIFY_SOURCE=2 $M_CXXFLAGS"
-      export CPPFLAGS="$M_SYM_INCLUDES -fPIC -g3 -rdynamic -D_FORTIFY_SOURCE=2 $M_CPPFLAGS"
+      export CFLAGS="-fPIC -g3 -rdynamic -D_FORTIFY_SOURCE=2 $M_CFLAGS"
+      export CXXFLAGS="-fPIC -g3 -rdynamic -D_FORTIFY_SOURCE=2 $M_CXXFLAGS"
+      export CPPFLAGS="-fPIC -g3 -rdynamic -D_FORTIFY_SOURCE=2 $M_CPPFLAGS"
 
       ./configure --enable-debug --enable-static=yes \
         --without-librtmp --without-krb4 --without-krb5 --without-libssh2 \
@@ -657,7 +657,7 @@ curl() {
         --disable-file --disable-ftp --disable-ftps --disable-gopher \
         --disable-imap --disable-imaps --disable-pop3 --disable-pop3s \
         --disable-rtsp --disable-smtp --disable-smtps --disable-telnet \
-        --disable-tftp --disable-ldap --disable-ssh --disable-dict \
+        --disable-tftp --disable-ldap --disable-ssh --disable-dict --disable-smb \
         --build=x86_64-redhat-linux-gnu --target=x86_64-redhat-linux-gnu --with-pic \
         --with-ssl="$M_SOURCES/openssl" --with-zlib="$M_SOURCES/zlib" \
         --prefix="$M_LOCAL" &>> "$M_LOGS/curl.txt"; error
@@ -1340,9 +1340,9 @@ clamav() {
       fi
 
       export LDFLAGS="-L$M_LDPATH -Wl,-rpath,$M_LDPATH $M_LDFLAGS"
-      export CFLAGS="$M_SYM_INCLUDES -fPIC -g3 -rdynamic -D_FORTIFY_SOURCE=2 -DGNU_SOURCE $M_CFLAGS"
-      export CXXFLAGS="$M_SYM_INCLUDES -fPIC -g3 -rdynamic -D_FORTIFY_SOURCE=2 -DGNU_SOURCE $M_CXXFLAGS"
-      export CPPFLAGS="$M_SYM_INCLUDES -fPIC -g3 -rdynamic -D_FORTIFY_SOURCE=2 -DGNU_SOURCE $M_CPPFLAGS"
+      export CFLAGS="-fPIC -g3 -rdynamic -D_FORTIFY_SOURCE=2 -DGNU_SOURCE $M_CFLAGS"
+      export CXXFLAGS="-fPIC -g3 -rdynamic -D_FORTIFY_SOURCE=2 -DGNU_SOURCE $M_CXXFLAGS"
+      export CPPFLAGS="-fPIC -g3 -rdynamic -D_FORTIFY_SOURCE=2 -DGNU_SOURCE $M_CPPFLAGS"
 
       # --disable-mempool
       ./configure  \
diff --git a/lib/archives/curl-7.23.1.tar.gz b/lib/archives/curl-7.23.1.tar.gz
deleted file mode 100644
index 60ad409b..00000000
--- a/lib/archives/curl-7.23.1.tar.gz
+++ /dev/null
diff --git a/lib/archives/curl-7.70.0.tar.gz b/lib/archives/curl-7.70.0.tar.gz
new file mode 100644
index 00000000..6c20f227
--- /dev/null
+++ b/lib/archives/curl-7.70.0.tar.gz
diff --git a/lib/archives/freetype-2.10.2.tar.gz b/lib/archives/freetype-2.10.2.tar.gz
new file mode 100644
index 00000000..7e440852
--- /dev/null
+++ b/lib/archives/freetype-2.10.2.tar.gz
diff --git a/lib/archives/freetype-2.9.1.tar.gz b/lib/archives/freetype-2.9.1.tar.gz
deleted file mode 100644
index 01ad8ea2..00000000
--- a/lib/archives/freetype-2.9.1.tar.gz
+++ /dev/null
diff --git a/lib/archives/jpeg-9c.tar.gz b/lib/archives/jpeg-9c.tar.gz
deleted file mode 100644
index 4b782b54..00000000
--- a/lib/archives/jpeg-9c.tar.gz
+++ /dev/null
diff --git a/lib/archives/jpeg-9d.tar.gz b/lib/archives/jpeg-9d.tar.gz
new file mode 100644
index 00000000..bdaf03af
--- /dev/null
+++ b/lib/archives/jpeg-9d.tar.gz
diff --git a/lib/archives/libpng-1.6.35.tar.gz b/lib/archives/libpng-1.6.35.tar.gz
deleted file mode 100644
index 65eaf200..00000000
--- a/lib/archives/libpng-1.6.35.tar.gz
+++ /dev/null
diff --git a/lib/archives/libpng-1.6.37.tar.gz b/lib/archives/libpng-1.6.37.tar.gz
new file mode 100644
index 00000000..54b0f810
--- /dev/null
+++ b/lib/archives/libpng-1.6.37.tar.gz
diff --git a/lib/archives/libxml2-2.9.10.tar.gz b/lib/archives/libxml2-2.9.10.tar.gz
new file mode 100644
index 00000000..4a267b9b
--- /dev/null
+++ b/lib/archives/libxml2-2.9.10.tar.gz
diff --git a/lib/archives/libxml2-2.9.3.tar.gz b/lib/archives/libxml2-2.9.3.tar.gz
deleted file mode 100644
index 5b5ff1b6..00000000
--- a/lib/archives/libxml2-2.9.3.tar.gz
+++ /dev/null
diff --git a/lib/archives/libxml2-tests-2.9.10.tar.gz b/lib/archives/libxml2-tests-2.9.10.tar.gz
new file mode 100644
index 00000000..688dfcc3
--- /dev/null
+++ b/lib/archives/libxml2-tests-2.9.10.tar.gz
diff --git a/lib/archives/libxml2-tests-2.9.3.tar.gz b/lib/archives/libxml2-tests-2.9.3.tar.gz
deleted file mode 100644
index 02bf8565..00000000
--- a/lib/archives/libxml2-tests-2.9.3.tar.gz
+++ /dev/null