diff --git a/.gitignore b/.gitignore index 93bbd68..eebff73 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/open-vm-tools-9.4.0-1280544.tar.gz +SOURCES/open-vm-tools-9.10.2-2822639.tar.gz diff --git a/.open-vm-tools.metadata b/.open-vm-tools.metadata index c20e812..ca4ae48 100644 --- a/.open-vm-tools.metadata +++ b/.open-vm-tools.metadata @@ -1 +1 @@ -92c80a00b4879e108b6970f7d016479e49421bd8 SOURCES/open-vm-tools-9.4.0-1280544.tar.gz +e77058f842120b0bc34cacc375757fa72c133518 SOURCES/open-vm-tools-9.10.2-2822639.tar.gz diff --git a/SOURCES/vmtoolsd.service b/SOURCES/vmtoolsd.service index 426d4fb..a4390c0 100644 --- a/SOURCES/vmtoolsd.service +++ b/SOURCES/vmtoolsd.service @@ -1,11 +1,15 @@ [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 TimeoutStopSec=5 +PrivateTmp=true [Install] WantedBy=multi-user.target +#Also=vgauthd.service diff --git a/SPECS/open-vm-tools.spec b/SPECS/open-vm-tools.spec index 1329ea5..ece7f5d 100644 --- a/SPECS/open-vm-tools.spec +++ b/SPECS/open-vm-tools.spec @@ -1,5 +1,5 @@ ################################################################################ -### Copyright 2013 VMware, Inc. All rights reserved. +### Copyright 2013-15 VMware, Inc. All rights reserved. ### ### RPM SPEC file for building open-vm-tools packages. ### @@ -19,27 +19,32 @@ ################################################################################ %global _hardened_build 1 -%global majorversion 9.4 -%global minorversion 0 -%global toolsbuild 1280544 +%global majorversion 9.10 +%global minorversion 2 +%global toolsbuild 2822639 %global toolsversion %{majorversion}.%{minorversion} %global toolsdaemon vmtoolsd +#%global vgauthdaemon vgauthd Name: open-vm-tools Version: %{toolsversion} -Release: 6%{?dist} +Release: 4%{?dist} Summary: Open Virtual Machine Tools for virtual machines hosted on VMware Group: Applications/System License: GPLv2 URL: http://%{name}.sourceforge.net/ Source0: http://sourceforge.net/projects/%{name}/files/%{name}/stable-%{majorversion}.x/%{name}-%{version}-%{toolsbuild}.tar.gz Source1: %{toolsdaemon}.service +#Source2: %{vgauthdaemon}.service %if 0%{?rhel} >= 7 ExclusiveArch: x86_64 %else ExclusiveArch: %{ix86} x86_64 %endif +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool BuildRequires: gcc-c++ BuildRequires: doxygen # Fuse is optional and enables vmblock-fuse @@ -49,6 +54,7 @@ BuildRequires: gtk2-devel >= 2.4.0 BuildRequires: gtkmm24-devel BuildRequires: libdnet-devel BuildRequires: libicu-devel +BuildRequires: libmspack-devel BuildRequires: libX11-devel BuildRequires: libXext-devel BuildRequires: libXi-devel @@ -56,9 +62,12 @@ BuildRequires: libXinerama-devel BuildRequires: libXrandr-devel BuildRequires: libXrender-devel BuildRequires: libXtst-devel +BuildRequires: openssl-devel BuildRequires: pam-devel -BuildRequires: procps-devel >= 3.3.10 +BuildRequires: procps-devel BuildRequires: systemd +BuildRequires: xerces-c-devel +#BuildRequires: xml-security-c-devel Requires: initscripts Requires: coreutils @@ -100,15 +109,21 @@ VMware virtual machines. %setup -q -n %{name}-%{version}-%{toolsbuild} %build -# Use -Wno-unused-local-typedefs to build with GCC 4.8 -# Use -Wno-deprecated-declarations for version 9.4.0 -export CFLAGS="$RPM_OPT_FLAGS -Wno-unused-local-typedefs -Wno-deprecated-declarations" -export CXXLAGS="$RPM_OPT_FLAGS -Wno-unused-local-typedefs -Wno-deprecated-declarations" -# Required for version 9.4.0 -export CUSTOM_PROCPS_NAME=procps +# Use _DEFAULT_SOURCE to suppress warning until upstream +# is fixed. Refer https://sourceware.org/bugzilla/show_bug.cgi?id=16632. +export CFLAGS="$RPM_OPT_FLAGS -D_DEFAULT_SOURCE" +export CXXLAGS="$RPM_OPT_FLAGS -D_DEFAULT_SOURCE" +# Required for regenerating configure script when +# configure.ac get modified +#autoreconf -i + +# configure from open-vm-tools 9.10.2 is missing 'x' bit +chmod a+x configure %configure \ --without-kernel-modules \ - --disable-static + --disable-static \ + --enable-deploypkg \ + --without-xmlsecurity sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool make %{?_smp_mflags} @@ -118,6 +133,8 @@ make install DESTDIR=%{buildroot} # Remove exec bit from config files chmod a-x %{buildroot}%{_sysconfdir}/pam.d/* +chmod a-x %{buildroot}%{_sysconfdir}/vmware-tools/*.conf +#chmod a-x %{buildroot}%{_sysconfdir}/vmware-tools/vgauth/schemas/* # Remove the DOS line endings sed -i "s|\r||g" README @@ -135,17 +152,25 @@ mv %{buildroot}%{_sysconfdir}/vmware-tools/vm-support %{buildroot}%{_bindir} # Systemd unit files install -p -m 644 -D %{SOURCE1} %{buildroot}%{_unitdir}/%{toolsdaemon}.service +#install -p -m 644 -D %{SOURCE2} %{buildroot}%{_unitdir}/%{vgauthdaemon}.service # 'make check' in open-vm-tools rebuilds docs and ends up regenerating # the font file. We can add %%check secion once 'make check' is fixed # upstream %post +if [ -e %{_bindir}/vmware-guestproxycerttool ]; then + mkdir -p %{_sysconfdir}/vmware-tools/GuestProxyData/server + mkdir -p -m 0700 %{_sysconfdir}/vmware-tools/GuestProxyData/trusted + %{_bindir}/vmware-guestproxycerttool -g &> /dev/null || /bin/true +fi /sbin/ldconfig +#%systemd_post %{vgauthdaemon}.service %systemd_post %{toolsdaemon}.service %preun %systemd_preun %{toolsdaemon}.service +#%systemd_preun %{vgauthdaemon}.service # Tell VMware that open-vm-tools is being uninstalled if [ "$1" = "0" -a \ @@ -158,6 +183,11 @@ fi %postun /sbin/ldconfig %systemd_postun_with_restart %{toolsdaemon}.service +#%systemd_postun_with_restart %{vgauthdaemon}.service +# Cleanup GuestProxy certs if open-vm-tools is being uninstalled +if [ "$1" = "0" ]; then \ + rm -rf %{_sysconfdir}/vmware-tools/GuestProxyData &> /dev/null || /bin/true +fi %post devel -p /sbin/ldconfig @@ -167,15 +197,22 @@ fi %doc AUTHORS ChangeLog COPYING NEWS README %config(noreplace) %{_sysconfdir}/pam.d/* %{_sysconfdir}/vmware-tools/ +%config(noreplace) %{_sysconfdir}/vmware-tools/*.conf +#%config %{_sysconfdir}/vmware-tools/vgauth/schemas/* +#%{_bindir}/VGAuthService +%{_bindir}/vm-support %{_bindir}/vmtoolsd %{_bindir}/vmware-checkvm +%{_bindir}/vmware-guestproxycerttool %{_bindir}/vmware-hgfsclient %{_bindir}/vmware-rpctool %{_bindir}/vmware-toolbox-cmd +#%{_bindir}/vmware-vgauth-cmd %{_bindir}/vmware-xferlogs -%{_bindir}/vm-support +%{_libdir}/libDeployPkg.so.* %{_libdir}/libguestlib.so.* %{_libdir}/libhgfs.so.* +#%{_libdir}/libvgauth.so.* %{_libdir}/libvmtools.so.* %dir %{_libdir}/%{name}/ %dir %{_libdir}/%{name}/plugins @@ -187,6 +224,7 @@ fi %{_datadir}/%{name}/ %exclude /sbin/ %{_unitdir}/%{toolsdaemon}.service +#%{_unitdir}/%{vgauthdaemon}.service %files desktop %{_sysconfdir}/xdg/autostart/*.desktop @@ -196,13 +234,41 @@ fi %files devel %doc docs/api/build/* +%exclude %{_includedir}/libDeployPkg/ %{_includedir}/vmGuestLib/ %{_libdir}/pkgconfig/*.pc +%{_libdir}/libDeployPkg.so %{_libdir}/libguestlib.so %{_libdir}/libhgfs.so +#%{_libdir}/libvgauth.so %{_libdir}/libvmtools.so %changelog +* Fri Aug 14 2015 Richard W.M. Jones - 9.10.2-4 +- Enable PrivateTmp for additional hardening + resolves: rhbz#1253698 + +* Wed Jul 29 2015 Richard W.M. Jones - 9.10.2-3 +- Enable deploypkg + resolves: rhbz#1172335 + +* Mon Jul 27 2015 Richard W.M. Jones - 9.10.2-2 +- Disable vgauthd service in vmtoolsd.service file. + resolves: rhbz#1172833 + +* Tue Jul 07 2015 Ravindra Kumar - 9.10.2-1 +- Package new upstream version open-vm-tools-9.10.2-2822639 +- Removed the patches that are no longer needed + resolves: rhbz#1172833 + +* Wed May 20 2015 Ravindra Kumar - 9.10.0-2 +- Claim ownership for /etc/vmware-tools directory + resolves: rhbz#1223498 + +* Wed May 20 2015 Richard W.M. Jones - 9.10.0-1 +- Rebase to open-vm-tools 9.10.0 (synchronizing with F22) + resolves: rhbz#1172833 + * Fri Sep 19 2014 Richard W.M. Jones - 9.4.0-6 - Really rebuild for updated procps resolves: rhbz#1140149