From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- app-emulation/open-vm-tools/Manifest | 12 ++ .../open-vm-tools/files/10.1.0-Werror.patch | 24 ++++ .../open-vm-tools/files/10.1.0-mount.vmhgfs.patch | 33 +++++ .../open-vm-tools/files/10.1.0-vgauth.patch | 25 ++++ app-emulation/open-vm-tools/files/mount.vmhgfs | 2 + .../open-vm-tools/files/open-vm-tools.confd | 2 + .../open-vm-tools/files/open-vm-tools.initd | 59 ++++++++ app-emulation/open-vm-tools/files/vmtoolsd.service | 11 ++ app-emulation/open-vm-tools/metadata.xml | 28 ++++ .../open-vm-tools/open-vm-tools-10.1.10.ebuild | 152 +++++++++++++++++++++ 10 files changed, 348 insertions(+) create mode 100644 app-emulation/open-vm-tools/Manifest create mode 100644 app-emulation/open-vm-tools/files/10.1.0-Werror.patch create mode 100644 app-emulation/open-vm-tools/files/10.1.0-mount.vmhgfs.patch create mode 100644 app-emulation/open-vm-tools/files/10.1.0-vgauth.patch create mode 100644 app-emulation/open-vm-tools/files/mount.vmhgfs create mode 100644 app-emulation/open-vm-tools/files/open-vm-tools.confd create mode 100644 app-emulation/open-vm-tools/files/open-vm-tools.initd create mode 100644 app-emulation/open-vm-tools/files/vmtoolsd.service create mode 100644 app-emulation/open-vm-tools/metadata.xml create mode 100644 app-emulation/open-vm-tools/open-vm-tools-10.1.10.ebuild (limited to 'app-emulation/open-vm-tools') diff --git a/app-emulation/open-vm-tools/Manifest b/app-emulation/open-vm-tools/Manifest new file mode 100644 index 000000000000..2d20dd8e866a --- /dev/null +++ b/app-emulation/open-vm-tools/Manifest @@ -0,0 +1,12 @@ +AUX 10.1.0-Werror.patch 660 SHA256 2cb0bedb1f4a2733c9214b2185eefdc4d69243a83f9a69386c2c22abd85286d7 SHA512 3bfbc1e5c064318b36b01e656ce6296726b31632222f8cebe96cac6acf011e1237380cdad71d01a0493c1382d0e3fc471e2a4e0ed0b902e70cf29e1d8a88633f WHIRLPOOL 3acf4671aee35215c8fb76881518464a2f09958eee5d3622bb8b7f59f0641a446e52cf0b5cf08d5a212a1410772ba160452c6ee4a03bdf982b7dbc6d48069169 +AUX 10.1.0-mount.vmhgfs.patch 1305 SHA256 13cddc943a54e40f6110198c1d6957a778ef1255740f20b6ce29f69407268098 SHA512 3cf1cf89f8e39d676075a56643e9d0aef22609234166195cb31cea2cb3daf6d90cb5aab0aa84f446c34dabc9ad67ccc5532276fe1c20d5cc5a723240b1313694 WHIRLPOOL 59d779d6e9601abfab8062184b181518643e798f19c05233413cf4fb7e0aa453073fc674ccdd978b56abc58f466cd4fd352b03e5f0da13c2dc4280b40e48d3bf +AUX 10.1.0-vgauth.patch 803 SHA256 b1f1965474b640d2115185ba085f0b124108a9f4f1278138ab15144f6369c937 SHA512 95b4ee3b24eb656241fa7a303429727cf5254df3a78756ff865fba6a9643a6e401c8b4fbfc014e81792a89ecab895006d42f5930e33c23fb3c381cbaf7bbd7a3 WHIRLPOOL b268bbe93d7dd1e3a58047c93d797cd17e13490dd76b03db7e6035175cd0f6df9bbe146300e0980c9f707513b2c29055c42749d1aaea0a9f46584c854ec198f2 +AUX mount.vmhgfs 63 SHA256 e8f86850e0520528aa2b797397b2692b29b3e34bf21ab1e21015e13e3295b05f SHA512 dbad70fbb96e37ffca4664abe7766c26ce3303e52ccfc80b5c83d1e21066d2a23d548910f8e15055be36e1ca162cdbbf6e19fcb672314888c63cd802a499acb9 WHIRLPOOL 7a448e77a59451492f0fd2e8b91b58009bafe4ccf12247dedc0c68c86e01bb8580c5509d845563ee6217917aef968cdb0a632360fc85eef7527b7ef1fafdfa86 +AUX open-vm-tools.confd 88 SHA256 180a2b6d9d18af319b79b2ca6ebf1020b63e5ebf2f601a63c1a9f9f7d2e0b95c SHA512 fca30a3be4dd3247e16115fe32b4d27ede8751f96b5a33b9f489b0ce57823c605b6249ff722d6f4ed82a98979f36d28821603b4a5a1d967d3048d23d983a19be WHIRLPOOL b2cbc98b5e0e125fc3ef6440006d4f6b75b8b020680a7184c4b7fa0651c2387c5d02baf8b61e196cfd560ccfc7be069fba19340dc6fc9ba6ea161f407ffd73e5 +AUX open-vm-tools.initd 1225 SHA256 b217c51d85b258c328a07ee902f406dd47bb16b586a922dc129b75d716471516 SHA512 a612dd69e671cd32b028caeefa8123243e46ed6ffe5f6f7cbd1f805ec10088dbe994d4ecb2346a7f6d094e913e70e87fa17fa195702a0825cc3af319d350d34d WHIRLPOOL 418667fe622ecb4895efba84f3524bf2c1f6451282631580291378d2c454ac7bb3356c9b1e92e2b45eb4d41106f36a7f71be3a3dd5aa6f84e21549bfa6fdd390 +AUX vmtoolsd.service 251 SHA256 ddc8dff4dc274fa9ba130208a647fe997885f7639e15f66976028df2e268f389 SHA512 912447c338f7875acc9fe420b7bc1430984d27d2cae6168ded14eea28b7516ff0b8fcdfa252aec3ab44c738697ece1a621e996cac18829b5631e28a99b743044 WHIRLPOOL a700241e7a0c2aa3aa1dcedaa07d6df965b99da9e7c5b809b4c9b98757dee74ea13bc9c71d52ddc2fc8e8447a43d07ae82067edb7662b5af575d56ef46db71a6 +DIST open-vm-tools-10.1.10-6082533.tar.gz 5111726 SHA256 4632d815996e7f2c283818b0d84b0c4cf2fb82a0897d77aee0f8cbcdc5678c61 SHA512 60c52a24509cb0630f2ad649fe6717fefff624fc2a5c736ced35cbdb8f639264d482e063e8140eedb39216adfb1231d58232bfef0233ebc477ba4f9a732c5965 WHIRLPOOL a895246a9cc9d7fa664203a696b8f1c8d84bb231601f7e95c4291624b812d5504168e019cb33f9b9a64eb62baf048001c0952e54a8002bc6eb57dc0664f1d164 +EBUILD open-vm-tools-10.1.10.ebuild 3412 SHA256 2c8033866b7db3693b7897d2d74d9e3caaeb7486688f6bc9692c1c00374aa44b SHA512 20d56ddb09464c77792febabe57db66a33d1c6f81e22a8b6f7b6e4c4d0ca6f58b1646bc155d1fb77a96774e023f321a74af0bb5b2f8aa08d3f50459f2f041ce5 WHIRLPOOL 22f8b7cb22a7616923a77f8aee9faf7ad0c7b238f4b093028418fd7e19eb6a6bd13655489cd3441fc5cdbde4be5a6335bc44105e58a5237884e08baffba8712d +MISC ChangeLog 6651 SHA256 54d43ba6e8f1326b812cb98e6c690dd16672e9a7487a1d5cdbe96539a1297390 SHA512 6621ebcfaec8eefb4f74ba6702dc33f4598df86abed5df6cabc9cd434f8af1ce14c1e6870f582d15ae2934e0da728b2e4933a6963b70ab0ebf3c470ad518b1ff WHIRLPOOL d3c02e12490423d4a5f037f64311d1471817cf018aad72de76a1f8be79e97bb67ed809e2e3ad8a2005d0de38e616a88f61601ae11d0786830c60fec4b31dd9af +MISC ChangeLog-2015 18704 SHA256 54d87b9ed67b870220185810ae4bd2eca033f73c7cfe1b854be0ba65e592324c SHA512 97a6e3a637e1632d7790e995d3bd38b53a19246d578122bccc936c114fb34462f29e03909bf6d2a5e64f6b3d7dd0a59fcd6a6432bccee8c17c1f96b79229d4c6 WHIRLPOOL 8b37e17be37250f15c0419c54a18fe335470f0734fe58c7ca4696297dcfedcfadc999dc98bd23b2c954e5b339c30eb241880d48e6b32f1deb95368846158f930 +MISC metadata.xml 1022 SHA256 6aa3bfb10ac0cfee3e29105c2ada29f7749df871d6706d4350729bed65bff5bf SHA512 c44fb55ce46aca3c218babe58ca2bb9ce12ad083ec850d4075dc2be5182e3c26e1c93cca76c04abf26ea33305da65143295e1119dc22957d2c2c3876d3f62b49 WHIRLPOOL 5e49da2b4c97ebc56c33e4ff5dfa2db9dcf283068a9306a764611e8cd95953664f5cacef1eca7f7835387d29d97c2775fbdc7cecb7737f01de010080c1bafb44 diff --git a/app-emulation/open-vm-tools/files/10.1.0-Werror.patch b/app-emulation/open-vm-tools/files/10.1.0-Werror.patch new file mode 100644 index 000000000000..b79865e62db6 --- /dev/null +++ b/app-emulation/open-vm-tools/files/10.1.0-Werror.patch @@ -0,0 +1,24 @@ +From fdf599994d58ef47b73dc94d21d3556a2ec5d9da Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Sat, 26 Nov 2016 11:54:33 -0500 +Subject: [PATCH] build: drop -Werror + +--- + open-vm-tools/configure.ac | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac +index 8d4604e8..4d925f22 100644 +--- a/open-vm-tools/configure.ac ++++ b/open-vm-tools/configure.ac +@@ -1137,7 +1137,6 @@ AC_C_VOLATILE + + ### General flags / actions + CFLAGS="$CFLAGS -Wall" +-CFLAGS="$CFLAGS -Werror" + + # -Wno-unknown-pragmas is due to gcc not understanding '#pragma ident' + # in Xlib.h on OpenSolaris. +-- +2.11.0.rc2 + 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 new file mode 100644 index 000000000000..bff97811771b --- /dev/null +++ b/app-emulation/open-vm-tools/files/10.1.0-mount.vmhgfs.patch @@ -0,0 +1,33 @@ +From 1805ab024b10e8185175de7ce9c9b9db87fd0897 Mon Sep 17 00:00:00 2001 +From: Bernd Zeimetz +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/10.1.0-vgauth.patch b/app-emulation/open-vm-tools/files/10.1.0-vgauth.patch new file mode 100644 index 000000000000..bc91b1b141ab --- /dev/null +++ b/app-emulation/open-vm-tools/files/10.1.0-vgauth.patch @@ -0,0 +1,25 @@ +From 488258effa60e293a70000338422c33ce5c73f9b Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Fri, 25 Nov 2016 13:59:34 -0500 +Subject: [PATCH] build: Always link VGAuthService using CXX + +--- + open-vm-tools/vgauth/service/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/open-vm-tools/vgauth/service/Makefile.am b/open-vm-tools/vgauth/service/Makefile.am +index 8c51d9f2..8f99dad1 100644 +--- a/open-vm-tools/vgauth/service/Makefile.am ++++ b/open-vm-tools/vgauth/service/Makefile.am +@@ -95,7 +95,7 @@ if HAVE_ICU + $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + else +- VGAuthService_LINK = $(LINK) ++ VGAuthService_LINK = $(CXXLINK) + endif + + # Message catalogs. +-- +2.11.0.rc2 + diff --git a/app-emulation/open-vm-tools/files/mount.vmhgfs b/app-emulation/open-vm-tools/files/mount.vmhgfs new file mode 100644 index 000000000000..d4b319c80cb2 --- /dev/null +++ b/app-emulation/open-vm-tools/files/mount.vmhgfs @@ -0,0 +1,2 @@ +#!/bin/sh +hgfsmounter "$@" >/dev/null 2>&1 || vmhgfs-fuse "$@" diff --git a/app-emulation/open-vm-tools/files/open-vm-tools.confd b/app-emulation/open-vm-tools/files/open-vm-tools.confd new file mode 100644 index 000000000000..4414fabdb46e --- /dev/null +++ b/app-emulation/open-vm-tools/files/open-vm-tools.confd @@ -0,0 +1,2 @@ +# Set this to no to disable drag and drop (and vmblock) loading. +VM_DRAG_AND_DROP="yes" diff --git a/app-emulation/open-vm-tools/files/open-vm-tools.initd b/app-emulation/open-vm-tools/files/open-vm-tools.initd new file mode 100644 index 000000000000..8b91e4fb4c0a --- /dev/null +++ b/app-emulation/open-vm-tools/files/open-vm-tools.initd @@ -0,0 +1,59 @@ +#!/sbin/openrc-run +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +pidfile="/run/vmtoolsd.pid" +command="/usr/bin/vmtoolsd" +command_args="-b ${pidfile}" + +vmblockmntpt="/proc/fs/vmblock/mountPoint" +vmblockfusemntpt="/run/vmblock-fuse" + +depend() { + before checkfs fsck net X +} + +start_vmblock() { + checkpath -d -m 1777 /tmp/VMwareDnD + if command -v vmware-vmblock-fuse > /dev/null; then + modprobe fuse > /dev/null 2>&1 + checkpath -d "${vmblockfusemntpt}" + ebegin "Mounting vmblock-fuse" + vmware-vmblock-fuse \ + -o subtype=vmware-vmblock,default_permissions,allow_other \ + "${vmblockfusemntpt}" + eend $? + else + modprobe vmblock > /dev/null 2>&1 + checkpath -d "${vmblockmntpt}" + ebegin "Mounting vmblock" + mount -t vmblock vmblock "${vmblockmntpt}" + eend $? + fi +} + +stop_vmblock() { + if [ -d "${vmblockfusemntpt}" ]; then + ebegin "Unmounting vmblock-fuse" + umount "${vmblockfusemntpt}" + eend $? + else + ebegin "Unmounting vmblock" + umount "${vmblockmntpt}" + eend $? + fi +} + +start_pre() { + if [ x"${VM_DRAG_AND_DROP}" = xyes ]; then + start_vmblock + fi + return 0 +} + +stop_post() { + if [ x"${VM_DRAG_AND_DROP}" = xyes ]; then + stop_vmblock + fi + return 0 +} diff --git a/app-emulation/open-vm-tools/files/vmtoolsd.service b/app-emulation/open-vm-tools/files/vmtoolsd.service new file mode 100644 index 000000000000..426d4fbd993c --- /dev/null +++ b/app-emulation/open-vm-tools/files/vmtoolsd.service @@ -0,0 +1,11 @@ +[Unit] +Description=Service for virtual machines hosted on VMware +Documentation=http://open-vm-tools.sourceforge.net/about.php +ConditionVirtualization=vmware + +[Service] +ExecStart=/usr/bin/vmtoolsd +TimeoutStopSec=5 + +[Install] +WantedBy=multi-user.target diff --git a/app-emulation/open-vm-tools/metadata.xml b/app-emulation/open-vm-tools/metadata.xml new file mode 100644 index 000000000000..53c18420cae0 --- /dev/null +++ b/app-emulation/open-vm-tools/metadata.xml @@ -0,0 +1,28 @@ + + + + + floppym@gentoo.org + Mike Gilbert + + + vmware@gentoo.org + Gentoo VMware Project + + + The Open Virtual Machine Tools (open-vm-tools) are the open source + implementation of VMware Tools. They are a set of guest operating system + virtualization components that enhance performance and user experience + of virtual machines. + + + Generate API documentation + Enable grabbitmqproxy + Force shared libraries to be built as PIC + Enable vgauth + + + vmware/open-vm-tools + open-vm-tools + + diff --git a/app-emulation/open-vm-tools/open-vm-tools-10.1.10.ebuild b/app-emulation/open-vm-tools/open-vm-tools-10.1.10.ebuild new file mode 100644 index 000000000000..5ba66d7b94fd --- /dev/null +++ b/app-emulation/open-vm-tools/open-vm-tools-10.1.10.ebuild @@ -0,0 +1,152 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +MODULES_OPTIONAL_USE="modules" + +inherit autotools linux-mod pam systemd toolchain-funcs user + +DESCRIPTION="Opensourced tools for VMware guests" +HOMEPAGE="https://github.com/vmware/open-vm-tools" +MY_P="${P}-6082533" +SRC_URI="https://github.com/vmware/open-vm-tools/releases/download/stable-${PV}/${MY_P}.tar.gz" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="X doc grabbitmqproxy icu pam +pic vgauth xinerama" + +COMMON_DEPEND=" + dev-libs/glib:2 + dev-libs/libdnet + sys-fs/fuse:0 + >=sys-process/procps-3.3.2 + grabbitmqproxy? ( dev-libs/openssl:0 ) + icu? ( dev-libs/icu:= ) + pam? ( virtual/pam ) + vgauth? ( + dev-libs/openssl:0 + dev-libs/xerces-c + dev-libs/xml-security-c + ) + X? ( + dev-cpp/gtkmm:3.0 + x11-libs/gtk+:3 + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + x11-libs/libXrandr + x11-libs/libXtst + xinerama? ( x11-libs/libXinerama ) + ) +" + +DEPEND="${COMMON_DEPEND} + doc? ( app-doc/doxygen ) + virtual/pkgconfig +" + +RDEPEND="${COMMON_DEPEND} +" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${FILESDIR}/10.1.0-mount.vmhgfs.patch" + "${FILESDIR}/10.1.0-vgauth.patch" + "${FILESDIR}/10.1.0-Werror.patch" +) + +pkg_setup() { + linux-info_get_any_version + local CONFIG_CHECK="~VMWARE_BALLOON ~VMWARE_PVSCSI ~VMXNET3" + 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" + if use modules; then + linux-mod_pkg_setup + else + linux-info_pkg_setup + fi +} + +src_prepare() { + eapply -p2 "${PATCHES[@]}" + eapply_user + eautoreconf +} + +src_configure() { + local myeconfargs=( + --disable-deploypkg + --disable-static + --disable-tests + --with-procps + --with-dnet + $(use_enable doc docs) + $(use_enable grabbitmqproxy) + $(use_enable vgauth) + $(use_enable xinerama multimon) + $(use_with icu) + $(use_with pam) + $(use_with pic) + --without-gtk2 + --without-gtkmm + $(use_with X gtk3) + $(use_with X gtkmm3) + $(use_with X x) + + # configure locates the kernel object directory by looking for + # "/lib/modules/${KERNEL_RELEASE}/build". + # This will fail if the user is building against an uninstalled kernel. + # Fixing this would mean reworking the build system. + $(use_with modules kernel-modules) + --without-root-privileges + --with-kernel-release="${KV_FULL}" + ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + use modules && set_arch_to_kernel + default +} + +src_install() { + default + prune_libtool_files --modules + + if use pam; then + rm "${ED%/}"/etc/pam.d/vmtoolsd || die + pamd_mimic_system vmtoolsd auth account + fi + + newinitd "${FILESDIR}/open-vm-tools.initd" vmware-tools + newconfd "${FILESDIR}/open-vm-tools.confd" vmware-tools + systemd_dounit "${FILESDIR}"/vmtoolsd.service + + # 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 + + if use X; then + fperms 4711 /usr/bin/vmware-user-suid-wrapper + dobin scripts/common/vmware-xdg-detect-de + + elog "To be able to use the drag'n'drop feature of VMware for file" + elog "exchange, please add the users to the 'vmware' group." + fi +} + +pkg_postinst() { + enewgroup vmware + linux-mod_pkg_postinst +} -- cgit v1.2.3