Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock package open-vm-tools
open-vm-tools-dkms fails to build against the recent jessie kernel
headers, 2:9.4.6-1770165-8 fixes this by using d_u.d_alias instead of
d_alias, depending on the kernel version.
Patch is attached.
unblock open-vm-tools/2:9.4.6-1770165-8
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 f6b5705..6213450 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+open-vm-tools (2:9.4.6-1770165-8) unstable; urgency=medium
+
+ * [406817b6] Add patch to move from d_alias to d_u.d_alias.
+ Make open-vm-tools build with the recent jessie kernel again.
+ Thanks to Timo Metsala (Closes: #778293)
+
+ -- Bernd Zeimetz <b...@debian.org> Fri, 13 Feb 2015 11:26:59 +0100
+
open-vm-tools (2:9.4.6-1770165-7) unstable; urgency=medium
* [8df5b4ac] Adding patch to fix CVE-2014-4199.
diff --git a/debian/patches/debian/d_alias_fix b/debian/patches/debian/d_alias_fix
new file mode 100644
index 0000000..7368349
--- /dev/null
+++ b/debian/patches/debian/d_alias_fix
@@ -0,0 +1,26 @@
+--- a/modules/linux/vmhgfs/inode.c
++++ b/modules/linux/vmhgfs/inode.c
+@@ -1838,7 +1838,11 @@ HgfsPermission(struct inode *inode,
+ p,
+ #endif
+ &inode->i_dentry,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 16, 7)
+ d_alias) {
++#else
++ d_u.d_alias) {
++#endif
+ int dcount = compat_d_count(dentry);
+ if (dcount) {
+ LOG(4, ("Found %s %d \n", dentry->d_name.name, dcount));
+@@ -1891,7 +1895,11 @@ HgfsPermission(struct inode *inode,
+ /* Find a dentry with valid d_count. Refer bug 587879. */
+ list_for_each(pos, &inode->i_dentry) {
+ int dcount;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 16, 7)
+ struct dentry *dentry = list_entry(pos, struct dentry, d_alias);
++#else
++ struct dentry *dentry = list_entry(pos, struct dentry, d_u.d_alias);
++#endif
+ dcount = compat_d_count(dentry);
+ if (dcount) {
+ LOG(4, ("Found %s %d \n", (dentry)->d_name.name, dcount));
diff --git a/debian/patches/series b/debian/patches/series
index bb3ff13..044ee69 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+debian/d_alias_fix
upstream/3a9f229_Harden-HostinfoOSData-against-PATH-attacks
upstream/54780b8_Debian-guys-want-to-play-with-FreeBSD-kernels-and-Linux-userland
