[gentoo-commits] repo/gentoo:master commit in: app-emulation/open-vm-tools/files/, app-emulation/open-vm-tools/
commit: 02f23d6cc0c1c5b3757bde216673416da1228027
Author: Mike Gilbert gentoo org>
AuthorDate: Mon Aug 1 16:20:48 2022 +
Commit: Mike Gilbert gentoo org>
CommitDate: Mon Aug 1 16:21:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02f23d6c
Revert "app-emulation/open-vm-tools: fix build error on musl"
Bug: https://bugs.gentoo.org/862795
Reverts: 18e535510c92807c48cf04d8a2a0475fa1ed5e36.
Signed-off-by: Mike Gilbert gentoo.org>
.../files/open-vm-tools-rename-poll.h.patch| 126 -
.../open-vm-tools-12.0.5_p19716617.ebuild | 1 -
2 files changed, 127 deletions(-)
diff --git
a/app-emulation/open-vm-tools/files/open-vm-tools-rename-poll.h.patch
b/app-emulation/open-vm-tools/files/open-vm-tools-rename-poll.h.patch
deleted file mode 100644
index c4e4518dbb28..
--- a/app-emulation/open-vm-tools/files/open-vm-tools-rename-poll.h.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-https://github.com/vmware/open-vm-tools/pull/383
-
-From 821c7949d79ad8e06b20cb1238316fce56778607 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine
-Date: Thu, 31 Oct 2019 17:06:10 +0100
-Subject: [PATCH] Rename poll.h into vm_poll.h to fix build failure on musl
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-musl libc redirects include of sys/poll.h to poll.h. But since poll.h is
-also a local header file, the musl libc header is never included. This
-leads to the following build failure:
-
-In file included from asyncsocket.c:73:0:
-.../host/i586-buildroot-linux-musl/sysroot/usr/include/sys/poll.h:1:2:
warning: #warning redirecting incorrect #include to
[-Wcpp]
- #warning redirecting incorrect #include to
-asyncsocket.c: In function ‘AsyncTCPSocketPollWork’:
-asyncsocket.c:2537:13: error: invalid use of undefined type ‘struct pollfd’
- pfd[i].fd = asock[i]->fd;
- ^
-asyncsocket.c:2537:13: error: dereferencing pointer to incomplete type ‘struct
pollfd’
-asyncsocket.c:2538:13: error: invalid use of undefined type ‘struct pollfd’
- pfd[i].events = read ? POLLIN : POLLOUT;
- ^
-asyncsocket.c:2538:33: error: ‘POLLIN’ undeclared (first use in this
function); did you mean ‘POLL_IN’?
- pfd[i].events = read ? POLLIN : POLLOUT;
-
-So rename poll.h into vm_poll.h as suggested by srowe in
-https://github.com/vmware/open-vm-tools/issues/359#issuecomment-533529956
-
-Fixes:
- -
http://autobuild.buildroot.org/results/4f575ef42bbc4387a07e396205052b2da081c64d
-
-Fix #359
-
-Signed-off-by: Fabrice Fontaine
- open-vm-tools/lib/asyncsocket/asyncsocket.c | 4 ++--
- open-vm-tools/lib/hgfsServer/hgfsServer.c | 2 +-
- open-vm-tools/lib/include/asyncsocket.h | 2 +-
- open-vm-tools/lib/include/pollImpl.h| 2 +-
- open-vm-tools/lib/include/{poll.h => vm_poll.h} | 0
- open-vm-tools/lib/rpcIn/rpcin.c | 2 +-
- 6 files changed, 6 insertions(+), 6 deletions(-)
- rename open-vm-tools/lib/include/{poll.h => vm_poll.h} (100%)
-
-diff --git a/open-vm-tools/lib/asyncsocket/asyncsocket.c
b/open-vm-tools/lib/asyncsocket/asyncsocket.c
-index 102638cc9..01181a957 100644
a/open-vm-tools/lib/asyncsocket/asyncsocket.c
-+++ b/open-vm-tools/lib/asyncsocket/asyncsocket.c
-@@ -69,8 +69,8 @@
- #else
- #include
- #include
-+#include
- #include
--#include
- #include
- #include
- #include
-@@ -86,7 +86,7 @@
- #include "random.h"
- #include "asyncsocket.h"
- #include "asyncSocketBase.h"
--#include "poll.h"
-+#include "vm_poll.h"
- #include "log.h"
- #include "err.h"
- #include "hostinfo.h"
-diff --git a/open-vm-tools/lib/hgfsServer/hgfsServer.c
b/open-vm-tools/lib/hgfsServer/hgfsServer.c
-index 462245511..fc6912860 100644
a/open-vm-tools/lib/hgfsServer/hgfsServer.c
-+++ b/open-vm-tools/lib/hgfsServer/hgfsServer.c
-@@ -48,7 +48,7 @@
- #include "hgfsServerOplock.h"
- #include "hgfsDirNotify.h"
- #include "userlock.h"
--#include "poll.h"
-+#include "vm_poll.h"
- #include "mutexRankLib.h"
- #include "vm_basic_asm.h"
- #include "unicodeOperations.h"
-diff --git a/open-vm-tools/lib/include/asyncsocket.h
b/open-vm-tools/lib/include/asyncsocket.h
-index 95a5e4643..a4b4e5aae 100644
a/open-vm-tools/lib/include/asyncsocket.h
-+++ b/open-vm-tools/lib/include/asyncsocket.h
-@@ -164,7 +164,7 @@ typedef struct AsyncSocket AsyncSocket;
- * Or the client can specify its favorite poll class and locking behavior.
- * Use of IVmdbPoll is only supported for regular sockets and for Attach.
- */
--#include "poll.h"
-+#include "vm_poll.h"
- struct IVmdbPoll;
- typedef struct AsyncSocketPollParams {
-int flags; /* Default 0, only POLL_FLAG_NO_BULL is valid */
-diff --git a/open-vm-tools/lib/include/pollImpl.h
b/open-vm-tools/lib/include/pollImpl.h
-index 46442e556..8bc669970 100644
a/open-vm-tools/lib/include/pollImpl.h
-+++ b/open-vm-tools/lib/include/pollImpl.h
-@@ -44,7 +44,7 @@
- #define
[gentoo-commits] repo/gentoo:master commit in: app-emulation/open-vm-tools/files/, app-emulation/open-vm-tools/
commit: 18e535510c92807c48cf04d8a2a0475fa1ed5e36
Author: Mike Gilbert gentoo org>
AuthorDate: Mon Aug 1 16:05:09 2022 +
Commit: Mike Gilbert gentoo org>
CommitDate: Mon Aug 1 16:05:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18e53551
app-emulation/open-vm-tools: fix build error on musl
Closes: https://bugs.gentoo.org/862795
Signed-off-by: Mike Gilbert gentoo.org>
.../files/open-vm-tools-rename-poll.h.patch| 126 +
.../open-vm-tools-12.0.5_p19716617.ebuild | 1 +
2 files changed, 127 insertions(+)
diff --git
a/app-emulation/open-vm-tools/files/open-vm-tools-rename-poll.h.patch
b/app-emulation/open-vm-tools/files/open-vm-tools-rename-poll.h.patch
new file mode 100644
index ..c4e4518dbb28
--- /dev/null
+++ b/app-emulation/open-vm-tools/files/open-vm-tools-rename-poll.h.patch
@@ -0,0 +1,126 @@
+https://github.com/vmware/open-vm-tools/pull/383
+
+From 821c7949d79ad8e06b20cb1238316fce56778607 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine
+Date: Thu, 31 Oct 2019 17:06:10 +0100
+Subject: [PATCH] Rename poll.h into vm_poll.h to fix build failure on musl
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+musl libc redirects include of sys/poll.h to poll.h. But since poll.h is
+also a local header file, the musl libc header is never included. This
+leads to the following build failure:
+
+In file included from asyncsocket.c:73:0:
+.../host/i586-buildroot-linux-musl/sysroot/usr/include/sys/poll.h:1:2:
warning: #warning redirecting incorrect #include to
[-Wcpp]
+ #warning redirecting incorrect #include to
+asyncsocket.c: In function ‘AsyncTCPSocketPollWork’:
+asyncsocket.c:2537:13: error: invalid use of undefined type ‘struct pollfd’
+ pfd[i].fd = asock[i]->fd;
+ ^
+asyncsocket.c:2537:13: error: dereferencing pointer to incomplete type ‘struct
pollfd’
+asyncsocket.c:2538:13: error: invalid use of undefined type ‘struct pollfd’
+ pfd[i].events = read ? POLLIN : POLLOUT;
+ ^
+asyncsocket.c:2538:33: error: ‘POLLIN’ undeclared (first use in this
function); did you mean ‘POLL_IN’?
+ pfd[i].events = read ? POLLIN : POLLOUT;
+
+So rename poll.h into vm_poll.h as suggested by srowe in
+https://github.com/vmware/open-vm-tools/issues/359#issuecomment-533529956
+
+Fixes:
+ -
http://autobuild.buildroot.org/results/4f575ef42bbc4387a07e396205052b2da081c64d
+
+Fix #359
+
+Signed-off-by: Fabrice Fontaine
+---
+ open-vm-tools/lib/asyncsocket/asyncsocket.c | 4 ++--
+ open-vm-tools/lib/hgfsServer/hgfsServer.c | 2 +-
+ open-vm-tools/lib/include/asyncsocket.h | 2 +-
+ open-vm-tools/lib/include/pollImpl.h| 2 +-
+ open-vm-tools/lib/include/{poll.h => vm_poll.h} | 0
+ open-vm-tools/lib/rpcIn/rpcin.c | 2 +-
+ 6 files changed, 6 insertions(+), 6 deletions(-)
+ rename open-vm-tools/lib/include/{poll.h => vm_poll.h} (100%)
+
+diff --git a/open-vm-tools/lib/asyncsocket/asyncsocket.c
b/open-vm-tools/lib/asyncsocket/asyncsocket.c
+index 102638cc9..01181a957 100644
+--- a/open-vm-tools/lib/asyncsocket/asyncsocket.c
b/open-vm-tools/lib/asyncsocket/asyncsocket.c
+@@ -69,8 +69,8 @@
+ #else
+ #include
+ #include
++#include
+ #include
+-#include
+ #include
+ #include
+ #include
+@@ -86,7 +86,7 @@
+ #include "random.h"
+ #include "asyncsocket.h"
+ #include "asyncSocketBase.h"
+-#include "poll.h"
++#include "vm_poll.h"
+ #include "log.h"
+ #include "err.h"
+ #include "hostinfo.h"
+diff --git a/open-vm-tools/lib/hgfsServer/hgfsServer.c
b/open-vm-tools/lib/hgfsServer/hgfsServer.c
+index 462245511..fc6912860 100644
+--- a/open-vm-tools/lib/hgfsServer/hgfsServer.c
b/open-vm-tools/lib/hgfsServer/hgfsServer.c
+@@ -48,7 +48,7 @@
+ #include "hgfsServerOplock.h"
+ #include "hgfsDirNotify.h"
+ #include "userlock.h"
+-#include "poll.h"
++#include "vm_poll.h"
+ #include "mutexRankLib.h"
+ #include "vm_basic_asm.h"
+ #include "unicodeOperations.h"
+diff --git a/open-vm-tools/lib/include/asyncsocket.h
b/open-vm-tools/lib/include/asyncsocket.h
+index 95a5e4643..a4b4e5aae 100644
+--- a/open-vm-tools/lib/include/asyncsocket.h
b/open-vm-tools/lib/include/asyncsocket.h
+@@ -164,7 +164,7 @@ typedef struct AsyncSocket AsyncSocket;
+ * Or the client can specify its favorite poll class and locking behavior.
+ * Use of IVmdbPoll is only supported for regular sockets and for Attach.
+ */
+-#include "poll.h"
++#include "vm_poll.h"
+ struct IVmdbPoll;
+ typedef struct AsyncSocketPollParams {
+int flags; /* Default 0, only POLL_FLAG_NO_BULL is valid */
+diff --git a/open-vm-tools/lib/include/pollImpl.h
b/open-vm-tools/lib/include/pollImpl.h
+index 46442e556..8bc669970 100644
+--- a/open-vm-tools/lib/include/pollImpl.h
b/open-vm-tools/lib/include/pollImpl.h
+@@ -44,7 +44,7 @@
+ #define INCLUDE_ALLOW_USERLEVEL
+ #include "includeCheck.h"
+
+-#include "poll.h"
[gentoo-commits] repo/gentoo:master commit in: app-emulation/open-vm-tools/files/, app-emulation/open-vm-tools/
commit: 4eb76510d4bf305b17718a6659bf17b651c88508
Author: Mike Gilbert gentoo org>
AuthorDate: Sun Sep 26 01:48:24 2021 +
Commit: Mike Gilbert gentoo org>
CommitDate: Sun Sep 26 01:48:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4eb76510
app-emulation/open-vm-tools: add 11.3.5_p18557794
Signed-off-by: Mike Gilbert gentoo.org>
app-emulation/open-vm-tools/Manifest | 1 +
app-emulation/open-vm-tools/files/11.3.5-icu.patch | 26
.../open-vm-tools-11.3.5_p18557794.ebuild | 139 +
3 files changed, 166 insertions(+)
diff --git a/app-emulation/open-vm-tools/Manifest
b/app-emulation/open-vm-tools/Manifest
index 95cb9974c3b..b9da3066bdd 100644
--- a/app-emulation/open-vm-tools/Manifest
+++ b/app-emulation/open-vm-tools/Manifest
@@ -1 +1,2 @@
DIST open-vm-tools-11.2.5-17337674.tar.gz 4057528 BLAKE2B
2adc5179e09a4bb501fe12c9e6dea7fee106516fd250899170a8fb3bcefb9b576136a82e4c3d3a73217b44aba8880728bb3588cedd715529f9b2991f0156ac84
SHA512
b6d4bc6522418ec7a881752181ad9240e535854df492e758abf3996c6afe245466ffbff60cc1b6cdff5cf731b5769c9f9cb96aed29f0b788d0eef05f91fcf8ab
+DIST open-vm-tools-11.3.5-18557794.tar.gz 4218935 BLAKE2B
41e3f5877a5074bfb206870d7bdba613a468aa104d6d497dcf16e80b24fcbdd2195fcce370b150ced4665dd19296ff27dc06922d2742a43f5bf70b1b5eea9d48
SHA512
fa31f5615c9c90865ba9122f7fcd0831068d48defee30a5f5c620e744b76ccd5b7cc2de20cea4e37b596f99619ffb7bb47774de04e7c4bea666c7c0b6fa1560e
diff --git a/app-emulation/open-vm-tools/files/11.3.5-icu.patch
b/app-emulation/open-vm-tools/files/11.3.5-icu.patch
new file mode 100644
index 000..d51c0cc60a3
--- /dev/null
+++ b/app-emulation/open-vm-tools/files/11.3.5-icu.patch
@@ -0,0 +1,26 @@
+From 08caf83eaa0e66cee8f3e49479cd201a10bb3919 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert
+Date: Sat, 25 Sep 2021 21:14:25 -0400
+Subject: [PATCH] lib/unicode: add ICU_LIBS to LDADD
+
+---
+ open-vm-tools/lib/unicode/Makefile.am | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/open-vm-tools/lib/unicode/Makefile.am
b/open-vm-tools/lib/unicode/Makefile.am
+index 4284c51c..40261fba 100644
+--- a/open-vm-tools/lib/unicode/Makefile.am
b/open-vm-tools/lib/unicode/Makefile.am
+@@ -25,7 +25,9 @@ libUnicode_la_SOURCES += unicodeSimpleTypes.c
+ libUnicode_la_SOURCES += unicodeSimpleOperations.c
+ libUnicode_la_SOURCES += unicodeSimpleTransforms.c
+ libUnicode_la_SOURCES += unicodeStatic.c
++libUnicode_la_LIBADD =
+
+ if HAVE_ICU
+ libUnicode_la_SOURCES += unicodeICU.c
++libUnicode_la_LIBADD += @ICU_LIBS@
+ endif
+--
+2.33.0
+
diff --git a/app-emulation/open-vm-tools/open-vm-tools-11.3.5_p18557794.ebuild
b/app-emulation/open-vm-tools/open-vm-tools-11.3.5_p18557794.ebuild
new file mode 100644
index 000..6c9aa7cdb10
--- /dev/null
+++ b/app-emulation/open-vm-tools/open-vm-tools-11.3.5_p18557794.ebuild
@@ -0,0 +1,139 @@
+# Copyright 2007-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info pam systemd
+
+DESCRIPTION="Tools for VMware guests"
+HOMEPAGE="https://github.com/vmware/open-vm-tools;
+MY_P="${PN}-${PV/_p/-}"
+SRC_URI="https://github.com/vmware/open-vm-tools/releases/download/stable-${PV%_p*}/${MY_P}.tar.gz;
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X +deploypkg +dnet doc +fuse gtkmm +icu multimon pam +resolutionkms +ssl
+vgauth"
+REQUIRED_USE="
+ multimon? ( X )
+ vgauth? ( ssl )
+"
+
+RDEPEND="
+ dev-libs/glib
+ net-libs/libtirpc
+ deploypkg? ( dev-libs/libmspack )
+ fuse? ( sys-fs/fuse:0 )
+ pam? ( sys-libs/pam )
+ !pam? ( virtual/libcrypt:= )
+ ssl? ( dev-libs/openssl:0= )
+ vgauth? (
+ dev-libs/libxml2
+ dev-libs/xmlsec
+ )
+ X? (
+ x11-libs/libXext
+ multimon? ( x11-libs/libXinerama )
+ x11-libs/libXi
+ x11-libs/libXrender
+ x11-libs/libXrandr
+ x11-libs/libXtst
+ x11-libs/libSM
+ x11-libs/libXcomposite
+ x11-libs/gdk-pixbuf-xlib
+ x11-libs/gtk+:3
+ gtkmm? (
+ dev-cpp/gtkmm:3.0
+ dev-libs/libsigc++:2
+ )
+ )
+ dnet? ( dev-libs/libdnet )
+ icu? ( dev-libs/icu:= )
+ resolutionkms? (
+ x11-libs/libdrm[video_cards_vmware]
+ virtual/libudev
+ )
+"
+
+DEPEND="${RDEPEND}
+ net-libs/rpcsvc-proto
+"
+
+BDEPEND="
+ dev-util/glib-utils
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}/10.1.0-Werror.patch"
+ "${FILESDIR}/11.3.5-icu.patch"
+)
+
+pkg_setup() {
+ local CONFIG_CHECK="~VMWARE_BALLOON ~VMWARE_PVSCSI ~VMXNET3"
+ use X && CONFIG_CHECK+=" ~DRM_VMWGFX"
+ kernel_is -lt 3 9 ||
[gentoo-commits] repo/gentoo:master commit in: app-emulation/open-vm-tools/files/, app-emulation/open-vm-tools/
commit: d41be7e2d80c3164594952e0b03504b52b006221
Author: Mike Gilbert gentoo org>
AuthorDate: Fri Dec 20 18:22:02 2019 +
Commit: Mike Gilbert gentoo org>
CommitDate: Fri Dec 20 18:22:02 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d41be7e2
app-emulation/open-vm-tools: fix udev warnings
Package-Manager: Portage-2.3.82, Repoman-2.3.20_p9
Signed-off-by: Mike Gilbert gentoo.org>
.../files/11.0.1-udev-complaints.patch | 60 ++
...1.0.1.ebuild => open-vm-tools-11.0.1-r1.ebuild} | 1 +
2 files changed, 61 insertions(+)
diff --git a/app-emulation/open-vm-tools/files/11.0.1-udev-complaints.patch
b/app-emulation/open-vm-tools/files/11.0.1-udev-complaints.patch
new file mode 100644
index 000..b34e06d1a22
--- /dev/null
+++ b/app-emulation/open-vm-tools/files/11.0.1-udev-complaints.patch
@@ -0,0 +1,60 @@
+From f1dab8ded454b6993a4d96d0aefc700f1796 Mon Sep 17 00:00:00 2001
+From: Oliver Kurth
+Date: Mon, 28 Oct 2019 16:12:42 -0700
+Subject: [PATCH] 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
+---
+ open-vm-tools/AUTHORS| 4
+ open-vm-tools/udev/99-vmware-scsi-udev.rules | 6 +++---
+ open-vm-tools/udev/Makefile.am | 4 ++--
+ 3 files changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/open-vm-tools/AUTHORS b/open-vm-tools/AUTHORS
+index 08cc28ef2..026de07e6 100644
+--- a/open-vm-tools/AUTHORS
b/open-vm-tools/AUTHORS
+@@ -49,3 +49,7 @@ Josh PaetzelAdditional changes to vmmemctl.ko for
FreeBSD 12.0 API changes.
+
+ Haruki TsurumotoFix 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 053b59706..fb4ed6844 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 68fbc3e27..c3baadf16 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)
+
diff --git a/app-emulation/open-vm-tools/open-vm-tools-11.0.1.ebuild
b/app-emulation/open-vm-tools/open-vm-tools-11.0.1-r1.ebuild
similarity index 98%
rename from app-emulation/open-vm-tools/open-vm-tools-11.0.1.ebuild
rename to app-emulation/open-vm-tools/open-vm-tools-11.0.1-r1.ebuild
index d86104a2c50..3fb3beb6d1d 100644
--- a/app-emulation/open-vm-tools/open-vm-tools-11.0.1.ebuild
+++ b/app-emulation/open-vm-tools/open-vm-tools-11.0.1-r1.ebuild
@@ -69,6 +69,7 @@ S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}/10.1.0-mount.vmhgfs.patch"
"${FILESDIR}/10.1.0-Werror.patch"
+ "${FILESDIR}/11.0.1-udev-complaints.patch"
)
pkg_setup() {
[gentoo-commits] repo/gentoo:master commit in: app-emulation/open-vm-tools/files/, app-emulation/open-vm-tools/
commit: 27cf8b83fbf2cb9394d1c123a4ab237caa5d0d2c
Author: Xiami f2light com>
AuthorDate: Wed Jul 4 09:54:00 2018 +
Commit: Mike Gilbert gentoo org>
CommitDate: Wed Jul 4 14:56:16 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27cf8b83
app-emulation/open-vm-tools: Bump to 10.2.5 and update the ebuild
- Update LICENSE
- According to configure.ac:
- Introducing more features
- Update IUSE, REQUIRED_USE and DEPENDs
- Patches for migrate to libtirpc (and keep -Werror)
Package-Manager: Portage-2.3.40, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/9039
Closes: https://bugs.gentoo.org/658086
app-emulation/open-vm-tools/Manifest | 1 +
.../open-vm-tools/files/10.2.5-libtirpc.patch | 45 ++
app-emulation/open-vm-tools/files/vgauthd.service | 14 ++
app-emulation/open-vm-tools/files/vmtoolsd.service | 2 +-
.../{vmtoolsd.service => vmtoolsd.vgauth.service} | 5 +-
app-emulation/open-vm-tools/metadata.xml | 16 +-
.../open-vm-tools/open-vm-tools-10.2.5.ebuild | 172 +
7 files changed, 250 insertions(+), 5 deletions(-)
diff --git a/app-emulation/open-vm-tools/Manifest
b/app-emulation/open-vm-tools/Manifest
index a8bf132586f..09a1e723dfe 100644
--- a/app-emulation/open-vm-tools/Manifest
+++ b/app-emulation/open-vm-tools/Manifest
@@ -1,2 +1,3 @@
DIST open-vm-tools-10.1.10-6082533.tar.gz 5111726 BLAKE2B
22e2e901c542ae14b7537bc26ff848359f30bde6824a16968b70070dd6e57c92fbf76dca0d02e35ef45bda257725e207632b0602a4336bd2d9c97d10fb094967
SHA512
60c52a24509cb0630f2ad649fe6717fefff624fc2a5c736ced35cbdb8f639264d482e063e8140eedb39216adfb1231d58232bfef0233ebc477ba4f9a732c5965
DIST open-vm-tools-10.1.15-6677369.tar.gz 5153995 BLAKE2B
03c6b359df8f42f1ba65331dcac67e8ce86b0fce9a572c1665d3f385cae14f1757611d3948d30bb5b2e40bb2b4673bb244c45f56098faf09d6de515bb937ea3f
SHA512
fe3699a7f704bdadc4c274c963d177f4700067e7436074554b7cf113ffa341ad0e4753016214f947418fd5a7cb4a6f2c0342acf074b6b414b3fd18fd2ea2bc58
+DIST open-vm-tools-10.2.5-8068406.tar.gz 4818035 BLAKE2B
87e3edc42afceaf9efe69ae8cbd1abfbbf959fe09a721dbe4737ca30c6b57dcf1d8bff23bb3ed3d2236c31e7f3e6fd4d10a689b40b3b725eb580609a68bb7090
SHA512
da2f26b4b22e195af111cc16d5819aeb963f0dfa18b5d2677d897549836ec8679808315646f7f86ae36862df9e623bbcb5d553dae97a68b3ef928a5c07ea2e68
diff --git a/app-emulation/open-vm-tools/files/10.2.5-libtirpc.patch
b/app-emulation/open-vm-tools/files/10.2.5-libtirpc.patch
new file mode 100644
index 000..a9dfb42b2fc
--- /dev/null
+++ b/app-emulation/open-vm-tools/files/10.2.5-libtirpc.patch
@@ -0,0 +1,45 @@
+From 75505fed193fc3779560b57c1b0d6d4209b05bf9 Mon Sep 17 00:00:00 2001
+From: Xiami
+Date: Thu, 14 Jun 2018 16:23:00 +0800
+Subject: [PATCH] lib/dynxdr: for libtirpc
+
+glibc-2.26 do not provide RPC support by default.
+This workaround only works for Gentoo as ebuild forces libtirpc.
+---
+ open-vm-tools/lib/dynxdr/dynxdr.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/open-vm-tools/lib/dynxdr/dynxdr.c
b/open-vm-tools/lib/dynxdr/dynxdr.c
+index 95fdc7e2..d3182733 100644
+--- a/open-vm-tools/lib/dynxdr/dynxdr.c
b/open-vm-tools/lib/dynxdr/dynxdr.c
+@@ -55,7 +55,7 @@ typedef struct DynXdrData {
+ * Mac OS X, FreeBSD and Solaris don't take a const parameter to the
+ * "x_getpostn" function.
+ */
+-#if defined(__APPLE__) || defined(__FreeBSD__) || defined(sun)
++#if defined(__APPLE__) || defined(__FreeBSD__) || defined(sun) ||
defined(_TIRPC_XDR_H)
+ # define DYNXDR_GETPOS_CONST
+ #else
+ # define DYNXDR_GETPOS_CONST const
+@@ -172,7 +172,7 @@ DynXdrSetPos(XDR *xdrs, // IN
+ }
+
+
+-#if defined(__GLIBC__) || (defined(sun) && (defined(_LP64) ||
defined(_KERNEL)))
++#if (defined(__GLIBC__) && !defined(_TIRPC_XDR_H)) || (defined(sun) &&
(defined(_LP64) || defined(_KERNEL)))
+ /*
+
*-
+ *
+@@ -322,7 +322,7 @@ DynXdr_Create(XDR *in) // IN
+ DynXdrSetPos, /* x_setpostn */
+ DynXdrInline, /* x_inline */
+ NULL, /* x_destroy */
+-#if defined(__GLIBC__)
++#if defined(__GLIBC__) && !defined(_TIRPC_XDR_H)
+ NULL, /* x_getint32 */
+ DynXdrPutInt32, /* x_putint32 */
+ #elif defined(__APPLE__)
+--
+2.16.4
+
diff --git a/app-emulation/open-vm-tools/files/vgauthd.service
b/app-emulation/open-vm-tools/files/vgauthd.service
new file mode 100644
index 000..db27bd56ef5
--- /dev/null
+++ b/app-emulation/open-vm-tools/files/vgauthd.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=VGAuth Service for open-vm-tools
+Documentation=https://github.com/vmware/open-vm-tools
+ConditionVirtualization=vmware
+PartOf=vmtoolsd.service
+
+[Service]
+# For dev-libs/xerces-c[iconv,-icu]
+EnvironmentFile=-/etc/env.d/50xerces-c
+ExecStart=/usr/bin/VGAuthService -s
+TimeoutStopSec=5
+
+[Install]
+RequiredBy=vmtoolsd.service
diff --git
