Hello community,
here is the log from the commit of package open-vm-tools for openSUSE:Factory
checked in at 2020-05-20 18:37:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/open-vm-tools (Old)
and /work/SRC/openSUSE:Factory/.open-vm-tools.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "open-vm-tools"
Wed May 20 18:37:23 2020 rev:91 rq:807054 version:11.1.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/open-vm-tools/open-vm-tools.changes
2020-03-11 18:49:30.439518234 +0100
+++ /work/SRC/openSUSE:Factory/.open-vm-tools.new.2738/open-vm-tools.changes
2020-05-20 18:37:34.116244067 +0200
@@ -1,0 +2,23 @@
+Fri May 15 22:53:34 UTC 2020 - Kirk Allan <kal...@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
+
+-------------------------------------------------------------------
Old:
----
app_info_plugin.patch
diskinfo-debug-logging-1162435.patch
gcc9-static-inline.patch
open-vm-tools-11.0.5-15389592.tar.gz
New:
----
open-vm-tools-11.1.0-16036546.tar.gz
pam-vmtoolsd.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ open-vm-tools.spec ++++++
--- /var/tmp/diff_new_pack.Oqse3c/_old 2020-05-20 18:37:35.612247203 +0200
+++ /var/tmp/diff_new_pack.Oqse3c/_new 2020-05-20 18:37:35.612247203 +0200
@@ -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
-%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
+%if 0%{?suse_version} >= 1500 || 0%{?sle_version} >= 0120200
+ %bcond_without vmblockfuseservice
%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 @@
# 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
-%else
-%if ( 0%{?is_opensuse} && 0%{?sle_version} >= 0120100 )
-BuildRequires: pkgconfig(xmlsec1)
-Requires: libxmlsec1-openssl1
+Requires: libxmlsec1-openssl1 >= 1.2.28
%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 @@
%define arg_xmlsecurity --enable-xmlsecurity
%endif
%endif
-%endif
+
%else
# not using vgauth
%define arg_xmlsecurity --without-xmlsecurity
@@ -161,12 +135,10 @@
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 @@
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 @@
%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 @@
%{?arg_xerces} \
--with-udev-rules-dir=%{_udevrulesdir} \
--enable-resolutionkms \
+ --enable-servicediscovery \
--disable-static
make
@@ -289,9 +269,6 @@
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 @@
%endif
+%post sdmp
+systemctl try-restart vmtoolsd.service || :
+
%preun
%service_del_preun vmtoolsd.service
%if %{with vgauth}
@@ -394,6 +374,10 @@
%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 @@
%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 @@
%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.*
++++++ gcc10-warning.patch ++++++
--- /var/tmp/diff_new_pack.Oqse3c/_old 2020-05-20 18:37:35.644247270 +0200
+++ /var/tmp/diff_new_pack.Oqse3c/_new 2020-05-20 18:37:35.644247270 +0200
@@ -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
++++++ open-vm-tools-11.0.5-15389592.tar.gz ->
open-vm-tools-11.1.0-16036546.tar.gz ++++++
++++ 262903 lines of diff (skipped)
++++++ pam-vmtoolsd.patch ++++++
--- 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
