[arch-commits] Commit in open-vm-tools-modules/trunk (PKGBUILD linux-3.8.patch)

[Sergej Pupykin]

    Date: Sunday, May 5, 2013 @ 23:30:55
  Author: spupykin
Revision: 89937

upgpkg: open-vm-tools-modules 1:9.2.3-1

upd

Modified:
  open-vm-tools-modules/trunk/PKGBUILD
Deleted:
  open-vm-tools-modules/trunk/linux-3.8.patch

-----------------+
 PKGBUILD        |   16 ++++++----------
 linux-3.8.patch |   53 -----------------------------------------------------
 2 files changed, 6 insertions(+), 63 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-05 21:30:50 UTC (rev 89936)
+++ PKGBUILD	2013-05-05 21:30:55 UTC (rev 89937)
@@ -4,9 +4,9 @@
 
 pkgname=open-vm-tools-modules
 epoch=1
-pkgver=9.2.2
-_pkgsubver=893683
-pkgrel=11
+pkgver=9.2.3
+_pkgsubver=1031360
+pkgrel=1
 pkgdesc="kernel modules for the open source implementation of VMware Tools"
 arch=('i686' 'x86_64')
 url="http://open-vm-tools.sourceforge.net/"
@@ -16,11 +16,9 @@
 install=$pkgname.install
 options=('!strip' '!makeflags')
 source=("http://downloads.sourceforge.net/open-vm-tools/open-vm-tools-$pkgver-${_pkgsubver}.tar.gz"
-	"modprobe.conf"
-	"linux-3.8.patch")
-md5sums=('7af505681d736d4c9ee6493b1166689f'
-         'bc5518489077e91655489bd04b868584'
-         'ff757686649404db0c2c9761eb293174')
+	"modprobe.conf")
+md5sums=('71a1d8065b632692af2cdcc9d82f305e'
+         'bc5518489077e91655489bd04b868584')
 
 build() {
   _kernver=$(pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -)
@@ -28,8 +26,6 @@
 
   cd "$srcdir/open-vm-tools-${pkgver}-${_pkgsubver}"
 
-  patch -Np1 -i "${srcdir}/linux-3.8.patch"
-
   sed -i 's|proc-3.2.8|procps|g' configure
   sed -i 's|putname(name);|__putname(name);|' modules/linux/vmblock/linux/control.c
 

Deleted: linux-3.8.patch
===================================================================
--- linux-3.8.patch	2013-05-05 21:30:50 UTC (rev 89936)
+++ linux-3.8.patch	2013-05-05 21:30:55 UTC (rev 89937)
@@ -1,53 +0,0 @@
-diff -upr open-vm-tools-9.2.2-893683.orig/modules/linux/shared/compat_mm.h open-vm-tools-9.2.2-893683/modules/linux/shared/compat_mm.h
---- open-vm-tools-9.2.2-893683.orig/modules/linux/shared/compat_mm.h	2013-02-21 03:02:46.000000000 +0200
-+++ open-vm-tools-9.2.2-893683/modules/linux/shared/compat_mm.h	2013-02-21 03:10:31.000000000 +0200
-@@ -99,8 +99,18 @@ static inline struct page * alloc_pages(
-    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, size)                                        \
-+({                                                                            \
-+   result = inode_newsize_ok(inode, size);                                    \
-+   if (!result)                                                               \
-+   {                                                                          \
-+      truncate_setsize(inode, size);                                          \
-+   }                                                                          \
-+   result;                                                                    \
-+})
- #endif
- 
- 
-diff -upr open-vm-tools-9.2.2-893683.orig/modules/linux/vmci/linux/driver.c open-vm-tools-9.2.2-893683/modules/linux/vmci/linux/driver.c
---- open-vm-tools-9.2.2-893683.orig/modules/linux/vmci/linux/driver.c	2013-02-21 03:02:46.000000000 +0200
-+++ open-vm-tools-9.2.2-893683/modules/linux/vmci/linux/driver.c	2013-02-21 03:03:20.000000000 +0200
-@@ -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) /
-  *-----------------------------------------------------------------------------
-  */
- 
--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,
-  *-----------------------------------------------------------------------------
-  */
- 
--static void __devexit
-+static void
- vmci_remove_device(struct pci_dev* pdev)
- {
-    struct vmci_device *dev = pci_get_drvdata(pdev);