From nobody Wed Jul 19 15:38:49 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4R5g2x5rGrz4dRjf; Wed, 19 Jul 2023 15:38:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R5g2x34j1z42JD; Wed, 19 Jul 2023 15:38:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689781129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9XUFbd40Fn0MX4AEFYiFU+0sN5fPPcVklwJ9aAzuz+c=; b=AMzCxGzxs1QGcaATiQiSJAAXRoYDLtpPq/E8l4KNQKP//JpcgR9HvaHOp0iEOoVJ3JfGwv aIgjv56D4TgjK8l5Njm8p6jIHn1ODWQnpm7e0QLUhUiSiKUXMJgQFxFZ0827ZYiRuzD1dW DvfqotNMuOqhye3SdpjXoKH2/uBLhi5p00V6B1aYwORGtFTqfML5bt36tNnMrjZrIALsKD 0ho6V8iYWRXiqlTuTtKSwdM7iH9Jz30vQeQIaG300rOCzJKwHrustPvaFQXgn9MNbDASAB Pcm/lfgg46OOHl6fsc4/aBLnN4FYk4ciw2p4nK6erDtSGievsu+I/8TxxusLCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689781129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9XUFbd40Fn0MX4AEFYiFU+0sN5fPPcVklwJ9aAzuz+c=; b=w0LTd+4aZnVaHeewbzd8XhwRK6I+iQCg0Mas+i3CToc+hMRKvMn3LechK9LiNy4O+dNfdJ 1f7Te8lhSxIXBUXl9x95txVIusINOCYhJJRK++YfxQofMjPzo6ALtL0RAoKJH230jUKpBz a6DEW4zS809afA9+OeAmin4MWv9tb52/hEQWktyun0ToDOOZUctG4vpp+k59TLSJBA0z+a O5IA2K/fekp1xlWK5hntwYgx2GmPsAOzOabObEY5X549H+/05m3IWMVeHAkWTCv4JOwzXP kDyiR9VbTNptqCBgVQhdA+5kI/JLgRyaCxhZG1igbhkeiju7Nj2pKWWbFK97zQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689781129; a=rsa-sha256; cv=none; b=J2d1qSq1D7GnIS1/0Oqz8EpQ8G9qasmvA6ChaC86eWZiLXAVlZoZirAUQxUrKE3w75D/CN dgS3ecpP0a23Pu2E/qE1TbacAy+us3PUvC5BJHLe5X4dze30Z0XlmbIYQoT9u7iOnaiyVo XRvjJKJ9eiw075ngrdXHxT38LWV0H1GwCRQj7jeF+z3NRjEdoshZDUC6LLsddl6vxZJ2V8 STTLuXG0HFrjFFXIxY3UQugr2dE5tDo/LoZdfgTihxM7Z3wzBD0o00arX8fBkotcW4tquH eY4FRJp9bWQSj9Y0FSZlw5sYdhGSl61wXFDK6E6275xqQUsr103ebp/aPSr8bw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R5g2x29kPzt8w; Wed, 19 Jul 2023 15:38:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36JFcncZ034789; Wed, 19 Jul 2023 15:38:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36JFcnpW034788; Wed, 19 Jul 2023 15:38:49 GMT (envelope-from git) Date: Wed, 19 Jul 2023 15:38:49 GMT Message-Id: <202307191538.36JFcnpW034788@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Renato Botelho Subject: git: 6b0def58e213 - main - emulators/open-vm-tools: Add DEPLOYPKG option List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: garga X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6b0def58e21327b708a50ad5afd7d8ddc77438d1 Auto-Submitted: auto-generated The branch main has been updated by garga: URL: https://cgit.FreeBSD.org/ports/commit/?id=6b0def58e21327b708a50ad5afd7d8ddc77438d1 commit 6b0def58e21327b708a50ad5afd7d8ddc77438d1 Author: Renato Botelho AuthorDate: 2023-07-19 15:34:29 +0000 Commit: Renato Botelho CommitDate: 2023-07-19 15:38:44 +0000 emulators/open-vm-tools: Add DEPLOYPKG option Before this change, open-vm-tools port used to depend inconditionally of libmspack, which is a requirement of DeployPkg plugin. It turns out that configure script only enable this plugin automatically on linux, so it was not being built and dependency was not supposed to be there. Instead of removing bogus dependency, I decided to add DEPLOYPKG option, used to enable that plugin and left it off by default in order to preserve previous default behavior. Some changes on source code were needed to make DeployPkg to build on FreeBSD and are done by new patches, which I intend to submit upstream. Reported by: vangyzen Sponsored by: Rubicon Communications, LLC ("Netgate") --- emulators/open-vm-tools/Makefile | 10 +++++++--- .../files/patch-libDeployPkg_processPosix.c | 11 +++++++++++ emulators/open-vm-tools/files/patch-lib_panic_panic.c | 11 +++++++++++ .../open-vm-tools/files/patch-lib_procMgr_procMgrPosix.c | 11 +++++++++++ emulators/open-vm-tools/pkg-plist | 16 ++++++++++++++++ 5 files changed, 56 insertions(+), 3 deletions(-) diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile index d90505341720..436a464e4965 100644 --- a/emulators/open-vm-tools/Makefile +++ b/emulators/open-vm-tools/Makefile @@ -1,6 +1,7 @@ PORTNAME= open-vm-tools PORTVERSION= 12.2.5 DISTVERSIONPREFIX= stable- +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= emulators @@ -13,8 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING ONLY_FOR_ARCHS= aarch64 amd64 i386 -LIB_DEPENDS= libdnet.so:net/libdnet \ - libmspack.so:archivers/libmspack +LIB_DEPENDS= libdnet.so:net/libdnet FLAVORS= default nox11 default_CONFLICTS_INSTALL= open-vm-tools-nox11 @@ -34,6 +34,7 @@ USE_RC_SUBR= vmware-guestd vmware-kmod GNU_CONFIGURE= yes CONFIGURE_ARGS+=--disable-vgauth \ --enable-containerinfo=no \ + --enable-deploypkg \ --sysconfdir=${PREFIX}/etc \ --without-icu CONFIGURE_ENV+= SYSDIR=${SRC_BASE}/sys @@ -47,15 +48,18 @@ WRKSRC_SUBDIR= open-vm-tools PORTDOCS= * -OPTIONS_DEFINE= DOCS FUSE LIBNOTIFY OPENSSL X11 +OPTIONS_DEFINE= DOCS DEPLOYPKG FUSE LIBNOTIFY OPENSSL X11 OPTIONS_DEFAULT=DOCS FUSE LIBNOTIFY OPENSSL X11 .if ${FLAVOR:U} == nox11 OPTIONS_EXCLUDE:= LIBNOTIFY X11 .endif OPTIONS_SUB= +DEPLOYPKG_DESC= DeployPkg plugin LIBNOTIFY_DESC= Desktop notification support +DEPLOYPKG_LIB_DEPENDS= libmspack.so:archivers/libmspack +DEPLOYPKG_CONFIGURE_ENABLE= deploypkg DOCS_BUILD_DEPENDS= doxygen:devel/doxygen DOCS_CONFIGURE_ENABLE= docs FUSE_USES= fuse diff --git a/emulators/open-vm-tools/files/patch-libDeployPkg_processPosix.c b/emulators/open-vm-tools/files/patch-libDeployPkg_processPosix.c new file mode 100644 index 000000000000..966cfa5827fe --- /dev/null +++ b/emulators/open-vm-tools/files/patch-libDeployPkg_processPosix.c @@ -0,0 +1,11 @@ +--- libDeployPkg/processPosix.c.orig 2023-07-18 17:10:48 UTC ++++ libDeployPkg/processPosix.c +@@ -28,6 +28,8 @@ + #include + #include + #include ++#include ++#include + #include + + #include "util.h" diff --git a/emulators/open-vm-tools/files/patch-lib_panic_panic.c b/emulators/open-vm-tools/files/patch-lib_panic_panic.c new file mode 100644 index 000000000000..555962fa2039 --- /dev/null +++ b/emulators/open-vm-tools/files/patch-lib_panic_panic.c @@ -0,0 +1,11 @@ +--- lib/panic/panic.c.orig 2023-06-12 23:13:35 UTC ++++ lib/panic/panic.c +@@ -34,6 +34,8 @@ + # include + # ifdef __APPLE__ + # include ++# endif ++# if defined (__APPLE__) || defined (__FreeBSD__) + # include + # include + # endif diff --git a/emulators/open-vm-tools/files/patch-lib_procMgr_procMgrPosix.c b/emulators/open-vm-tools/files/patch-lib_procMgr_procMgrPosix.c new file mode 100644 index 000000000000..a4088489e16a --- /dev/null +++ b/emulators/open-vm-tools/files/patch-lib_procMgr_procMgrPosix.c @@ -0,0 +1,11 @@ +--- lib/procMgr/procMgrPosix.c.orig 2023-07-18 17:10:48 UTC ++++ lib/procMgr/procMgrPosix.c +@@ -58,6 +58,8 @@ + #include + #include + #include ++#include ++#include + #endif + #if defined(__APPLE__) + #include diff --git a/emulators/open-vm-tools/pkg-plist b/emulators/open-vm-tools/pkg-plist index ae96eabc1925..7ae249592b27 100644 --- a/emulators/open-vm-tools/pkg-plist +++ b/emulators/open-vm-tools/pkg-plist @@ -13,10 +13,24 @@ bin/vmware-toolbox-cmd bin/vmware-xferlogs etc/pam.d/vmtoolsd %%X11%%etc/xdg/autostart/vmware-user.desktop +%%DEPLOYPKG%%include/libDeployPkg/deployPkgFormat.h +%%DEPLOYPKG%%include/libDeployPkg/deploypkg.h +%%DEPLOYPKG%%include/libDeployPkg/guestcust-events.h +%%DEPLOYPKG%%include/libDeployPkg/guestrpc.h +%%DEPLOYPKG%%include/libDeployPkg/imgcust-api.h +%%DEPLOYPKG%%include/libDeployPkg/includeCheck.h +%%DEPLOYPKG%%include/libDeployPkg/linuxDeployment.h +%%DEPLOYPKG%%include/libDeployPkg/log.h +%%DEPLOYPKG%%include/libDeployPkg/process.h +%%DEPLOYPKG%%include/libDeployPkg/vm_basic_types.h include/vmGuestLib/includeCheck.h include/vmGuestLib/vmGuestLib.h include/vmGuestLib/vmSessionId.h include/vmGuestLib/vm_basic_types.h +%%DEPLOYPKG%%lib/libDeployPkg.a +%%DEPLOYPKG%%lib/libDeployPkg.so +%%DEPLOYPKG%%lib/libDeployPkg.so.0 +%%DEPLOYPKG%%lib/libDeployPkg.so.0.0.0 lib/libguestlib.a lib/libguestlib.so lib/libguestlib.so.0 @@ -31,6 +45,7 @@ lib/libvmtools.so.0 lib/libvmtools.so.0.0.0 lib/open-vm-tools/plugins/common/libhgfsServer.so lib/open-vm-tools/plugins/common/libvix.so +%%DEPLOYPKG%%lib/open-vm-tools/plugins/vmsvc/libdeployPkgPlugin.so lib/open-vm-tools/plugins/vmsvc/libguestInfo.so lib/open-vm-tools/plugins/vmsvc/libpowerOps.so lib/open-vm-tools/plugins/vmsvc/libtimeSync.so @@ -40,6 +55,7 @@ lib/open-vm-tools/plugins/vmsvc/libvmbackup.so %%X11%%lib/open-vm-tools/plugins/vmusr/libresolutionSet.so lib/vmware-tools/modules/drivers/vmblock.ko lib/vmware-tools/modules/drivers/vmmemctl.ko +%%DEPLOYPKG%%libdata/pkgconfig/libDeployPkg.pc libdata/pkgconfig/vmguestlib.pc sbin/mount_vmblock %%DATADIR%%/messages/de/toolboxcmd.vmsg