forked from rpms/open-vm-tools
- Package new upstream version open-vm-tools-9.10.2-2822639
- Remove the patches that are no longer needed
This commit is contained in:
Ravindra Kumar
parent
f24174ab7c
commit
3525cce0f9
1
.gitignore
vendored
1
.gitignore
vendored
@ -3,3 +3,4 @@
|
||||
/open-vm-tools-9.4.0-1280544.tar.gz
|
||||
/open-vm-tools-9.4.6-1770165.tar.gz
|
||||
/open-vm-tools-9.10.0-2476743.tar.gz
|
||||
/open-vm-tools-9.10.2-2822639.tar.gz
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
--- open-vm-tools-9.10.0-2476743/lib/include/vm_basic_asm_x86.h.orig 2015-04-30 20:27:54.197056616 -0700
|
||||
+++ open-vm-tools-9.10.0-2476743/lib/include/vm_basic_asm_x86.h 2015-04-30 20:47:22.916480187 -0700
|
||||
@@ -352,7 +352,9 @@
|
||||
*-----------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
-#if defined(__GNUC__) && (__GNUC__ >= 4) && (__GNUC_MINOR__ >= 4) && !defined(MUL64_NO_ASM)
|
||||
+#if defined(__GNUC__) && \
|
||||
+ (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) && \
|
||||
+ !defined(MUL64_NO_ASM)
|
||||
|
||||
static INLINE uint64
|
||||
Mul64x3264(uint64 multiplicand, uint32 multiplier, uint32 shift)
|
||||
@@ -457,7 +459,9 @@
|
||||
*-----------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
-#if defined(__GNUC__) && (__GNUC__ >= 4) && (__GNUC_MINOR__ >= 4) && !defined(MUL64_NO_ASM)
|
||||
+#if defined(__GNUC__) && \
|
||||
+ (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) && \
|
||||
+ !defined(MUL64_NO_ASM)
|
||||
|
||||
static INLINE int64
|
||||
Muls64x32s64(int64 multiplicand, uint32 multiplier, uint32 shift)
|
||||
@ -20,15 +20,15 @@
|
||||
|
||||
%global _hardened_build 1
|
||||
%global majorversion 9.10
|
||||
%global minorversion 0
|
||||
%global toolsbuild 2476743
|
||||
%global minorversion 2
|
||||
%global toolsbuild 2822639
|
||||
%global toolsversion %{majorversion}.%{minorversion}
|
||||
%global toolsdaemon vmtoolsd
|
||||
%global vgauthdaemon vgauthd
|
||||
|
||||
Name: open-vm-tools
|
||||
Version: %{toolsversion}
|
||||
Release: 5%{?dist}
|
||||
Release: 1%{?dist}
|
||||
Summary: Open Virtual Machine Tools for virtual machines hosted on VMware
|
||||
Group: Applications/System
|
||||
License: GPLv2
|
||||
@ -36,9 +36,6 @@ 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
|
||||
Patch0: asm_x86.patch
|
||||
Patch1: strerror_r.patch
|
||||
Patch2: toolboxcmd.patch
|
||||
%if 0%{?rhel} >= 7
|
||||
ExclusiveArch: x86_64
|
||||
%else
|
||||
@ -118,9 +115,6 @@ VMware virtual machines.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}-%{toolsbuild}
|
||||
%patch0 -p1 -b .asm_x86
|
||||
%patch1 -p1 -b .strerror_r
|
||||
%patch2 -p1 -b .toolboxcmd
|
||||
|
||||
%build
|
||||
# Use _DEFAULT_SOURCE to suppress warning until upstream
|
||||
@ -130,6 +124,9 @@ 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
|
||||
@ -253,6 +250,10 @@ fi
|
||||
%{_libdir}/libvmtools.so
|
||||
|
||||
%changelog
|
||||
* Tue Jul 07 2015 Ravindra Kumar <ravindrakumar@vmware.com> - 9.10.2-1
|
||||
- Package new upstream version open-vm-tools-9.10.2-2822639
|
||||
- Removed the patches that are no longer needed
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 9.10.0-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
d19439b499f0cbc7001e0cc65aa1a5a7 open-vm-tools-9.10.0-2476743.tar.gz
|
||||
00d0e37d487150d8d2bd3fd88b9ccd7e open-vm-tools-9.10.2-2822639.tar.gz
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
--- open-vm-tools-9.10.0-2476743.orig/vgauth/common/VGAuthLog.c 2015-03-19 15:53:25.000000000 -0700
|
||||
+++ open-vm-tools-9.10.0-2476743/vgauth/common/VGAuthLog.c 2015-04-21 01:24:32.370582529 -0700
|
||||
@@ -25,6 +25,11 @@
|
||||
#ifdef _WIN32
|
||||
#include <windows.h>
|
||||
#else
|
||||
+/*
|
||||
+ * Need GNU definition of strerror_r for better compatibility
|
||||
+ * across different glibc versions.
|
||||
+ */
|
||||
+#define _GNU_SOURCE
|
||||
#include <errno.h>
|
||||
#include <unistd.h>
|
||||
#include <string.h>
|
||||
@ -1,11 +0,0 @@
|
||||
--- open-vm-tools-9.10.0-2476743.orig/toolbox/toolboxcmd-shrink.c 2015-03-19 15:53:25.000000000 -0700
|
||||
+++ open-vm-tools-9.10.0-2476743/toolbox/toolboxcmd-shrink.c 2015-04-29 17:35:12.190392096 -0700
|
||||
@@ -391,7 +391,7 @@
|
||||
* Verify that wiping/shrinking are permitted before going through with the
|
||||
* wiping operation.
|
||||
*/
|
||||
- if (!ShrinkGetWiperState() == WIPER_ENABLED && !Wiper_IsWipeSupported(part)) {
|
||||
+ if (ShrinkGetWiperState() != WIPER_ENABLED && !Wiper_IsWipeSupported(part)) {
|
||||
g_debug("%s cannot be wiped / shrunk\n", mountPoint);
|
||||
ToolsCmd_PrintErr("%s",
|
||||
SU_(disk.shrink.disabled, SHRINK_DISABLED_ERR));
|
||||
Loading…
Reference in New Issue
Block a user