main/open-vm-tools-grsec: upgrade to 9.4.0

4 files changed, 56 insertions, 63 deletions

diff --git a/main/open-vm-tools-grsec/APKBUILD b/main/open-vm-tools-grsec/APKBUILD
index 85d5ff9f38..8e652c2372 100644
--- a/main/open-vm-tools-grsec/APKBUILD
+++ b/main/open-vm-tools-grsec/APKBUILD
@@ -6,9 +6,9 @@ _realname=open-vm-tools
 _kver=3.10.18
 _kpkgrel=0
 
-_realver=9.2.3_p1031360
+_realver=9.4.0_p1280544
 _ver=${_realver/_p/-}
-_mypkgrel=0
+_mypkgrel=1
 
 # source open-vm-tools version
 if [ -f ../main/$_realname/APKBUILD ]; then
@@ -40,8 +40,9 @@ depends="linux-${_flavor}=${_kernelver}"
 depends_dev="bash glib-dev gettext-dev linux-${_flavor}-dev=${_kernelver}"
 makedepends="$depends_dev"
 source="http://downloads.sourceforge.net/project/open-vm-tools/open-vm-tools/stable-${_realver%.*}.x/open-vm-tools-${_ver}.tar.gz
-	vmci_driver_c.patch
 	linux-3.10.patch
+	frozen.patch
+	putname.patch
 	vmware-modules.initd
 	"
 #	constify.patch
@@ -73,12 +74,12 @@ build() {
 		--with-kernel-release="${_abi_release}" \
 		|| return 1
 	cd "$_builddir"/modules
-	make -j1 modules || return 1
+	make -j1 modules MODULES="vmxnet vmhgfs" || return 1
 }
 
 package() {
 	cd "$_builddir"
- 	install -D -m755 "$srcdir"/vmware-modules.initd \
+	install -D -m755 "$srcdir"/vmware-modules.initd \
 		"$pkgdir"/etc/init.d/vmware-modules-${_flavor} || return 1
 	mkdir -p $pkgdir/lib/modules/${_abi_release}/misc/
 	cd "$_builddir"/modules
@@ -87,15 +88,18 @@ package() {
 	done
 }
 
-md5sums="71a1d8065b632692af2cdcc9d82f305e  open-vm-tools-9.2.3-1031360.tar.gz
-16e060275e028d1edf1c5fd1a10b6a96  vmci_driver_c.patch
+md5sums="91f74bf6e42a3f460a42b3be31db31dc  open-vm-tools-9.4.0-1280544.tar.gz
 cc82715976e9af9fb8f44465af2ca5aa  linux-3.10.patch
+40706c98b9a3d124cb16a7ad58526313  frozen.patch
+9bca49147ac32f592efa859dbbd9a5f9  putname.patch
 afba2c3487d0b12cee80eb2f04b05ba1  vmware-modules.initd"
-sha256sums="1a004ea1675101fd44cddda299e2e9ac254388769b69f41b7ff5d1797549c8f1  open-vm-tools-9.2.3-1031360.tar.gz
-0c7e24a78784e2e74421b119f996eb74fd346d5634e7f58172860e2c5f5d5bf4  vmci_driver_c.patch
+sha256sums="5d30652eb0f6dc5e930781029c184837e700be5543b6a7116db4c62a6f3ca399  open-vm-tools-9.4.0-1280544.tar.gz
 f3108ab321f9b32ecb59aa4760f9958f97335492345a04de79d95bd98a7af8ff  linux-3.10.patch
+5997f5aa4d1d2bb262b9ef24888d4706f1227af4d359862d3d49b4e6c961d193  frozen.patch
+dccba065f71f7a27dd7d38e3eb7d1de9e87b82a18db618538054043829c5d961  putname.patch
 6ceb5c75b002991c511d9dadb6cf91720771e76b701e5f2d91ac9ede4b168265  vmware-modules.initd"
-sha512sums="bad1e94e2006e2b1b20fcb4bb1ec6969fd4ed62af477ffe5dfc2e38e81677e62140bd3c5da2acd31d3adf74fdead067831de86af52b8089c57d527c8f96aa3f8  open-vm-tools-9.2.3-1031360.tar.gz
-a2fb52dd5bb323e7bba62ace64e655536c5d103f66bde17266762ecd6327de1ffc629acaa9e22814b23e09239cb7685c4bb0748362d6b2f0d6c34260cb09edc6  vmci_driver_c.patch
+sha512sums="07b36f49713140606f74864b59c2e01c9ed83a960dd3f5d172b84fc75e760f7370065774a0e26897924af60454c86b682ca0fd32276b0e9fb17b268247f8cbdf  open-vm-tools-9.4.0-1280544.tar.gz
 0b36a6318ef419832817f22d50f85d8a5ae080e9496ecdf16753b17e8a693573e46eb896c3dc83a44fc596e6737130245663908befe8aa4a038e16b08cc499a3  linux-3.10.patch
+5dbee1a119d6abd13b8217d66b8f611fee92c863b0d48029b1c05f33a06f6a20f35eaf6f01fb268a811270c6c799a1fef26939f7bfc97a42421e7f14b4cfa46d  frozen.patch
+4a6da3c33bdd4b03ed7cf536c40c18d76a902687378e85cce08cf9ef9b23ae6ccedb0d334f69daee3588e6e83c080adce456f36fad69848e7089401052c4d2c2  putname.patch
 639098221975cadaed0ae0f32454a6718ceaa5f43f17d949a84a85dee56fbf5f9e6248899c10a46b12c9c9cf28b837d83a37c25aba62b11cb7849a1cf8d32e1e  vmware-modules.initd"
diff --git a/main/open-vm-tools-grsec/frozen.patch b/main/open-vm-tools-grsec/frozen.patch
new file mode 100644
index 0000000000..8b3fd7f379
--- /dev/null
+++ b/main/open-vm-tools-grsec/frozen.patch
@@ -0,0 +1,28 @@
+diff -urpN a/modules/linux/vmsync/sync.c b/modules/linux/vmsync/sync.c
+--- a/modules/linux/vmsync/sync.c	2012-08-01 19:02:59.000000000 -0700
++++ b/modules/linux/vmsync/sync.c	2012-10-14 07:38:18.000000000 -0700
+@@ -162,7 +162,11 @@ VmSyncThawDevices(void  *_state)  // IN
+    cancel_delayed_work(&state->thawTask);
+    list_for_each_safe(cur, tmp, &state->devices) {
+       dev = list_entry(cur, VmSyncBlockDevice, list);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
++      if (dev->sb != NULL && dev->sb->s_writers.frozen != SB_UNFROZEN) {
++#else
+       if (dev->sb != NULL && dev->sb->s_frozen != SB_UNFROZEN) {
++#endif
+          thaw_bdev(dev->bdev, dev->sb);
+          atomic_dec(&gFreezeCount);
+       }
+@@ -237,7 +241,11 @@ VmSyncAddPath(const VmSyncState *state,
+     * the superblock is already frozen.
+     */
+    if (inode->i_sb->s_bdev == NULL ||
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
++       inode->i_sb->s_writers.frozen != SB_UNFROZEN) {
++#else
+        inode->i_sb->s_frozen != SB_UNFROZEN) {
++#endif
+       result = (inode->i_sb->s_bdev == NULL) ? -EINVAL : -EALREADY;
+       compat_path_release(&nd);
+       goto exit;
+
diff --git a/main/open-vm-tools-grsec/putname.patch b/main/open-vm-tools-grsec/putname.patch
new file mode 100644
index 0000000000..b605e12fa0
--- /dev/null
+++ b/main/open-vm-tools-grsec/putname.patch
@@ -0,0 +1,13 @@
+diff --git a/modules/linux/vmblock/linux/control.c b/modules/linux/vmblock/linux/control.c
+index 79716bd..2dd83fe 100644
+--- a/modules/linux/vmblock/linux/control.c
++++ b/modules/linux/vmblock/linux/control.c
+@@ -293,7 +293,7 @@ ExecuteBlockOp(const char __user *buf,                // IN: buffer with name
+ 
+    retval = i < 0 ? -EINVAL : blockOp(name, blocker);
+ 
+-   putname(name);
++   __putname(name);
+ 
+    return retval;
+ }
diff --git a/main/open-vm-tools-grsec/vmci_driver_c.patch b/main/open-vm-tools-grsec/vmci_driver_c.patch
deleted file mode 100644
index 95450d13b6..0000000000
--- a/main/open-vm-tools-grsec/vmci_driver_c.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- ./modules/linux/vmci/linux/driver.c.orig
-+++ ./modules/linux/vmci/linux/driver.c
-@@ -252,7 +252,21 @@
- #define LinuxDriverUnlockIoctlPerFD(mutex) do {} while (0)
- #endif
- 
--static struct file_operations vmuser_fops;
-+/* initilaize here to make constify plugin happy */
-+static struct file_operations vmuser_fops = {
-+	.owner = THIS_MODULE,
-+	.poll = LinuxDriverPoll,
-+#ifdef HAVE_UNLOCKED_IOCTL
-+	.unlocked_ioctl = LinuxDriver_UnlockedIoctl,
-+#else
-+	.ioctl = LinuxDriver_Ioctl,
-+#endif
-+#ifdef HAVE_COMPAT_IOCTL
-+	.compat_ioctl = LinuxDriver_UnlockedIoctl,
-+#endif
-+	.open = LinuxDriver_Open,
-+	.release = LinuxDriver_Close
-+};
- 
- 
- /*
-@@ -388,26 +402,6 @@
-    if (VMCI_HostInit() < VMCI_SUCCESS) {
-       return -ENOMEM;
-    }
--
--   /*
--    * Initialize the file_operations structure. Because this code is always
--    * compiled as a module, this is fine to do it here and not in a static
--    * initializer.
--    */
--
--   memset(&vmuser_fops, 0, sizeof vmuser_fops);
--   vmuser_fops.owner = THIS_MODULE;
--   vmuser_fops.poll = LinuxDriverPoll;
--#ifdef HAVE_UNLOCKED_IOCTL
--   vmuser_fops.unlocked_ioctl = LinuxDriver_UnlockedIoctl;
--#else
--   vmuser_fops.ioctl = LinuxDriver_Ioctl;
--#endif
--#ifdef HAVE_COMPAT_IOCTL
--   vmuser_fops.compat_ioctl = LinuxDriver_UnlockedIoctl;
--#endif
--   vmuser_fops.open = LinuxDriver_Open;
--   vmuser_fops.release = LinuxDriver_Close;
- 
-    sprintf(linuxState.deviceName, "vmci");
-    linuxState.major = 10;