Merge branch 'stable-13.0.x'

diff --cc open-vm-tools/lib/include/vm_tools_version.h
index af490a5102f32d02aa80238a5e9017e297e30d02,ef67f737c812254f60e41e89b53e334093bffd36..5a745c7b588da8edbd0a1176961e4efe9f0d382d
--- 1/open-vm-tools/lib/include/vm_tools_version.h
--- 2/open-vm-tools/lib/include/vm_tools_version.h
+++ b/open-vm-tools/lib/include/vm_tools_version.h
@@@ -1793,24 -1803,16 +1803,31 @@@ TOOLS_VERSION_UINT_TO_COMPONENTS(const 
  #define   TOOLS_VERSION_PLIERS_RELEASE_V_MNR  5
  #define   TOOLS_VERSION_PLIERS_RELEASE_V_BASE 0
  
 -#define   TOOLS_VERSION_CURRENT        TOOLS_VERSION_NEXT
 -#define   TOOLS_VERSION_CURRENT_STR    TOOLS_VERSION_TO_STR(TOOLS_VERSION_NEXT)
 -#define   TOOLS_VERSION_CURRENT_CSV    TOOLS_VERSION_TO_CSV(TOOLS_VERSION_NEXT)
+ #ifndef RC_INVOKED
+ #define   TOOLS_VERSION_NEXT TOOLS_VERSION_TO_UINT(TOOLS_VERSION_NEXT_V)
+ #endif /* RC_INVOKED */
+ #define   TOOLS_VERSION_NEXT_V_MJR  13
+ #define   TOOLS_VERSION_NEXT_V_MNR  0
+ #define   TOOLS_VERSION_NEXT_V_BASE 0
+ 
 +#ifndef RC_INVOKED
 +#define   TOOLS_VERSION_PLIERS_PATCH1 TOOLS_VERSION_TO_UINT(TOOLS_VERSION_PLIERS_PATCH1_V)
 +#endif /* RC_INVOKED */
 +#define   TOOLS_VERSION_PLIERS_PATCH1_V_MJR  12
 +#define   TOOLS_VERSION_PLIERS_PATCH1_V_MNR  5
 +#define   TOOLS_VERSION_PLIERS_PATCH1_V_BASE 1
 +
 +
 +#ifndef RC_INVOKED
 +#define   TOOLS_VERSION_PLIERS_PATCH2 TOOLS_VERSION_TO_UINT(TOOLS_VERSION_PLIERS_PATCH2_V)
 +#endif /* RC_INVOKED */
 +#define   TOOLS_VERSION_PLIERS_PATCH2_V_MJR  12
 +#define   TOOLS_VERSION_PLIERS_PATCH2_V_MNR  5
 +#define   TOOLS_VERSION_PLIERS_PATCH2_V_BASE 2
 +
 +#define   TOOLS_VERSION_CURRENT        TOOLS_VERSION_PLIERS_PATCH2
 +#define   TOOLS_VERSION_CURRENT_STR    TOOLS_VERSION_TO_STR(TOOLS_VERSION_PLIERS_PATCH2)
 +#define   TOOLS_VERSION_CURRENT_CSV    TOOLS_VERSION_TO_CSV(TOOLS_VERSION_PLIERS_PATCH2)
  
  /*
   * The extended Tools version is the current Tools version with the

diff --cc open-vm-tools/services/vmtoolsd/l10n/es.vmsg
Simple merge

diff --cc open-vm-tools/vgauth/serviceImpl/saml-xmlsec1.c
index 7de27aa44bdb29537f80c3a493af9fdf49af2da9,7bf70fa74adb1e795995d482201fc12c35e786db..c127cbcefbad7e695dc6d5eb06650925a9d40c68
--- 1/open-vm-tools/vgauth/serviceImpl/saml-xmlsec1.c
--- 2/open-vm-tools/vgauth/serviceImpl/saml-xmlsec1.c
+++ b/open-vm-tools/vgauth/serviceImpl/saml-xmlsec1.c
@@@ -32,25 -32,7 +32,23 @@@
  #include <libxml/parser.h>
  #include <libxml/catalog.h>
  #include <libxml/xmlschemas.h>
- #include <libxml/xmlIO.h>
- #include <libxml/uri.h>
  
 +// PR 3416639, xmlFile* APIs were deprecated in libxml2 2.13.0
 +// Ignore the deprecated warnings after updating libxml2 to 2.13.3
 +// ToDo: Define the deprecated APIs locally and remove the
 +// XML_IGNORE_DEPRECATION_WARNINGS
 +#ifdef _WIN32
 +#define XML_IGNORE_DEPRECATION_WARNINGS \
 +    __pragma(warning(push)) \
 +    __pragma(warning(disable : 4996))
 +#define XML_POP_WARNINGS __pragma(warning(pop))
 +#else
 +#define XML_IGNORE_DEPRECATION_WARNINGS \
 +    _Pragma("GCC diagnostic push") \
 +    _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
 +#define XML_POP_WARNINGS _Pragma("GCC diagnostic pop")
 +#endif
 +
  #include <xmlsec/xmlsec.h>
  #include <xmlsec/xmltree.h>
  #include <xmlsec/xmldsig.h>