Hello community, here is the log from the commit of package open-vm-tools for openSUSE:Factory checked in at 2015-09-13 09:45:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/open-vm-tools (Old) and /work/SRC/openSUSE:Factory/.open-vm-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "open-vm-tools" Changes: -------- --- /work/SRC/openSUSE:Factory/open-vm-tools/open-vm-tools.changes 2015-08-21 07:42:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.open-vm-tools.new/open-vm-tools.changes 2015-09-13 09:45:05.000000000 +0200 @@ -1,0 +2,42 @@ +Wed Sep 9 16:43:54 UTC 2015 - [email protected] + +- Enable certificate-based access control via SAML tokens (vgauth) on + openSUSE Factory. + +------------------------------------------------------------------- +Thu Sep 3 21:51:58 UTC 2015 - [email protected] + +- Update to open-vm-tools-10.0.0-3000743 (boo#944615) + + Common versioning + + Quiesced snapshots enhancements for Linux guests running IO workload + + Shared Folders (Linux kernel 4.0.0 and higher only) + + ESXi Serviceability + + GuestInfo Enhancements + + Internationalization, with support for: + + English + + French + + German + + Spanish + + Italian + + Japanese + + Korean + + Simplified Chinese + + Traditional Chinese + + Compatibility with all supported versions of VMware vSphere, VMware + Workstation 12.0 and VMware Fusion 8.0 +- Drop upstream patches included (or not necessary) in 10.0.0: + - 0001-Fix-vmxnet-module-on-kernels-3.16.patch + - 0002-Fix-d_alias-to-d_u.d_alias-for-kernel-3.18.patch + - 0003-Fix-f_dentry-msghdr-kernel-3.19.patch + - 0004-vmhgfs-bdi-kernel-4.0.patch + - xutils-add-cstring.patch +- Remove vmhgfs define to ensure vmhgfs is always built +- Only build kernel modules for versions <= openSUSE 13.2 + +------------------------------------------------------------------- +Wed Sep 2 22:39:25 UTC 2015 - [email protected] + +- Do not attempt to start vmware-vmblock-fuse if vmware-vmblock-fuse + (included with the -desktop package) is not installed (bsc#943236) + +------------------------------------------------------------------- Old: ---- 0001-Fix-vmxnet-module-on-kernels-3.16.patch 0002-Fix-d_alias-to-d_u.d_alias-for-kernel-3.18.patch 0003-Fix-f_dentry-msghdr-kernel-3.19.patch 0004-vmhgfs-bdi-kernel-4.0.patch open-vm-tools-9.10.2-2822639.tar.gz xutils-add-cstring.patch New: ---- open-vm-tools-10.0.0-3000743.tar.gz vgauthd.service ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ open-vm-tools.spec ++++++ --- /var/tmp/diff_new_pack.saIpOw/_old 2015-09-13 09:45:06.000000000 +0200 +++ /var/tmp/diff_new_pack.saIpOw/_new 2015-09-13 09:45:06.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package open-vm-tools # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 Dominique Leuenberger, Amsterdam, Netherlands. # # All modifications and additions to the file contributed by third parties @@ -28,9 +28,12 @@ %bcond_with deploypkg %endif -# The vmhgfs module is currently built for all versions -# (Shared Folders are not supported under ESX/ESXi, so this driver is not necessary for SLES11/12) -%define vmhgfs vmhgfs +# vgauth is enabled on versions > 13.2 (which include xml-security-c and xerces-c) +%if 0%{?suse_version} > 1320 +%bcond_without vgauth +%else +%bcond_with vgauth +%endif # exclude AMD PCnet32 LANCE pci.id from Supplements list [bnc#397554] %define __find_supplements sh -c '/usr/lib/rpm/find-supplements %{name} | grep -v pci:v00001022d00002000' @@ -50,28 +53,33 @@ %define vm_modules1210 vmxnet %endif -# Modules that have to be build up to version 12.3 (Last checked on 2012-02-05 with kernel 3.2.0) -%define vm_modules %{?vm_modules1230} %{?vmhgfs} %{?vm_modules1210} %{?vm_modules1220} +# Modules are only built for versions <= openSUSE 13.2 +# The vmhgfs module is currently built for all versions <= openSUSE 13.2 +# Beginning with the 4.0.0 kernel, the vmhgfs module is replaced by the user space vmhgfs-fuse client +%if 0%{?suse_version} <= 1320 +%define vm_modules vmhgfs %{?vm_modules1230} %{?vm_modules1210} %{?vm_modules1220} +%endif # X modules are lower prio upstream and once in a while fail. Offer an easy way to enable/disable them. %define with_X 1 Name: open-vm-tools %define tarname open-vm-tools -Version: 9.10.2 +Version: 10.0.0 Release: 0 -%define svn_rev 2822639 +%define svn_rev 3000743 Summary: Open Virtual Machine Tools License: BSD-3-Clause and GPL-2.0 and LGPL-2.1 Group: System/Emulators/PC -Url: http://open-vm-tools.sourceforge.net/ -Source: http://sourceforge.net/projects/open-vm-tools/files/open-vm-tools/stable-9.10.x/%{tarname}-%{version}-%{svn_rev}.tar.gz +Url: https://github.com/vmware/open-vm-tools +Source: https://github.com/vmware/open-vm-tools/archive/%{tarname}-%{version}-%{svn_rev}.tar.gz Source1: vmtoolsd Source2: vmtoolsd.service Source3: vmware-user-autostart.desktop Source5: vmware-user-autostart-wrapper Source6: open-vm-tools-modprobe.conf Source7: tools.conf +Source8: vgauthd.service Source98: preamble BuildRoot: %{_tmppath}/%{name}-%{version}-build # SUSE versions below 1110 (SLES11 SP4) must use gcc 4.7 to compile under i586 @@ -102,15 +110,18 @@ BuildRequires: pcre-devel BuildRequires: update-desktop-files BuildRequires: xorg-x11-devel +%if %{with vgauth} +# vgauth requires xerces-c and xml-security-c +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 -%if "%{?vmhgfs}" -# Fuse is optional and enables vmblock-fuse +# vmhgfs is always built so fuse is no longer optional BuildRequires: fuse-devel %endif -%endif Requires: net-tools Requires: tar %if 0%{?suse_version} >= 1310 @@ -127,12 +138,7 @@ Requires(pre): %fillup_prereq Requires(pre): %insserv_prereq ExclusiveArch: %ix86 x86_64 -Patch0: xutils-add-cstring.patch -Patch1: enable-gcc46+.patch -Patch2: 0001-Fix-vmxnet-module-on-kernels-3.16.patch -Patch3: 0002-Fix-d_alias-to-d_u.d_alias-for-kernel-3.18.patch -Patch4: 0003-Fix-f_dentry-msghdr-kernel-3.19.patch -Patch5: 0004-vmhgfs-bdi-kernel-4.0.patch +Patch0: enable-gcc46+.patch %if %{KMP} %suse_kernel_module_package -n vmware-guest -p %{SOURCE98} xen um @@ -229,16 +235,11 @@ if you intend to create own plugins for vmtoolsd. %prep -%setup -q -n %{tarname}-%{version}-%{svn_rev} -chmod -x AUTHORS COPYING ChangeLog NEWS README +# The tarball seems a little bit broken... +%setup -q -n %{tarname}-%{tarname}-%{version}-%{svn_rev}/%{tarname} # fix for an rpmlint warning regarding wrong line feeds sed -i -e "s/\r//" README %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 %build %if ! %{KMP} @@ -248,8 +249,6 @@ # (this is because of 'g_static_mutex_init' usage which is now deprecated) # disable deploypkg due to old versions of libmspack not providing pkgconfig # disable ssl due to 'discards qualifiers' error in SLES11 -# compile without pkgconfig(xml-security-c), as this is not yet available in OBS -# compile without pkgconfig(xerces-c), which requires xml-security-c to provide vgauth %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" @@ -283,9 +282,11 @@ --without-x \ %endif --disable-dependency-tracking \ - --disable-static \ +%if ! %{with vgauth} --without-xmlsecurity \ - --without-xerces + --without-xerces \ +%endif + --disable-static make %endif @@ -354,6 +355,10 @@ %if %{with systemd} install -p -m 644 -D %{SOURCE2} %{buildroot}%{_unitdir}/vmtoolsd.service ln -sf service %{buildroot}%{_sbindir}/rcvmtoolsd +%if %{with vgauth} +install -p -m 644 -D %{SOURCE8} %{buildroot}%{_unitdir}/vgauthd.service +ln -sf service %{buildroot}%{_sbindir}/rcvgauthd +%endif %else install -D -m 0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/vmtoolsd ln -sf ../../etc/init.d/vmtoolsd %{buildroot}%{_sbindir}/rcvmtoolsd @@ -387,24 +392,26 @@ install -D -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/modprobe.d/50-vmnics.conf %endif -%if "%{?vmhgfs}" # fix a link pointing to the buildroot for mount.vmhgfs ( cd %{buildroot}/sbin; rm mount.vmhgfs; ln -s ..%{_sbindir}/mount.vmhgfs ) -%else -find %{buildroot} -name '*vmhgfs*' -delete -print -%endif %endif %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 @@ -426,6 +433,9 @@ %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 @@ -448,6 +458,9 @@ %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 @@ -476,16 +489,15 @@ %{_libdir}/%{name}/plugins/vmsvc/libvmbackup.so %{_libdir}/%{name}/plugins/common/libhgfsServer.so %{_libdir}/%{name}/plugins/common/libvix.so +%{_bindir}/vmhgfs-fuse %{_bindir}/vmware-checkvm %{_bindir}/vmware-hgfsclient %{_bindir}/vmware-rpctool %{_bindir}/vmware-toolbox-cmd %{_bindir}/vmware-xferlogs %{_bindir}/vm-support -%if "%{?vmhgfs}" %{_sbindir}/mount.vmhgfs /sbin/mount.vmhgfs -%endif %config(noreplace) %{_sysconfdir}/pam.d/vmtoolsd %dir %{_sysconfdir}/vmware-tools %dir %{_sysconfdir}/vmware-tools/scripts @@ -507,9 +519,21 @@ %{_libdir}/%{name}/plugins/vmsvc/libgrabbitmqProxy.so %config(noreplace) %{_sysconfdir}/vmware-tools/guestproxy-ssl.conf %endif +%if %{with vgauth} +%{_bindir}/VGAuthService +%{_bindir}/vmware-vgauth-cmd +%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 @@ -535,6 +559,9 @@ %if %{with deploypkg} %{_libdir}/libDeployPkg.so.* %endif +%if %{with vgauth} +%{_libdir}/libvgauth.so.* +%endif %files -n libvmtools-devel %defattr(-,root,root) ++++++ open-vm-tools-9.10.2-2822639.tar.gz -> open-vm-tools-10.0.0-3000743.tar.gz ++++++ ++++ 1323280 lines of diff (skipped) ++++++ vgauthd.service ++++++ [Unit] Description=VGAuth Service for open-vm-tools Documentation=http://github.com/vmware/open-vm-tools ConditionVirtualization=vmware PartOf=vmtoolsd.service [Service] ExecStart=/usr/bin/VGAuthService -s TimeoutStopSec=5 [Install] RequiredBy=vmtoolsd.service ++++++ vmtoolsd ++++++ --- /var/tmp/diff_new_pack.saIpOw/_old 2015-09-13 09:45:08.000000000 +0200 +++ /var/tmp/diff_new_pack.saIpOw/_new 2015-09-13 09:45:08.000000000 +0200 @@ -81,12 +81,14 @@ if [ ! -d /tmp/VMwareDnD ]; then mkdir -m 1777 /tmp/VMwareDnD fi - if [ ! -d /var/run/vmblock-fuse ]; then - mkdir -m 555 /var/run/vmblock-fuse + if [ -x /usr/bin/vmware-vmblock-fuse ]; then + if [ ! -d /var/run/vmblock-fuse ]; then + mkdir -m 555 /var/run/vmblock-fuse + fi + /usr/bin/vmware-vmblock-fuse \ + -o subtype=vmware-vmblock,default_permissions,allow_other \ + /var/run/vmblock-fuse fi - /usr/bin/vmware-vmblock-fuse \ - -o subtype=vmware-vmblock,default_permissions,allow_other \ - /var/run/vmblock-fuse modprobe $VMBALLOON ## Start daemon with startproc(8). If this fails ## the return value is set appropriately by startproc. @@ -107,7 +109,7 @@ /sbin/killproc -SIGUSR1 $VMTOOLSUSER_BIN fi /sbin/killproc -TERM $VMTOOLSD_BIN - umount /var/run/vmblock-fuse || : + /bin/mountpoint -q /var/run/vmblock-fuse && umount /var/run/vmblock-fuse || : modprobe -r $VMBALLOON || : # Remember status and be verbose ++++++ vmtoolsd.service ++++++ --- /var/tmp/diff_new_pack.saIpOw/_old 2015-09-13 09:45:08.000000000 +0200 +++ /var/tmp/diff_new_pack.saIpOw/_new 2015-09-13 09:45:08.000000000 +0200 @@ -1,7 +1,9 @@ [Unit] Description=Service for virtual machines hosted on VMware -Documentation=http://open-vm-tools.sourceforge.net/about.php +Documentation=http://github.com/vmware/open-vm-tools ConditionVirtualization=vmware +Requires=vgauthd.service +After=vgauthd.service [Service] ExecStart=/usr/bin/vmtoolsd @@ -9,3 +11,4 @@ [Install] WantedBy=multi-user.target +Also=vgauthd.service
