pool/open-vm-tools
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 807053 from home:kallan:branches:Virtualization:VMware

Browse Source 
- Update to 11.1.0 (build 16036546) (boo#1171764, boo#1171765)
  + open-vm-tools 11.1.0 includes a new 'Service Discovery' plugin, which
    connects with the vRealize Operations Manager product.  For more
    information and details on configuring this plugin, refer to Configuring
    Service Discovery.
  + In this release, a new tools.conf switch is added to enable and disable
    the guest customization in the guest virtual machine. By default, the
    guest customization is enabled. For more details, refer KB 78903.
- Spec file changes to remove the is_opensuse macros where possible.
- Remoed the mv vm-support line from the spec file.  vm-support is now
  automatically placed in the /usr/bin directory.
- Added version number to Requires: libxmlsec1-openssl1 to help with vgauth
  version checking.
- Added patches
  + pam-vmtoolsd.patch (boo#1171003)
- Drop unnecessary patch:
  - app_info_plugin.patch
  - diskinfo-debug-logging-1162435.patch
  - gcc9-static-inline.patch

OBS-URL: https://build.opensuse.org/request/show/807053
OBS-URL: https://build.opensuse.org/package/show/Virtualization:VMware/open-vm-tools?expand=0&rev=388
This commit is contained in:
Kirk Allan 2020-05-18 21:54:47 +00:00 committed by Git OBS Bridge
parent 9f9b4f6627
commit 0cc4e5dd59
9 changed files with 92 additions and 1737 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1571
app_info_plugin.patch
View File

File diff suppressed because it is too large Load Diff

32
diskinfo-debug-logging-1162435.patch
View File

@ -1,32 +0,0 @@
commit 4ee0bd3c8ead89541ab7d196fb54e940e397420d
Author: Oliver Kurth <okurth@vmware.com>
Date: Fri Feb 7 10:39:38 2020 -0800
Rectify a log spew in vmsvc logging (vmware-vmsvc-root.log )
When a LSI Logic Parallel SCSI controller sits in PCI bus 0
(SCSI controller 0), the Linux disk device enumeration does not provide
a "label" file with the controller name. This results in messages like
"GuestInfoGetDiskDevice: Missing disk device name; VMDK mapping unavailable for "/var/log", fsName: "/dev/sda2"
repeatedly appearing in the vmsvc logging. The patch converts what previously
was a warning message to a debug message and thus avoids the log spew.
diff --git a/open-vm-tools/services/plugins/guestInfo/diskInfo.c b/open-vm-tools/services/plugins/guestInfo/diskInfo.c
index 878276ce..032c0928 100644
--- a/open-vm-tools/services/plugins/guestInfo/diskInfo.c
+++ b/open-vm-tools/services/plugins/guestInfo/diskInfo.c
@@ -846,9 +846,9 @@ GuestInfoGetDiskDevice(const char *fsName,
*/
for (indx = 0; indx < partEntry->diskDevCnt; indx++) {
if (partEntry->diskDevNames[indx][0] == '\0') {
- g_warning("%s: Missing disk device name; VMDK mapping unavailable "
- "for \"%s\", fsName: \"%s\"\n", __FUNCTION__,
- partEntry->name, fsName);
+ g_debug("%s: Missing disk device name; VMDK mapping unavailable "
+ "for \"%s\", fsName: \"%s\"\n", __FUNCTION__,
+ partEntry->name, fsName);
partEntry->diskDevCnt = 0;
free(partEntry->diskDevNames);
partEntry->diskDevNames = NULL;

12
gcc10-warning.patch
View File

@ -1,22 +1,22 @@
--- a/open-vm-tools/lib/user/utilBacktrace.c
+++ b/open-vm-tools/lib/user/utilBacktrace.c
@@ -510,13 +510,16 @@
options.bugNumber = bugNr;
CoreDump_LogFullBacktraceToFunc(&options, outFunc, outFuncData);
@@ -431,13 +431,16 @@ Util_BacktraceWithFunc(int bugNr,
}
}
#else
- uintptr_t *x = (uintptr_t *) &bugNr;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Warray-bounds"
+ uintptr_t *x = ((uintptr_t *) &bugNr) - 2;
+#pragma GCC diagnostic pop
if (bugNr == 0) {
outFunc(outFuncData, "Backtrace:\n");
} else {
outFunc(outFuncData, "Backtrace for bugNr=%d\n",bugNr);
}
- Util_BacktraceFromPointerWithFunc(&x[-2], outFunc, outFuncData);
+ Util_BacktraceFromPointerWithFunc(x, outFunc, outFuncData);
- UtilBacktraceFromPointerWithFunc(&x[-2], outFunc, outFuncData);
+ UtilBacktraceFromPointerWithFunc(x, outFunc, outFuncData);
#endif
}
--- a/open-vm-tools/services/plugins/dndcp/copyPasteUIX11.cpp

74
gcc9-static-inline.patch
View File

@ -1,74 +0,0 @@
diff --git a/open-vm-tools/lib/include/vmware/tools/plugin.h b/open-vm-tools/lib/include/vmware/tools/plugin.h
index f9acc6a29..deefd1f3d 100644
--- a/open-vm-tools/lib/include/vmware/tools/plugin.h
+++ b/open-vm-tools/lib/include/vmware/tools/plugin.h
@@ -290,7 +290,7 @@ typedef struct ToolsAppCtx {
*
* @return TRUE if COM is initialized when the function returns.
*/
-G_INLINE_FUNC gboolean
+static inline gboolean
ToolsCore_InitializeCOM(ToolsAppCtx *ctx)
{
if (!ctx->comInitialized) {
diff --git a/open-vm-tools/lib/include/vmware/tools/threadPool.h b/open-vm-tools/lib/include/vmware/tools/threadPool.h
index 3f2082b3e..5880fbcff 100644
--- a/open-vm-tools/lib/include/vmware/tools/threadPool.h
+++ b/open-vm-tools/lib/include/vmware/tools/threadPool.h
@@ -91,7 +91,7 @@ typedef struct ToolsCorePool {
*******************************************************************************
*/
-G_INLINE_FUNC ToolsCorePool *
+static inline ToolsCorePool *
ToolsCorePool_GetPool(ToolsAppCtx *ctx)
{
ToolsCorePool *pool = NULL;
@@ -123,7 +123,7 @@ ToolsCorePool_GetPool(ToolsAppCtx *ctx)
*******************************************************************************
*/
-G_INLINE_FUNC guint
+static inline guint
ToolsCorePool_SubmitTask(ToolsAppCtx *ctx,
ToolsCorePoolCb cb,
gpointer data,
@@ -153,7 +153,7 @@ ToolsCorePool_SubmitTask(ToolsAppCtx *ctx,
*******************************************************************************
*/
-G_INLINE_FUNC void
+static inline void
ToolsCorePool_CancelTask(ToolsAppCtx *ctx,
guint taskId)
{
@@ -197,7 +197,7 @@ ToolsCorePool_CancelTask(ToolsAppCtx *ctx,
*******************************************************************************
*/
-G_INLINE_FUNC gboolean
+static inline gboolean
ToolsCorePool_StartThread(ToolsAppCtx *ctx,
const gchar *threadName,
ToolsCorePoolCb cb,
diff --git a/open-vm-tools/lib/include/vmware/tools/utils.h b/open-vm-tools/lib/include/vmware/tools/utils.h
index f65745906..a3292d5c0 100644
--- a/open-vm-tools/lib/include/vmware/tools/utils.h
+++ b/open-vm-tools/lib/include/vmware/tools/utils.h
@@ -51,15 +51,6 @@
# include <sys/time.h>
#endif
-
-/* Work around a glib limitation: it doesn't set G_INLINE_FUNC on Win32. */
-#if defined(G_PLATFORM_WIN32)
-# if defined(G_INLINE_FUNC)
-# undef G_INLINE_FUNC
-# endif
-# define G_INLINE_FUNC static __inline
-#endif
-
#ifndef ABS
# define ABS(x) (((x) >= 0) ? (x) : -(x))
#endif

3
open-vm-tools-11.0.5-15389592.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fc5ed2d752af33775250e0f103d622c0031d578f8394511617d2619b124dfc42
size 3979725

3
open-vm-tools-11.1.0-16036546.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cb029af04357f19a899995f9e1ecfe55222b76158ab6d64fe8b56df0ccf87308
size 3986835

23
open-vm-tools.changes
View File

@ -1,3 +1,26 @@
-------------------------------------------------------------------
Fri May 15 22:53:34 UTC 2020 - Kirk Allan <kallan@suse.com>
- Update to 11.1.0 (build 16036546) (boo#1171764, boo#1171765)
+ open-vm-tools 11.1.0 includes a new 'Service Discovery' plugin, which
connects with the vRealize Operations Manager product. For more
information and details on configuring this plugin, refer to Configuring
Service Discovery.
+ In this release, a new tools.conf switch is added to enable and disable
the guest customization in the guest virtual machine. By default, the
guest customization is enabled. For more details, refer KB 78903.
- Spec file changes to remove the is_opensuse macros where possible.
- Remoed the mv vm-support line from the spec file. vm-support is now
automatically placed in the /usr/bin directory.
- Added version number to Requires: libxmlsec1-openssl1 to help with vgauth
version checking.
- Added patches
+ pam-vmtoolsd.patch (boo#1171003)
- Drop unnecessary patch:
- app_info_plugin.patch
- diskinfo-debug-logging-1162435.patch
- gcc9-static-inline.patch
-------------------------------------------------------------------
Mon Mar 9 17:10:27 UTC 2020 - Kirk Allan <kallan@suse.com>

96
open-vm-tools.spec
View File

@ -18,41 +18,17 @@
# vgauth is enabled for openSUSE Factory, Leap 42.1, SLES12SP1 and later releases (which include xml-security-c and xerces-c)
%if 0%{?is_opensuse} && 0%{?suse_version} >= 1315 && 0%{?suse_version} != 1320
%bcond_without vgauth
%else
%if 0%{?sle_version} >= 0120100
%if 0%{?suse_version} >= 1500 || 0%{?sle_version} >= 0120100
%bcond_without vgauth
%else
%bcond_with vgauth
%endif
%endif
# vmblock-fuse.service requires systemd >= 228 which is in openSUSE Factory, SLES12SP2 and Leap 42.2 (see bsc#985773)
%if 0%{?is_opensuse}
%if 0%{?suse_version} >= 1315
%if 0%{?suse_version} != 1320
%if 0%{?sle_version} != 120100
%bcond_without vmblockfuseservice
%if 0%{?suse_version} >= 1500 || 0%{?sle_version} >= 0120200
%bcond_without vmblockfuseservice
%else
%bcond_with vmblockfuseservice
%endif
%else
%bcond_with vmblockfuseservice
%endif
%else
%bcond_with vmblockfuseservice
%endif
%else # !opensuse
%if 0%{?suse_version} >= 1315
%if 0%{?sle_version} > 120100
%bcond_without vmblockfuseservice
%else
%bcond_with vmblockfuseservice
%endif
%else
%bcond_with vmblockfuseservice
%endif
%bcond_with vmblockfuseservice
%endif
# exclude AMD PCnet32 LANCE pci.id from Supplements list [bnc#397554]
@ -64,8 +40,8 @@
Name: open-vm-tools
%define subname open-vm-tools
%define tarname open-vm-tools
%define bldnum 15389592
Version: 11.0.5
%define bldnum 16036546
Version: 11.1.0
Release: 0
Summary: Open Virtual Machine Tools
License: BSD-3-Clause AND GPL-2.0-only AND LGPL-2.1-only
@ -120,15 +96,13 @@ BuildRequires: pkgconfig(xerces-c)
# Use xmlsec1 instead of xml-security-c where available.
# If using xmlsec1, also need to use libxmlsec1-openssl1
%if 0%{?suse_version } > 1500
%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 0120300
BuildRequires: pkgconfig(xmlsec1)
Requires: libxmlsec1-openssl1
Requires: libxmlsec1-openssl1 >= 1.2.28
%else
%if ( 0%{?is_opensuse} && 0%{?sle_version} >= 0120100 )
BuildRequires: pkgconfig(xmlsec1)
Requires: libxmlsec1-openssl1
%else
%if 0%{?sle_version} >= 120300 && !0%{?is_opensuse}
# Leap 42.1 and 42.2 supports xmlsec1 and libxmlsec1-openssl1 but 12 SP1 and
# SP2 do not.
%if 0%{?is_opensuse} && 0%{?sle_version} >= 0120100
BuildRequires: pkgconfig(xmlsec1)
Requires: libxmlsec1-openssl1
%else
@ -136,7 +110,7 @@ BuildRequires: xml-security-c-devel
%define arg_xmlsecurity --enable-xmlsecurity
%endif
%endif
%endif
%else
# not using vgauth
%define arg_xmlsecurity --without-xmlsecurity
@ -161,12 +135,10 @@ Obsoletes: open-vm-tools-deploypkg <= 10.0.5
Supplements: modalias(pci:v000015ADd*sv*sd*bc*sc*i*)
ExclusiveArch: %ix86 x86_64
#Upstream patches
Patch0: gcc9-static-inline.patch
Patch1: gcc10-warning.patch
Patch2: diskinfo-debug-logging-1162435.patch
Patch3: app_info_plugin.patch
Patch0: gcc10-warning.patch
Patch1: pam-vmtoolsd.patch
%if 0%{?suse_version } >= 1500
%if 0%{?suse_version} >= 1500
%systemd_ordering
%else
%systemd_requires
@ -213,6 +185,14 @@ This package contains only the user-space programs and libraries of
machines.
%endif
%package sdmp
Summary: Service Discovery Plugin
Group: System Environment/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
%description sdmp
Service Discovery Plugin
%package -n libvmtools0
Summary: Open Virtual Machine Tools - shared library
Group: System/Libraries
@ -232,13 +212,12 @@ if you intend to create own plugins for vmtoolsd.
%prep
%setup -q -n %{tarname}-%{version}-%{bldnum}
# fix for an rpmlint warning regarding wrong line feeds
sed -i -e "s/\r//" README
#Upstream patches
%patch0 -p2
%patch1 -p2
%patch2 -p2
%patch3 -p2
%build
%if %{with_X}
@ -274,6 +253,7 @@ chmod 755 configure
%{?arg_xerces} \
--with-udev-rules-dir=%{_udevrulesdir} \
--enable-resolutionkms \
--enable-servicediscovery \
--disable-static
make
@ -289,9 +269,6 @@ rm -fr %{buildroot}%{_defaultdocdir}
rm -fr %{buildroot}/usr/share/doc/open-vm-tools/api
rm -f docs/api/build/html/FreeSans.ttf
# Move vm-support to /usr/bin (bnc#874931)
mv %{buildroot}%{_sysconfdir}/vmware-tools/vm-support %{buildroot}%{_bindir}
# install systemd init scripts and symlinks
install -p -m 644 -D %{SOURCE2} %{buildroot}%{_unitdir}/vmtoolsd.service
ln -sf service %{buildroot}%{_sbindir}/rcvmtoolsd
@ -374,6 +351,9 @@ install -D -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/modprobe.d/50-vmnics.co
%endif
%post sdmp
systemctl try-restart vmtoolsd.service || :
%preun
%service_del_preun vmtoolsd.service
%if %{with vgauth}
@ -394,6 +374,10 @@ fi
%endif
/sbin/ldconfig
%postun sdmp
# restart tools without plugin
systemctl try-restart vmtoolsd.service || :
%post -n libvmtools0 -p /sbin/ldconfig
%postun -n libvmtools0 -p /sbin/ldconfig
@ -403,12 +387,13 @@ rm -rf %{buildroot}
%files
%defattr(-, root, root)
%if 0%{?sle_version} <= 120200 && !0%{?is_opensuse}
%doc AUTHORS COPYING ChangeLog NEWS README
%else
%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 0120300
%license COPYING
%doc AUTHORS ChangeLog NEWS README
%else
%doc AUTHORS COPYING ChangeLog NEWS README
%endif
%{_bindir}/vmtoolsd
%dir %{_libdir}/%{name}
%dir %{_libdir}/%{name}/plugins
@ -486,6 +471,15 @@ rm -rf %{buildroot}
%endif
%files sdmp
%dir %{_libdir}/%{name}/serviceDiscovery/
%dir %{_libdir}/%{name}/serviceDiscovery/scripts/
%{_libdir}/%{name}/plugins/vmsvc/libserviceDiscovery.so
%{_libdir}/%{name}/serviceDiscovery/scripts/get-connection-info.sh
%{_libdir}/%{name}/serviceDiscovery/scripts/get-listening-process-info.sh
%{_libdir}/%{name}/serviceDiscovery/scripts/get-listening-process-perf-metrics.sh
%{_libdir}/%{name}/serviceDiscovery/scripts/get-versions.sh
%files -n libvmtools0
%defattr(-, root, root)
%{_libdir}/libvmtools.so.*

15
pam-vmtoolsd.patch Normal file
View File

@ -0,0 +1,15 @@
--- a/open-vm-tools/scripts/linux/pam.d/vmtoolsd
+++ b/open-vm-tools/scripts/linux/pam.d/vmtoolsd
@@ -1,7 +1,6 @@
#%PAM-1.0
-auth required pam_shells.so
-auth sufficient pam_unix.so shadow
-auth required pam_unix_auth.so shadow
-account required pam_shells.so
-account sufficient pam_unix.so
-account required pam_unix_acct.so
+auth required pam_shells.so
+auth requisite pam_nologin.so
+auth [user_unknown=ignore success=ok ignore=ignore auth_err=die default=bad] pam_securetty.so
+auth include common-auth
+account include common-account