rpms
/
open-vm-tools
7
0
Fork 0
Code Issues Pull Requests Releases Activity

* Wed Jul 21 2021 Miroslav Rezanina <rezanin@redhat.com> - 11.3.0-1 

- Rebase to 11.3.0 [bz#1974471]
- Resolves: bz#1974471
  ([ESXi][RHEL9]Open-vm-tools release 11.3.0 has been released - please update for RHEL 9.0)
This commit is contained in:
Miroslav Rezanina 2021-07-21 02:58:31 -04:00
parent d4060079ea
commit 8c34994952
3 changed files with 74 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -20,3 +20,4 @@
/open-vm-tools-11.1.5-16724464.tar.gz
/open-vm-tools-11.2.0-16938113.tar.gz
/open-vm-tools-11.2.5-17337674.tar.gz
/open-vm-tools-11.3.0-18090558.tar.gz

144
open-vm-tools.spec
View File

@ -19,19 +19,24 @@
################################################################################
%global _hardened_build 1
%global majorversion 11.2
%global minorversion 5
%global toolsbuild 17337674
%global majorversion 11.3
%global minorversion 0
%global toolsbuild 18090558
%global toolsversion %{majorversion}.%{minorversion}
%global toolsdaemon vmtoolsd
%global vgauthdaemon vgauthd
%if 0%{?rhel} == 7
%global _modulesloaddir %{_prefix}/lib/modules-load.d
%endif
Name: open-vm-tools
Version: %{toolsversion}
Release: 5%{?dist}
Release: 1%{?dist}
Summary: Open Virtual Machine Tools for virtual machines hosted on VMware
License: GPLv2
URL: https://github.com/vmware/%{name}
Source0: https://github.com/vmware/%{name}/releases/download/stable-%{version}/%{name}-%{version}-%{toolsbuild}.tar.gz
Source1: %{toolsdaemon}.service
Source2: %{vgauthdaemon}.service
@ -39,17 +44,14 @@ Source3: run-vmblock\x2dfuse.mount
Source4: open-vm-tools.conf
Source5: vmtoolsd.pam
%if 0%{?rhel} >= 7
ExclusiveArch: x86_64
%else
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64 aarch64
%endif
Patch1: %{name}-gcc11.patch
# For bz#1936382 - [ESXi][RHEL-9][FTBS] open-vm-tools not working with newer gtk libraries
Patch2: ovt-Fixes-necessary-to-build-open-vm-tools-with-newer-gt.patch
# For bz#1954040 - [ESXi][RHEL9.0][open-vm-tools] Coverity detected an important defect in open-vm-tools-11.2.5 rebase
Patch3: ovt-Fix-a-memory-leak-reported-by-a-partner-from-their-C.patch
# Source-git patches
BuildRequires: autoconf
BuildRequires: automake
@ -60,24 +62,10 @@ BuildRequires: doxygen
# Fuse is optional and enables vmblock-fuse
BuildRequires: fuse-devel
BuildRequires: glib2-devel >= 2.14.0
%if 0%{?fedora} >= 23 || 0%{?rhel} > 7
# F23 split gdk-pixbuf2-devel >= 2.31.3-5 into 3 packages,
# gdk-pixbuf2-devel, gdk-pixbuf2-modules-devel, and
# gdk-pixbuf2-xlib-devel. gtk2-devel does not depend on
# gdk-pixbuf2-xlib-devel. Therefore, we need to pull in
# gdk-pixbuf2-xlib-devel dependency ourselves.
BuildRequires: gdk-pixbuf2-xlib-devel
BuildRequires: gtk3-devel >= 3.10.0
BuildRequires: gtkmm30-devel >= 3.10.0
%else
BuildRequires: gtk2-devel >= 2.4.0
BuildRequires: gtkmm24-devel
%endif
BuildRequires: libdrm-devel
BuildRequires: libicu-devel
BuildRequires: libmspack-devel
# Unfortunately, xmlsec1-openssl does not add libtool-ltdl
# dependency, so we need to add it ourselves.
# Unfortunately, xmlsec1-openssl does not add libtool-ltdl dependency, so we
# need to add it ourselves.
BuildRequires: libtool-ltdl-devel
BuildRequires: libX11-devel
BuildRequires: libXext-devel
@ -88,20 +76,24 @@ BuildRequires: libXrender-devel
BuildRequires: libXtst-devel
BuildRequires: openssl-devel
BuildRequires: pam-devel
BuildRequires: pkgconfig(libdrm)
BuildRequires: pkgconfig(libudev)
BuildRequires: procps-devel
%if 0%{?fedora} >= 28 || 0%{?rhel} >=8
BuildRequires: rpcgen
%endif
BuildRequires: systemd-devel
%if 0%{?fedora} >= 30 || 0%{?rhel} >= 9
BuildRequires: systemd-rpm-macros
%endif
%if 0%{?fedora} >= 28 || 0%{?rhel} >=9
BuildRequires: libtirpc-devel
%endif
BuildRequires: xmlsec1-openssl-devel
%if 0%{?fedora} || 0%{?rhel} >= 8
BuildRequires: gdk-pixbuf2-xlib-devel
BuildRequires: gtk3-devel >= 3.10.0
BuildRequires: gtkmm30-devel >= 3.10.0
BuildRequires: libtirpc-devel
BuildRequires: rpcgen
BuildRequires: systemd-rpm-macros
%else
BuildRequires: gtk2-devel >= 2.4.0
BuildRequires: gtkmm24-devel
BuildRequires: systemd
%endif
Requires: coreutils
Requires: fuse
Requires: iproute
@ -114,14 +106,10 @@ Requires: util-linux
Requires: which
# xmlsec1-openssl needs to be added explicitly
Requires: xmlsec1-openssl
%if 0%{?fedora} < 28 || 0%{?rhel} < 8
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
%endif
# 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.
# 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
%description
@ -152,8 +140,8 @@ Requires: procps
%description sdmp
This package contains only the user-space programs and utility scripts of
%{name} that are essential for performing service discovery in VMware virtual
machines by vRealize Operations Service Discovery Management Pack.
%{name} that are essential for performing service discovery in VMware
virtual machines by vRealize Operations Service Discovery Management Pack.
%package devel
Summary: Development libraries for Open Virtual Machine Tools
@ -177,22 +165,22 @@ machines.
%autosetup -p2 -n %{name}-%{version}-%{toolsbuild}
%build
# Required for regenerating configure script when
# configure.ac get modified
autoreconf -vif
%if 0%{?fedora} >= 28 || 0%{?rhel} >=8
%global usetirpc with-tirpc
%else
%global usetirpc without-tirpc
%endif
%configure \
--without-kernel-modules \
--enable-xmlsec1 \
--enable-resolutionkms \
--enable-servicediscovery \
--%{usetirpc} \
%if 0%{?fedora} || 0%{?rhel} >= 8
--with-tirpc \
--without-gtk2 \
--without-gtkmm \
%else
--without-tirpc \
--without-gtk3 \
--without-gtkmm3 \
%endif
--disable-static
sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
@ -231,16 +219,11 @@ install -p -m 644 -D '%{SOURCE3}' %{buildroot}%{_unitdir}/run-vmblock\\x2dfuse.m
install -p -m 644 -D %{SOURCE4} %{buildroot}%{_modulesloaddir}/open-vm-tools.conf
install -p -m 644 -D %{SOURCE5} %{buildroot}%{_sysconfdir}/pam.d/vmtoolsd
# '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
# '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 0%{?fedora} >= 28 || 0%{?rhel} >= 8
%{?ldconfig}
%else
/sbin/ldconfig
%endif
%?ldconfig
# Setup mount point for Shared Folders
# NOTE: Use systemd-detect-virt to detect VMware platform because
# vmware-checkvm might misbehave on non-VMware platforms.
@ -268,7 +251,16 @@ fi
%systemd_post %{vgauthdaemon}.service %{toolsdaemon}.service
%post desktop
%systemd_post run-vmblock\x2dfuse.mount
%systemd_post run-vmblock\\x2dfuse.mount
# Need to enable the service as it is not enabled by default.
# Enabling an already-enabled service is not an error. So, we can perform this
# step everytime during the post-install.
if [ -f %{_bindir}/vmware-checkvm ] && \
%{_bindir}/systemd-detect-virt | grep -iq VMware && \
%{_bindir}/vmware-checkvm &> /dev/null && \
%{_bindir}/vmware-checkvm -p | grep -q Workstation; then
%{_bindir}/systemctl enable run-vmblock\\x2dfuse.mount &> /dev/null || /bin/true
fi
%post sdmp
# Load the newly installed or upgraded SDMP plugin
@ -277,6 +269,7 @@ if %{_bindir}/systemctl is-active %{toolsdaemon}.service &> /dev/null; then
fi
%preun
%?ldconfig
%systemd_preun %{toolsdaemon}.service %{vgauthdaemon}.service
if [ "$1" = "0" -a \
@ -298,18 +291,14 @@ if [ "$1" = "0" -a \
fi
%preun desktop
%systemd_preun run-vmblock\x2dfuse.mount
%systemd_preun run-vmblock\\x2dfuse.mount
%postun
%if 0%{?fedora} >= 28 || 0%{?rhel} >= 8
%{?ldconfig}
%else
/sbin/ldconfig
%endif
%?ldconfig
%systemd_postun_with_restart %{toolsdaemon}.service %{vgauthdaemon}.service
%postun desktop
%systemd_postun run-vmblock\x2dfuse.mount
%systemd_postun run-vmblock\\x2dfuse.mount
%postun sdmp
# In case of uninstall, unload the uninstalled SDMP plugin
@ -337,6 +326,7 @@ fi
%{_bindir}/vm-support
%{_bindir}/vmhgfs-fuse
%{_bindir}/vmtoolsd
%{_bindir}/vmware-alias-import
%{_bindir}/vmware-checkvm
%{_bindir}/vmware-hgfsclient
%{_bindir}/vmware-namespace-cmd
@ -346,6 +336,7 @@ fi
%{_bindir}/vmware-xferlogs
%{_libdir}/libDeployPkg.so.*
%{_libdir}/libguestlib.so.*
%{_libdir}/libguestStoreClient.so.*
%{_libdir}/libhgfs.so.*
%{_libdir}/libvgauth.so.*
%{_libdir}/libvmtools.so.*
@ -356,7 +347,9 @@ fi
%dir %{_libdir}/%{name}/plugins/vmsvc
%{_libdir}/%{name}/plugins/vmsvc/libappInfo.so
%{_libdir}/%{name}/plugins/vmsvc/libdeployPkgPlugin.so
%{_libdir}/%{name}/plugins/vmsvc/libgdp.so
%{_libdir}/%{name}/plugins/vmsvc/libguestInfo.so
%{_libdir}/%{name}/plugins/vmsvc/libguestStore.so
%{_libdir}/%{name}/plugins/vmsvc/libpowerOps.so
%{_libdir}/%{name}/plugins/vmsvc/libresolutionKMS.so
%{_libdir}/%{name}/plugins/vmsvc/libtimeSync.so
@ -366,15 +359,16 @@ fi
%{_udevrulesdir}/99-vmware-scsi-udev.rules
%{_unitdir}/%{toolsdaemon}.service
%{_unitdir}/%{vgauthdaemon}.service
%{_unitdir}/run-vmblock\x2dfuse.mount
%{_modulesloaddir}/open-vm-tools.conf
%files desktop
%{_sysconfdir}/xdg/autostart/*.desktop
%{_bindir}/vmware-user
%{_bindir}/vmwgfxctrl
%attr(4755,-,-) %{_bindir}/vmware-user-suid-wrapper
%{_bindir}/vmware-vmblock-fuse
%{_libdir}/%{name}/plugins/vmusr/
%{_unitdir}/run-vmblock\x2dfuse.mount
%files sdmp
%{_libdir}/%{name}/plugins/vmsvc/libserviceDiscovery.so
@ -387,6 +381,7 @@ fi
%{_libdir}/pkgconfig/*.pc
%{_libdir}/libDeployPkg.so
%{_libdir}/libguestlib.so
%{_libdir}/libguestStoreClient.so
%{_libdir}/libhgfs.so
%{_libdir}/libvgauth.so
%{_libdir}/libvmtools.so
@ -395,6 +390,11 @@ fi
%{_bindir}/vmware-vgauth-smoketest
%changelog
* Wed Jul 21 2021 Miroslav Rezanina <rezanin@redhat.com> - 11.3.0-1
- Rebase to 11.3.0 [bz#1974471]
- Resolves: bz#1974471
([ESXi][RHEL9]Open-vm-tools release 11.3.0 has been released - please update for RHEL 9.0)
* Wed Jun 16 2021 Mohan Boddu <mboddu@redhat.com> - 11.2.5-5
- Rebuilt for RHEL 9 BETA for openssl 3.0
Related: rhbz#1971065

2
sources
View File

@ -1 +1 @@
SHA512 (open-vm-tools-11.2.5-17337674.tar.gz) = b6d4bc6522418ec7a881752181ad9240e535854df492e758abf3996c6afe245466ffbff60cc1b6cdff5cf731b5769c9f9cb96aed29f0b788d0eef05f91fcf8ab
SHA512 (open-vm-tools-11.3.0-18090558.tar.gz) = 36fa4fc309e57f49f1000abe8ca48aaf8bda67cd0ef3fd25ed0dfc12e2dd88e5a2bc8dae69abbadb44b2fa5195802f9925681a452f54916daa268adb20e8c8cd