From: Oliver Kurth <okurth@vmware.com>
Date: Fri, 28 Jul 2017 19:16:51 +0000 (-0700)
Subject: Previously Common Agent Framework (CAF) builds were linking against
X-Git-Tag: stable-10.1.10~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4076f114437504bf05d7d6c3ad2b6e84dd7fa08;p=thirdparty%2Fopen-vm-tools.git

Previously Common Agent Framework (CAF) builds were linking against
specific versions of PCRE and libiconv.  That restriction has been removed.
---

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 070973f3b..8aea5b856 100644
--- a/open-vm-tools/common-agent/etc/install/caf-dbg.sh
+++ b/open-vm-tools/common-agent/etc/install/caf-dbg.sh
@@ -208,8 +208,8 @@ 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/libpcre.so.1"
+   checkFileExists "$CAF_LIB_DIR/libiconv.so.2"
    checkFileExists "$CAF_LIB_DIR/libz.so.1.2.8"
    checkFileExists "$CAF_LIB_DIR/libffi.so.6.0.4"
 }
diff --git a/open-vm-tools/common-agent/etc/install/install.sh b/open-vm-tools/common-agent/etc/install/install.sh
index e24c701ba..91ac56daa 100644
--- a/open-vm-tools/common-agent/etc/install/install.sh
+++ b/open-vm-tools/common-agent/etc/install/install.sh
@@ -178,10 +178,8 @@ if [ "$linkSo" != "no" ] ; then
 	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 libpcre.so.1 libpcre.so
+	ln -sf libiconv.so.2 libiconv.so
 	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
diff --git a/open-vm-tools/common-agent/etc/install/upgrade.sh b/open-vm-tools/common-agent/etc/install/upgrade.sh
index d22783abe..118f5197e 100644
--- a/open-vm-tools/common-agent/etc/install/upgrade.sh
+++ b/open-vm-tools/common-agent/etc/install/upgrade.sh
@@ -92,10 +92,8 @@ 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 libpcre.so.1 libpcre.so
+ln -sf libiconv.so.2 libiconv.so
 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