[arch-commits] Commit in open-vm-tools/trunk (2 files)

[Christian Hesse]

    Date: Tuesday, January 14, 2020 @ 12:25:19
  Author: eworm
Revision: 552490

upgpkg: open-vm-tools 6:11.0.1-2

fix udev rules

Added:
  open-vm-tools/trunk/0002-stop-systemd-243-udev-complaints.patch
Modified:
  open-vm-tools/trunk/PKGBUILD

---------------------------------------------+
 0002-stop-systemd-243-udev-complaints.patch |   56 ++++++++++++++++++++++++++
 PKGBUILD                                    |    5 +-
 2 files changed, 60 insertions(+), 1 deletion(-)

Added: 0002-stop-systemd-243-udev-complaints.patch
===================================================================
--- 0002-stop-systemd-243-udev-complaints.patch	                        (rev 0)
+++ 0002-stop-systemd-243-udev-complaints.patch	2020-01-14 12:25:19 UTC (rev 552490)
@@ -0,0 +1,56 @@
+commit f1dab8ded45aaaa4b6993a4d96d0aefc700f1796
+Author: Oliver Kurth <okurth at vmware.com>
+Date:   Mon Oct 28 16:12:42 2019 -0700
+
+    stop systemd-243 udev complaints #371
+    
+    Address issues from pull request #371 on github:
+    - fix substiution variables for systemd-243
+    - fix permissions of rules file
+    See https://github.com/vmware/open-vm-tools/pull/371
+
+diff --git a/open-vm-tools/AUTHORS b/open-vm-tools/AUTHORS
+index 08cc28ef..026de07e 100644
+--- a/open-vm-tools/AUTHORS
++++ b/open-vm-tools/AUTHORS
+@@ -49,3 +49,7 @@ Josh Paetzel    Additional changes to vmmemctl.ko for FreeBSD 12.0 API changes.
+ 
+ Haruki Tsurumoto        Fix Asianux identification
+                 - https://github.com/vmware/open-vm-tools/pull/325
++
++MilhouseVH      stop systemd-243 udev complaints
++                - https://github.com/vmware/open-vm-tools/pull/371
++
+diff --git a/open-vm-tools/udev/99-vmware-scsi-udev.rules b/open-vm-tools/udev/99-vmware-scsi-udev.rules
+index 053b5970..fb4ed684 100644
+--- a/open-vm-tools/udev/99-vmware-scsi-udev.rules
++++ b/open-vm-tools/udev/99-vmware-scsi-udev.rules
+@@ -1,7 +1,7 @@
+-# Copyright (C) 2016 VMware, Inc.  All rights reserved.
++# Copyright (C) 2016,2019 VMware, Inc.  All rights reserved.
+ #
+ # This file is part of open-vm-tools
+ 
+-ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware*", ATTRS{model}=="Virtual disk*", ENV{DEVTYPE}=="disk", RUN+="/bin/sh -c 'echo 180 >/sys$DEVPATH/device/timeout'"
+-ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware*", ATTRS{model}=="VMware Virtual S", ENV{DEVTYPE}=="disk", RUN+="/bin/sh -c 'echo 180 >/sys$DEVPATH/device/timeout'"
++ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware*", ATTRS{model}=="Virtual disk*", ENV{DEVTYPE}=="disk", RUN+="/bin/sh -c 'echo 180 >/sys$env{DEVPATH}/device/timeout'"
++ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware*", ATTRS{model}=="VMware Virtual S", ENV{DEVTYPE}=="disk", RUN+="/bin/sh -c 'echo 180 >/sys$env{DEVPATH}/device/timeout'"
+ 
+diff --git a/open-vm-tools/udev/Makefile.am b/open-vm-tools/udev/Makefile.am
+index 68fbc3e2..c3baadf1 100644
+--- a/open-vm-tools/udev/Makefile.am
++++ b/open-vm-tools/udev/Makefile.am
+@@ -1,5 +1,5 @@
+ ################################################################################
+-### Copyright (C) 2016 VMware, Inc.  All rights reserved.
++### Copyright (C) 2016,2019 VMware, Inc.  All rights reserved.
+ ###
+ ### This program is free software; you can redistribute it and/or modify
+ ### it under the terms of version 2 of the GNU General Public License as
+@@ -17,5 +17,5 @@
+ 
+ install-data-local:
+ 	$(INSTALL) -d $(DESTDIR)$(UDEVRULESDIR)
+-	$(INSTALL) $(srcdir)/99-vmware-scsi-udev.rules $(DESTDIR)$(UDEVRULESDIR)
++	$(INSTALL) -m 644 $(srcdir)/99-vmware-scsi-udev.rules $(DESTDIR)$(UDEVRULESDIR)
+ 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-01-14 12:03:35 UTC (rev 552489)
+++ PKGBUILD	2020-01-14 12:25:19 UTC (rev 552490)
@@ -4,7 +4,7 @@
 pkgname=open-vm-tools
 epoch=6
 pkgver=11.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc='The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools'
 arch=('x86_64')
 url='https://github.com/vmware/open-vm-tools'
@@ -20,10 +20,12 @@
 options=('docs')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/vmware/open-vm-tools/archive/stable-${pkgver/_/-}.tar.gz"
         '0001-Remove-references-to-deprecated-G_INLINE_FUNC.patch'
+        '0002-stop-systemd-243-udev-complaints.patch'
         'vmtoolsd.service'
         'vmware-vmblock-fuse.service')
 sha256sums=('99f1e3c5245bb002c1e66cbb7a1078e1c3567db5f92cc2e00ab08557e9df4758'
             'c97484a15dbc65d7eb14bbd96dd3785e2a1a130a44e3950f9865a988c28bc137'
+            'a01990c7cda8426e5bfcebc33b4024ff037367e27d58c006f5b0fe6a7f5bd52c'
             '5a9403f78356873258521644068f2c9639b994d5954e5ad953934136822b2689'
             '99e3cc1da20a751049144cc02dec77174a55109b5b5960e1facd78709da7724f')
 
@@ -31,6 +33,7 @@
   cd "$srcdir/$pkgname-stable-${pkgver}/"
 
   patch -Np1 < ../0001-Remove-references-to-deprecated-G_INLINE_FUNC.patch
+  patch -Np1 < ../0002-stop-systemd-243-udev-complaints.patch
 }
 
 build() {