From 12a003b42f10b12a85e9a2525056bb736f72fc0d Mon Sep 17 00:00:00 2001
From: Camber Huang <camber@poi.science>
Date: Fri, 4 Nov 2022 14:36:58 +0800
Subject: [PATCH] open-vm-tools: update to 12.1.0 (Security, #4284)

* Fix CVE-2022-31676
* Add some TO-DOs at defines file, including some features related to recent
pakreqs.

Signed-off-by: Camber Huang <camber@poi.science>
---
 extra-emulation/open-vm-tools/autobuild/defines | 16 ++++++++++++++++
 extra-emulation/open-vm-tools/spec              |  6 +++---
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/extra-emulation/open-vm-tools/autobuild/defines b/extra-emulation/open-vm-tools/autobuild/defines
index 5dcd4170cf1..44072045fdf 100644
--- a/extra-emulation/open-vm-tools/autobuild/defines
+++ b/extra-emulation/open-vm-tools/autobuild/defines
@@ -8,6 +8,22 @@ PKGDES="Open source implementation of VMware Tools"
 
 AUTOTOOLS_AFTER="--sbindir=/usr/bin \
                  --enable-xmlsec1"
+
+# TO-DO: package python-saltstack
+# open-vm-tools introduced salt minions support at version 12.0.0. However,
+# saltstack is not currently offically packaged by AOSC OS. The following 
+# parameter will be commented for convenience of further support for saltstack.
+#AUTOTOOLS_AFTER+=" --enable-salt-minion"
+#PKGDEP+=" curl awk python-saltstack"
+
+# TO-DO: package containerd
+# open-vm-tools introduced containerd's containerinfo support at version 
+# 12.0.0. However, containerd is not currently offically packaged by AOSC OS.
+# The following parameter will be commented for convenience of further support
+# for containerd and its toolchains.
+#AUTOTOOLS_AFTER+=" --enable-containerinfo"
+#PKGDEP+=" curl protobuf grpc containerd"
+
 RECONF=1
 ABSHADOW=0
 
diff --git a/extra-emulation/open-vm-tools/spec b/extra-emulation/open-vm-tools/spec
index 601755f8a8e..a5127452cb0 100644
--- a/extra-emulation/open-vm-tools/spec
+++ b/extra-emulation/open-vm-tools/spec
@@ -1,6 +1,6 @@
-VER=11.3.0
-BUILDNBR=18090558
+VER=12.1.0
+BUILDNBR=20219665
 SRCS="tbl::https://github.com/vmware/open-vm-tools/releases/download/stable-${VER}/open-vm-tools-${VER}-${BUILDNBR}.tar.gz"
-CHKSUMS="sha256::9bad3ee755340853bf7990e92f3d3880959a73e0749e8aaae62730854368bd2c"
+CHKSUMS="sha256::f9cff769cb60d3e570b8dfed98179b345b089ee3cc31a60d80a4fcca1cc220ee"
 SUDDIR="open-vm-tools-${VER}-${BUILDNBR}"
 CHKUPDATE="anitya::id=10998"