From e0771d26fffc991bd053860e5b594fc2137e3d402b2e447c5c23b7d78ad4fad7 Mon Sep 17 00:00:00 2001 From: Kirk Allan Date: Wed, 29 Mar 2023 19:39:56 +0000 Subject: [PATCH] Accepting request 1075339 from home:kallan:branches:Virtualization:VMware - Update to 12.2.0 (build 21223074) (boo#1209128) - There are no new features in the open-vm-tools 12.2.0 release. This is primarily a maintenance release that addresses a few critical problems, including: - Linux quiesced snapshots have been updated to avoid intermittent hangs of the vmtoolsd process. - Updated the guestOps to handle some edge cases when File_GetSize() fails or returns -1. - A number of Coverity reported issues have been addressed. - Detect the proto files for the containerd grpc client in alternate locations. Pull request #626 - FreeBSD: Support newer releases and code clean-up for earlier versions. Pull request #584 - Please refer to the release notes at https://github.com/vmware/open-vm-tools/blob/stable-12.2.0/ReleaseNotes.md - The granular changes that have gone into the 12.2.0 release are in the ChangeLog at https://github.com/vmware/open-vm-tools/blob/stable-12.2.0/ open-vm-tools/ChangeLog - Update detect-suse-location.patch to remove upstream accepted portion of the patch (jsc-PED-1344). OBS-URL: https://build.opensuse.org/request/show/1075339 OBS-URL: https://build.opensuse.org/package/show/Virtualization:VMware/open-vm-tools?expand=0&rev=428 --- _service | 4 ++-- detect-suse-location.patch | 19 ++----------------- open-vm-tools-12.1.5.tar.xz | 3 --- open-vm-tools-12.2.0.tar.xz | 3 +++ open-vm-tools.changes | 24 ++++++++++++++++++++++++ open-vm-tools.spec | 4 ++-- 6 files changed, 33 insertions(+), 24 deletions(-) delete mode 100644 open-vm-tools-12.1.5.tar.xz create mode 100644 open-vm-tools-12.2.0.tar.xz diff --git a/_service b/_service index ebd66e8..507e446 100644 --- a/_service +++ b/_service @@ -2,9 +2,9 @@ git https://github.com/vmware/open-vm-tools.git - stable-12.1.5 + stable-12.2.0 open-vm-tools - 12.1.5 + 12.2.0 *.tar diff --git a/detect-suse-location.patch b/detect-suse-location.patch index eb7891d..8b68d52 100644 --- a/detect-suse-location.patch +++ b/detect-suse-location.patch @@ -1,23 +1,8 @@ -diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac -index 3c058135..203fdc6f 100644 --- a/open-vm-tools/configure.ac +++ b/open-vm-tools/configure.ac -@@ -726,12 +726,18 @@ AC_DEFUN([AC_VMW_CONTAINERINFO_MSG],[ - # - # proto files needed by containerd grpc client. - # -- shared_prefix=/usr/share/gocode/src/github.com -+ for d in /usr/share/gocode/src /usr/share/go/1.*/contrib/src; do -+ if test -d "$d"/github.com; then -+ src_prefix="$d" -+ break -+ fi -+ done -+ shared_prefix=$src_prefix/github.com - AC_SUBST(TYPES_DIR, github.com/containerd/containerd/api/types) +@@ -741,7 +741,7 @@ AC_DEFUN([AC_VMW_CONTAINERINFO_MSG],[ AC_SUBST(TASKS_PROTOPATH, $shared_prefix/containerd/containerd/api/services/tasks/v1) -- AC_SUBST(DEP_PROTOPATH, /usr/share/gocode/src) -+ AC_SUBST(DEP_PROTOPATH, $src_prefix) + AC_SUBST(DEP_PROTOPATH, $src_prefix) AC_SUBST(CONTAINERD_PROTOPATH, $shared_prefix/containerd/containerd/api/services/containers/v1) - AC_SUBST(GOGO_PROTOPATH, $shared_prefix/gogo/protobuf) + AC_SUBST(GOGO_PROTOPATH, $shared_prefix/containerd/containerd/vendor/github.com/gogo/protobuf) diff --git a/open-vm-tools-12.1.5.tar.xz b/open-vm-tools-12.1.5.tar.xz deleted file mode 100644 index 7bf1fcf..0000000 --- a/open-vm-tools-12.1.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0167932c6b06fe8eeafafb9b30b7d1a71ae0e7d854b300135de4aa09ef1f857d -size 1790180 diff --git a/open-vm-tools-12.2.0.tar.xz b/open-vm-tools-12.2.0.tar.xz new file mode 100644 index 0000000..d5db9b5 --- /dev/null +++ b/open-vm-tools-12.2.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ef22adf11d16a8bc675d1c73c190d178e791ee247d6cabfe78df9c56c9fae8c0 +size 1801020 diff --git a/open-vm-tools.changes b/open-vm-tools.changes index 7cdd9f8..00cb301 100644 --- a/open-vm-tools.changes +++ b/open-vm-tools.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Tue Mar 28 23:16:47 UTC 2023 - Kirk Allan + +- Update to 12.2.0 (build 21223074) (boo#1209128) + - There are no new features in the open-vm-tools 12.2.0 release. This is + primarily a maintenance release that addresses a few critical problems, + including: + - Linux quiesced snapshots have been updated to avoid intermittent hangs of + the vmtoolsd process. + - Updated the guestOps to handle some edge cases when File_GetSize() fails + or returns -1. + - A number of Coverity reported issues have been addressed. + - Detect the proto files for the containerd grpc client in alternate + locations. Pull request #626 + - FreeBSD: Support newer releases and code clean-up for earlier versions. + Pull request #584 + - Please refer to the release notes at + https://github.com/vmware/open-vm-tools/blob/stable-12.2.0/ReleaseNotes.md + - The granular changes that have gone into the 12.2.0 release are in the + ChangeLog at https://github.com/vmware/open-vm-tools/blob/stable-12.2.0/ + open-vm-tools/ChangeLog +- Update detect-suse-location.patch to remove upstream accepted portion of the + patch (jsc-PED-1344). + ------------------------------------------------------------------- Wed Dec 28 08:18:43 UTC 2022 - Stefan Schubert diff --git a/open-vm-tools.spec b/open-vm-tools.spec index 163424e..3d214cf 100644 --- a/open-vm-tools.spec +++ b/open-vm-tools.spec @@ -1,7 +1,7 @@ # # spec file for package open-vm-tools # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # Copyright (c) 2010 Dominique Leuenberger, Amsterdam, Netherlands. # # All modifications and additions to the file contributed by third parties @@ -38,7 +38,7 @@ %define with_X 1 Name: open-vm-tools -Version: 12.1.5 +Version: 12.2.0 Release: 0 Summary: Open Virtual Machine Tools License: BSD-3-Clause AND GPL-2.0-only AND LGPL-2.1-only