svn commit: r436703 - in head/emulators: open-vm-tools open-vm-tools-nox11 open-vm-tools/files
Steve Wills
swills at FreeBSD.org
Wed Mar 22 14:52:03 UTC 2017
Author: swills
Date: Wed Mar 22 14:52:00 2017
New Revision: 436703
URL: https://svnweb.freebsd.org/changeset/ports/436703
Log:
emulators/open-vm-tools: Update to 10.1.0
PR: 212471
Deleted:
head/emulators/open-vm-tools/files/patch-base64rename
head/emulators/open-vm-tools/files/patch-freebsd-8
head/emulators/open-vm-tools/files/patch-getpwnam
head/emulators/open-vm-tools/files/patch-hgfsProto.h
head/emulators/open-vm-tools/files/patch-hgfsmounter-Makefile.in
head/emulators/open-vm-tools/files/patch-lib__include__vm_assert.h
head/emulators/open-vm-tools/files/patch-lib__include__vm_atomic.h
head/emulators/open-vm-tools/files/patch-lib_include_vmware_tools_log.h
head/emulators/open-vm-tools/files/patch-libvmtools__i18n.c
head/emulators/open-vm-tools/files/patch-modules__freebsd__vmhgfs__channel.h
head/emulators/open-vm-tools/files/patch-net_compat.h
head/emulators/open-vm-tools/files/patch-toolbox__toolboxcmd-shrink.c
head/emulators/open-vm-tools/files/patch-vm_basic_asm.h
head/emulators/open-vm-tools/files/patch-vm_basic_types.h
head/emulators/open-vm-tools/files/patch-vmblock-vfsops.c
head/emulators/open-vm-tools/files/patch-vmblock-vnops.c
head/emulators/open-vm-tools/files/patch-vmhgfs-Makefile
head/emulators/open-vm-tools/files/patch-vmhgfs-kernelStubs.h
head/emulators/open-vm-tools/files/patch-vmhgfs-os.c
head/emulators/open-vm-tools/files/patch-vmhgfs-vfsops.c
head/emulators/open-vm-tools/files/patch-vmhgfs-vnopscommon.c
head/emulators/open-vm-tools/files/pkg-message.in
Modified:
head/emulators/open-vm-tools-nox11/Makefile
head/emulators/open-vm-tools/Makefile
head/emulators/open-vm-tools/distinfo
head/emulators/open-vm-tools/files/patch-configure
head/emulators/open-vm-tools/files/patch-lib__vmCheck__vmcheck.c
head/emulators/open-vm-tools/files/patch-modules-Makefile.in
head/emulators/open-vm-tools/files/patch-scripts-Makefile
head/emulators/open-vm-tools/files/patch-scripts_linux_pam.d_vmtoolsd
head/emulators/open-vm-tools/files/patch-util_misc.c
head/emulators/open-vm-tools/files/patch-vmblockmounter-Makefile.in
head/emulators/open-vm-tools/files/patch-vmmemctl-os.c
head/emulators/open-vm-tools/files/patch-vmtoolsd-Makefile.in
head/emulators/open-vm-tools/files/vmware-kmod.in
head/emulators/open-vm-tools/pkg-plist
Modified: head/emulators/open-vm-tools-nox11/Makefile
==============================================================================
--- head/emulators/open-vm-tools-nox11/Makefile Wed Mar 22 14:41:58 2017 (r436702)
+++ head/emulators/open-vm-tools-nox11/Makefile Wed Mar 22 14:52:00 2017 (r436703)
@@ -5,7 +5,4 @@ MASTERDIR= ${.CURDIR}/../open-vm-tools
PKGNAMESUFFIX= -nox11
OPTIONS_EXCLUDE= X11 LIBNOTIFY
-BROKEN_mips64= Does not configure: error: Unknown architecture
-BROKEN_powerpc64= Does not build
-
.include "${MASTERDIR}/Makefile"
Modified: head/emulators/open-vm-tools/Makefile
==============================================================================
--- head/emulators/open-vm-tools/Makefile Wed Mar 22 14:41:58 2017 (r436702)
+++ head/emulators/open-vm-tools/Makefile Wed Mar 22 14:52:00 2017 (r436703)
@@ -2,12 +2,11 @@
# $FreeBSD$
PORTNAME= open-vm-tools
-PORTVERSION= ${BUILD_VER}
-PORTREVISION= 17
-PORTEPOCH= 1
-CATEGORIES= emulators
-MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/stable-9.4.x
+PORTVERSION= ${RELEASE_VER}
+PORTEPOCH= 2
+MASTER_SITES= https://github.com/vmware/open-vm-tools/files/590760/
DISTNAME= open-vm-tools-${RELEASE_VER}-${BUILD_VER}
+CATEGORIES= emulators
MAINTAINER= swills at FreeBSD.org
COMMENT?= Open VMware tools for FreeBSD VMware guests
@@ -15,8 +14,8 @@ COMMENT?= Open VMware tools for FreeBSD
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
-RELEASE_VER= 9.4.0
-BUILD_VER= 1280544
+RELEASE_VER= 10.1.0
+BUILD_VER= 4449150
OPTIONS_DEFINE= X11 LIBNOTIFY UNITY FUSE DNET ICU
OPTIONS_DEFAULT= X11 LIBNOTIFY FUSE DNET ICU
@@ -26,11 +25,13 @@ DNET_DESC= libdnet support
LIBNOTIFY_DESC= Desktop notification support
UNITY_DESC= liburiparser support
+# TODO add USE_GITHUB=yes after switching to USES=autoreconf
+
X11_CONFIGURE_WITH= x gtk2 gtkmm
-X11_LDFLAGS= -L${LOCALBASE}/lib
-X11_USE= xorg=x11,ice,sm,xext,xineramaproto,xinerama,xrandr,xrender,xtst \
- gnome=gtk20,gtkmm24
-X11_USES= fuse
+X11_USE= xorg=x11,ice,sm,xext,xineramaproto,xinerama,xrandr,xrender,xtst,xi \
+ gnome=gtk20,gtkmm24,gdkpixbuf2
+X11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
+ libfreetype.so:print/freetype2
LIBNOTIFY_LIB_DEPENDS= libnotify.so:devel/libnotify
UNITY_CONFIGURE_ENV= CUSTOM_URIPARSER_CPPFLAGS="-I${LOCALBASE}/include/uriparser"
UNITY_LIB_DEPENDS= liburiparser.so:net/uriparser
@@ -40,19 +41,27 @@ DNET_LIB_DEPENDS= libdnet.so:net/libdnet
ICU_CONFIGURE_WITH= icu
ICU_LIB_DEPENDS= libicuuc.so:devel/icu
-WRKSRC= ${WRKDIR}/open-vm-tools-${RELEASE_VER}-${BUILD_VER}
+WRKSRC= ${WRKDIR}/open-vm-tools-${RELEASE_VER}-${BUILD_VER}/open-vm-tools
GNU_CONFIGURE= yes
-USES= pathfix pkgconfig kmod libtool
USE_GNOME= glib20
+# TODO add autoreconf when included files are compatible
+USES= fuse gettext-runtime kmod libtool pathfix pkgconfig
+
+LIB_DEPENDS= libmspack.so:archivers/libmspack \
+ libxerces-c.so.3:textproc/xerces-c3 \
+ libxml-security-c.so:security/apache-xml-security-c
+
USE_LDCONFIG= yes
CPPFLAGS+= -Wno-deprecated-declarations
+LDFLAGS= -L${LOCALBASE}/lib
SSP_UNSAFE= kernel module does not support ssp
-CONFIGURE_ARGS+= --without-procps --sysconfdir=${LOCALBASE}/etc
+CONFIGURE_ARGS+= --disable-grabbitmqproxy --disable-deploypkg \
+ --disable-vgauth --without-procps \
+ --sysconfdir=${LOCALBASE}/etc
CONFLICTS+= vmware-guestd[0-9]* vmware-tools[0-9]*
-SUB_FILES= pkg-message
USE_RC_SUBR= vmware-guestd vmware-kmod
@@ -64,10 +73,9 @@ CONFLICTS= open-vm-tools-nox11-[0-9]*
CONFLICTS= open-vm-tools-[0-9]*
.endif
-BROKEN_aarch64= Fails to configure: error: Unknown architecture
+ONLY_FOR_ARCHS= i386 amd64
-NOT_FOR_ARCHS= sparc64
-NOT_FOR_ARCHS_REASON= not yet ported to this architecture
+CONFIGURE_ENV+= SYSDIR=${SRC_BASE}/sys
.include <bsd.port.pre.mk>
@@ -77,12 +85,16 @@ post-build:
post-install:
${MKDIR} ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/drivers
${MKDIR} ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/input
+ ${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmblock.ko ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/drivers/vmblock.ko
${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmmemctl.ko ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/drivers/vmmemctl.ko
${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmxnet.ko ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/drivers/vmxnet.ko
- ${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmhgfs.ko ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/drivers/vmhgfs.ko
- ${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmblock.ko ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/drivers/vmblock.ko
${MKDIR} ${STAGEDIR}${PREFIX}/share/open-vm-tools/scripts/vmware/
${MKDIR} ${STAGEDIR}${PREFIX}/share/open-vm-tools/scripts/
${MKDIR} ${STAGEDIR}${PREFIX}/share/open-vm-tools/tests/
+ ${MKDIR} ${STAGEDIR}${PREFIX}/etc/rc.conf.d
+ ${ECHO} 'vmware_guest_vmblock_enable="yes"' > ${STAGEDIR}${PREFIX}/etc/rc.conf.d/vmware_guest_vmblock
+ ${ECHO} 'vmware_guest_vmmemctl_enable="yes"' > ${STAGEDIR}${PREFIX}/etc/rc.conf.d/vmware_guest_vmmemctl
+ ${ECHO} 'vmware_guest_vmxnet_enable="yes"' > ${STAGEDIR}${PREFIX}/etc/rc.conf.d/vmware_guest_vmxnet
+ ${ECHO} 'vmware_guestd_enable="yes"' > ${STAGEDIR}${PREFIX}/etc/rc.conf.d/vmware_guestd
.include <bsd.port.post.mk>
Modified: head/emulators/open-vm-tools/distinfo
==============================================================================
--- head/emulators/open-vm-tools/distinfo Wed Mar 22 14:41:58 2017 (r436702)
+++ head/emulators/open-vm-tools/distinfo Wed Mar 22 14:52:00 2017 (r436703)
@@ -1,2 +1,3 @@
-SHA256 (open-vm-tools-9.4.0-1280544.tar.gz) = 5d30652eb0f6dc5e930781029c184837e700be5543b6a7116db4c62a6f3ca399
-SIZE (open-vm-tools-9.4.0-1280544.tar.gz) = 3659504
+TIMESTAMP = 1484345963
+SHA256 (open-vm-tools-10.1.0-4449150.tar.gz) = d579474c9495b504a544dfc2635d291c27488e7e9303ec4fe6b393836dc3b017
+SIZE (open-vm-tools-10.1.0-4449150.tar.gz) = 5025787
Modified: head/emulators/open-vm-tools/files/patch-configure
==============================================================================
--- head/emulators/open-vm-tools/files/patch-configure Wed Mar 22 14:41:58 2017 (r436702)
+++ head/emulators/open-vm-tools/files/patch-configure Wed Mar 22 14:52:00 2017 (r436703)
@@ -1,40 +1,11 @@
---- ./configure.orig 2013-09-23 15:51:43.000000000 +0000
-+++ ./configure 2014-04-23 15:36:44.174844399 +0000
-@@ -2823,6 +2823,9 @@
- x86_64)
- userSpaceBitness="64"
- ;;
-+ amd64)
-+ userSpaceBitness="64"
-+ ;;
- *)
- as_fn_error $? "Unknown architecture." "$LINENO" 5
- ;;
-@@ -21733,18 +21736,6 @@
-
- done
-
--for ac_header in unwind.h
--do :
-- ac_fn_c_check_header_mongrel "$LINENO" "unwind.h" "ac_cv_header_unwind_h" "$ac_includes_default"
--if test "x$ac_cv_header_unwind_h" = xyes; then :
-- cat >>confdefs.h <<_ACEOF
--#define HAVE_UNWIND_H 1
--_ACEOF
--
--fi
--
--done
--
-
- ac_fn_c_check_header_mongrel "$LINENO" "wchar.h" "ac_cv_header_wchar_h" "$ac_includes_default"
- if test "x$ac_cv_header_wchar_h" = xyes; then :
-@@ -22238,7 +22229,7 @@
-
- ### General flags / actions
- CFLAGS="$CFLAGS -Wall"
--CFLAGS="$CFLAGS -Werror"
-+CFLAGS="$CFLAGS -Werror -Wno-unused-function"
-
- # -Wno-unknown-pragmas is due to gcc not understanding '#pragma ident' in Xlib.h on OpenSolaris.
+--- configure.orig 2017-01-11 20:40:42.694207000 +0000
++++ configure 2017-01-11 20:41:03.256056000 +0000
+@@ -34117,7 +34117,7 @@ CFLAGS="$CFLAGS -Werror"
+ # warnings for now (-Wno-deprecated-declarations).
for TEST_CFLAG in -Wno-pointer-sign -Wno-unused-value -fno-strict-aliasing \
+ -Wno-unknown-pragmas -Wno-uninitialized -Wno-deprecated-declarations \
+- -Wno-unused-const-variable; do
++ -Wno-unused-const-variable -Wno-address-of-packed-member; do
+ { echo "$as_me:$LINENO: checking for GCC flag $TEST_CFLAG" >&5
+ echo $ECHO_N "checking for GCC flag $TEST_CFLAG... $ECHO_C" >&6; }
+ ORIGINAL_CFLAGS="$CFLAGS"
Modified: head/emulators/open-vm-tools/files/patch-lib__vmCheck__vmcheck.c
==============================================================================
--- head/emulators/open-vm-tools/files/patch-lib__vmCheck__vmcheck.c Wed Mar 22 14:41:58 2017 (r436702)
+++ head/emulators/open-vm-tools/files/patch-lib__vmCheck__vmcheck.c Wed Mar 22 14:52:00 2017 (r436703)
@@ -1,5 +1,5 @@
---- ./lib/vmCheck/vmcheck.c.orig 2013-09-23 15:51:10.000000000 +0000
-+++ ./lib/vmCheck/vmcheck.c 2014-04-23 15:36:44.323843725 +0000
+--- ./lib/vmCheck/vmcheck.c.orig 2013-09-23 15:51:10.000000000 +0000
++++ ./lib/vmCheck/vmcheck.c 2014-04-23 15:36:44.323843725 +0000
@@ -134,6 +134,7 @@
#else
do {
Modified: head/emulators/open-vm-tools/files/patch-modules-Makefile.in
==============================================================================
--- head/emulators/open-vm-tools/files/patch-modules-Makefile.in Wed Mar 22 14:41:58 2017 (r436702)
+++ head/emulators/open-vm-tools/files/patch-modules-Makefile.in Wed Mar 22 14:52:00 2017 (r436703)
@@ -1,6 +1,6 @@
---- modules/Makefile.in.orig 2009-04-06 18:44:58.000000000 -0400
-+++ modules/Makefile.in 2009-04-06 18:45:57.000000000 -0400
-@@ -528,11 +528,11 @@
+--- modules/Makefile.in.orig 2017-01-11 21:40:55.849672000 -0500
++++ modules/Makefile.in 2017-01-11 21:41:10.446157000 -0500
+@@ -543,11 +543,6 @@
@SOLARIS_TRUE@ $(MAKE) VM_UNAME=$(KERNEL_RELEASE) MV=mv RM=rm \
@SOLARIS_TRUE@ -C "$(modulesrc)/$(MODULES_OS)/$$MOD" install || exit 1; \
@SOLARIS_TRUE@ done
@@ -9,11 +9,6 @@
- at FREEBSD_TRUE@ $(INSTALL) -m644 $(modulesrc)/$(MODULES_OS)/$$MOD.ko \
- at FREEBSD_TRUE@ $(DESTDIR)$(MODULES_DIR); \
- at FREEBSD_TRUE@ done
-+#@FREEBSD_TRUE@ for MOD in $(MODULES); do \
-+#@FREEBSD_TRUE@ $(INSTALL) -d $(DESTDIR)$(MODULES_DIR); \
-+#@FREEBSD_TRUE@ $(INSTALL) -m644 $(modulesrc)/$(MODULES_OS)/$$MOD.ko \
-+#@FREEBSD_TRUE@ $(DESTDIR)$(MODULES_DIR); \
-+#@FREEBSD_TRUE@ done
@LINUX_TRUE@ for MOD in $(MODULES); do \
@LINUX_TRUE@ $(INSTALL) -d $(DESTDIR)`eval echo '$$'$${MOD}dir`; \
@LINUX_TRUE@ $(INSTALL) -m644 $(modulesrc)/$(MODULES_OS)/$$MOD/$$MOD.ko \
Modified: head/emulators/open-vm-tools/files/patch-scripts-Makefile
==============================================================================
--- head/emulators/open-vm-tools/files/patch-scripts-Makefile Wed Mar 22 14:41:58 2017 (r436702)
+++ head/emulators/open-vm-tools/files/patch-scripts-Makefile Wed Mar 22 14:52:00 2017 (r436703)
@@ -1,11 +1,11 @@
---- scripts/Makefile.in.orig 2010-05-22 04:41:58.000000000 +0200
-+++ scripts/Makefile.in 2010-05-22 04:43:57.000000000 +0200
-@@ -236,7 +236,7 @@
+--- scripts/Makefile.in.orig 2017-01-11 20:52:28.004220000 -0500
++++ scripts/Makefile.in 2017-01-11 20:52:42.153725000 -0500
+@@ -256,7 +256,7 @@
top_srcdir = @top_srcdir@
defaultscripts = poweron-vm-default poweroff-vm-default \
suspend-vm-default resume-vm-default
-confdir = /etc/vmware-tools
+confdir = ${prefix}/share/vmware-tools
conf_SCRIPTS = ./common/vm-support ./common/statechange.subr \
- $(defaultscripts)
+ $(am__append_1) $(defaultscripts)
vmwsrcdir = $(confdir)/scripts/vmware
Modified: head/emulators/open-vm-tools/files/patch-scripts_linux_pam.d_vmtoolsd
==============================================================================
--- head/emulators/open-vm-tools/files/patch-scripts_linux_pam.d_vmtoolsd Wed Mar 22 14:41:58 2017 (r436702)
+++ head/emulators/open-vm-tools/files/patch-scripts_linux_pam.d_vmtoolsd Wed Mar 22 14:52:00 2017 (r436703)
@@ -2,9 +2,11 @@
+++ scripts/linux/pam.d/vmtoolsd
@@ -1,7 +1,3 @@
#%PAM-1.0
--auth sufficient pam_unix2.so nullok
- auth sufficient pam_unix.so shadow nullok
--auth required pam_unix_auth.so shadow nullok
--account sufficient pam_unix2.so
- account sufficient pam_unix.so
+-auth required pam_shells.so
+-auth sufficient pam_unix.so shadow
+-auth required pam_unix_auth.so shadow
+-account required pam_shells.so
+-account sufficient pam_unix.so
-account required pam_unix_acct.so
++auth include system
++account include system
Modified: head/emulators/open-vm-tools/files/patch-util_misc.c
==============================================================================
--- head/emulators/open-vm-tools/files/patch-util_misc.c Wed Mar 22 14:41:58 2017 (r436702)
+++ head/emulators/open-vm-tools/files/patch-util_misc.c Wed Mar 22 14:52:00 2017 (r436703)
@@ -1,6 +1,6 @@
---- lib/misc/util_misc.c.orig 2009-04-14 02:38:09.000000000 +0200
-+++ lib/misc/util_misc.c 2009-04-14 02:39:00.000000000 +0200
-@@ -292,7 +292,7 @@
+--- lib/misc/util_misc.c.orig 2017-01-12 00:14:04.989252000 -0500
++++ lib/misc/util_misc.c 2017-01-12 00:14:12.099031000 -0500
+@@ -307,7 +307,7 @@ Util_CanonicalPathsIdentical(const char
return (strcmp(path1, path2) == 0);
#elif defined(_WIN32)
return (_stricmp(path1, path2) == 0);
@@ -9,12 +9,3 @@
return (strcasecmp(path1, path2) == 0);
#else
NOT_IMPLEMENTED();
-@@ -319,7 +319,7 @@
- Bool
- Util_IsAbsolutePath(const char *path) // IN: path to check
- {
--#if defined(__linux__) || defined(__APPLE__)
-+#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__)
- // path[0] is valid even for the empty string.
- return path && path[0] == DIRSEPC;
- #elif defined(_WIN32)
Modified: head/emulators/open-vm-tools/files/patch-vmblockmounter-Makefile.in
==============================================================================
--- head/emulators/open-vm-tools/files/patch-vmblockmounter-Makefile.in Wed Mar 22 14:41:58 2017 (r436702)
+++ head/emulators/open-vm-tools/files/patch-vmblockmounter-Makefile.in Wed Mar 22 14:52:00 2017 (r436703)
@@ -1,6 +1,6 @@
---- vmblockmounter/Makefile.in.orig 2013-12-27 17:42:57.000000000 +0000
-+++ vmblockmounter/Makefile.in 2013-12-27 17:44:31.000000000 +0000
-@@ -644,9 +644,6 @@
+--- vmblockmounter/Makefile.in.orig 2017-01-11 20:47:51.559298000 -0500
++++ vmblockmounter/Makefile.in 2017-01-11 20:48:04.188633000 -0500
+@@ -578,9 +578,6 @@
@FREEBSD_TRUE at install-exec-hook:
@FREEBSD_TRUE@ mv $(DESTDIR)$(sbindir)/mount.vmblock \
@FREEBSD_TRUE@ $(DESTDIR)$(sbindir)/mount_vmblock
Modified: head/emulators/open-vm-tools/files/patch-vmmemctl-os.c
==============================================================================
--- head/emulators/open-vm-tools/files/patch-vmmemctl-os.c Wed Mar 22 14:41:58 2017 (r436702)
+++ head/emulators/open-vm-tools/files/patch-vmmemctl-os.c Wed Mar 22 14:52:00 2017 (r436703)
@@ -1,5 +1,5 @@
---- modules/freebsd/vmmemctl/os.c.orig 2013-09-23 08:51:10.000000000 -0700
-+++ modules/freebsd/vmmemctl/os.c 2017-02-20 21:19:02.000000000 -0800
+--- modules/freebsd/vmmemctl/os.c.orig 2016-09-29 06:07:23.000000000 -0400
++++ modules/freebsd/vmmemctl/os.c 2017-02-22 12:15:23.708060000 -0500
@@ -37,9 +37,11 @@
#include <sys/param.h>
#include <sys/systm.h>
@@ -12,7 +12,7 @@
#include <sys/sysctl.h>
#include <vm/vm.h>
-@@ -223,7 +225,11 @@
+@@ -223,7 +225,11 @@ static __inline__ unsigned long os_ffz(u
unsigned long
OS_ReservedPageGetLimit(void)
{
@@ -24,33 +24,7 @@
}
-@@ -295,7 +301,13 @@
- Mapping
- OS_MapPageHandle(PageHandle handle) // IN
- {
-+
-+#if __FreeBSD_version >= 1000042
-+ vm_offset_t res = kva_alloc(PAGE_SIZE);
-+#else
- vm_offset_t res = kmem_alloc_nofault(kernel_map, PAGE_SIZE);
-+#endif
-+
- vm_page_t page = (vm_page_t)handle;
-
- if (!res) {
-@@ -352,7 +364,11 @@
- OS_UnmapPage(Mapping mapping) // IN
- {
- pmap_qremove((vm_offset_t)mapping, 1);
-+#if __FreeBSD_version >= 1000042
-+ kva_free((vm_offset_t)mapping, PAGE_SIZE);
-+#else
- kmem_free(kernel_map, (vm_offset_t)mapping, PAGE_SIZE);
-+#endif
- }
-
-
-@@ -360,7 +376,11 @@
+@@ -369,7 +375,11 @@ static void
os_pmap_alloc(os_pmap *p) // IN
{
/* number of pages (div. 8) */
@@ -61,32 +35,8 @@
+#endif
/*
- * expand to nearest word boundary
-@@ -369,14 +389,23 @@
- p->size = (p->size + sizeof(unsigned long) - 1) &
- ~(sizeof(unsigned long) - 1);
-
-+#if __FreeBSD_version >= 1000042
-+ p->bitmap = (unsigned long *)kmem_malloc(kernel_arena, p->size,
-+ M_WAITOK | M_ZERO);
-+#else
- p->bitmap = (unsigned long *)kmem_alloc(kernel_map, p->size);
-+#endif
- }
-
-
- static void
- os_pmap_free(os_pmap *p) // IN
- {
-+#if __FreeBSD_version >= 1000042
-+ kva_free((vm_offset_t)p->bitmap, p->size);
-+#else
- kmem_free(kernel_map, (vm_offset_t)p->bitmap, p->size);
-+#endif
- p->size = 0;
- p->bitmap = NULL;
- }
-@@ -449,12 +478,31 @@
+ * expand to nearest word boundary
+@@ -466,12 +476,31 @@ os_kmem_free(vm_page_t page) // IN
os_state *state = &global_state;
os_pmap *pmap = &state->pmap;
@@ -123,7 +73,7 @@
}
-@@ -466,8 +514,19 @@
+@@ -483,8 +512,19 @@ os_kmem_alloc(int alloc_normal_failed) /
os_state *state = &global_state;
os_pmap *pmap = &state->pmap;
@@ -143,7 +93,7 @@
return NULL;
}
-@@ -488,6 +547,11 @@
+@@ -505,6 +545,11 @@ os_kmem_alloc(int alloc_normal_failed) /
if (!page) {
os_pmap_putindex(pmap, pindex);
}
@@ -155,7 +105,7 @@
return page;
}
-@@ -824,7 +888,7 @@
+@@ -847,7 +892,7 @@ vmmemctl_sysctl(SYSCTL_HANDLER_ARGS)
static void
vmmemctl_init_sysctl(void)
{
Modified: head/emulators/open-vm-tools/files/patch-vmtoolsd-Makefile.in
==============================================================================
--- head/emulators/open-vm-tools/files/patch-vmtoolsd-Makefile.in Wed Mar 22 14:41:58 2017 (r436702)
+++ head/emulators/open-vm-tools/files/patch-vmtoolsd-Makefile.in Wed Mar 22 14:52:00 2017 (r436703)
@@ -1,7 +1,7 @@
---- services/vmtoolsd/Makefile.in.orig 2009-04-06 18:40:27.000000000 -0400
-+++ services/vmtoolsd/Makefile.in 2009-04-06 18:41:16.000000000 -0400
-@@ -722,7 +722,7 @@
- $@ || (rm -f $@ && exit 1)
+--- services/vmtoolsd/Makefile.in.orig 2017-01-11 21:00:01.938705000 -0500
++++ services/vmtoolsd/Makefile.in 2017-01-11 21:00:22.495767000 -0500
+@@ -761,7 +761,7 @@
+ @INSTVMSG@ vmtoolsd $(srcdir)/l10n $(DESTDIR)$(datadir)
install-exec-hook:
- $(INSTALL) -d $(DESTDIR)/etc/vmware-tools
Modified: head/emulators/open-vm-tools/files/vmware-kmod.in
==============================================================================
--- head/emulators/open-vm-tools/files/vmware-kmod.in Wed Mar 22 14:41:58 2017 (r436702)
+++ head/emulators/open-vm-tools/files/vmware-kmod.in Wed Mar 22 14:52:00 2017 (r436703)
@@ -84,18 +84,3 @@ stop_cmd=":"
load_rc_config $name
[ -z "$vmware_guest_vmblock_enable" ] && vmware_guest_vmblock_enable="NO"
run_rc_command "$1"
-
-# VMware kernel module: vmhgfs
-kernel_mod="vmhgfs"
-name="vmware_guest_${kernel_mod}"
-rcvar=vmware_guest_${kernel_mod}_enable
-extra_commands="status"
-status_cmd="vmware_mod_status ${kernel_mod}"
-start_precmd="${checkvm_cmd}"
-start_cmd="vmware_mod_load ${kernel_mod}"
-stop_precmd="${checkvm_cmd}"
-stop_cmd=":"
-
-load_rc_config $name
-[ -z "$vmware_guest_vmhgfs_enable" ] && vmware_guest_vmhgfs_enable="NO"
-run_rc_command "$1"
Modified: head/emulators/open-vm-tools/pkg-plist
==============================================================================
--- head/emulators/open-vm-tools/pkg-plist Wed Mar 22 14:41:58 2017 (r436702)
+++ head/emulators/open-vm-tools/pkg-plist Wed Mar 22 14:52:00 2017 (r436703)
@@ -1,9 +1,11 @@
+bin/vmhgfs-fuse
+bin/vmtoolsd
bin/vmware-checkvm
bin/vmware-hgfsclient
+bin/vmware-namespace-cmd
bin/vmware-rpctool
-bin/vmware-xferlogs
-bin/vmtoolsd
bin/vmware-toolbox-cmd
+bin/vmware-xferlogs
%%X11%%%%FUSE%%bin/vmware-vmblock-fuse
lib/open-vm-tools/plugins/vmsvc/libguestInfo.so
lib/open-vm-tools/plugins/vmsvc/libpowerOps.so
@@ -29,7 +31,6 @@ lib/libguestlib.so.0
lib/libguestlib.so.0.0.0
libdata/pkgconfig/vmguestlib.pc
lib/vmware-tools/modules/drivers/vmblock.ko
-lib/vmware-tools/modules/drivers/vmhgfs.ko
lib/vmware-tools/modules/drivers/vmmemctl.ko
lib/vmware-tools/modules/drivers/vmxnet.ko
include/vmGuestLib/includeCheck.h
@@ -37,16 +38,15 @@ include/vmGuestLib/vmGuestLib.h
include/vmGuestLib/vmSessionId.h
include/vmGuestLib/vm_basic_types.h
@dir lib/vmware-tools/modules/input
-sbin/mount_vmhgfs
sbin/mount_vmblock
%%X11%%bin/vmware-user-suid-wrapper
share/vmware-tools/poweroff-vm-default
share/vmware-tools/poweron-vm-default
share/vmware-tools/resume-vm-default
+share/vmware-tools/scripts/vmware/network
+share/vmware-tools/statechange.subr
share/vmware-tools/suspend-vm-default
share/vmware-tools/vm-support
-share/vmware-tools/statechange.subr
-share/vmware-tools/scripts/vmware/network
%%DATADIR%%/messages/de/toolboxcmd.vmsg
%%DATADIR%%/messages/de/vmtoolsd.vmsg
%%DATADIR%%/messages/ja/toolboxcmd.vmsg
@@ -57,5 +57,10 @@ share/vmware-tools/scripts/vmware/networ
@rmtry share/vmware-tools/tools.conf
@rmtry etc/vmware-tools/plugins
etc/pam.d/vmtoolsd
+etc/rc.conf.d/vmware_guest_vmblock
+etc/rc.conf.d/vmware_guest_vmmemctl
+etc/rc.conf.d/vmware_guest_vmxnet
+etc/rc.conf.d/vmware_guestd
@dir %%DATADIR%%/scripts/vmware
@dir %%DATADIR%%/tests
+ at preunexec %%PREFIX%%/bin/vmware-rpctool 'tools.set.version 0' ; service vmware-guestd stop ; true
More information about the svn-ports-all
mailing list