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

Update to 9.2.2 - fix bnc#803157

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Virtualization:VMware/open-vm-tools?expand=0&rev=237
This commit is contained in:
Dominique Leuenberger 2013-04-03 19:07:33 +00:00 committed by Git OBS Bridge
parent d5a10ffe9e
commit 9d61750557
6 changed files with 39 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
open-vm-tools-9.2.0-799703.tar.gz
View File

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

3
open-vm-tools-9.2.2-893683.tar.gz Normal file
View File

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

54
open-vm-tools-kernel-3.6.patch
View File

@ -1,49 +1,8 @@
diff -wbBur open-vm-tools-2012.05.21-724730.org/modules/linux/vmhgfs/inode.c open-vm-tools-2012.05.21-724730/modules/linux/vmhgfs/inode.c
--- open-vm-tools-2012.05.21-724730.org/modules/linux/vmhgfs/inode.c 2012-05-23 00:12:52.000000000 +0400
+++ open-vm-tools-2012.05.21-724730/modules/linux/vmhgfs/inode.c 2012-10-02 15:39:47.000000000 +0400
@@ -1801,7 +1802,7 @@
#else
if (mask & MAY_ACCESS) { /* For sys_access. */
#endif
- struct list_head *pos;
+ struct hlist_node *pos;
int dcount = 0;
struct dentry *dentry = NULL;
@@ -1817,7 +1818,7 @@
#endif
/* Find a dentry with valid d_count. Refer bug 587789. */
- list_for_each(pos, &inode->i_dentry) {
+ list_for_each(pos, inode->i_dentry.first) {
dentry = list_entry(pos, struct dentry, d_alias);
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 38)
dcount = atomic_read(&dentry->d_count);
diff -wbBur open-vm-tools-2012.05.21-724730.org/modules/linux/vmhgfs/page.c open-vm-tools-2012.05.21-724730/modules/linux/vmhgfs/page.c
--- open-vm-tools-2012.05.21-724730.org/modules/linux/vmhgfs/page.c 2012-05-23 00:12:52.000000000 +0400
+++ open-vm-tools-2012.05.21-724730/modules/linux/vmhgfs/page.c 2012-10-02 15:41:38.000000000 +0400
@@ -893,7 +893,7 @@
*/
if ((offset >= currentFileSize) ||
((pageFrom == 0) && (offset + pageTo) >= currentFileSize)) {
- void *kaddr = kmap_atomic(page, KM_USER0);
+ void *kaddr = kmap_atomic(page);
if (pageFrom) {
memset(kaddr, 0, pageFrom);
@@ -901,7 +901,7 @@
if (pageTo < PAGE_CACHE_SIZE) {
memset(kaddr + pageTo, 0, PAGE_CACHE_SIZE - pageTo);
}
- kunmap_atomic(kaddr, KM_USER0);
+ kunmap_atomic(kaddr);
flush_dcache_page(page);
}
}
diff -wbBur open-vm-tools-2012.05.21-724730.org/modules/linux/vmsync/sync.c open-vm-tools-2012.05.21-724730/modules/linux/vmsync/sync.c
--- open-vm-tools-2012.05.21-724730.org/modules/linux/vmsync/sync.c 2012-05-23 00:12:52.000000000 +0400
+++ open-vm-tools-2012.05.21-724730/modules/linux/vmsync/sync.c 2012-10-02 15:23:56.000000000 +0400
@@ -162,7 +162,7 @@
Index: open-vm-tools-9.2.2-893683/modules/linux/vmsync/sync.c
===================================================================
--- open-vm-tools-9.2.2-893683.orig/modules/linux/vmsync/sync.c
+++ open-vm-tools-9.2.2-893683/modules/linux/vmsync/sync.c
@@ -162,7 +162,7 @@ VmSyncThawDevices(void *_state) // IN
cancel_delayed_work(&state->thawTask);
list_for_each_safe(cur, tmp, &state->devices) {
dev = list_entry(cur, VmSyncBlockDevice, list);
@ -52,7 +11,7 @@ diff -wbBur open-vm-tools-2012.05.21-724730.org/modules/linux/vmsync/sync.c open
thaw_bdev(dev->bdev, dev->sb);
atomic_dec(&gFreezeCount);
}
@@ -237,7 +237,7 @@
@@ -237,7 +237,7 @@ VmSyncAddPath(const VmSyncState *state,
* the superblock is already frozen.
*/
if (inode->i_sb->s_bdev == NULL ||
@ -61,4 +20,3 @@ diff -wbBur open-vm-tools-2012.05.21-724730.org/modules/linux/vmsync/sync.c open
result = (inode->i_sb->s_bdev == NULL) ? -EINVAL : -EALREADY;
compat_path_release(&nd);
goto exit;

13
open-vm-tools-putname.patch Normal file
View File

@ -0,0 +1,13 @@
diff -ur open-vm-tools-9.2.2-893683/modules/linux/vmblock/linux/control.c open-vm-tools-9.2.2-893683.patched/modules/linux/vmblock/linux/control.c
--- open-vm-tools-9.2.2-893683/modules/linux/vmblock/linux/control.c 2012-11-01 00:59:58.000000000 +0100
+++ open-vm-tools-9.2.2-893683.patched/modules/linux/vmblock/linux/control.c 2013-04-03 20:50:08.349729641 +0200
@@ -293,7 +293,7 @@
retval = i < 0 ? -EINVAL : blockOp(name, blocker);
- putname(name);
+ __putname(name);
return retval;
}

14
open-vm-tools.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Wed Apr 3 18:26:54 UTC 2013 - dimstar@opensuse.org
- Update to version 9.2.0:
+ Fixes for HGFS driver to compile on newer kernels (3.6).
+ vmsync driver is disabled on kernels 3.0+ as vmbackup plugin
uses FIFREEZE/FITHAW standard ioctls.
+ Fixes for Copy/Paste (and C&P is temporarily disabled on
Solaris due to C++ library issues).
- Drop open-vm-tools-kernel-3.6.patch: fixed upstream.
- Add open-vm-tools-putname.patch: Change the putname symbol to
__putname, following what the kernel folks did back in 2.6.6.
Fixes bnc#803157.
-------------------------------------------------------------------
Sat Mar 2 08:16:26 UTC 2013 - coolo@suse.com

6
open-vm-tools.spec
View File

@ -32,9 +32,9 @@
%define with_X 1
Name: open-vm-tools
Version: 9.2.0
Version: 9.2.2
Release: 0
%define svn_rev 799703
%define svn_rev 893683
Summary: Open Virtual Machine Tools
License: BSD-3-Clause and GPL-2.0 and LGPL-2.1
Group: System/Emulators/PC
@ -161,7 +161,7 @@ if you intend to create own plugins for vmtoolsd.
%prep
%setup -q -n %{name}-%{version}-%{svn_rev}
%if 0%{?suse_version} > 1220
%patch0 -p1
#patch0 -p1
%endif
chmod -x AUTHORS COPYING ChangeLog NEWS README
# fix for an rpmlint warning regarding wrong line feeds