From: Kruti <kpendharkar@vmware.com>
Date: Tue, 21 May 2024 05:58:13 +0000 (-0700)
Subject: Verify the xmlsec version before passing the compiler flag "-DXMLSEC_NO_SIZE_T",
X-Git-Tag: stable-12.5.0~64
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae0b62370b6ca926dbabe25bf5856c2a97cdcc5c;p=thirdparty%2Fopen-vm-tools.git

Verify the xmlsec version before passing the compiler flag "-DXMLSEC_NO_SIZE_T",
as it has been deprecated since 1.3.3.

The configure option "--enable-size-t" has been set to yes by default starting
with 1.3.0.

version < 1.3.0 :
  Add "-DXMLSEC_NO_SIZE_T" if size_t has a size other than 4 bytes.
  (There was no enable-size-t before 1.2.35 and the enable-size-t is
   "no" by default in [1.2.35, 1.3.0))
version >= 1.3.0 :
  Do not add "-DXMLSEC_NO_SIZE_T" (as enable-size-t is "yes" by
  default in version [1.3.0, 1.3.3) and no need to consider this
  option since 1.3.3)
---

diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac
index 9c991156d..fe366ed97 100644
--- a/open-vm-tools/configure.ac
+++ b/open-vm-tools/configure.ac
@@ -1,5 +1,6 @@
 ################################################################################
-### Copyright (c) 2007-2023 VMware, Inc.  All rights reserved.
+### Copyright (c) 2007-2024 Broadcom. All Rights Reserved.
+### The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
 ###
 ### Configure script for building the VMware OSS Tools.
 ###
@@ -868,8 +869,13 @@ if test "$enable_vgauth" = "yes" ; then
                      [AC_VMW_LIB_ERROR([XML2], [xml2])])
 
 # Multiple distros built xmlsec1 with -DXMLSEC_NO_SIZE_T but
-# their xmlssec1-config --cflags doesn't properly report it,
-# so force it on.
+# their xmlssec1-config --cflags doesn't properly report it.
+# Force it on following the xmlSecSize changelog in below link:
+# https://www.aleksey.com/xmlsec/news.html
+# The xmlsec configure flag "enable_size_t" is "yes" by default
+# since 1.3.0, and both the configure flag and CPP flag has been
+# deprecated since 1.3.3, which means the size_t is used by default
+# and no need to add CPP flag -DXMLSEC_NO_SIZE_T since 1.3.0.
    AC_VMW_DEFAULT_FLAGS([XMLSEC1])
    AC_VMW_CHECK_LIB([xmlsec1],
                      [XMLSEC1],
@@ -878,7 +884,16 @@ if test "$enable_vgauth" = "yes" ; then
                      [],
                      [xmlsec/xmlsec.h],
                      [xmlSecCheckVersionExt],
-                     [XMLSEC1_CPPFLAGS="$XMLSEC1_CPPFLAGS -DXMLSEC_NO_SIZE_T"],
+                     [XMLSEC1_VER=`pkg-config --modversion xmlsec1`
+                      xmlsec1_major_version="`echo $XMLSEC1_VER | cut -f1 -d. | cut -f1 -d-`"
+                      xmlsec1_minor_version="`echo $XMLSEC1_VER | cut -f2 -d. | cut -f1 -d-`"
+                      xmlsec1_micro_version="`echo $XMLSEC1_VER | cut -f3 -d. | cut -f1 -d-`"
+                      xmlsec1_version=`printf '%02d%02d%02d' $xmlsec1_major_version $xmlsec1_minor_version $xmlsec1_micro_version`
+                      AC_CHECK_SIZEOF(size_t)
+                      if test "$xmlsec1_version" -lt 010300 -a "$ac_cv_sizeof_size_t" -ne 4 ; then
+                         XMLSEC1_CPPFLAGS="$XMLSEC1_CPPFLAGS -DXMLSEC_NO_SIZE_T"
+                      fi
+                     ],
                      [AC_VMW_LIB_ERROR([XMLSEC1], [xmlsec1])])
 fi