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

Accepting request 558997 from Virtualization:VMware

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/558997
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/open-vm-tools?expand=0&rev=75
This commit is contained in:
Dominique Leuenberger 2017-12-23 11:20:05 +00:00 committed by Git OBS Bridge
commit 6311b844ed
8 changed files with 53 additions and 2437 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Report-SLES12-SAP-guest-OS-as-SLES12.patch
View File

@ -1,37 +0,0 @@
From: Sebastian Parschauer <sparschauer@suse.de>
Date: Wed, 14 Dec 2016 14:28:42 +0100
Subject: Report SLES12-SAP guest OS as SLES12
References: bsc#1013496
Patch-mainline: Submitted, 2016-12-14 16:29 UTC+1 as GitHub PR 123
Git-commit: 35668574ecd785834b3de85d9b5f1c5999fbdba9
Git-repo: https://github.com/sriemer/open-vm-tools
On SLES12-SP1-SAP the "lsb_release -sd" command returns the string
"SUSE Linux Enterprise Server for SAP Applications 12 SP1".
Parsing in HostinfoGetOSShortName() detects the sub-strings "suse"
and "enterprise" but not "server 12". STR_OS_SLES is returned
resulting in displaying of "SUSE Linux Enterprise 8/9" in the
summary screen of the vSphere client. This is wrong.
So search for the sub-string "server for sap applications 12" and
return STR_OS_SLES_12 there. SLES11-SAP is not affected.
Signed-off-by: Sebastian Parschauer <sparschauer@suse.de>
---
open-vm-tools/lib/misc/hostinfoPosix.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/open-vm-tools/lib/misc/hostinfoPosix.c b/open-vm-tools/lib/misc/hostinfoPosix.c
index 0f55070..59f40f7 100644
--- a/open-vm-tools/lib/misc/hostinfoPosix.c
+++ b/open-vm-tools/lib/misc/hostinfoPosix.c
@@ -534,6 +534,7 @@ HostinfoGetOSShortName(char *distro, // IN: full distro name
} else if (strstr(distroLower, "suse")) {
if (strstr(distroLower, "enterprise")) {
if (strstr(distroLower, "server 12") ||
+ strstr(distroLower, "server for sap applications 12") ||
strstr(distroLower, "desktop 12")) {
Str_Strcpy(distroShort, STR_OS_SLES_12, distroShortSize);
} else if (strstr(distroLower, "server 11") ||

23
fix_discards_qualifiers_warning.patch
View File

@ -1,23 +0,0 @@
This patch is required in SLES11 environments which will report the following
error during compilation:
cert_key.c: In function 'LoadOpenSSLConf':
cert_key.c:264: error: passing argument 1 of 'ASN1_STRING_set_default_mask_asc'
discards qualifiers from pointer target type
In order to avoid the warning, mask must be passed as a char to
ASN1_STRING_set_default_mask_asc.
Index: open-vm-tools-10.1.15-6677369/guestproxycerttool/cert_key.c
===================================================================
--- open-vm-tools-10.1.15-6677369.orig/guestproxycerttool/cert_key.c
+++ open-vm-tools-10.1.15-6677369/guestproxycerttool/cert_key.c
@@ -261,7 +261,7 @@ LoadOpenSSLConf(const gchar *fname)
mask = NCONF_get_string(config, "req", "string_mask");
if (mask) {
- ASN1_STRING_set_default_mask_asc(mask);
+ ASN1_STRING_set_default_mask_asc((char*)mask);
}
ret = TRUE;

3
open-vm-tools-10.1.15-6677369.tar.gz
View File

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

3
open-vm-tools-10.2.0-7253323.tar.gz Normal file
View File

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

24
open-vm-tools.changes
View File

@ -1,3 +1,27 @@
-------------------------------------------------------------------
Thu Dec 21 00:40:51 UTC 2017 - mlatimer@suse.com
- The VMware provided open-vm-tools-deploypkg is now obsoleted.
-------------------------------------------------------------------
Fri Dec 15 23:45:30 UTC 2017 - mlatimer@suse.com
- Update to 10.2.0 (build 7253323) (boo#1073174)
+ Fix memory leak in vmtoolsd.
+ Add SUSE Server for SAP Applications to hostinfoPosix.c
+ Fix crash issue when stopping vmtoolsd(vmuser).
+ Add new GOS definitions (e.g. SLES 15) for virtual hardware version 14.
+ Add /usr/bin/vmware-user symlink to vmware-user-suid-wrapper.
+ Provide vmware-vgauth-smoketest, for VGAUthservice validation.
- Modify udev rules to only adjust timeout on disk devices (bsc#1063320)
+ udev_rules-disk-devs-only.patch
- Due to a hard dependency on glibc 2.12, open-vm-tools 10.2.0 no longer
builds for SLES11. Remove all SLES11 specific options in spec file.
- Drop unnecessary patches
- Report-SLES12-SAP-guest-OS-as-SLES12.patch
- resolutionKMS-wayland.patch
- fix_discards_qualifiers_warning.patch (only applicable to SLES11)
-------------------------------------------------------------------
Fri Oct 13 17:05:56 UTC 2017 - mlatimer@suse.com

106
open-vm-tools.spec
View File

@ -17,13 +17,6 @@
#
# systemd should be enabled by default on versions >= 13.1
%if 0%{?suse_version} >= 1310
%bcond_without systemd
%else
%bcond_with systemd
%endif
# 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
@ -71,8 +64,8 @@
Name: open-vm-tools
%define subname open-vm-tools
%define tarname open-vm-tools
%define bldnum 6677369
Version: 10.1.15
%define bldnum 7253323
Version: 10.2.0
Release: 0
Summary: Open Virtual Machine Tools
License: BSD-3-Clause and GPL-2.0 and LGPL-2.1
@ -89,17 +82,13 @@ Source8: vgauthd.service
Source9: vmblock-fuse.service
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: gcc-c++
BuildRequires: glibc >= 2.12
# don't use pkgconfig(gtk+-2.0) so we can build on SLE
%if 0%{?suse_version} >= 1310
BuildRequires: gtk3-devel
BuildRequires: gtkmm3-devel
%else
BuildRequires: gtk2-devel
BuildRequires: gtkmm2-devel
%endif
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: doxygen
BuildRequires: gtk3-devel
BuildRequires: gtkmm3-devel
BuildRequires: libdnet-devel
BuildRequires: libicu-devel
BuildRequires: libmspack-devel
@ -107,6 +96,7 @@ BuildRequires: libtool
BuildRequires: openssl-devel
BuildRequires: pam-devel
BuildRequires: pcre-devel
BuildRequires: procps-devel
BuildRequires: update-desktop-files
BuildRequires: xorg-x11-devel
%if %{with vgauth}
@ -114,10 +104,6 @@ BuildRequires: xorg-x11-devel
BuildRequires: xml-security-c-devel
BuildRequires: pkgconfig(xerces-c)
%endif
# libprocps is required with 12.3 and above
%if 0%{?suse_version} >= 1230
BuildRequires: procps-devel
%endif
# vmhgfs is always built so fuse is no longer optional
BuildRequires: fuse-devel
BuildRequires: udev
@ -129,24 +115,16 @@ BuildRequires: udev
Requires: libvmtools0 = %{version}-%{release}
Requires: net-tools
Requires: tar
%if 0%{?suse_version} >= 1310
Requires: which
%endif
# To prevent autoinstallation on SLES11, exclude supplements from that version
%if 0%{?suse_version} != 1110
# open-vm-tools >= 10.0.0 do not require open-vm-tools-deploypkg
# provided by VMware. That functionality is now available as part
# of open-vm-tools package itself.
Obsoletes: open-vm-tools-deploypkg <= 10.0.5
Supplements: modalias(pci:v000015ADd*sv*sd*bc*sc*i*)
%endif
%if !%{with systemd}
Requires(pre): %insserv_prereq
%endif
ExclusiveArch: %ix86 x86_64
Patch0: Report-SLES12-SAP-guest-OS-as-SLES12.patch
Patch1: resolutionKMS-wayland.patch
Patch2: fix_discards_qualifiers_warning.patch
Patch0: udev_rules-disk-devs-only.patch
%if %{with systemd}
%systemd_requires
%endif
%description
Open Virtual Machine Tools (open-vm-tools) are the open source
@ -210,24 +188,15 @@ if you intend to create own plugins for vmtoolsd.
%setup -q -n %{tarname}-%{version}-%{bldnum}
# fix for an rpmlint warning regarding wrong line feeds
sed -i -e "s/\r//" README
%patch0 -p2
%patch1 -p1
%if 0%{?suse_version} < 1310
%patch2 -p1
%endif
%patch0 -p1
%build
# disable warning unused-but-set-variable which will raise error because of -Werror
# disable warning deprecated-declarations which will raise error because of -Werror
# disable warning sizeof-pointer-memaccess which will raise error because of -Werror
# (this is because of 'g_static_mutex_init' usage which is now deprecated)
%if 0%{?suse_version} > 1110
export CFLAGS="%{optflags} -Wno-unused-local-typedefs -Wno-unused-but-set-variable -Wno-deprecated-declarations -Wno-sizeof-pointer-memaccess -Wno-cpp -fPIE"
export CXXFLAGS="%{optflags} -Wno-unused-local-typedefs -Wno-unused-but-set-variable -Wno-deprecated-declarations -Wno-sizeof-pointer-memaccess -Wno-cpp -fPIE"
%else
export CFLAGS="%{optflags} -Wno-deprecated-declarations -fPIE"
export CXXFLAGS="%{optflags} -Wno-deprecated-declarations -fPIE"
%endif
export LDFLAGS="-pie"
# Required for version 9.4.0
export CUSTOM_PROCPS_NAME=procps
@ -238,18 +207,13 @@ chmod 755 configure
%configure \
--without-kernel-modules \
--without-root-privileges \
%if 0%{?suse_version} < 1230
--without-procps \
%endif
%if %{with_X}
--with-x \
%else
--without-x \
%endif
--disable-dependency-tracking \
%if 0%{?suse_version} >= 1310
--with-gtk3 \
%endif
%if ! %{with vgauth}
--without-xmlsecurity \
--without-xerces \
@ -260,11 +224,7 @@ chmod 755 configure
make
%install
%if 0%{?suse_version} > 1110
%make_install
%else
%makeinstall
%endif
# Remove exec bit from config files
chmod a-x %{buildroot}%{_sysconfdir}/pam.d/*
@ -278,8 +238,7 @@ 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/sysvinit init scripts and symlinks
%if %{with systemd}
# install systemd init scripts and symlinks
install -p -m 644 -D %{SOURCE2} %{buildroot}%{_unitdir}/vmtoolsd.service
ln -sf service %{buildroot}%{_sbindir}/rcvmtoolsd
%if %{with vmblockfuseservice}
@ -294,10 +253,6 @@ mkdir -p %{buildroot}%{_var}/lib/vmware
# if vgauth is not enabled, it must be removed from vmtoolsd.service
sed -i '/vgauth/d' %{buildroot}%{_unitdir}/vmtoolsd.service
%endif
%else
install -D -m 0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/vmtoolsd
ln -sf ../../etc/init.d/vmtoolsd %{buildroot}%{_sbindir}/rcvmtoolsd
%endif
%if %{with_X}
# vmware-user is started by vmware-user-suid-wrapper by xdg-autostart
@ -310,9 +265,7 @@ install -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/xdg/autostart/vmware-us
# Install the default tools.conf
install -D -m 0644 %{S:7} %{buildroot}%{_sysconfdir}/vmware-tools/tools.conf
# Remove the 'disable-perl-mon=1' setting if procps is available
%if 0%{?suse_version} > 1220
sed -i '/openSUSE/,+2d' %{buildroot}%{_sysconfdir}/vmware-tools/tools.conf
%endif
# We have our own 'safe' autostart wrapper, which checks for modules to start in autologin mode...
# Thus we drop the 'original' autostartup
@ -331,23 +284,17 @@ install -D -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/modprobe.d/50-vmnics.co
( cd %{buildroot}/sbin; rm mount.vmhgfs; ln -s ..%{_sbindir}/mount.vmhgfs )
%pre
%if %{with systemd}
%service_add_pre vmtoolsd.service
%if %{with vgauth}
%service_add_pre vgauthd.service
%endif
%endif
%post
/sbin/ldconfig
%if %{with systemd}
%service_add_post vmtoolsd.service
%if %{with vgauth}
%service_add_post vgauthd.service
%endif
%else
%{fillup_and_insserv -Y vmtoolsd}
%endif
%if %{with_X}
@ -360,11 +307,7 @@ install -D -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/modprobe.d/50-vmnics.co
%endif
%post desktop
%if 0%{?suse_version} <= 1130
%run_permissions
%else
%set_permissions /usr/bin/vmware-user-suid-wrapper
%endif
%if %{with vmblockfuseservice}
%service_add_post vmblock-fuse.service
%endif
@ -384,22 +327,10 @@ install -D -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/modprobe.d/50-vmnics.co
%endif
%preun
%if %{with systemd}
%service_del_preun vmtoolsd.service
%if %{with vgauth}
%service_del_preun vgauthd.service
%endif
%else
# stop service with the old name (if exists) on update (something like %%stop_on_update)
test -n "$FIRST_ARG" || FIRST_ARG=$1
if test "$FIRST_ARG" -ge 1 ; then
test -f /etc/sysconfig/services && . /etc/sysconfig/services
if test "$YAST_IS_RUNNING" != "instsys" ; then
/etc/init.d/vmware-guestd stop > /dev/null 2>&1 || :
fi
fi
%stop_on_removal vmtoolsd
%endif
# Tell VMware that open-vm-tools is being uninstalled
if [ "$1" = "0" -a \
-e %{_bindir}/vmware-checkvm -a \
@ -409,15 +340,10 @@ if [ "$1" = "0" -a \
fi
%postun
%if %{with systemd}
%service_del_postun vmtoolsd.service
%if %{with vgauth}
%service_del_postun vgauthd.service
%endif
%else
%restart_on_update vmtoolsd
%insserv_cleanup
%endif
/sbin/ldconfig
%post -n libvmtools0 -p /sbin/ldconfig
@ -476,21 +402,18 @@ rm -rf %{buildroot}
%dir %{_var}/lib/vmware
%{_bindir}/VGAuthService
%{_bindir}/vmware-vgauth-cmd
%{_bindir}/vmware-vgauth-smoketest
%dir %{_sysconfdir}/vmware-tools/vgauth
%dir %{_sysconfdir}/vmware-tools/vgauth/schemas
%config(noreplace) %{_sysconfdir}/vmware-tools/vgauth.conf
%config(noreplace) %{_sysconfdir}/vmware-tools/vgauth/schemas/*
%endif
%{_datadir}/%{name}/
%if %{with systemd}
%{_unitdir}/vmtoolsd.service
%if %{with vgauth}
%{_unitdir}/vgauthd.service
%{_sbindir}/rcvgauthd
%endif
%else
%{_sysconfdir}/init.d/vmtoolsd
%endif
%{_sbindir}/rcvmtoolsd
%exclude %{_libdir}/*.so
@ -501,6 +424,7 @@ rm -rf %{buildroot}
%config %{_sysconfdir}/xdg/autostart/vmware-user-autostart.desktop
%verify(not mode) %attr(0755, root, root) %{_bindir}/vmware-user-suid-wrapper
%{_libdir}/%{name}/plugins/vmusr/
%{_bindir}/vmware-user
%{_bindir}/vmware-user-autostart-wrapper
%{_bindir}/vmware-vmblock-fuse
%if %{with vmblockfuseservice}

2283
resolutionKMS-wayland.patch
View File

File diff suppressed because it is too large Load Diff

11
udev_rules-disk-devs-only.patch Normal file
View File

@ -0,0 +1,11 @@
Only adjust timeout on disk devices.
Index: open-vm-tools-10.2.0-7253323/udev/99-vmware-scsi-udev.rules
===================================================================
--- open-vm-tools-10.2.0-7253323.orig/udev/99-vmware-scsi-udev.rules
+++ open-vm-tools-10.2.0-7253323/udev/99-vmware-scsi-udev.rules
@@ -1,3 +1,3 @@
-ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware*", ATTRS{timeout}=="?*", ATTRS{model}=="Virtual disk*", RUN+="/bin/sh -c 'echo 180 >/sys$DEVPATH/timeout'"
-ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware*", ATTRS{timeout}=="?*", ATTRS{model}=="VMware Virtual S", RUN+="/bin/sh -c 'echo 180 >/sys$DEVPATH/timeout'"
+ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware*" , ATTRS{model}=="Virtual disk*", ENV{DEVTYPE}=="disk", RUN+="/bin/sh -c 'echo 180 >/sys$DEVPATH/device/timeout'"
+ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware*" , ATTRS{model}=="VMware Virtual S", ENV{DEVTYPE}=="disk", RUN+="/bin/sh -c 'echo 180 >/sys$DEVPATH/device/timeout'"