Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] open-vm-tools: update to 12.0.0.
@ 2022-05-09 22:24 Piraty
  2022-05-09 23:08 ` [PR PATCH] [Updated] " Piraty
                   ` (17 more replies)
  0 siblings, 18 replies; 19+ messages in thread
From: Piraty @ 2022-05-09 22:24 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 542 bytes --]

There is a new pull request by Piraty against master on the void-packages repository

https://github.com/Piraty/void-packages open-vm-tools-12.0.0
https://github.com/void-linux/void-packages/pull/37067

open-vm-tools: update to 12.0.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO**

I don't run vmware guests anymore, so testers are welcome


A patch file from https://github.com/void-linux/void-packages/pull/37067.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-open-vm-tools-12.0.0-37067.patch --]
[-- Type: text/x-diff, Size: 5593 bytes --]

From b7d0d04aaf5810cf153d5b1d3953ac7fa99e770c Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Tue, 10 May 2022 00:10:27 +0200
Subject: [PATCH] open-vm-tools: update to 12.0.0.

---
 .../patches/0001-recognize-Void.patch         | 18 ++++++-------
 ...2-Fix-subdir-objects-configure-error.patch | 27 -------------------
 srcpkgs/open-vm-tools/template                | 18 ++++++-------
 3 files changed, 17 insertions(+), 46 deletions(-)
 delete mode 100644 srcpkgs/open-vm-tools/patches/1002-Fix-subdir-objects-configure-error.patch

diff --git a/srcpkgs/open-vm-tools/patches/0001-recognize-Void.patch b/srcpkgs/open-vm-tools/patches/0001-recognize-Void.patch
index 87a145a2becc..ad6d37b130ac 100644
--- a/srcpkgs/open-vm-tools/patches/0001-recognize-Void.patch
+++ b/srcpkgs/open-vm-tools/patches/0001-recognize-Void.patch
@@ -11,15 +11,13 @@
  #define STR_OS_YELLOW_DOG         "Yellow Dog"
  #define STR_OS_ECOMSTATION        "eComStation"
  
-diff --git a/open-vm-tools/lib/misc/hostinfoPosix.c b/open-vm-tools/lib/misc/hostinfoPosix.c
-index 6ac15412..ea898e24 100644
 --- a/open-vm-tools/lib/misc/hostinfoPosix.c
 +++ b/open-vm-tools/lib/misc/hostinfoPosix.c
-@@ -1259,6 +1259,7 @@ static const ShortNameSet shortNameArray[] = {
- {"united linux",        STR_OS_UNITEDLINUX,        HostinfoGenericSetShortName},
- {"va linux",            STR_OS_VALINUX,            HostinfoGenericSetShortName},
- {"vmware photon",       STR_OS_PHOTON,             HostinfoGenericSetShortName},
-+{"void",                STR_OS_VOID,               HostinfoGenericSetShortName},
- {"yellow dog",          STR_OS_YELLOW_DOG,         HostinfoGenericSetShortName},
- {NULL,                  NULL,                      NULL} // MUST BE LAST
- };
+@@ -1288,6 +1288,7 @@
+ { "ubuntu",              STR_OS_UBUNTU,             HostinfoGenericSetShortName },
+ { "ultra penguin",       STR_OS_ULTRAPENGUIN,       HostinfoGenericSetShortName },
+ { "united linux",        STR_OS_UNITEDLINUX,        HostinfoGenericSetShortName },
++{ "void linux",          STR_OS_VOID,               HostinfoGenericSetShortName },
+ { "va linux",            STR_OS_VALINUX,            HostinfoGenericSetShortName },
+ { "vmware photon",       STR_OS_PHOTON,             HostinfoGenericSetShortName },
+ { "yellow dog",          STR_OS_YELLOW_DOG,         HostinfoGenericSetShortName },
diff --git a/srcpkgs/open-vm-tools/patches/1002-Fix-subdir-objects-configure-error.patch b/srcpkgs/open-vm-tools/patches/1002-Fix-subdir-objects-configure-error.patch
deleted file mode 100644
index 775a78d303e2..000000000000
--- a/srcpkgs/open-vm-tools/patches/1002-Fix-subdir-objects-configure-error.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-#src: http://cgit.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/open-vm-tools/open-vm-tools?id=6642ae94227f7c3c91c1a58f00f99aeb9eb2393f
-#upstream: no
-
-From cf1284fda8fb22a2b27cb2ce7962f166166e74c3 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 13 Jun 2018 23:48:04 -0700
-Subject: [PATCH] Fix subdir objects configure error
-
-Fix build on musl while here
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- open-vm-tools/configure.ac | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac
-index 71e684bb..b76a7966 100644
---- a/open-vm-tools/configure.ac
-+++ b/open-vm-tools/configure.ac
-@@ -303,6 +303,7 @@ AC_ARG_ENABLE(
-    [],
-    [enable_resolutionkms="auto"])
- 
-+AM_INIT_AUTOMAKE([subdir-objects])
- AM_INIT_AUTOMAKE
- 
- ###
diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template
index 27fcfbbb0b6f..4659bda812b6 100644
--- a/srcpkgs/open-vm-tools/template
+++ b/srcpkgs/open-vm-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'open-vm-tools'
 pkgname=open-vm-tools
-version=11.3.0
+version=12.0.0
 revision=1
 archs="x86_64* i686* aarch64*"
 wrksrc="open-vm-tools-stable-${version}"
@@ -12,14 +12,14 @@ configure_args="--sbindir=/usr/bin --with-udev-rules-dir=/usr/lib/udev/rules.d
 hostmakedepends="automake libtool pkg-config glib-devel rpcsvc-proto"
 makedepends="fuse-devel glib-devel libmspack-devel openssl-devel libtirpc-devel
  libxerces-c-devel procps-ng-devel $(vopt_if pam 'pam-devel')
- $(vopt_if x11 'gtkmm-devel libXtst-devel xmlsec1-devel')"
+ $(vopt_if x11 'gdk-pixbuf-xlib-devel gtkmm-devel libXtst-devel xmlsec1-devel')"
 short_desc="Open source implementation of VMware Tools"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-2.0-only, LGPL-2.1-only"
 homepage="https://github.com/vmware/open-vm-tools"
 changelog="https://github.com/vmware/open-vm-tools/blob/master/open-vm-tools/ChangeLog"
 distfiles="https://github.com/vmware/open-vm-tools/archive/stable-${version}.tar.gz"
-checksum=588f1b6252c36bc55581aa3451a47880290f38ef46aad493710bcf4ce3c7635e
+checksum=244d224dc503f2c9350899a61fef418f23dc0520e8e30dce10863ea2dc81f047
 
 build_options="pam x11"
 build_options_default="pam x11"
@@ -33,16 +33,16 @@ pre_configure() {
 }
 
 post_install() {
-	# Get rid of unwanted symlinks
-	rm ${DESTDIR}/sbin/mount.vmhgfs
-	rm -r ${DESTDIR}/sbin
-	# If X11 enabled, copy extra files
 	if [ "$build_option_x11" ]; then
 		vmkdir /etc/xdg/autostart
 		vinstall vmware-user-suid-wrapper/vmware-user.desktop 0644 /etc/xdg/autostart/
 		vbin scripts/common/vmware-xdg-detect-de
-		chmod 07755 ${DESTDIR}/usr/bin/vmware-user-suid-wrapper
+		chmod 4755 "${DESTDIR}/usr/bin/vmware-user-suid-wrapper"
 	fi
-	# Install service
+
+	if [ ! "$build_option_pam" ]; then
+		rm -rf "${DESTDIR}/etc/pam.d/vmtoolsd"
+	fi
+
 	vsv vmtoolsd
 }

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Updated] open-vm-tools: update to 12.0.0.
  2022-05-09 22:24 [PR PATCH] open-vm-tools: update to 12.0.0 Piraty
@ 2022-05-09 23:08 ` Piraty
  2022-05-10  8:26 ` Piraty
                   ` (16 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: Piraty @ 2022-05-09 23:08 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 547 bytes --]

There is an updated pull request by Piraty against master on the void-packages repository

https://github.com/Piraty/void-packages open-vm-tools-12.0.0
https://github.com/void-linux/void-packages/pull/37067

open-vm-tools: update to 12.0.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO**

I don't run vmware guests anymore, so testers are welcome


A patch file from https://github.com/void-linux/void-packages/pull/37067.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-open-vm-tools-12.0.0-37067.patch --]
[-- Type: text/x-diff, Size: 5960 bytes --]

From 6bff37724f4b28eb75cefb1445318f496fab9ef2 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Tue, 10 May 2022 00:10:27 +0200
Subject: [PATCH] open-vm-tools: update to 12.0.0.

don't build new containerinfo plugin, as it fails during configure when
crosscompiling and requires tons of additional dependencies. may become a
build option later
---
 .../patches/0001-recognize-Void.patch         | 18 ++++++-------
 ...2-Fix-subdir-objects-configure-error.patch | 27 -------------------
 srcpkgs/open-vm-tools/template                | 20 +++++++-------
 3 files changed, 18 insertions(+), 47 deletions(-)
 delete mode 100644 srcpkgs/open-vm-tools/patches/1002-Fix-subdir-objects-configure-error.patch

diff --git a/srcpkgs/open-vm-tools/patches/0001-recognize-Void.patch b/srcpkgs/open-vm-tools/patches/0001-recognize-Void.patch
index 87a145a2becc..ad6d37b130ac 100644
--- a/srcpkgs/open-vm-tools/patches/0001-recognize-Void.patch
+++ b/srcpkgs/open-vm-tools/patches/0001-recognize-Void.patch
@@ -11,15 +11,13 @@
  #define STR_OS_YELLOW_DOG         "Yellow Dog"
  #define STR_OS_ECOMSTATION        "eComStation"
  
-diff --git a/open-vm-tools/lib/misc/hostinfoPosix.c b/open-vm-tools/lib/misc/hostinfoPosix.c
-index 6ac15412..ea898e24 100644
 --- a/open-vm-tools/lib/misc/hostinfoPosix.c
 +++ b/open-vm-tools/lib/misc/hostinfoPosix.c
-@@ -1259,6 +1259,7 @@ static const ShortNameSet shortNameArray[] = {
- {"united linux",        STR_OS_UNITEDLINUX,        HostinfoGenericSetShortName},
- {"va linux",            STR_OS_VALINUX,            HostinfoGenericSetShortName},
- {"vmware photon",       STR_OS_PHOTON,             HostinfoGenericSetShortName},
-+{"void",                STR_OS_VOID,               HostinfoGenericSetShortName},
- {"yellow dog",          STR_OS_YELLOW_DOG,         HostinfoGenericSetShortName},
- {NULL,                  NULL,                      NULL} // MUST BE LAST
- };
+@@ -1288,6 +1288,7 @@
+ { "ubuntu",              STR_OS_UBUNTU,             HostinfoGenericSetShortName },
+ { "ultra penguin",       STR_OS_ULTRAPENGUIN,       HostinfoGenericSetShortName },
+ { "united linux",        STR_OS_UNITEDLINUX,        HostinfoGenericSetShortName },
++{ "void linux",          STR_OS_VOID,               HostinfoGenericSetShortName },
+ { "va linux",            STR_OS_VALINUX,            HostinfoGenericSetShortName },
+ { "vmware photon",       STR_OS_PHOTON,             HostinfoGenericSetShortName },
+ { "yellow dog",          STR_OS_YELLOW_DOG,         HostinfoGenericSetShortName },
diff --git a/srcpkgs/open-vm-tools/patches/1002-Fix-subdir-objects-configure-error.patch b/srcpkgs/open-vm-tools/patches/1002-Fix-subdir-objects-configure-error.patch
deleted file mode 100644
index 775a78d303e2..000000000000
--- a/srcpkgs/open-vm-tools/patches/1002-Fix-subdir-objects-configure-error.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-#src: http://cgit.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/open-vm-tools/open-vm-tools?id=6642ae94227f7c3c91c1a58f00f99aeb9eb2393f
-#upstream: no
-
-From cf1284fda8fb22a2b27cb2ce7962f166166e74c3 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 13 Jun 2018 23:48:04 -0700
-Subject: [PATCH] Fix subdir objects configure error
-
-Fix build on musl while here
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- open-vm-tools/configure.ac | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac
-index 71e684bb..b76a7966 100644
---- a/open-vm-tools/configure.ac
-+++ b/open-vm-tools/configure.ac
-@@ -303,6 +303,7 @@ AC_ARG_ENABLE(
-    [],
-    [enable_resolutionkms="auto"])
- 
-+AM_INIT_AUTOMAKE([subdir-objects])
- AM_INIT_AUTOMAKE
- 
- ###
diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template
index 27fcfbbb0b6f..07c5bebdeb4a 100644
--- a/srcpkgs/open-vm-tools/template
+++ b/srcpkgs/open-vm-tools/template
@@ -1,25 +1,25 @@
 # Template file for 'open-vm-tools'
 pkgname=open-vm-tools
-version=11.3.0
+version=12.0.0
 revision=1
 archs="x86_64* i686* aarch64*"
 wrksrc="open-vm-tools-stable-${version}"
 build_wrksrc="open-vm-tools"
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --with-udev-rules-dir=/usr/lib/udev/rules.d
- --without-xmlsecurity --without-kernel-modules
+ --without-xmlsecurity --without-kernel-modules --disable-containerinfo
  $(vopt_with x11 x) $(vopt_with pam)"
 hostmakedepends="automake libtool pkg-config glib-devel rpcsvc-proto"
 makedepends="fuse-devel glib-devel libmspack-devel openssl-devel libtirpc-devel
  libxerces-c-devel procps-ng-devel $(vopt_if pam 'pam-devel')
- $(vopt_if x11 'gtkmm-devel libXtst-devel xmlsec1-devel')"
+ $(vopt_if x11 'gdk-pixbuf-xlib-devel gtkmm-devel libXtst-devel xmlsec1-devel')"
 short_desc="Open source implementation of VMware Tools"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-2.0-only, LGPL-2.1-only"
 homepage="https://github.com/vmware/open-vm-tools"
 changelog="https://github.com/vmware/open-vm-tools/blob/master/open-vm-tools/ChangeLog"
 distfiles="https://github.com/vmware/open-vm-tools/archive/stable-${version}.tar.gz"
-checksum=588f1b6252c36bc55581aa3451a47880290f38ef46aad493710bcf4ce3c7635e
+checksum=244d224dc503f2c9350899a61fef418f23dc0520e8e30dce10863ea2dc81f047
 
 build_options="pam x11"
 build_options_default="pam x11"
@@ -33,16 +33,16 @@ pre_configure() {
 }
 
 post_install() {
-	# Get rid of unwanted symlinks
-	rm ${DESTDIR}/sbin/mount.vmhgfs
-	rm -r ${DESTDIR}/sbin
-	# If X11 enabled, copy extra files
 	if [ "$build_option_x11" ]; then
 		vmkdir /etc/xdg/autostart
 		vinstall vmware-user-suid-wrapper/vmware-user.desktop 0644 /etc/xdg/autostart/
 		vbin scripts/common/vmware-xdg-detect-de
-		chmod 07755 ${DESTDIR}/usr/bin/vmware-user-suid-wrapper
+		chmod 4755 "${DESTDIR}/usr/bin/vmware-user-suid-wrapper"
 	fi
-	# Install service
+
+	if [ ! "$build_option_pam" ]; then
+		rm -rf "${DESTDIR}/etc/pam.d/vmtoolsd"
+	fi
+
 	vsv vmtoolsd
 }

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Updated] open-vm-tools: update to 12.0.0.
  2022-05-09 22:24 [PR PATCH] open-vm-tools: update to 12.0.0 Piraty
  2022-05-09 23:08 ` [PR PATCH] [Updated] " Piraty
@ 2022-05-10  8:26 ` Piraty
  2022-05-10  8:26 ` Piraty
                   ` (15 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: Piraty @ 2022-05-10  8:26 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 547 bytes --]

There is an updated pull request by Piraty against master on the void-packages repository

https://github.com/Piraty/void-packages open-vm-tools-12.0.0
https://github.com/void-linux/void-packages/pull/37067

open-vm-tools: update to 12.0.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO**

I don't run vmware guests anymore, so testers are welcome


A patch file from https://github.com/void-linux/void-packages/pull/37067.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-open-vm-tools-12.0.0-37067.patch --]
[-- Type: text/x-diff, Size: 5975 bytes --]

From f7e8ec640a29e3cd44725fe221809b4d53086046 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Tue, 10 May 2022 00:10:27 +0200
Subject: [PATCH] open-vm-tools: update to 12.0.0.

disable new containerinfo plugin, as it fails during configure when
crosscompiling (AC_CHECK_FILE) and requires work on containerd template.
may become a build option later though
---
 .../patches/0001-recognize-Void.patch         | 18 ++++++-------
 ...2-Fix-subdir-objects-configure-error.patch | 27 -------------------
 srcpkgs/open-vm-tools/template                | 20 +++++++-------
 3 files changed, 18 insertions(+), 47 deletions(-)
 delete mode 100644 srcpkgs/open-vm-tools/patches/1002-Fix-subdir-objects-configure-error.patch

diff --git a/srcpkgs/open-vm-tools/patches/0001-recognize-Void.patch b/srcpkgs/open-vm-tools/patches/0001-recognize-Void.patch
index 87a145a2becc..ad6d37b130ac 100644
--- a/srcpkgs/open-vm-tools/patches/0001-recognize-Void.patch
+++ b/srcpkgs/open-vm-tools/patches/0001-recognize-Void.patch
@@ -11,15 +11,13 @@
  #define STR_OS_YELLOW_DOG         "Yellow Dog"
  #define STR_OS_ECOMSTATION        "eComStation"
  
-diff --git a/open-vm-tools/lib/misc/hostinfoPosix.c b/open-vm-tools/lib/misc/hostinfoPosix.c
-index 6ac15412..ea898e24 100644
 --- a/open-vm-tools/lib/misc/hostinfoPosix.c
 +++ b/open-vm-tools/lib/misc/hostinfoPosix.c
-@@ -1259,6 +1259,7 @@ static const ShortNameSet shortNameArray[] = {
- {"united linux",        STR_OS_UNITEDLINUX,        HostinfoGenericSetShortName},
- {"va linux",            STR_OS_VALINUX,            HostinfoGenericSetShortName},
- {"vmware photon",       STR_OS_PHOTON,             HostinfoGenericSetShortName},
-+{"void",                STR_OS_VOID,               HostinfoGenericSetShortName},
- {"yellow dog",          STR_OS_YELLOW_DOG,         HostinfoGenericSetShortName},
- {NULL,                  NULL,                      NULL} // MUST BE LAST
- };
+@@ -1288,6 +1288,7 @@
+ { "ubuntu",              STR_OS_UBUNTU,             HostinfoGenericSetShortName },
+ { "ultra penguin",       STR_OS_ULTRAPENGUIN,       HostinfoGenericSetShortName },
+ { "united linux",        STR_OS_UNITEDLINUX,        HostinfoGenericSetShortName },
++{ "void linux",          STR_OS_VOID,               HostinfoGenericSetShortName },
+ { "va linux",            STR_OS_VALINUX,            HostinfoGenericSetShortName },
+ { "vmware photon",       STR_OS_PHOTON,             HostinfoGenericSetShortName },
+ { "yellow dog",          STR_OS_YELLOW_DOG,         HostinfoGenericSetShortName },
diff --git a/srcpkgs/open-vm-tools/patches/1002-Fix-subdir-objects-configure-error.patch b/srcpkgs/open-vm-tools/patches/1002-Fix-subdir-objects-configure-error.patch
deleted file mode 100644
index 775a78d303e2..000000000000
--- a/srcpkgs/open-vm-tools/patches/1002-Fix-subdir-objects-configure-error.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-#src: http://cgit.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/open-vm-tools/open-vm-tools?id=6642ae94227f7c3c91c1a58f00f99aeb9eb2393f
-#upstream: no
-
-From cf1284fda8fb22a2b27cb2ce7962f166166e74c3 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 13 Jun 2018 23:48:04 -0700
-Subject: [PATCH] Fix subdir objects configure error
-
-Fix build on musl while here
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- open-vm-tools/configure.ac | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac
-index 71e684bb..b76a7966 100644
---- a/open-vm-tools/configure.ac
-+++ b/open-vm-tools/configure.ac
-@@ -303,6 +303,7 @@ AC_ARG_ENABLE(
-    [],
-    [enable_resolutionkms="auto"])
- 
-+AM_INIT_AUTOMAKE([subdir-objects])
- AM_INIT_AUTOMAKE
- 
- ###
diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template
index 27fcfbbb0b6f..07c5bebdeb4a 100644
--- a/srcpkgs/open-vm-tools/template
+++ b/srcpkgs/open-vm-tools/template
@@ -1,25 +1,25 @@
 # Template file for 'open-vm-tools'
 pkgname=open-vm-tools
-version=11.3.0
+version=12.0.0
 revision=1
 archs="x86_64* i686* aarch64*"
 wrksrc="open-vm-tools-stable-${version}"
 build_wrksrc="open-vm-tools"
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --with-udev-rules-dir=/usr/lib/udev/rules.d
- --without-xmlsecurity --without-kernel-modules
+ --without-xmlsecurity --without-kernel-modules --disable-containerinfo
  $(vopt_with x11 x) $(vopt_with pam)"
 hostmakedepends="automake libtool pkg-config glib-devel rpcsvc-proto"
 makedepends="fuse-devel glib-devel libmspack-devel openssl-devel libtirpc-devel
  libxerces-c-devel procps-ng-devel $(vopt_if pam 'pam-devel')
- $(vopt_if x11 'gtkmm-devel libXtst-devel xmlsec1-devel')"
+ $(vopt_if x11 'gdk-pixbuf-xlib-devel gtkmm-devel libXtst-devel xmlsec1-devel')"
 short_desc="Open source implementation of VMware Tools"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-2.0-only, LGPL-2.1-only"
 homepage="https://github.com/vmware/open-vm-tools"
 changelog="https://github.com/vmware/open-vm-tools/blob/master/open-vm-tools/ChangeLog"
 distfiles="https://github.com/vmware/open-vm-tools/archive/stable-${version}.tar.gz"
-checksum=588f1b6252c36bc55581aa3451a47880290f38ef46aad493710bcf4ce3c7635e
+checksum=244d224dc503f2c9350899a61fef418f23dc0520e8e30dce10863ea2dc81f047
 
 build_options="pam x11"
 build_options_default="pam x11"
@@ -33,16 +33,16 @@ pre_configure() {
 }
 
 post_install() {
-	# Get rid of unwanted symlinks
-	rm ${DESTDIR}/sbin/mount.vmhgfs
-	rm -r ${DESTDIR}/sbin
-	# If X11 enabled, copy extra files
 	if [ "$build_option_x11" ]; then
 		vmkdir /etc/xdg/autostart
 		vinstall vmware-user-suid-wrapper/vmware-user.desktop 0644 /etc/xdg/autostart/
 		vbin scripts/common/vmware-xdg-detect-de
-		chmod 07755 ${DESTDIR}/usr/bin/vmware-user-suid-wrapper
+		chmod 4755 "${DESTDIR}/usr/bin/vmware-user-suid-wrapper"
 	fi
-	# Install service
+
+	if [ ! "$build_option_pam" ]; then
+		rm -rf "${DESTDIR}/etc/pam.d/vmtoolsd"
+	fi
+
 	vsv vmtoolsd
 }

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Updated] open-vm-tools: update to 12.0.0.
  2022-05-09 22:24 [PR PATCH] open-vm-tools: update to 12.0.0 Piraty
  2022-05-09 23:08 ` [PR PATCH] [Updated] " Piraty
  2022-05-10  8:26 ` Piraty
@ 2022-05-10  8:26 ` Piraty
  2022-05-10 19:23 ` tranzystorek-io
                   ` (14 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: Piraty @ 2022-05-10  8:26 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 547 bytes --]

There is an updated pull request by Piraty against master on the void-packages repository

https://github.com/Piraty/void-packages open-vm-tools-12.0.0
https://github.com/void-linux/void-packages/pull/37067

open-vm-tools: update to 12.0.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO**

I don't run vmware guests anymore, so testers are welcome


A patch file from https://github.com/void-linux/void-packages/pull/37067.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-open-vm-tools-12.0.0-37067.patch --]
[-- Type: text/x-diff, Size: 5968 bytes --]

From cf04ef8f4d963fe6e293defc39aea4dc4ac3ac92 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Tue, 10 May 2022 00:10:27 +0200
Subject: [PATCH] open-vm-tools: update to 12.0.0.

disable new containerinfo plugin, as it fails during configure when
crosscompiling (AC_CHECK_FILE) and requires work on containerd template.
may become a build option later
---
 .../patches/0001-recognize-Void.patch         | 18 ++++++-------
 ...2-Fix-subdir-objects-configure-error.patch | 27 -------------------
 srcpkgs/open-vm-tools/template                | 20 +++++++-------
 3 files changed, 18 insertions(+), 47 deletions(-)
 delete mode 100644 srcpkgs/open-vm-tools/patches/1002-Fix-subdir-objects-configure-error.patch

diff --git a/srcpkgs/open-vm-tools/patches/0001-recognize-Void.patch b/srcpkgs/open-vm-tools/patches/0001-recognize-Void.patch
index 87a145a2becc..ad6d37b130ac 100644
--- a/srcpkgs/open-vm-tools/patches/0001-recognize-Void.patch
+++ b/srcpkgs/open-vm-tools/patches/0001-recognize-Void.patch
@@ -11,15 +11,13 @@
  #define STR_OS_YELLOW_DOG         "Yellow Dog"
  #define STR_OS_ECOMSTATION        "eComStation"
  
-diff --git a/open-vm-tools/lib/misc/hostinfoPosix.c b/open-vm-tools/lib/misc/hostinfoPosix.c
-index 6ac15412..ea898e24 100644
 --- a/open-vm-tools/lib/misc/hostinfoPosix.c
 +++ b/open-vm-tools/lib/misc/hostinfoPosix.c
-@@ -1259,6 +1259,7 @@ static const ShortNameSet shortNameArray[] = {
- {"united linux",        STR_OS_UNITEDLINUX,        HostinfoGenericSetShortName},
- {"va linux",            STR_OS_VALINUX,            HostinfoGenericSetShortName},
- {"vmware photon",       STR_OS_PHOTON,             HostinfoGenericSetShortName},
-+{"void",                STR_OS_VOID,               HostinfoGenericSetShortName},
- {"yellow dog",          STR_OS_YELLOW_DOG,         HostinfoGenericSetShortName},
- {NULL,                  NULL,                      NULL} // MUST BE LAST
- };
+@@ -1288,6 +1288,7 @@
+ { "ubuntu",              STR_OS_UBUNTU,             HostinfoGenericSetShortName },
+ { "ultra penguin",       STR_OS_ULTRAPENGUIN,       HostinfoGenericSetShortName },
+ { "united linux",        STR_OS_UNITEDLINUX,        HostinfoGenericSetShortName },
++{ "void linux",          STR_OS_VOID,               HostinfoGenericSetShortName },
+ { "va linux",            STR_OS_VALINUX,            HostinfoGenericSetShortName },
+ { "vmware photon",       STR_OS_PHOTON,             HostinfoGenericSetShortName },
+ { "yellow dog",          STR_OS_YELLOW_DOG,         HostinfoGenericSetShortName },
diff --git a/srcpkgs/open-vm-tools/patches/1002-Fix-subdir-objects-configure-error.patch b/srcpkgs/open-vm-tools/patches/1002-Fix-subdir-objects-configure-error.patch
deleted file mode 100644
index 775a78d303e2..000000000000
--- a/srcpkgs/open-vm-tools/patches/1002-Fix-subdir-objects-configure-error.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-#src: http://cgit.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/open-vm-tools/open-vm-tools?id=6642ae94227f7c3c91c1a58f00f99aeb9eb2393f
-#upstream: no
-
-From cf1284fda8fb22a2b27cb2ce7962f166166e74c3 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 13 Jun 2018 23:48:04 -0700
-Subject: [PATCH] Fix subdir objects configure error
-
-Fix build on musl while here
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- open-vm-tools/configure.ac | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac
-index 71e684bb..b76a7966 100644
---- a/open-vm-tools/configure.ac
-+++ b/open-vm-tools/configure.ac
-@@ -303,6 +303,7 @@ AC_ARG_ENABLE(
-    [],
-    [enable_resolutionkms="auto"])
- 
-+AM_INIT_AUTOMAKE([subdir-objects])
- AM_INIT_AUTOMAKE
- 
- ###
diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template
index 27fcfbbb0b6f..07c5bebdeb4a 100644
--- a/srcpkgs/open-vm-tools/template
+++ b/srcpkgs/open-vm-tools/template
@@ -1,25 +1,25 @@
 # Template file for 'open-vm-tools'
 pkgname=open-vm-tools
-version=11.3.0
+version=12.0.0
 revision=1
 archs="x86_64* i686* aarch64*"
 wrksrc="open-vm-tools-stable-${version}"
 build_wrksrc="open-vm-tools"
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --with-udev-rules-dir=/usr/lib/udev/rules.d
- --without-xmlsecurity --without-kernel-modules
+ --without-xmlsecurity --without-kernel-modules --disable-containerinfo
  $(vopt_with x11 x) $(vopt_with pam)"
 hostmakedepends="automake libtool pkg-config glib-devel rpcsvc-proto"
 makedepends="fuse-devel glib-devel libmspack-devel openssl-devel libtirpc-devel
  libxerces-c-devel procps-ng-devel $(vopt_if pam 'pam-devel')
- $(vopt_if x11 'gtkmm-devel libXtst-devel xmlsec1-devel')"
+ $(vopt_if x11 'gdk-pixbuf-xlib-devel gtkmm-devel libXtst-devel xmlsec1-devel')"
 short_desc="Open source implementation of VMware Tools"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-2.0-only, LGPL-2.1-only"
 homepage="https://github.com/vmware/open-vm-tools"
 changelog="https://github.com/vmware/open-vm-tools/blob/master/open-vm-tools/ChangeLog"
 distfiles="https://github.com/vmware/open-vm-tools/archive/stable-${version}.tar.gz"
-checksum=588f1b6252c36bc55581aa3451a47880290f38ef46aad493710bcf4ce3c7635e
+checksum=244d224dc503f2c9350899a61fef418f23dc0520e8e30dce10863ea2dc81f047
 
 build_options="pam x11"
 build_options_default="pam x11"
@@ -33,16 +33,16 @@ pre_configure() {
 }
 
 post_install() {
-	# Get rid of unwanted symlinks
-	rm ${DESTDIR}/sbin/mount.vmhgfs
-	rm -r ${DESTDIR}/sbin
-	# If X11 enabled, copy extra files
 	if [ "$build_option_x11" ]; then
 		vmkdir /etc/xdg/autostart
 		vinstall vmware-user-suid-wrapper/vmware-user.desktop 0644 /etc/xdg/autostart/
 		vbin scripts/common/vmware-xdg-detect-de
-		chmod 07755 ${DESTDIR}/usr/bin/vmware-user-suid-wrapper
+		chmod 4755 "${DESTDIR}/usr/bin/vmware-user-suid-wrapper"
 	fi
-	# Install service
+
+	if [ ! "$build_option_pam" ]; then
+		rm -rf "${DESTDIR}/etc/pam.d/vmtoolsd"
+	fi
+
 	vsv vmtoolsd
 }

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: open-vm-tools: update to 12.0.0.
  2022-05-09 22:24 [PR PATCH] open-vm-tools: update to 12.0.0 Piraty
                   ` (2 preceding siblings ...)
  2022-05-10  8:26 ` Piraty
@ 2022-05-10 19:23 ` tranzystorek-io
  2022-05-11 22:39 ` Piraty
                   ` (13 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: tranzystorek-io @ 2022-05-10 19:23 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 340 bytes --]

New comment by tranzystorek-io on void-packages repository

https://github.com/void-linux/void-packages/pull/37067#issuecomment-1122776126

Comment:
I noticed that compared to Arch we're missing a service for `vmware-vmblock-fuse`: https://github.com/archlinux/svntogit-community/blob/master/open-vm-tools/trunk/vmware-vmblock-fuse.service

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: open-vm-tools: update to 12.0.0.
  2022-05-09 22:24 [PR PATCH] open-vm-tools: update to 12.0.0 Piraty
                   ` (3 preceding siblings ...)
  2022-05-10 19:23 ` tranzystorek-io
@ 2022-05-11 22:39 ` Piraty
  2022-05-12  7:03 ` tranzystorek-io
                   ` (12 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: Piraty @ 2022-05-11 22:39 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 266 bytes --]

New comment by Piraty on void-packages repository

https://github.com/void-linux/void-packages/pull/37067#issuecomment-1124357427

Comment:
if you have a use case, would you mind testing the trivial runit service for this then (for example , copy the whole cmdline)

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: open-vm-tools: update to 12.0.0.
  2022-05-09 22:24 [PR PATCH] open-vm-tools: update to 12.0.0 Piraty
                   ` (4 preceding siblings ...)
  2022-05-11 22:39 ` Piraty
@ 2022-05-12  7:03 ` tranzystorek-io
  2022-05-12  9:09 ` tranzystorek-io
                   ` (11 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: tranzystorek-io @ 2022-05-12  7:03 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 284 bytes --]

New comment by tranzystorek-io on void-packages repository

https://github.com/void-linux/void-packages/pull/37067#issuecomment-1124609136

Comment:
I did a quick prototype, but I'm not sure how to emulate systemd's `RuntimeDirectory` parameter, to create the `/run/vmblock-fuse` dir

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: open-vm-tools: update to 12.0.0.
  2022-05-09 22:24 [PR PATCH] open-vm-tools: update to 12.0.0 Piraty
                   ` (5 preceding siblings ...)
  2022-05-12  7:03 ` tranzystorek-io
@ 2022-05-12  9:09 ` tranzystorek-io
  2022-05-12  9:14 ` tranzystorek-io
                   ` (10 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: tranzystorek-io @ 2022-05-12  9:09 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 610 bytes --]

New comment by tranzystorek-io on void-packages repository

https://github.com/void-linux/void-packages/pull/37067#issuecomment-1124609136

Comment:
I did a quick prototype, but I'm not sure how to emulate systemd's `RuntimeDirectory` parameter, to create the `/run/vmblock-fuse` dir

EDIT: managed to get it to work, the following service enables copy-paste between host and guest (X11 guest only):

```sh
#!/bin/sh
set -e
[ ! -d /run/vmblock-fuse ] && mkdir -p /run/vmblock-fuse
exec /usr/bin/vmware-vmblock-fuse -d -f -o subtype=vmware-vmblock,default_permissions,allow_other /run/vmblock-fuse
```

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: open-vm-tools: update to 12.0.0.
  2022-05-09 22:24 [PR PATCH] open-vm-tools: update to 12.0.0 Piraty
                   ` (6 preceding siblings ...)
  2022-05-12  9:09 ` tranzystorek-io
@ 2022-05-12  9:14 ` tranzystorek-io
  2022-05-12 12:45 ` tranzystorek-io
                   ` (9 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: tranzystorek-io @ 2022-05-12  9:14 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 663 bytes --]

New comment by tranzystorek-io on void-packages repository

https://github.com/void-linux/void-packages/pull/37067#issuecomment-1124609136

Comment:
I did a quick prototype, but I'm not sure how to emulate systemd's `RuntimeDirectory` parameter, to create the `/run/vmblock-fuse` dir

EDIT: managed to get it to work, the following service enables copy-paste between host and guest (X11 guest only):

```sh
#!/bin/sh
set -e
[ ! -d /run/vmblock-fuse ] && mkdir -p /run/vmblock-fuse
exec /usr/bin/vmware-vmblock-fuse -d -f -o subtype=vmware-vmblock,default_permissions,allow_other /run/vmblock-fuse
```

tested on KDE on vmware workstation player 16.2.3

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: open-vm-tools: update to 12.0.0.
  2022-05-09 22:24 [PR PATCH] open-vm-tools: update to 12.0.0 Piraty
                   ` (7 preceding siblings ...)
  2022-05-12  9:14 ` tranzystorek-io
@ 2022-05-12 12:45 ` tranzystorek-io
  2022-05-13  7:40 ` tranzystorek-io
                   ` (8 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: tranzystorek-io @ 2022-05-12 12:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 668 bytes --]

New comment by tranzystorek-io on void-packages repository

https://github.com/void-linux/void-packages/pull/37067#issuecomment-1124609136

Comment:
I did a quick prototype, but I'm not sure how to emulate systemd's `RuntimeDirectory` parameter, to create the `/run/vmblock-fuse` dir

EDIT: managed to get it to work, the following service enables file copy-paste between host and guest (X11 guest only):

```sh
#!/bin/sh
set -e
[ ! -d /run/vmblock-fuse ] && mkdir -p /run/vmblock-fuse
exec /usr/bin/vmware-vmblock-fuse -d -f -o subtype=vmware-vmblock,default_permissions,allow_other /run/vmblock-fuse
```

tested on KDE on vmware workstation player 16.2.3

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: open-vm-tools: update to 12.0.0.
  2022-05-09 22:24 [PR PATCH] open-vm-tools: update to 12.0.0 Piraty
                   ` (8 preceding siblings ...)
  2022-05-12 12:45 ` tranzystorek-io
@ 2022-05-13  7:40 ` tranzystorek-io
  2022-05-14 16:28 ` tranzystorek-io
                   ` (7 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: tranzystorek-io @ 2022-05-13  7:40 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 672 bytes --]

New comment by tranzystorek-io on void-packages repository

https://github.com/void-linux/void-packages/pull/37067#issuecomment-1124609136

Comment:
~~I did a quick prototype, but I'm not sure how to emulate systemd's `RuntimeDirectory` parameter, to create the `/run/vmblock-fuse` dir~~

EDIT: managed to get it to work, the following service enables file copy-paste between host and guest (X11 guest only):

```sh
#!/bin/sh
set -e
[ ! -d /run/vmblock-fuse ] && mkdir -p /run/vmblock-fuse
exec /usr/bin/vmware-vmblock-fuse -d -f -o subtype=vmware-vmblock,default_permissions,allow_other /run/vmblock-fuse
```

tested on KDE on vmware workstation player 16.2.3

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: open-vm-tools: update to 12.0.0.
  2022-05-09 22:24 [PR PATCH] open-vm-tools: update to 12.0.0 Piraty
                   ` (9 preceding siblings ...)
  2022-05-13  7:40 ` tranzystorek-io
@ 2022-05-14 16:28 ` tranzystorek-io
  2022-05-16 19:21 ` Piraty
                   ` (6 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: tranzystorek-io @ 2022-05-14 16:28 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 234 bytes --]

New comment by tranzystorek-io on void-packages repository

https://github.com/void-linux/void-packages/pull/37067#issuecomment-1126771114

Comment:
@Piraty I guess I could add this service in a spearate PR to make this update easier

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: open-vm-tools: update to 12.0.0.
  2022-05-09 22:24 [PR PATCH] open-vm-tools: update to 12.0.0 Piraty
                   ` (10 preceding siblings ...)
  2022-05-14 16:28 ` tranzystorek-io
@ 2022-05-16 19:21 ` Piraty
  2022-05-16 19:24 ` tranzystorek-io
                   ` (5 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: Piraty @ 2022-05-16 19:21 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 166 bytes --]

New comment by Piraty on void-packages repository

https://github.com/void-linux/void-packages/pull/37067#issuecomment-1128046819

Comment:
did you test this PR too?

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: open-vm-tools: update to 12.0.0.
  2022-05-09 22:24 [PR PATCH] open-vm-tools: update to 12.0.0 Piraty
                   ` (11 preceding siblings ...)
  2022-05-16 19:21 ` Piraty
@ 2022-05-16 19:24 ` tranzystorek-io
  2022-05-16 22:37 ` [PR PATCH] [Updated] " Piraty
                   ` (4 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: tranzystorek-io @ 2022-05-16 19:24 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 264 bytes --]

New comment by tranzystorek-io on void-packages repository

https://github.com/void-linux/void-packages/pull/37067#issuecomment-1128049870

Comment:
> did you test this PR too?

I made the service change on top of this PR and tested it out, I guess that counts?

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Updated] open-vm-tools: update to 12.0.0.
  2022-05-09 22:24 [PR PATCH] open-vm-tools: update to 12.0.0 Piraty
                   ` (12 preceding siblings ...)
  2022-05-16 19:24 ` tranzystorek-io
@ 2022-05-16 22:37 ` Piraty
  2022-05-17  7:56 ` tranzystorek-io
                   ` (3 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: Piraty @ 2022-05-16 22:37 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 547 bytes --]

There is an updated pull request by Piraty against master on the void-packages repository

https://github.com/Piraty/void-packages open-vm-tools-12.0.0
https://github.com/void-linux/void-packages/pull/37067

open-vm-tools: update to 12.0.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO**

I don't run vmware guests anymore, so testers are welcome


A patch file from https://github.com/void-linux/void-packages/pull/37067.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-open-vm-tools-12.0.0-37067.patch --]
[-- Type: text/x-diff, Size: 6701 bytes --]

From aa42cc9501071c33ba37af89e65e7bd147ac984a Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Tue, 10 May 2022 00:10:27 +0200
Subject: [PATCH] open-vm-tools: update to 12.0.0.

disable new containerinfo plugin, as it fails during configure when
crosscompiling (AC_CHECK_FILE) and requires work on containerd template.
may become a build option later

add vmware-vmblock-fuse service as reported by @tranzystorek-io.

Closes: #37067
---
 .../files/vmware-vmblock-fuse/run             |  6 +++++
 .../patches/0001-recognize-Void.patch         | 18 ++++++-------
 ...2-Fix-subdir-objects-configure-error.patch | 27 -------------------
 srcpkgs/open-vm-tools/template                | 21 ++++++++-------
 4 files changed, 25 insertions(+), 47 deletions(-)
 create mode 100644 srcpkgs/open-vm-tools/files/vmware-vmblock-fuse/run
 delete mode 100644 srcpkgs/open-vm-tools/patches/1002-Fix-subdir-objects-configure-error.patch

diff --git a/srcpkgs/open-vm-tools/files/vmware-vmblock-fuse/run b/srcpkgs/open-vm-tools/files/vmware-vmblock-fuse/run
new file mode 100644
index 000000000000..b0a5cc121b90
--- /dev/null
+++ b/srcpkgs/open-vm-tools/files/vmware-vmblock-fuse/run
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+set -e
+
+[ -d /run/vmblock-fuse ] || mkdir -p /run/vmblock-fuse
+exec vmware-vmblock-fuse -d -f -o subtype=vmware-vmblock,default_permissions,allow_other /run/vmblock-fuse
diff --git a/srcpkgs/open-vm-tools/patches/0001-recognize-Void.patch b/srcpkgs/open-vm-tools/patches/0001-recognize-Void.patch
index 87a145a2becc..ad6d37b130ac 100644
--- a/srcpkgs/open-vm-tools/patches/0001-recognize-Void.patch
+++ b/srcpkgs/open-vm-tools/patches/0001-recognize-Void.patch
@@ -11,15 +11,13 @@
  #define STR_OS_YELLOW_DOG         "Yellow Dog"
  #define STR_OS_ECOMSTATION        "eComStation"
  
-diff --git a/open-vm-tools/lib/misc/hostinfoPosix.c b/open-vm-tools/lib/misc/hostinfoPosix.c
-index 6ac15412..ea898e24 100644
 --- a/open-vm-tools/lib/misc/hostinfoPosix.c
 +++ b/open-vm-tools/lib/misc/hostinfoPosix.c
-@@ -1259,6 +1259,7 @@ static const ShortNameSet shortNameArray[] = {
- {"united linux",        STR_OS_UNITEDLINUX,        HostinfoGenericSetShortName},
- {"va linux",            STR_OS_VALINUX,            HostinfoGenericSetShortName},
- {"vmware photon",       STR_OS_PHOTON,             HostinfoGenericSetShortName},
-+{"void",                STR_OS_VOID,               HostinfoGenericSetShortName},
- {"yellow dog",          STR_OS_YELLOW_DOG,         HostinfoGenericSetShortName},
- {NULL,                  NULL,                      NULL} // MUST BE LAST
- };
+@@ -1288,6 +1288,7 @@
+ { "ubuntu",              STR_OS_UBUNTU,             HostinfoGenericSetShortName },
+ { "ultra penguin",       STR_OS_ULTRAPENGUIN,       HostinfoGenericSetShortName },
+ { "united linux",        STR_OS_UNITEDLINUX,        HostinfoGenericSetShortName },
++{ "void linux",          STR_OS_VOID,               HostinfoGenericSetShortName },
+ { "va linux",            STR_OS_VALINUX,            HostinfoGenericSetShortName },
+ { "vmware photon",       STR_OS_PHOTON,             HostinfoGenericSetShortName },
+ { "yellow dog",          STR_OS_YELLOW_DOG,         HostinfoGenericSetShortName },
diff --git a/srcpkgs/open-vm-tools/patches/1002-Fix-subdir-objects-configure-error.patch b/srcpkgs/open-vm-tools/patches/1002-Fix-subdir-objects-configure-error.patch
deleted file mode 100644
index 775a78d303e2..000000000000
--- a/srcpkgs/open-vm-tools/patches/1002-Fix-subdir-objects-configure-error.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-#src: http://cgit.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/open-vm-tools/open-vm-tools?id=6642ae94227f7c3c91c1a58f00f99aeb9eb2393f
-#upstream: no
-
-From cf1284fda8fb22a2b27cb2ce7962f166166e74c3 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 13 Jun 2018 23:48:04 -0700
-Subject: [PATCH] Fix subdir objects configure error
-
-Fix build on musl while here
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- open-vm-tools/configure.ac | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac
-index 71e684bb..b76a7966 100644
---- a/open-vm-tools/configure.ac
-+++ b/open-vm-tools/configure.ac
-@@ -303,6 +303,7 @@ AC_ARG_ENABLE(
-    [],
-    [enable_resolutionkms="auto"])
- 
-+AM_INIT_AUTOMAKE([subdir-objects])
- AM_INIT_AUTOMAKE
- 
- ###
diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template
index 27fcfbbb0b6f..9e28fe1f749e 100644
--- a/srcpkgs/open-vm-tools/template
+++ b/srcpkgs/open-vm-tools/template
@@ -1,25 +1,25 @@
 # Template file for 'open-vm-tools'
 pkgname=open-vm-tools
-version=11.3.0
+version=12.0.0
 revision=1
 archs="x86_64* i686* aarch64*"
 wrksrc="open-vm-tools-stable-${version}"
 build_wrksrc="open-vm-tools"
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --with-udev-rules-dir=/usr/lib/udev/rules.d
- --without-xmlsecurity --without-kernel-modules
+ --without-xmlsecurity --without-kernel-modules --disable-containerinfo
  $(vopt_with x11 x) $(vopt_with pam)"
 hostmakedepends="automake libtool pkg-config glib-devel rpcsvc-proto"
 makedepends="fuse-devel glib-devel libmspack-devel openssl-devel libtirpc-devel
  libxerces-c-devel procps-ng-devel $(vopt_if pam 'pam-devel')
- $(vopt_if x11 'gtkmm-devel libXtst-devel xmlsec1-devel')"
+ $(vopt_if x11 'gdk-pixbuf-xlib-devel gtkmm-devel libXtst-devel xmlsec1-devel')"
 short_desc="Open source implementation of VMware Tools"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-2.0-only, LGPL-2.1-only"
 homepage="https://github.com/vmware/open-vm-tools"
 changelog="https://github.com/vmware/open-vm-tools/blob/master/open-vm-tools/ChangeLog"
 distfiles="https://github.com/vmware/open-vm-tools/archive/stable-${version}.tar.gz"
-checksum=588f1b6252c36bc55581aa3451a47880290f38ef46aad493710bcf4ce3c7635e
+checksum=244d224dc503f2c9350899a61fef418f23dc0520e8e30dce10863ea2dc81f047
 
 build_options="pam x11"
 build_options_default="pam x11"
@@ -33,16 +33,17 @@ pre_configure() {
 }
 
 post_install() {
-	# Get rid of unwanted symlinks
-	rm ${DESTDIR}/sbin/mount.vmhgfs
-	rm -r ${DESTDIR}/sbin
-	# If X11 enabled, copy extra files
 	if [ "$build_option_x11" ]; then
 		vmkdir /etc/xdg/autostart
 		vinstall vmware-user-suid-wrapper/vmware-user.desktop 0644 /etc/xdg/autostart/
 		vbin scripts/common/vmware-xdg-detect-de
-		chmod 07755 ${DESTDIR}/usr/bin/vmware-user-suid-wrapper
+		chmod 4755 "${DESTDIR}/usr/bin/vmware-user-suid-wrapper"
 	fi
-	# Install service
+
+	if [ ! "$build_option_pam" ]; then
+		rm -rf "${DESTDIR}/etc/pam.d/vmtoolsd"
+	fi
+
 	vsv vmtoolsd
+	vsv vmware-vmblock-fuse  #XXX needs testing. void-packages/pull/37067
 }

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: open-vm-tools: update to 12.0.0.
  2022-05-09 22:24 [PR PATCH] open-vm-tools: update to 12.0.0 Piraty
                   ` (13 preceding siblings ...)
  2022-05-16 22:37 ` [PR PATCH] [Updated] " Piraty
@ 2022-05-17  7:56 ` tranzystorek-io
  2022-05-17  7:58 ` tranzystorek-io
                   ` (2 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: tranzystorek-io @ 2022-05-17  7:56 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 295 bytes --]

New comment by tranzystorek-io on void-packages repository

https://github.com/void-linux/void-packages/pull/37067#issuecomment-1128539545

Comment:
Tested the latest changes - all services run correctly when enabled, and the new `vmware-vmbock-fuse` allows copying files between host and guest

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: open-vm-tools: update to 12.0.0.
  2022-05-09 22:24 [PR PATCH] open-vm-tools: update to 12.0.0 Piraty
                   ` (14 preceding siblings ...)
  2022-05-17  7:56 ` tranzystorek-io
@ 2022-05-17  7:58 ` tranzystorek-io
  2022-05-17 18:11 ` [PR PATCH] [Closed]: " Piraty
  2022-05-17 18:28 ` Piraty
  17 siblings, 0 replies; 19+ messages in thread
From: tranzystorek-io @ 2022-05-17  7:58 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 295 bytes --]

New comment by tranzystorek-io on void-packages repository

https://github.com/void-linux/void-packages/pull/37067#issuecomment-1128539545

Comment:
Tested the latest changes - all services run correctly when enabled, and the new `vmware-vmbock-fuse` allows copying files between host and guest

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Closed]: open-vm-tools: update to 12.0.0.
  2022-05-09 22:24 [PR PATCH] open-vm-tools: update to 12.0.0 Piraty
                   ` (15 preceding siblings ...)
  2022-05-17  7:58 ` tranzystorek-io
@ 2022-05-17 18:11 ` Piraty
  2022-05-17 18:28 ` Piraty
  17 siblings, 0 replies; 19+ messages in thread
From: Piraty @ 2022-05-17 18:11 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 380 bytes --]

There's a closed pull request on the void-packages repository

open-vm-tools: update to 12.0.0.
https://github.com/void-linux/void-packages/pull/37067

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO**

I don't run vmware guests anymore, so testers are welcome


^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: open-vm-tools: update to 12.0.0.
  2022-05-09 22:24 [PR PATCH] open-vm-tools: update to 12.0.0 Piraty
                   ` (16 preceding siblings ...)
  2022-05-17 18:11 ` [PR PATCH] [Closed]: " Piraty
@ 2022-05-17 18:28 ` Piraty
  17 siblings, 0 replies; 19+ messages in thread
From: Piraty @ 2022-05-17 18:28 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 149 bytes --]

New comment by Piraty on void-packages repository

https://github.com/void-linux/void-packages/pull/37067#issuecomment-1129186948

Comment:
thanks !

^ permalink raw reply	[flat|nested] 19+ messages in thread

end of thread, other threads:[~2022-05-17 18:28 UTC | newest]

Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-09 22:24 [PR PATCH] open-vm-tools: update to 12.0.0 Piraty
2022-05-09 23:08 ` [PR PATCH] [Updated] " Piraty
2022-05-10  8:26 ` Piraty
2022-05-10  8:26 ` Piraty
2022-05-10 19:23 ` tranzystorek-io
2022-05-11 22:39 ` Piraty
2022-05-12  7:03 ` tranzystorek-io
2022-05-12  9:09 ` tranzystorek-io
2022-05-12  9:14 ` tranzystorek-io
2022-05-12 12:45 ` tranzystorek-io
2022-05-13  7:40 ` tranzystorek-io
2022-05-14 16:28 ` tranzystorek-io
2022-05-16 19:21 ` Piraty
2022-05-16 19:24 ` tranzystorek-io
2022-05-16 22:37 ` [PR PATCH] [Updated] " Piraty
2022-05-17  7:56 ` tranzystorek-io
2022-05-17  7:58 ` tranzystorek-io
2022-05-17 18:11 ` [PR PATCH] [Closed]: " Piraty
2022-05-17 18:28 ` Piraty

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).