From: Oliver Kurth <okurth@vmware.com>
Date: Fri, 15 Sep 2017 18:23:03 +0000 (-0700)
Subject: Update glib and dependent libraries for CAF to latest version
X-Git-Tag: stable-10.2.0~537
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bb446f9e8b7cc88271e6553db0f800eea944b39e;p=thirdparty%2Fopen-vm-tools.git

Update glib and dependent libraries for CAF to latest version
---

diff --git a/open-vm-tools/common-agent/etc/install/caf-dbg.sh b/open-vm-tools/common-agent/etc/install/caf-dbg.sh
index 405919b61..070973f3b 100644
--- a/open-vm-tools/common-agent/etc/install/caf-dbg.sh
+++ b/open-vm-tools/common-agent/etc/install/caf-dbg.sh
@@ -199,8 +199,8 @@ function checkFileExistsLib() {
    checkFileExists "$CAF_LIB_DIR/libcom_err.so.3"
    checkFileExists "$CAF_LIB_DIR/libcrypto.so.1.0.2"
    checkFileExists "$CAF_LIB_DIR/libgcc_s.so.1"
-   checkFileExists "$CAF_LIB_DIR/libglib-2.0.so.0.3400.3"
-   checkFileExists "$CAF_LIB_DIR/libgthread-2.0.so.0.3400.3"
+   checkFileExists "$CAF_LIB_DIR/libglib-2.0.so.0.4800.1"
+   checkFileExists "$CAF_LIB_DIR/libgthread-2.0.so.0.4800.1"
    checkFileExists "$CAF_LIB_DIR/liblog4cpp.so.5.0.6"
    checkFileExists "$CAF_LIB_DIR/librabbitmq.so.4.2.1"
    checkFileExists "$CAF_LIB_DIR/libssl.so.1.0.2"
@@ -208,7 +208,10 @@ function checkFileExistsLib() {
    checkFileExists "$CAF_LIB_DIR/libvgauth.so"
    checkFileExists "$CAF_LIB_DIR/libxerces-c-3.1.so"
    checkFileExists "$CAF_LIB_DIR/libxml-security-c.so.16"
-   checkFileExists "$CAF_LIB_DIR/libz.so.1.2.3"
+   checkFileExists "$CAF_LIB_DIR/libpcre.so.1.2.6"
+   checkFileExists "$CAF_LIB_DIR/libiconv.so.2.5.1"
+   checkFileExists "$CAF_LIB_DIR/libz.so.1.2.8"
+   checkFileExists "$CAF_LIB_DIR/libffi.so.6.0.4"
 }
 
 function checkFileExistsConfig() {
@@ -385,8 +388,8 @@ function checkFileExistsLib() {
       checkFileExists "$CAF_LIB_DIR/libManagementAgentHost.so"
       checkFileExists "$CAF_LIB_DIR/liblog4cpp.so.5.0.6"
       checkFileExists "$CAF_LIB_DIR/librabbitmq.so.4.2.1"
-      checkFileExists "$CAF_LIB_DIR/libgthread-2.0.so.0.3400.3"
-      checkFileExists "$CAF_LIB_DIR/libglib-2.0.so.0.3400.3"
+      checkFileExists "$CAF_LIB_DIR/libgthread-2.0.so.0.4800.1"
+      checkFileExists "$CAF_LIB_DIR/libglib-2.0.so.0.4800.1"
    fi
 }
 
diff --git a/open-vm-tools/common-agent/etc/install/install.sh b/open-vm-tools/common-agent/etc/install/install.sh
index 4abfb83ce..924f36872 100644
--- a/open-vm-tools/common-agent/etc/install/install.sh
+++ b/open-vm-tools/common-agent/etc/install/install.sh
@@ -164,14 +164,22 @@ fi
 #Set up links
 if [ "$linkSo" != "no" ] ; then
 	cd "$libDir"
-	ln -sf libglib-2.0.so.0.3400.3 libglib-2.0.so
-	ln -sf libglib-2.0.so.0.3400.3 libglib-2.0.so.0
-	ln -sf libgthread-2.0.so.0.3400.3 libgthread-2.0.so
-	ln -sf libgthread-2.0.so.0.3400.3 libgthread-2.0.so.0
+	ln -sf libglib-2.0.so.0.4800.1 libglib-2.0.so
+	ln -sf libglib-2.0.so.0.4800.1 libglib-2.0.so.0
+	ln -sf libgthread-2.0.so.0.4800.1 libgthread-2.0.so
+	ln -sf libgthread-2.0.so.0.4800.1 libgthread-2.0.so.0
 	ln -sf liblog4cpp.so.5.0.6 liblog4cpp.so
 	ln -sf liblog4cpp.so.5.0.6 liblog4cpp.so.5
 	ln -sf librabbitmq.so.4.2.1 librabbitmq.so
 	ln -sf librabbitmq.so.4.2.1 librabbitmq.so.4
+	ln -sf libpcre.so.1.2.6 libpcre.so
+	ln -sf libpcre.so.1.2.6 libpcre.so.1
+	ln -sf libiconv.so.2.5.1 libiconv.so
+	ln -sf libiconv.so.2.5.1 libiconv.so.2
+	ln -sf libz.so.1.2.8 libz.so
+	ln -sf libz.so.1.2.8 libz.so.1
+	ln -sf libffi.so.6.0.4 libffi.so
+	ln -sf libffi.so.6.0.4 libffi.so.6
 fi
 
 #Run provider install logic
diff --git a/open-vm-tools/common-agent/etc/install/upgrade.sh b/open-vm-tools/common-agent/etc/install/upgrade.sh
index 397385802..cd2de8d9b 100644
--- a/open-vm-tools/common-agent/etc/install/upgrade.sh
+++ b/open-vm-tools/common-agent/etc/install/upgrade.sh
@@ -44,11 +44,19 @@ if [ ! -d $CAF_LIB_DIR ]; then
 fi
 
 cd $CAF_LIB_DIR
-ln -sf libglib-2.0.so.0.3400.3 libglib-2.0.so
-ln -sf libglib-2.0.so.0.3400.3 libglib-2.0.so.0
-ln -sf libgthread-2.0.so.0.3400.3 libgthread-2.0.so
-ln -sf libgthread-2.0.so.0.3400.3 libgthread-2.0.so.0
+ln -sf libglib-2.0.so.0.4800.1 libglib-2.0.so
+ln -sf libglib-2.0.so.0.4800.1 libglib-2.0.so.0
+ln -sf libgthread-2.0.so.0.4800.1 libgthread-2.0.so
+ln -sf libgthread-2.0.so.0.4800.1 libgthread-2.0.so.0
 ln -sf liblog4cpp.so.5.0.6 liblog4cpp.so
 ln -sf liblog4cpp.so.5.0.6 liblog4cpp.so.5
 ln -sf librabbitmq.so.4.2.1 librabbitmq.so
 ln -sf librabbitmq.so.4.2.1 librabbitmq.so.4
+ln -sf libpcre.so.1.2.6 libpcre.so
+ln -sf libpcre.so.1.2.6 libpcre.so.1
+ln -sf libiconv.so.2.5.1 libiconv.so
+ln -sf libiconv.so.2.5.1 libiconv.so.2
+ln -sf libz.so.1.2.8 libz.so
+ln -sf libz.so.1.2.8 libz.so.1
+ln -sf libffi.so.6.0.4 libffi.so
+ln -sf libffi.so.6.0.4 libffi.so.6