Package: release.debian.org
Severity: normal
Tags: wheezy
User: release.debian....@packages.debian.org
Usertags: pu
Hi release team,
I've uploaded open-vm-tools 2:8.8.0+2012.05.21-724730-1+nmu2+deb7u1
which fixes #779081. The bug was introduced with the new kernel revision
in the last point release - d_alias was moved into the d_u struct.
I've added a patch which checks for the loction of d_alias and uses the
appropriate one.
Please pick this fix for the next point release as for those who
(still) need the dkms modules (vmwar eplayer users or old esx
installations) won't be able to upgrade to the recent kernel otherwise.
Thanks,
Bernd
--
Bernd Zeimetz Debian GNU/Linux Developer
http://bzed.de http://www.debian.org
GPG Fingerprint: ECA1 E3F2 8E11 2432 D485 DD95 EB36 171A 6FF9 435F
diff --git a/debian/changelog b/debian/changelog
index 71e14e1..332f472 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+open-vm-tools (2:8.8.0+2012.05.21-724730-1+nmu2+deb7u1) stable; urgency=medium
+
+ * [6f4a32b1] Add patch to handle the move of d_alias to d_u.d_alias.
+ Thanks to Stefan Schueller (Closes: #779081)
+ * [b32d3413] Add git-buildpackage config for wheezy.
+ * [3f1b34b0] Updating Maintainer.
+
+ -- Bernd Zeimetz <b...@debian.org> Thu, 19 Mar 2015 16:44:25 +0100
+
open-vm-tools (2:8.8.0+2012.05.21-724730-1+nmu2) testing-proposed-updates; urgency=low
* Non-maintainer upload.
diff --git a/debian/control b/debian/control
index 1e402eb..83e7d74 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
Source: open-vm-tools
Section: admin
Priority: extra
-Maintainer: Daniel Baumann <daniel.baum...@progress-technologies.net>
+Maintainer: Bernd Zeimetz <b...@debian.org>
Build-Depends:
debhelper (>= 9), autotools-dev, dkms, doxygen, libcunit1-dev,
libdumbnet-dev, libfuse-dev, libgtk2.0-dev, libgtkmm-2.4-dev,
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..34d5f7b
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,5 @@
+# Configuration file for git-buildpackage and friends
+
+[DEFAULT]
+debian-branch = wheezy
+pristine-tar = True
diff --git a/debian/patches/04-vmhgfs-d_alias-kernel-3.18.1-tools-9.9.0.patch b/debian/patches/04-vmhgfs-d_alias-kernel-3.18.1-tools-9.9.0.patch
new file mode 100644
index 0000000..9919e6c
--- /dev/null
+++ b/debian/patches/04-vmhgfs-d_alias-kernel-3.18.1-tools-9.9.0.patch
@@ -0,0 +1,51 @@
+--- a/modules/linux/vmhgfs/inode.c
++++ b/modules/linux/vmhgfs/inode.c
+@@ -1818,7 +1818,13 @@ HgfsPermission(struct inode *inode,
+
+ /* Find a dentry with valid d_count. Refer bug 587789. */
+ list_for_each(pos, &inode->i_dentry) {
+- dentry = list_entry(pos, struct dentry, d_alias);
++ dentry = list_entry(pos, struct dentry,
++#if defined(VMW_D_ALIAS_3181) || LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 1)
++ d_u.d_alias
++#else
++ d_alias
++#endif
++ );
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 38)
+ dcount = atomic_read(&dentry->d_count);
+ #else
+--- a/modules/linux/vmhgfs/Makefile.kernel
++++ b/modules/linux/vmhgfs/Makefile.kernel
+@@ -33,6 +33,7 @@ EXTRA_CFLAGS += $(call vm_check_build, $
+ EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/getsb1.c,, -DVMW_GETSB_2618)
+ EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/statfs1.c,, -DVMW_STATFS_2618)
+ EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/inode1.c,, -DVMW_INODE_2618)
++EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/d_alias.c,, -DVMW_D_ALIAS_3181)
+
+ MODPOST_VMCI_SYMVERS := $(wildcard $(MODULEBUILDDIR)/VMwareVMCIModule.symvers)
+
+--- /dev/null
++++ b/modules/linux/shared/autoconf/d_alias.c
+@@ -0,0 +1,21 @@
++/*********************************************************
++ * Copyright (C) 2015 Ross Smith II. MIT Licensed.
++ *
++ *********************************************************/
++
++#include "compat_version.h"
++#include "compat_autoconf.h"
++
++#include <linux/dcache.h>
++
++/*
++ * After 3.18.1, the dentry d_alias field was moved to struct d_u.
++ *
++ * This test will fail on a kernel with such a patch.
++ */
++void test(void)
++{
++ struct dentry dentry;
++
++ dentry.d_alias.next = NULL;
++}
diff --git a/debian/patches/series b/debian/patches/series
index 0aaf8da..48f12f0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
01-kvers.patch
02-procps.patch
03-dkms.patch
+04-vmhgfs-d_alias-kernel-3.18.1-tools-9.9.0.patch
