Backout update of 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 070973f3bed861ca9a323a3829e351d09cef6291..405919b61b988bbeb2e6615b660d5879b04a6062 100644 (file)
--- 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.4800.1"
-   checkFileExists "$CAF_LIB_DIR/libgthread-2.0.so.0.4800.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/liblog4cpp.so.5.0.6"
    checkFileExists "$CAF_LIB_DIR/librabbitmq.so.4.2.1"
    checkFileExists "$CAF_LIB_DIR/libssl.so.1.0.2"
@@ -208,10 +208,7 @@ 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/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"
+   checkFileExists "$CAF_LIB_DIR/libz.so.1.2.3"
 }
 
 function checkFileExistsConfig() {
@@ -388,8 +385,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.4800.1"
-      checkFileExists "$CAF_LIB_DIR/libglib-2.0.so.0.4800.1"
+      checkFileExists "$CAF_LIB_DIR/libgthread-2.0.so.0.3400.3"
+      checkFileExists "$CAF_LIB_DIR/libglib-2.0.so.0.3400.3"
    fi
 }
 

diff --git a/open-vm-tools/common-agent/etc/install/install.sh b/open-vm-tools/common-agent/etc/install/install.sh
index 924f368729f00fdd0d236a00b4b4b6c28495d00c..4abfb83cedae968da18b407ec988093d629ba86b 100644 (file)
--- a/open-vm-tools/common-agent/etc/install/install.sh
+++ b/open-vm-tools/common-agent/etc/install/install.sh
@@ -164,22 +164,14 @@ fi
 #Set up links
 if [ "$linkSo" != "no" ] ; then
        cd "$libDir"
-       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 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 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 cd2de8d9b0f6dfcbbd81880d9a1a8a3609af46af..397385802bd10f2a81f84f79be81e02238c60987 100644 (file)
--- a/open-vm-tools/common-agent/etc/install/upgrade.sh
+++ b/open-vm-tools/common-agent/etc/install/upgrade.sh
@@ -44,19 +44,11 @@ if [ ! -d $CAF_LIB_DIR ]; then
 fi
 
 cd $CAF_LIB_DIR
-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 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 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