svn commit: r480889 - in head/emulators/open-vm-tools: . files
Josh Paetzel
jpaetzel at FreeBSD.org
Sat Sep 29 05:29:30 UTC 2018
Author: jpaetzel
Date: Sat Sep 29 05:29:28 2018
New Revision: 480889
URL: https://svnweb.freebsd.org/changeset/ports/480889
Log:
Update to 10.3.0
PR: 229985
Submitted by: John Wolfe <jwolfe at vmware.com>
Deleted:
head/emulators/open-vm-tools/files/patch-configure.ac
head/emulators/open-vm-tools/files/patch-lib_auth_authPosix.c
head/emulators/open-vm-tools/files/patch-lib_file_fileTempPosix.c
head/emulators/open-vm-tools/files/patch-lib_include_vm__basic__types.h
head/emulators/open-vm-tools/files/patch-services_plugins_vix_vixTools.c
Modified:
head/emulators/open-vm-tools/Makefile
head/emulators/open-vm-tools/distinfo
head/emulators/open-vm-tools/files/patch-lib_guestApp_guestApp.c
head/emulators/open-vm-tools/files/patch-lib_vmCheck_vmcheck.c
head/emulators/open-vm-tools/files/patch-modules_Makefile.am
head/emulators/open-vm-tools/files/patch-modules_freebsd_vmmemctl_os.c
Modified: head/emulators/open-vm-tools/Makefile
==============================================================================
--- head/emulators/open-vm-tools/Makefile Sat Sep 29 03:24:49 2018 (r480888)
+++ head/emulators/open-vm-tools/Makefile Sat Sep 29 05:29:28 2018 (r480889)
@@ -4,7 +4,6 @@
PORTNAME= open-vm-tools
PORTVERSION= ${RELEASE_VER}
DISTVERSIONPREFIX= stable-
-PORTREVISION= 4
PORTEPOCH= 2
CATEGORIES= emulators
@@ -18,8 +17,8 @@ ONLY_FOR_ARCHS= amd64 i386
LIB_DEPENDS= libmspack.so:archivers/libmspack
-RELEASE_VER= 10.2.5
-BUILD_VER= 8068406
+RELEASE_VER= 10.3.0
+BUILD_VER= 8931395
OPTIONS_DEFINE= DNET LIBNOTIFY OPENSSL X11
OPTIONS_DEFAULT= DNET LIBNOTIFY OPENSSL X11
@@ -42,7 +41,7 @@ OPENSSL_CONFIGURE_WITH= ssl
WRKSRC_SUBDIR= open-vm-tools
GNU_CONFIGURE= yes
-USES= autoreconf fuse gettext-runtime kmod libtool localbase pathfix pkgconfig
+USES= autoreconf fuse gettext-runtime kmod libtool localbase pathfix pkgconfig gnome
USE_GNOME= glib20
USE_GITHUB= yes
@@ -64,6 +63,10 @@ USE_RC_SUBR= vmware-guestd vmware-kmod
INSTALL_TARGET= install-strip
.include <bsd.port.options.mk>
+
+.if ${OSVERSION} < 1100000
+CFLAGS+= -Wno-unknown-warning-option
+.endif
.if ${PORT_OPTIONS:MX11}
CONFLICTS= open-vm-tools-nox11-[0-9]*
Modified: head/emulators/open-vm-tools/distinfo
==============================================================================
--- head/emulators/open-vm-tools/distinfo Sat Sep 29 03:24:49 2018 (r480888)
+++ head/emulators/open-vm-tools/distinfo Sat Sep 29 05:29:28 2018 (r480889)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524018090
-SHA256 (vmware-open-vm-tools-stable-10.2.5_GH0.tar.gz) = c0f182c0c422fca8f8b3e5c21802f724256dfe5907383db28ec7e4d5b6d52b0f
-SIZE (vmware-open-vm-tools-stable-10.2.5_GH0.tar.gz) = 3207633
+TIMESTAMP = 1533858593
+SHA256 (vmware-open-vm-tools-stable-10.3.0_GH0.tar.gz) = b3d0b5fd272a8dc35cab1ddd732f9d436f72682925212a6cdeccdab283e2f5ec
+SIZE (vmware-open-vm-tools-stable-10.3.0_GH0.tar.gz) = 3498624
Modified: head/emulators/open-vm-tools/files/patch-lib_guestApp_guestApp.c
==============================================================================
--- head/emulators/open-vm-tools/files/patch-lib_guestApp_guestApp.c Sat Sep 29 03:24:49 2018 (r480888)
+++ head/emulators/open-vm-tools/files/patch-lib_guestApp_guestApp.c Sat Sep 29 05:29:28 2018 (r480889)
@@ -1,11 +1,11 @@
---- lib/guestApp/guestApp.c.orig 2018-03-30 18:44:35 UTC
+--- lib/guestApp/guestApp.c.orig 2018-07-13 18:54:23 UTC
+++ lib/guestApp/guestApp.c
@@ -63,7 +63,7 @@
#elif defined __APPLE__
# define GUESTAPP_TOOLS_INSTALL_PATH "/Library/Application Support/VMware Tools"
#else
-# define GUESTAPP_TOOLS_INSTALL_PATH "/etc/vmware-tools"
-+# define GUESTAPP_TOOLS_INSTALL_PATH "%%PREFIX%%/share/vmware-tools"
++# define GUESTAPP_TOOLS_INSTALL_PATH "/usr/local/share/vmware-tools"
#endif
#if defined _WIN32
Modified: head/emulators/open-vm-tools/files/patch-lib_vmCheck_vmcheck.c
==============================================================================
--- head/emulators/open-vm-tools/files/patch-lib_vmCheck_vmcheck.c Sat Sep 29 03:24:49 2018 (r480888)
+++ head/emulators/open-vm-tools/files/patch-lib_vmCheck_vmcheck.c Sat Sep 29 05:29:28 2018 (r480889)
@@ -1,6 +1,6 @@
---- lib/vmCheck/vmcheck.c.orig 2018-03-30 18:44:35 UTC
+--- lib/vmCheck/vmcheck.c.orig 2018-07-13 18:54:23 UTC
+++ lib/vmCheck/vmcheck.c
-@@ -135,6 +135,7 @@ VmCheckSafe(SafeCheckFn checkFn)
+@@ -153,6 +153,7 @@ VmCheckSafe(SafeCheckFn checkFn)
#else
do {
int signals[] = {
Modified: head/emulators/open-vm-tools/files/patch-modules_Makefile.am
==============================================================================
--- head/emulators/open-vm-tools/files/patch-modules_Makefile.am Sat Sep 29 03:24:49 2018 (r480888)
+++ head/emulators/open-vm-tools/files/patch-modules_Makefile.am Sat Sep 29 05:29:28 2018 (r480889)
@@ -1,6 +1,6 @@
---- modules/Makefile.am.orig 2018-04-18 02:28:12 UTC
+--- modules/Makefile.am.orig 2018-09-29 03:57:04 UTC
+++ modules/Makefile.am
-@@ -48,11 +48,11 @@ if SOLARIS
+@@ -65,11 +65,11 @@ if SOLARIS
done
endif
if FREEBSD
Modified: head/emulators/open-vm-tools/files/patch-modules_freebsd_vmmemctl_os.c
==============================================================================
--- head/emulators/open-vm-tools/files/patch-modules_freebsd_vmmemctl_os.c Sat Sep 29 03:24:49 2018 (r480888)
+++ head/emulators/open-vm-tools/files/patch-modules_freebsd_vmmemctl_os.c Sat Sep 29 05:29:28 2018 (r480889)
@@ -1,45 +1,9 @@
---- modules/freebsd/vmmemctl/os.c.orig 2017-07-28 21:59:15 UTC
+--- modules/freebsd/vmmemctl/os.c.orig 2018-09-29 03:58:10 UTC
+++ modules/freebsd/vmmemctl/os.c
-@@ -37,9 +37,11 @@
- #include <sys/param.h>
- #include <sys/systm.h>
- #include <sys/kernel.h>
-+#include <sys/lock.h>
- #include <sys/malloc.h>
- #include <sys/module.h>
- #include <sys/conf.h>
-+#include <sys/rwlock.h>
- #include <sys/sysctl.h>
+@@ -109,6 +109,30 @@ MALLOC_DEFINE(M_VMMEMCTL, BALLOON_NAME, "vmmemctl meta
+ #define VM_SYS_PAGES vm_cnt.v_page_count
+ #endif
- #include <vm/vm.h>
-@@ -83,6 +85,55 @@ typedef struct {
- MALLOC_DEFINE(M_VMMEMCTL, BALLOON_NAME, "vmmemctl metadata");
-
- /*
-+ * FreeBSD version specific MACROS
-+ */
-+#if __FreeBSD_version >= 900000
-+ #define VM_PAGE_LOCK(page) vm_page_lock(page);
-+ #define VM_PAGE_UNLOCK(page) vm_page_unlock(page)
-+#else
-+ #define VM_PAGE_LOCK(page) vm_page_lock_queues()
-+ #define VM_PAGE_UNLOCK(page) vm_page_unlock_queues()
-+#endif
-+
-+#if __FreeBSD_version > 1000029
-+ #define VM_OBJ_LOCK(object) VM_OBJECT_WLOCK(object)
-+ #define VM_OBJ_UNLOCK(object) VM_OBJECT_WUNLOCK(object);
-+#else
-+ #define VM_OBJ_LOCK(object) VM_OBJECT_LOCK(object);
-+ #define VM_OBJ_UNLOCK(object) VM_OBJECT_UNLOCK(object);
-+#endif
-+
-+#if __FreeBSD_version < 1100015
-+ #define VM_SYS_PAGES cnt.v_page_count
-+#else
-+ #define VM_SYS_PAGES vm_cnt.v_page_count
-+#endif
-+
+#if __FreeBSD_version < 1000000
+ #define KVA_ALLOC(size) kmem_alloc_nofault(kernel_map, size)
+ #define KVA_FREE(offset, size) kmem_free(kernel_map, offset, size)
@@ -64,20 +28,10 @@
+ #define KMEM_FREE(offset, size) kmem_free(offset, size)
+#endif
+
-+/*
+ /*
* Globals
*/
-
-@@ -223,7 +274,7 @@ static __inline__ unsigned long os_ffz(unsigned long w
- unsigned long
- OS_ReservedPageGetLimit(void)
- {
-- return cnt.v_page_count;
-+ return VM_SYS_PAGES;
- }
-
-
-@@ -295,11 +346,7 @@ OS_ReservedPageGetHandle(PA64 pa) // IN
+@@ -322,11 +346,7 @@ OS_ReservedPageGetHandle(PA64 pa) // IN
Mapping
OS_MapPageHandle(PageHandle handle) // IN
{
@@ -90,7 +44,7 @@
vm_page_t page = (vm_page_t)handle;
-@@ -357,11 +404,7 @@ void
+@@ -384,11 +404,7 @@ void
OS_UnmapPage(Mapping mapping) // IN
{
pmap_qremove((vm_offset_t)mapping, 1);
@@ -103,16 +57,7 @@
}
-@@ -369,7 +412,7 @@ static void
- os_pmap_alloc(os_pmap *p) // IN
- {
- /* number of pages (div. 8) */
-- p->size = (cnt.v_page_count + 7) / 8;
-+ p->size = (VM_SYS_PAGES + 7) / 8;
-
- /*
- * expand to nearest word boundary
-@@ -378,22 +421,14 @@ os_pmap_alloc(os_pmap *p) // IN
+@@ -405,22 +421,14 @@ os_pmap_alloc(os_pmap *p) // IN
p->size = (p->size + sizeof(unsigned long) - 1) &
~(sizeof(unsigned long) - 1);
@@ -121,7 +66,7 @@
-#else
- p->bitmap = (unsigned long *)kmem_malloc(kernel_arena, p->size, M_WAITOK | M_ZERO);
-#endif
-+ p->bitmap = (unsigned long *)KMEM_ALLOC(p->size);
++ p->bitmap = (unsigned long *)KMEM_ALLOC(p->size);
}
@@ -137,52 +82,3 @@
p->size = 0;
p->bitmap = NULL;
}
-@@ -466,12 +501,14 @@ os_kmem_free(vm_page_t page) // IN
- os_state *state = &global_state;
- os_pmap *pmap = &state->pmap;
-
-- if ( !vm_page_lookup(state->vmobject, page->pindex) ) {
-- return;
-+ VM_OBJ_LOCK(state->vmobject);
-+ if ( vm_page_lookup(state->vmobject, page->pindex) ) {
-+ os_pmap_putindex(pmap, page->pindex);
-+ VM_PAGE_LOCK(page);
-+ vm_page_free(page);
-+ VM_PAGE_UNLOCK(page);
- }
--
-- os_pmap_putindex(pmap, page->pindex);
-- vm_page_free(page);
-+ VM_OBJ_UNLOCK(state->vmobject);
- }
-
-
-@@ -483,8 +520,11 @@ os_kmem_alloc(int alloc_normal_failed) // IN
- os_state *state = &global_state;
- os_pmap *pmap = &state->pmap;
-
-+ VM_OBJ_LOCK(state->vmobject);
-+
- pindex = os_pmap_getindex(pmap);
- if (pindex == (vm_pindex_t)-1) {
-+ VM_OBJ_UNLOCK(state->vmobject);
- return NULL;
- }
-
-@@ -505,6 +545,7 @@ os_kmem_alloc(int alloc_normal_failed) // IN
- if (!page) {
- os_pmap_putindex(pmap, pindex);
- }
-+ VM_OBJ_UNLOCK(state->vmobject);
-
- return page;
- }
-@@ -847,7 +888,7 @@ vmmemctl_sysctl(SYSCTL_HANDLER_ARGS)
- static void
- vmmemctl_init_sysctl(void)
- {
-- oid = sysctl_add_oid(NULL, SYSCTL_STATIC_CHILDREN(_vm), OID_AUTO,
-+ oid = SYSCTL_ADD_OID(NULL, SYSCTL_STATIC_CHILDREN(_vm), OID_AUTO,
- BALLOON_NAME, CTLTYPE_STRING | CTLFLAG_RD,
- 0, 0, vmmemctl_sysctl, "A",
- BALLOON_NAME_VERBOSE);
More information about the svn-ports-head
mailing list