sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add fix for vmware-user-suid-wrapper failes to load vmblock.ko

Browse source 
Don't install vmware-user-suid-wrapper automatically in kde autostart
Bump portrevision

PR:			ports/152292
Submitted by:		Fumiyuki Shimizu <fumifumi@abacustech.jp>
This commit is contained in:
Martin Blapp 2010-11-16 20:37:05 +00:00
parent 2c50c3afba
commit cdcf5ddf92
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=264649
5 changed files with 91 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
emulators/open-vm-tools/Makefile
View file

@ -7,6 +7,7 @@
PORTNAME= open-vm-tools PORTNAME= open-vm-tools
PORTVERSION= ${BUILD_VER} PORTVERSION= ${BUILD_VER}
PORTREVISION= 1
CATEGORIES= emulators kld CATEGORIES= emulators kld
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${RELEASE_DATE} MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${RELEASE_DATE}
DISTNAME= open-vm-tools-${RELEASE_DATE}-${BUILD_VER} DISTNAME= open-vm-tools-${RELEASE_DATE}-${BUILD_VER}

11
emulators/open-vm-tools/files/patch-wrapper-Makefile.am Normal file
View file

@ -0,0 +1,11 @@
--- vmware-user-suid-wrapper/Makefile.am.orig 2010-10-20 05:19:54.000000000 +0900
+++ vmware-user-suid-wrapper/Makefile.am 2010-11-16 17:52:55.000000000 +0900
@@ -19,6 +19,8 @@
AM_CPPFLAGS =
AM_CPPFLAGS += -DVMTOOLSD_PATH=\"$(bindir)/vmtoolsd\"
+# See post-install on Makefile of ports.
+AM_CPPFLAGS += -DVMWARE_KMOD_DIR=\"$(prefix)/lib/vmware-tools/modules/drivers\"
vmware_user_suid_wrapper_SOURCES =
vmware_user_suid_wrapper_SOURCES += main.c

20
emulators/open-vm-tools/files/patch-wrapper-Makefile.in Normal file
View file

@ -0,0 +1,20 @@
--- vmware-user-suid-wrapper/Makefile.in.orig 2010-10-20 05:20:08.000000000 +0900
+++ vmware-user-suid-wrapper/Makefile.in 2010-11-16 17:52:55.000000000 +0900
@@ -301,7 +301,7 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-AM_CPPFLAGS = -DVMTOOLSD_PATH=\"$(bindir)/vmtoolsd\"
+AM_CPPFLAGS = -DVMTOOLSD_PATH=\"$(bindir)/vmtoolsd\" -DVMWARE_KMOD_DIR=\"$(prefix)/lib/vmware-tools/modules/drivers\"
vmware_user_suid_wrapper_SOURCES = main.c wrapper-@TARGET_OS@.c
vmware_user_suid_wrapper_LDADD = ../lib/vmSignal/libVmSignal.la
desktopfile = vmware-user.desktop
@@ -583,7 +583,7 @@
info-am:
-install-data-am: install-autostartDATA
+#install-data-am: install-autostartDATA
install-dvi: install-dvi-am

11
emulators/open-vm-tools/files/patch-wrapper-wrapper-freebsd.c Normal file
View file

@ -0,0 +1,11 @@
--- vmware-user-suid-wrapper/wrapper-freebsd.c.orig 2010-10-20 05:19:54.000000000 +0900
+++ vmware-user-suid-wrapper/wrapper-freebsd.c 2010-11-16 17:52:55.000000000 +0900
@@ -116,7 +116,7 @@
/*
* Kldload(2) will handle module search paths for us.
*/
- if (kldload(MODULE_NAME) == -1) {
+ if (kldload(VMWARE_KMOD_DIR "/" MODULE_NAME ".ko") == -1) {
Error("failed to load vmblock: %s\n", strerror(errno));
return FALSE;
}

48
emulators/open-vm-tools/files/patch.txt Normal file
View file

@ -0,0 +1,48 @@
diff -auwprN emulators/open-vm-tools/files/patch-wrapper-Makefile.am emulators/open-vm-tools.suid-wrapper/files/patch-wrapper-Makefile.am
--- emulators/open-vm-tools/files/patch-wrapper-Makefile.am 1970-01-01 09:00:00.000000000 +0900
+++ emulators/open-vm-tools.suid-wrapper/files/patch-wrapper-Makefile.am 2010-11-16 18:06:18.000000000 +0900
@@ -0,0 +1,11 @@
+--- vmware-user-suid-wrapper/Makefile.am.orig 2010-10-20 05:19:54.000000000 +0900
++++ vmware-user-suid-wrapper/Makefile.am 2010-11-16 17:52:55.000000000 +0900
+@@ -19,6 +19,8 @@
+
+ AM_CPPFLAGS =
+ AM_CPPFLAGS += -DVMTOOLSD_PATH=\"$(bindir)/vmtoolsd\"
++# See post-install on Makefile of ports.
++AM_CPPFLAGS += -DVMWARE_KMOD_DIR=\"$(prefix)/lib/vmware-tools/modules/drivers\"
+
+ vmware_user_suid_wrapper_SOURCES =
+ vmware_user_suid_wrapper_SOURCES += main.c
diff -auwprN emulators/open-vm-tools/files/patch-wrapper-Makefile.in emulators/open-vm-tools.suid-wrapper/files/patch-wrapper-Makefile.in
--- emulators/open-vm-tools/files/patch-wrapper-Makefile.in 1970-01-01 09:00:00.000000000 +0900
+++ emulators/open-vm-tools.suid-wrapper/files/patch-wrapper-Makefile.in 2010-11-16 18:06:18.000000000 +0900
@@ -0,0 +1,11 @@
+--- vmware-user-suid-wrapper/Makefile.in.orig 2010-10-20 05:20:08.000000000 +0900
++++ vmware-user-suid-wrapper/Makefile.in 2010-11-16 17:52:55.000000000 +0900
+@@ -301,7 +301,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-AM_CPPFLAGS = -DVMTOOLSD_PATH=\"$(bindir)/vmtoolsd\"
++AM_CPPFLAGS = -DVMTOOLSD_PATH=\"$(bindir)/vmtoolsd\" -DVMWARE_KMOD_DIR=\"$(prefix)/lib/vmware-tools/modules/drivers\"
+ vmware_user_suid_wrapper_SOURCES = main.c wrapper-@TARGET_OS@.c
+ vmware_user_suid_wrapper_LDADD = ../lib/vmSignal/libVmSignal.la
+ desktopfile = vmware-user.desktop
diff -auwprN emulators/open-vm-tools/files/patch-wrapper-wrapper-freebsd.c emulators/open-vm-tools.suid-wrapper/files/patch-wrapper-wrapper-freebsd.c
--- emulators/open-vm-tools/files/patch-wrapper-wrapper-freebsd.c 1970-01-01 09:00:00.000000000 +0900
+++ emulators/open-vm-tools.suid-wrapper/files/patch-wrapper-wrapper-freebsd.c 2010-11-16 18:06:18.000000000 +0900
@@ -0,0 +1,11 @@
+--- vmware-user-suid-wrapper/wrapper-freebsd.c.orig 2010-10-20 05:19:54.000000000 +0900
++++ vmware-user-suid-wrapper/wrapper-freebsd.c 2010-11-16 17:52:55.000000000 +0900
+@@ -116,7 +116,7 @@
+ /*
+ * Kldload(2) will handle module search paths for us.
+ */
+- if (kldload(MODULE_NAME) == -1) {
++ if (kldload(VMWARE_KMOD_DIR "/" MODULE_NAME ".ko") == -1) {
+ Error("failed to load vmblock: %s\n", strerror(errno));
+ return FALSE;
+ }