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.0.1-udev-complaints.patch | 60 | ||||
| -rw-r--r-- | app-emulation/open-vm-tools/files/11.3.5-icu.patch | 26 | ||||
| -rw-r--r-- | app-emulation/open-vm-tools/metadata.xml | 8 | ||||
| -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.1.0.ebuild) | 41 | ||||
| -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.0.1-r1.ebuild) | 43 |
7 files changed, 80 insertions, 135 deletions
diff --git a/app-emulation/open-vm-tools/Manifest b/app-emulation/open-vm-tools/Manifest index 3860659e62e1..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.0.1-14773994.tar.gz 3972888 BLAKE2B 8ead9b37e9fa861386087d50af4e20274a9ee9fafd929da3ca0652ea2c4eecff4c203cadf02d38401bfd7ff0129ebcc7895d2819785cf2d818aac91a46f8d163 SHA512 3f500b3f0daaed01f787cf271d094b693baa18304491c3b58c79b64ab7db41b1b4a4747440e0039b2d9f9cc7e1474ee15f0ee7413544a34c2c9402443c145276 -DIST open-vm-tools-11.1.0-16036546.tar.gz 3986835 BLAKE2B f02e9426fb324ec0f4f78f43554a55ce0b615f609f888c008e8ecaf59332b9e25b0c865730cd263be1936d223c9cd5e078d304d1ddd8903cec88512cd63c258b SHA512 cd1f8399b9660ecac8222cfdc0d6331dce67db2f3a1788f21b18b201066dbcd059f429130f1fb5b416bb9a06b4882ec462a134aa8ca595f17dc48af0b7f59e8e +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.0.1-udev-complaints.patch b/app-emulation/open-vm-tools/files/11.0.1-udev-complaints.patch deleted file mode 100644 index b34e06d1a227..000000000000 --- a/app-emulation/open-vm-tools/files/11.0.1-udev-complaints.patch +++ /dev/null @@ -1,60 +0,0 @@ -From f1dab8ded45aaaa4b6993a4d96d0aefc700f1796 Mon Sep 17 00:00:00 2001 -From: Oliver Kurth <okurth@vmware.com> -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 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 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/files/11.3.5-icu.patch b/app-emulation/open-vm-tools/files/11.3.5-icu.patch new file mode 100644 index 000000000000..d51c0cc60a37 --- /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 <floppym@gentoo.org> +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/metadata.xml b/app-emulation/open-vm-tools/metadata.xml index b3da7a11a515..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 "http://www.gentoo.org/dtd/metadata.dtd"> +<!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.1.0.ebuild b/app-emulation/open-vm-tools/open-vm-tools-12.2.0.ebuild index b9f5c70c0417..3b96f8c85ee9 100644 --- a/app-emulation/open-vm-tools/open-vm-tools-11.1.0.ebuild +++ b/app-emulation/open-vm-tools/open-vm-tools-12.2.0.ebuild @@ -1,19 +1,19 @@ -# Copyright 2007-2020 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 toolchain-funcs +inherit autotools linux-info pam systemd udev -DESCRIPTION="Opensourced tools for VMware guests" +DESCRIPTION="Tools for VMware guests" HOMEPAGE="https://github.com/vmware/open-vm-tools" -MY_P="${P}-16036546" +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" -IUSE="X +deploypkg +dnet doc +fuse gtkmm +icu multimon pam +resolutionkms +ssl static-libs +vgauth" +KEYWORDS="amd64 x86" +IUSE="X +deploypkg +dnet doc +fuse gtkmm +icu multimon pam +resolutionkms +ssl +vgauth" REQUIRED_USE=" multimon? ( X ) vgauth? ( ssl ) @@ -25,10 +25,11 @@ RDEPEND=" deploypkg? ( dev-libs/libmspack ) fuse? ( sys-fs/fuse:0 ) pam? ( sys-libs/pam ) - ssl? ( dev-libs/openssl:0 ) + !pam? ( virtual/libcrypt:= ) + ssl? ( dev-libs/openssl:0= ) vgauth? ( dev-libs/libxml2 - dev-libs/xmlsec + dev-libs/xmlsec:= ) X? ( x11-libs/libXext @@ -39,7 +40,7 @@ RDEPEND=" x11-libs/libXtst x11-libs/libSM x11-libs/libXcomposite - x11-libs/gdk-pixbuf:2 + x11-libs/gdk-pixbuf-xlib x11-libs/gtk+:3 gtkmm? ( dev-cpp/gtkmm:3.0 @@ -61,14 +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.3.5-icu.patch" ) pkg_setup() { @@ -88,6 +89,7 @@ src_prepare() { src_configure() { local myeconfargs=( + --disable-glibc-check --without-root-privileges $(use_enable multimon) $(use_with X x) @@ -96,12 +98,13 @@ src_configure() { $(use_enable doc docs) --disable-tests $(use_enable resolutionkms) - $(use_enable static-libs static) + --disable-static $(use_enable deploypkg) $(use_with pam) $(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 ) @@ -128,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 @@ -140,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.0.1-r1.ebuild b/app-emulation/open-vm-tools/open-vm-tools-12.2.5.ebuild index 3fb3beb6d1d3..051fc71853da 100644 --- a/app-emulation/open-vm-tools/open-vm-tools-11.0.1-r1.ebuild +++ b/app-emulation/open-vm-tools/open-vm-tools-12.2.5.ebuild @@ -1,19 +1,19 @@ -# Copyright 2007-2019 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 toolchain-funcs +inherit autotools linux-info pam systemd udev -DESCRIPTION="Opensourced tools for VMware guests" +DESCRIPTION="Tools for VMware guests" HOMEPAGE="https://github.com/vmware/open-vm-tools" -MY_P="${P}-14773994" +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" -IUSE="X +deploypkg +dnet doc +fuse gtkmm +icu multimon pam +resolutionkms +ssl static-libs +vgauth" +KEYWORDS="amd64 ~arm64 x86" +IUSE="X +deploypkg +dnet doc +fuse gtkmm +icu multimon pam +resolutionkms +ssl +vgauth" REQUIRED_USE=" multimon? ( X ) vgauth? ( ssl ) @@ -25,10 +25,11 @@ RDEPEND=" deploypkg? ( dev-libs/libmspack ) fuse? ( sys-fs/fuse:0 ) pam? ( sys-libs/pam ) - ssl? ( dev-libs/openssl:0 ) + !pam? ( virtual/libcrypt:= ) + ssl? ( dev-libs/openssl:0= ) vgauth? ( dev-libs/libxml2 - dev-libs/xmlsec + dev-libs/xmlsec:= ) X? ( x11-libs/libXext @@ -39,7 +40,7 @@ RDEPEND=" x11-libs/libXtst x11-libs/libSM x11-libs/libXcomposite - x11-libs/gdk-pixbuf:2 + x11-libs/gdk-pixbuf-xlib x11-libs/gtk+:3 gtkmm? ( dev-cpp/gtkmm:3.0 @@ -61,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.0.1-udev-complaints.patch" + "${FILESDIR}/11.3.5-icu.patch" ) pkg_setup() { @@ -77,6 +77,7 @@ pkg_setup() { use X && CONFIG_CHECK+=" ~DRM_VMWGFX" kernel_is -lt 3 9 || CONFIG_CHECK+=" ~VMWARE_VMCI ~VMWARE_VMCI_VSOCKETS" kernel_is -lt 3 || CONFIG_CHECK+=" ~FUSE_FS" + kernel_is -lt 5 5 || CONFIG_CHECK+=" ~X86_IOPL_IOPERM" linux-info_pkg_setup } @@ -88,6 +89,7 @@ src_prepare() { src_configure() { local myeconfargs=( + --disable-glibc-check --without-root-privileges $(use_enable multimon) $(use_with X x) @@ -96,12 +98,13 @@ src_configure() { $(use_enable doc docs) --disable-tests $(use_enable resolutionkms) - $(use_enable static-libs static) + --disable-static $(use_enable deploypkg) $(use_with pam) $(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 ) @@ -128,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 @@ -140,3 +139,11 @@ src_install() { dobin scripts/common/vmware-xdg-detect-de fi } + +pkg_postinst() { + udev_reload +} + +pkg_postrm() { + udev_reload +} |