main/open-vm-tools-grsec: rebuild against kernel 3.9.2-r0

2 files changed, 5 insertions, 110 deletions

diff --git a/main/open-vm-tools-grsec/APKBUILD b/main/open-vm-tools-grsec/APKBUILD
index ac363d5373..d42f324fd6 100644
--- a/main/open-vm-tools-grsec/APKBUILD
+++ b/main/open-vm-tools-grsec/APKBUILD
@@ -3,10 +3,10 @@
 _flavor=grsec
 _kpkg=linux-$_flavor
 _realname=open-vm-tools
-_kver=3.8.12
+_kver=3.9.2
 _kpkgrel=0
 
-_realver=9.2.2_p893683
+_realver=9.2.3_p1031360
 _ver=${_realver/_p/-}
 _mypkgrel=0
 
@@ -40,7 +40,6 @@ 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
-	linux-3.8.patch
 	vmci_driver_c.patch
 	vmware-modules.initd
 	"
@@ -83,15 +82,12 @@ package() {
 	done
 }
 
-md5sums="7af505681d736d4c9ee6493b1166689f  open-vm-tools-9.2.2-893683.tar.gz
-fa306331d54af2b9acad5d5693dc05cf  linux-3.8.patch
+md5sums="71a1d8065b632692af2cdcc9d82f305e  open-vm-tools-9.2.3-1031360.tar.gz
 16e060275e028d1edf1c5fd1a10b6a96  vmci_driver_c.patch
 afba2c3487d0b12cee80eb2f04b05ba1  vmware-modules.initd"
-sha256sums="1ae795e75bf4b38185f39083b8075686d3bab4c1222f4e39c863aeccb2f5f387  open-vm-tools-9.2.2-893683.tar.gz
-98de7879598f229e99ef408776a3ed5fbc7f7fe937c8b925f4fbe3907df50f89  linux-3.8.patch
+sha256sums="1a004ea1675101fd44cddda299e2e9ac254388769b69f41b7ff5d1797549c8f1  open-vm-tools-9.2.3-1031360.tar.gz
 0c7e24a78784e2e74421b119f996eb74fd346d5634e7f58172860e2c5f5d5bf4  vmci_driver_c.patch
 6ceb5c75b002991c511d9dadb6cf91720771e76b701e5f2d91ac9ede4b168265  vmware-modules.initd"
-sha512sums="13490bdff2b8b316b1cd09e06c76293f21b83ede025ded5ddc71251e4f64279296f7dd0f248335f7e3d0714759be13f07263f154683878870a062c9ba55644fc  open-vm-tools-9.2.2-893683.tar.gz
-2182873330d80d37dfaaccb0b91c4fd25c938ed54979e8a5f9f04f332542c784084b0a10a83e9679f5bfbca4d2e8727b03dc3a23b473692212cc3f7a9894f413  linux-3.8.patch
+sha512sums="bad1e94e2006e2b1b20fcb4bb1ec6969fd4ed62af477ffe5dfc2e38e81677e62140bd3c5da2acd31d3adf74fdead067831de86af52b8089c57d527c8f96aa3f8  open-vm-tools-9.2.3-1031360.tar.gz
 a2fb52dd5bb323e7bba62ace64e655536c5d103f66bde17266762ecd6327de1ffc629acaa9e22814b23e09239cb7685c4bb0748362d6b2f0d6c34260cb09edc6  vmci_driver_c.patch
 639098221975cadaed0ae0f32454a6718ceaa5f43f17d949a84a85dee56fbf5f9e6248899c10a46b12c9c9cf28b837d83a37c25aba62b11cb7849a1cf8d32e1e  vmware-modules.initd"
diff --git a/main/open-vm-tools-grsec/linux-3.8.patch b/main/open-vm-tools-grsec/linux-3.8.patch
deleted file mode 100644
index 253871611d..0000000000
--- a/main/open-vm-tools-grsec/linux-3.8.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-diff --git a/modules/linux/vmci/linux/driver.c b/modules/linux/vmci/linux/driver.c
-index a34de66..799d69f 100644
---- a/modules/linux/vmci/linux/driver.c
-+++ b/modules/linux/vmci/linux/driver.c
-@@ -124,7 +124,7 @@ static struct pci_driver vmci_driver = {
-    .name     = "vmci",
-    .id_table = vmci_ids,
-    .probe = vmci_probe_device,
--   .remove = __devexit_p(vmci_remove_device),
-+   .remove = vmci_remove_device,
- };
- 
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
-@@ -1750,7 +1750,7 @@ vmci_enable_msix(struct pci_dev *pdev) // IN
-  *-----------------------------------------------------------------------------
-  */
- 
--static int __devinit
-+static int
- vmci_probe_device(struct pci_dev *pdev,           // IN: vmci PCI device
-                   const struct pci_device_id *id) // IN: matching device ID
- {
-@@ -1978,7 +1978,7 @@ vmci_probe_device(struct pci_dev *pdev,           // IN: vmci PCI device
-  *-----------------------------------------------------------------------------
-  */
- 
--static void __devexit
-+static void
- vmci_remove_device(struct pci_dev* pdev)
- {
-    struct vmci_device *dev = pci_get_drvdata(pdev);
---- ./modules/linux/vsock/linux/af_vsock.c.orig	2013-03-12 10:38:52.592399593 +0000
-+++ ./modules/linux/vsock/linux/af_vsock.c	2013-03-12 13:15:43.405983373 +0000
-@@ -319,7 +319,7 @@
-    .sendpage   = sock_no_sendpage,
- };
- 
--static struct proto_ops vsockVmciStreamOps = {
-+static struct proto_ops vsockVmciStreamOps __read_mostly = {
-    .family     = VSOCK_INVALID_FAMILY,
-    .owner      = THIS_MODULE,
-    .release    = VSockVmciRelease,
-@@ -3159,19 +3159,21 @@
-     * when a hard-coded, currently-available value gets assigned to someone
-     * else in the future.
-     */
-+   pax_open_kernel();
-    for (i = NPROTO - 1; i >= 0; i--) {
--      vsockVmciFamilyOps.family = i;
-+      *(void **)&vsockVmciFamilyOps.family = i;
-       err = sock_register(&vsockVmciFamilyOps);
-       if (err) {
-          Warning("Could not register address family %d.\n", i);
--         vsockVmciFamilyOps.family = VSOCK_INVALID_FAMILY;
-+         *(void **)&vsockVmciFamilyOps.family = VSOCK_INVALID_FAMILY;
-       } else {
--         vsockVmciDgramOps.family = i;
--         vsockVmciStreamOps.family = i;
-+         *(void **)&vsockVmciDgramOps.family = i;
-+         *(void **)&vsockVmciStreamOps.family = i;
-          err = i;
-          break;
-       }
-    }
-+   pax_close_kernel();
- 
-    return err;
- }
-@@ -3202,8 +3204,10 @@
-       sock_unregister(vsockVmciFamilyOps.family);
-    }
- 
--   vsockVmciDgramOps.family = vsockVmciFamilyOps.family = VSOCK_INVALID_FAMILY;
--   vsockVmciStreamOps.family = vsockVmciFamilyOps.family;
-+   pax_open_kernel();
-+   *(void **)&vsockVmciDgramOps.family = *(void **)&vsockVmciFamilyOps.family = VSOCK_INVALID_FAMILY;
-+   *(void **)&vsockVmciStreamOps.family = vsockVmciFamilyOps.family;
-+   pax_close_kernel();
- }
- 
- 
---- ./modules/linux/shared/compat_mm.h.orig	2013-03-12 13:23:12.973400354 +0000
-+++ ./modules/linux/shared/compat_mm.h	2013-03-12 13:36:43.680968670 +0000
-@@ -99,8 +99,16 @@
-    vmtruncate(inode, size);                                                   \
-    result;                                                                    \
- })
--#else
-+#elif LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
- #define compat_vmtruncate(inode, size) vmtruncate(inode, size)
-+#else
-+#define compat_vmtruncate(inode, len)		\
-+({						\
-+  int result = inode_newsize_ok(inode, len);	\
-+  if (!result)					\
-+    truncate_setsize(inode, len);		\
-+  result;					\
-+})
- #endif
- 
-