From: Oliver Kurth Date: Fri, 15 Sep 2017 18:23:05 +0000 (-0700) Subject: Updating glib and dependent libraries for CAF to latest version X-Git-Tag: stable-10.2.0~518 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=03e97029b0e2a84e2179a32dbb5d756ecf47e88f;p=thirdparty%2Fopen-vm-tools.git Updating glib and dependent libraries for CAF to latest version Update glib libiconv, pcre, zlib and libffi. --- diff --git a/open-vm-tools/common-agent/etc/config/cafenv-appconfig b/open-vm-tools/common-agent/etc/config/cafenv-appconfig index 4e1b92c7a..91e8e2af5 100644 --- a/open-vm-tools/common-agent/etc/config/cafenv-appconfig +++ b/open-vm-tools/common-agent/etc/config/cafenv-appconfig @@ -33,3 +33,7 @@ invokers_dir=@invokersDir@ # Substitute @providersDir@ for the value passed in during install # Maps to 'providers' in the build output - Used by the internal providers providers_dir=@providersDir@ + +# Substitute @toolsLibDir@ for the value passed in during install +# Maps to 'lib' in the build output +tools_lib_dir=@toolsLibDir@ 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..e24c701ba 100644 --- a/open-vm-tools/common-agent/etc/install/install.sh +++ b/open-vm-tools/common-agent/etc/install/install.sh @@ -25,6 +25,7 @@ baseInputDir='/var/lib' baseOutputDir='/var/lib' brokerAddr='#brokerAddr#' linkSo='yes' +toolsLibDir='/usr/lib/vmware-tools/lib' # lib is symlink to either lib64 or lib32 #Help function HELP() { @@ -37,6 +38,7 @@ HELP() { echo "B --Sets the location for the binaries. Default is '$baseLibDir'/bin or 'bin' in base location of libraries." echo "o --Sets the base location for the output data. Default is '$baseOutputDir'." echo "L --Do not create symlinks for libraries." + echo "t --Sets the location for the tools lib dir. Default is '$toolsLibDir'." echo -e "h --Displays this help message. No further functions are performed."\\n echo -e "Example: $SCRIPT -b 10.25.91.81 -i \"/usr/lib\" -i \"/var/lib\" -o \"/var/lib\""\\n exit 1 @@ -65,7 +67,7 @@ setupCafConfig() { ##BEGIN Main #Get Optional overrides -while getopts ":b:i:l:B:o:hL" opt; do +while getopts ":b:i:l:B:o:t:hL" opt; do case $opt in b) brokerAddr="$OPTARG" @@ -82,6 +84,9 @@ while getopts ":b:i:l:B:o:hL" opt; do o) baseOutputDir="$OPTARG" ;; + t) + toolsLibDir="$OPTARG" + ;; L) linkSo='no' ;; @@ -127,6 +132,7 @@ setupCafConfig '@outputDir@' "$outputDir" "$configDir" setupCafConfig '@providersDir@' "$providersDir" "$configDir" setupCafConfig '@invokersDir@' "$invokersDir" "$configDir" setupCafConfig '@logDir@' "$logDir" "$configDir" +setupCafConfig '@toolsLibDir@' "$toolsLibDir" "$configDir" #Set default permissions if [ -d "$libDir" ]; then @@ -164,14 +170,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..d22783abe 100644 --- a/open-vm-tools/common-agent/etc/install/upgrade.sh +++ b/open-vm-tools/common-agent/etc/install/upgrade.sh @@ -1,8 +1,44 @@ #!/bin/sh +#Standard env +SCRIPT=`basename "$0"` + installDir=$(dirname $(readlink -f $0)) scriptsDir=$installDir/../scripts configDir=$installDir/../config +toolsLibDir='/usr/lib/vmware-tools/lib' # lib is symlink to either lib64 or lib32 + + +#Help function +HELP() { + echo -e \\n"Help documentation for ${SCRIPT}."\\n + echo -e "Basic usage: $SCRIPT"\\n + echo "Command line switches are optional. The following switches are recognized." + echo "t --Sets the location for the tools lib dir. Default is '$toolsLibDir'." + echo -e "h --Displays this help message. No further functions are performed."\\n + echo -e "Example: $SCRIPT -t \"/usr/lib/vmware-tools/lib\""\\n + exit 1 +} + + +##BEGIN Main + +#Get Optional overrides +while getopts ":t:h" opt; do + case $opt in + t) + toolsLibDir="$OPTARG" + ;; + h) + HELP + ;; + \?) + echo "Invalid option: -$OPTARG" >&2 + HELP + ;; + esac +done + prevCafenvConfig="$configDir/_previous_/cafenv.config" if [ -f "$prevCafenvConfig" ]; then @@ -13,7 +49,11 @@ if [ -f "$prevCafenvConfig" ]; then outputDir=$(echo "$CAF_OUTPUT_DIR" | sed 's:/vmware-caf/pme/data/output::') libDir=$(echo "$CAF_LIB_DIR" | sed 's:/vmware-caf/pme/lib::') binDir=$(echo "$CAF_BIN_DIR" | sed 's:/vmware-caf/pme/bin::') - $installDir/install.sh -L -b "$CAF_BROKER_ADDRESS" -i "$inputDir" -o "$outputDir" -l "$libDir" -B "$binDir" + if [ -n "$CAF_TOOLS_LIB_DIR" ]; then + toolsLibDir="$CAF_TOOLS_LIB_DIR" + fi + $installDir/install.sh -L -b "$CAF_BROKER_ADDRESS" -i "$inputDir" \ + -o "$outputDir" -l "$libDir" -B "$binDir" -t "$toolsLibDir" rm -f "$prevCafenvConfig" else @@ -44,11 +84,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 diff --git a/open-vm-tools/common-agent/etc/scripts/caf-common b/open-vm-tools/common-agent/etc/scripts/caf-common index 9db49f7cd..2b18196d5 100644 --- a/open-vm-tools/common-agent/etc/scripts/caf-common +++ b/open-vm-tools/common-agent/etc/scripts/caf-common @@ -13,6 +13,8 @@ sourceCafenv() { cat "$cafenvAppconfig" | sed 's/^\[/#[/g' | sed 's/^\([a-z].*=\)/export CAF_\U\1/g' > "$tmpCafenv" sed -i 's/[ ]*=[ ]*/=/g' "$tmpCafenv" . "$tmpCafenv" + export LD_LIBRARY_PATH="$CAF_TOOLS_LIB_DIR/libvgauth.so/:$CAF_TOOLS_LIB_DIR/libcrypto.so.1.0.2/:$CAF_TOOLS_LIB_DIR/libssl.so.1.0.2/:$CAF_LIB_DIR" + export VMWARE_USE_SYSTEM_LIBS=1 } getCurrentDir() { diff --git a/open-vm-tools/common-agent/etc/scripts/start-listener b/open-vm-tools/common-agent/etc/scripts/start-listener index 1148b5c10..361be3d65 100644 --- a/open-vm-tools/common-agent/etc/scripts/start-listener +++ b/open-vm-tools/common-agent/etc/scripts/start-listener @@ -24,8 +24,6 @@ sourceCafenv "$configDir" processName="CommAmqpListener" -export LD_LIBRARY_PATH="$CAF_LIB_DIR" - #enableCoreFiles startCafProcess "$startType" "$CAF_LOG_DIR" "$CAF_BIN_DIR" "$processName" diff --git a/open-vm-tools/common-agent/etc/scripts/start-ma b/open-vm-tools/common-agent/etc/scripts/start-ma index a576aa88a..788557127 100644 --- a/open-vm-tools/common-agent/etc/scripts/start-ma +++ b/open-vm-tools/common-agent/etc/scripts/start-ma @@ -25,8 +25,6 @@ sourceCafenv "$configDir" processName="ManagementAgentHost" -export LD_LIBRARY_PATH="$CAF_LIB_DIR" - #enableCoreFiles startCafProcess "$startType" "$CAF_LOG_DIR" "$CAF_BIN_DIR" "$processName"