diff options
Diffstat (limited to 'app-emulation/open-vm-tools')
| -rw-r--r-- | app-emulation/open-vm-tools/Manifest | 4 | ||||
| -rw-r--r-- | app-emulation/open-vm-tools/files/10.1.0-mount.vmhgfs.patch | 33 | ||||
| -rw-r--r-- | app-emulation/open-vm-tools/files/11.2.5-glib-2.68.patch | 148 | ||||
| -rw-r--r-- | app-emulation/open-vm-tools/metadata.xml | 6 | ||||
| -rw-r--r-- | app-emulation/open-vm-tools/open-vm-tools-12.2.0.ebuild (renamed from app-emulation/open-vm-tools/open-vm-tools-11.3.5_p18557794.ebuild) | 26 | ||||
| -rw-r--r-- | app-emulation/open-vm-tools/open-vm-tools-12.2.5.ebuild (renamed from app-emulation/open-vm-tools/open-vm-tools-11.2.5_p17337674-r3.ebuild) | 33 |
6 files changed, 41 insertions, 209 deletions
diff --git a/app-emulation/open-vm-tools/Manifest b/app-emulation/open-vm-tools/Manifest index b9da3066bdd2..bdbc4e5c9a51 100644 --- a/app-emulation/open-vm-tools/Manifest +++ b/app-emulation/open-vm-tools/Manifest @@ -1,2 +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 +DIST open-vm-tools-12.2.0-21223074.tar.gz 4365836 BLAKE2B ecac1ada523b9ba6e6f9e880f700a9c35200e9093c81f3367ce3b196365166f682f7d8ba290f624417b83c3573894020fe6b4cbd82a117412ebe80df283f32db SHA512 d663d8ea455264cad7d3eaac16c5d08672e8e10f7a9171be40fff69e208ae697bc0e8af498c978d8de470ed273351b42c54994b2c552fdc05b828c80f4826b84 +DIST open-vm-tools-12.2.5-21855600.tar.gz 4365531 BLAKE2B 1df621aea3d349af45c41268f3ab9ef6dc012bc7b74b8ff399a3819f75c92b408f272c03e31ff74d7f1aceda8a88e5755064236b87403d8ef2717567de174434 SHA512 72db3b88f61624d26e8ff7e37e4fc52ecd0bec0b6f076d935870c03312321c5e0b406d05eae7012872734a50626ed760dff2cf872e26ec18ebf200aff5ed12ef diff --git a/app-emulation/open-vm-tools/files/10.1.0-mount.vmhgfs.patch b/app-emulation/open-vm-tools/files/10.1.0-mount.vmhgfs.patch deleted file mode 100644 index bff97811771b..000000000000 --- a/app-emulation/open-vm-tools/files/10.1.0-mount.vmhgfs.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 1805ab024b10e8185175de7ce9c9b9db87fd0897 Mon Sep 17 00:00:00 2001 -From: Bernd Zeimetz <bernd@bzed.de> -Date: Sun, 10 Jan 2016 22:18:04 +0100 -Subject: [PATCH] Fix mount.vmhgfs symlinks if DESTDIR is used - -Without this change symlinks in the form of -sbin/mount.vmhgfs -> /build/open-vm-tools-10.0.5-3227872/debian/open-vm-tools/usr/sbin/mount.vmhgfs -are being produced, if DESTDIR was uset while running make install. ---- - open-vm-tools/hgfsmounter/Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/open-vm-tools/hgfsmounter/Makefile.am b/open-vm-tools/hgfsmounter/Makefile.am -index e48417e..fe70892 100644 ---- a/open-vm-tools/hgfsmounter/Makefile.am -+++ b/open-vm-tools/hgfsmounter/Makefile.am -@@ -33,14 +33,14 @@ install-exec-hook: - mv $(DESTDIR)$(sbindir)/mount.vmhgfs \ - $(DESTDIR)$(sbindir)/mount_vmhgfs - -$(MKDIR_P) $(DESTDIR)/sbin -- -$(LN_S) $(DESTDIR)$(sbindir)/mount_vmhgfs \ -+ -$(LN_S) $(sbindir)/mount_vmhgfs \ - $(DESTDIR)/sbin/mount_vmhgfs &> /dev/null - uninstall-hook: - rm -f $(DESTDIR)$(sbindir)/mount_vmhgfs - else - install-exec-hook: - -$(MKDIR_P) $(DESTDIR)/sbin -- -$(LN_S) $(DESTDIR)$(sbindir)/mount.vmhgfs \ -+ -$(LN_S) $(sbindir)/mount.vmhgfs \ - $(DESTDIR)/sbin/mount.vmhgfs &> /dev/null - uninstall-hook: - rm -f $(DESTDIR)/sbin/mount.vmhgfs diff --git a/app-emulation/open-vm-tools/files/11.2.5-glib-2.68.patch b/app-emulation/open-vm-tools/files/11.2.5-glib-2.68.patch deleted file mode 100644 index b04342c3f68e..000000000000 --- a/app-emulation/open-vm-tools/files/11.2.5-glib-2.68.patch +++ /dev/null @@ -1,148 +0,0 @@ -From 82931a1bcb39d5132910c7fb2ddc086c51d06662 Mon Sep 17 00:00:00 2001 -From: John Wolfe <jwolfe@vmware.com> -Date: Mon, 19 Apr 2021 11:08:10 -0700 -Subject: [PATCH] Fix issues using GCC 11 with gtk >= 3.20 and glib >=2.66.3 - -With glib2.0 releases >= 2.66.3, glib header files inside an -extern "C" block will encounter compilation errors. This has -impacted several OSS packages. Consumers of newer versions of glib2.0 -must not include glib headers in an extern "C" block. - -GTK 3.20 has deprecated gdk_display_get_device_manager(); using the -newer gdk_display_get_default_seat() when the GTK version is >= 3.20. - -The return value from read() must be used to avoid an unused result -warning from the compiler. This can be avoided by using dummy retyping -in the case where the return value is not used or in this case, using -the returned value in a debug log message. - -Pull Request: https://github.com/vmware/open-vm-tools/pull/505 -Addresses: https://github.com/vmware/open-vm-tools/issues/500 -Addresses: https://github.com/vmware/open-vm-tools/issues/509 ---- - open-vm-tools/AUTHORS | 3 +++ - open-vm-tools/lib/include/tracer.hh | 4 +--- - .../services/plugins/dndcp/copyPasteUIX11.cpp | 3 ++- - .../plugins/dndcp/dndGuest/dndCPTransportGuestRpc.hpp | 6 +++--- - open-vm-tools/services/plugins/dndcp/dndUIX11.cpp | 11 +++++++++-- - open-vm-tools/services/plugins/dndcp/dndcp.cpp | 7 ++++++- - 6 files changed, 24 insertions(+), 10 deletions(-) - -diff --git a/open-vm-tools/lib/include/tracer.hh b/open-vm-tools/lib/include/tracer.hh -index 697caedbc..e9ae892cb 100644 ---- a/open-vm-tools/lib/include/tracer.hh -+++ b/open-vm-tools/lib/include/tracer.hh -@@ -1,5 +1,5 @@ - /********************************************************* -- * Copyright (C) 2013-2017 VMware, Inc. All rights reserved. -+ * Copyright (C) 2013-2017,2021 VMware, Inc. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published -@@ -28,9 +28,7 @@ - - #include "vm_basic_defs.h" - --extern "C" { - #include "glib.h" --} - - - #ifdef VMX86_DEVEL -diff --git a/open-vm-tools/services/plugins/dndcp/copyPasteUIX11.cpp b/open-vm-tools/services/plugins/dndcp/copyPasteUIX11.cpp -index 68212ab8b..080dc3d76 100644 ---- a/open-vm-tools/services/plugins/dndcp/copyPasteUIX11.cpp -+++ b/open-vm-tools/services/plugins/dndcp/copyPasteUIX11.cpp -@@ -1,5 +1,5 @@ - /********************************************************* -- * Copyright (C) 2009-2020 VMware, Inc. All rights reserved. -+ * Copyright (C) 2009-2021 VMware, Inc. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published -@@ -1666,6 +1666,7 @@ CopyPasteUIX11::FileBlockMonitorThread(void *arg) // IN - char buf[sizeof(VMBLOCK_FUSE_READ_RESPONSE)]; - ssize_t size; - size = read(fd, buf, sizeof(VMBLOCK_FUSE_READ_RESPONSE)); -+ g_debug("%s: Number of bytes read : %" FMTSZ "u\n", __FUNCTION__, size); - /* - * The current thread will block in read function until - * any other application accesses the file params->fileBlockName -diff --git a/open-vm-tools/services/plugins/dndcp/dndGuest/dndCPTransportGuestRpc.hpp b/open-vm-tools/services/plugins/dndcp/dndGuest/dndCPTransportGuestRpc.hpp -index 9b70984fc..424481baa 100644 ---- a/open-vm-tools/services/plugins/dndcp/dndGuest/dndCPTransportGuestRpc.hpp -+++ b/open-vm-tools/services/plugins/dndcp/dndGuest/dndCPTransportGuestRpc.hpp -@@ -1,5 +1,5 @@ - /********************************************************* -- * Copyright (C) 2010-2017 VMware, Inc. All rights reserved. -+ * Copyright (C) 2010-2017,2021 VMware, Inc. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published -@@ -31,13 +31,13 @@ - - #include "dnd.h" - --extern "C" { - #ifdef VMX86_TOOLS - #include "vmware/tools/guestrpc.h" - #else -+extern "C" { - #include "guest_rpc.h" --#endif - } -+#endif - - #define GUEST_RPC_CMD_STR_DND "dnd.transport" - #define GUEST_RPC_CMD_STR_CP "copypaste.transport" -diff --git a/open-vm-tools/services/plugins/dndcp/dndUIX11.cpp b/open-vm-tools/services/plugins/dndcp/dndUIX11.cpp -index 50c2bf5e1..03cf3e0d7 100644 ---- a/open-vm-tools/services/plugins/dndcp/dndUIX11.cpp -+++ b/open-vm-tools/services/plugins/dndcp/dndUIX11.cpp -@@ -1,5 +1,5 @@ - /********************************************************* -- * Copyright (C) 2009-2019 VMware, Inc. All rights reserved. -+ * Copyright (C) 2009-2021 VMware, Inc. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published -@@ -467,8 +467,15 @@ DnDUIX11::OnSrcDragBegin(const CPClipboard *clip, // IN - #ifndef GTK3 - event.device = gdk_device_get_core_pointer(); - #else -- GdkDeviceManager* manager = gdk_display_get_device_manager(gdk_window_get_display(event.window)); -+# if GTK_MINOR_VERSION >= 20 -+ GdkSeat *seat = -+ gdk_display_get_default_seat(gdk_window_get_display(event.window)); -+ event.device = gdk_seat_get_pointer(seat); -+# else -+ GdkDeviceManager *manager = -+ gdk_display_get_device_manager(gdk_window_get_display(event.window)); - event.device = gdk_device_manager_get_client_pointer(manager); -+# endif - #endif - event.x_root = mOrigin.get_x(); - event.y_root = mOrigin.get_y(); -diff --git a/open-vm-tools/services/plugins/dndcp/dndcp.cpp b/open-vm-tools/services/plugins/dndcp/dndcp.cpp -index d1013f4a7..bae4c94c7 100644 ---- a/open-vm-tools/services/plugins/dndcp/dndcp.cpp -+++ b/open-vm-tools/services/plugins/dndcp/dndcp.cpp -@@ -1,5 +1,5 @@ - /********************************************************* -- * Copyright (C) 2010-2019 VMware, Inc. All rights reserved. -+ * Copyright (C) 2010-2021 VMware, Inc. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published -@@ -31,6 +31,11 @@ - - #define G_LOG_DOMAIN "dndcp" - -+/** -+ * Include glib.h before encountering any extern "C". -+ */ -+#include <glib.h> -+ - extern "C" { - #include "vmware/guestrpc/tclodefs.h" - #include "vmware/tools/plugin.h" diff --git a/app-emulation/open-vm-tools/metadata.xml b/app-emulation/open-vm-tools/metadata.xml index 4fd1ab46c632..f53e431f81a1 100644 --- a/app-emulation/open-vm-tools/metadata.xml +++ b/app-emulation/open-vm-tools/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>floppym@gentoo.org</email> - <name>Mike Gilbert</name> - </maintainer> + <!-- maintainer-needed --> <longdescription> The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools. They are a set of guest operating system @@ -23,5 +20,6 @@ </use> <upstream> <remote-id type="github">vmware/open-vm-tools</remote-id> + <remote-id type="cpe">cpe:/a:vmware:tools</remote-id> </upstream> </pkgmetadata> 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-12.2.0.ebuild index 6c9aa7cdb10e..3b96f8c85ee9 100644 --- a/app-emulation/open-vm-tools/open-vm-tools-11.3.5_p18557794.ebuild +++ b/app-emulation/open-vm-tools/open-vm-tools-12.2.0.ebuild @@ -1,18 +1,18 @@ -# Copyright 2007-2021 Gentoo Authors +# Copyright 2007-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools linux-info pam systemd +inherit autotools linux-info pam systemd udev 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" +MY_P="${P}-21223074" +SRC_URI="https://github.com/vmware/open-vm-tools/releases/download/stable-${PV}/${MY_P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="X +deploypkg +dnet doc +fuse gtkmm +icu multimon pam +resolutionkms +ssl +vgauth" REQUIRED_USE=" multimon? ( X ) @@ -29,7 +29,7 @@ RDEPEND=" ssl? ( dev-libs/openssl:0= ) vgauth? ( dev-libs/libxml2 - dev-libs/xmlsec + dev-libs/xmlsec:= ) X? ( x11-libs/libXext @@ -62,7 +62,7 @@ DEPEND="${RDEPEND} BDEPEND=" dev-util/glib-utils virtual/pkgconfig - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) " S="${WORKDIR}/${MY_P}" @@ -89,6 +89,7 @@ src_prepare() { src_configure() { local myeconfargs=( + --disable-glibc-check --without-root-privileges $(use_enable multimon) $(use_with X x) @@ -103,6 +104,7 @@ src_configure() { $(use_enable vgauth) $(use_with dnet) $(use_with icu) + --with-udev-rules-dir="$(get_udevdir)/rules.d" ) # Avoid a bug in configure.ac use ssl || myeconfargs+=( --without-ssl ) @@ -137,3 +139,11 @@ src_install() { dobin scripts/common/vmware-xdg-detect-de fi } + +pkg_postinst() { + udev_reload +} + +pkg_postrm() { + udev_reload +} diff --git a/app-emulation/open-vm-tools/open-vm-tools-11.2.5_p17337674-r3.ebuild b/app-emulation/open-vm-tools/open-vm-tools-12.2.5.ebuild index ec165bf63f26..051fc71853da 100644 --- a/app-emulation/open-vm-tools/open-vm-tools-11.2.5_p17337674-r3.ebuild +++ b/app-emulation/open-vm-tools/open-vm-tools-12.2.5.ebuild @@ -1,18 +1,18 @@ -# Copyright 2007-2021 Gentoo Authors +# Copyright 2007-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools linux-info pam systemd +inherit autotools linux-info pam systemd udev 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" +MY_P="${P}-21855600" +SRC_URI="https://github.com/vmware/open-vm-tools/releases/download/stable-${PV}/${MY_P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="X +deploypkg +dnet doc +fuse gtkmm +icu multimon pam +resolutionkms +ssl +vgauth" REQUIRED_USE=" multimon? ( X ) @@ -29,7 +29,7 @@ RDEPEND=" ssl? ( dev-libs/openssl:0= ) vgauth? ( dev-libs/libxml2 - dev-libs/xmlsec + dev-libs/xmlsec:= ) X? ( x11-libs/libXext @@ -62,15 +62,14 @@ DEPEND="${RDEPEND} BDEPEND=" dev-util/glib-utils virtual/pkgconfig - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) " S="${WORKDIR}/${MY_P}" PATCHES=( - "${FILESDIR}/10.1.0-mount.vmhgfs.patch" "${FILESDIR}/10.1.0-Werror.patch" - "${FILESDIR}/11.2.5-glib-2.68.patch" + "${FILESDIR}/11.3.5-icu.patch" ) pkg_setup() { @@ -90,6 +89,7 @@ src_prepare() { src_configure() { local myeconfargs=( + --disable-glibc-check --without-root-privileges $(use_enable multimon) $(use_with X x) @@ -104,6 +104,7 @@ src_configure() { $(use_enable vgauth) $(use_with dnet) $(use_with icu) + --with-udev-rules-dir="$(get_udevdir)/rules.d" ) # Avoid a bug in configure.ac use ssl || myeconfargs+=( --without-ssl ) @@ -130,10 +131,6 @@ src_install() { systemd_dounit "${FILESDIR}"/vmtoolsd.service fi - # Replace mount.vmhgfs with a wrapper - mv "${ED}"/usr/sbin/{mount.vmhgfs,hgfsmounter} || die - dosbin "${FILESDIR}/mount.vmhgfs" - # Make fstype = vmhgfs-fuse work in fstab dosym vmhgfs-fuse /usr/bin/mount.vmhgfs-fuse @@ -142,3 +139,11 @@ src_install() { dobin scripts/common/vmware-xdg-detect-de fi } + +pkg_postinst() { + udev_reload +} + +pkg_postrm() { + udev_reload +} |