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

Upgrade to 2009.03.18

Browse source 
Various fixes for X11

Submitted by:	Alexander Kabaev <kabaev@gmail.com>
This commit is contained in:
Martin Blapp 2009-04-06 14:57:03 +00:00
parent 4a3a261baf
commit b83bf751da
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=231705
5 changed files with 30 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -14,8 +14,8 @@ DISTNAME= open-vm-tools-${RELEASE_DATE}-${BUILD_VER}
MAINTAINER= mbr@freebsd.org MAINTAINER= mbr@freebsd.org
COMMENT?= Open VMware tools for FreeBSD VMware guests COMMENT?= Open VMware tools for FreeBSD VMware guests
RELEASE_DATE= 2009.02.18 RELEASE_DATE= 2009.03.18
BUILD_VER= 148847 BUILD_VER= 154848
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
USE_LDCONFIG= yes USE_LDCONFIG= yes

6
emulators/open-vm-tools/distinfo
View file

@ -1,3 +1,3 @@
MD5 (open-vm-tools-2009.02.18-148847.tar.gz) = 6e473ebdf29f1b15388149bc2fde6941 MD5 (open-vm-tools-2009.03.18-154848.tar.gz) = 23d577a1bc07fa61bcd5352e94f05ed6
SHA256 (open-vm-tools-2009.02.18-148847.tar.gz) = 10c082b629921356b885cc287ca80d4d50d695431b8e1f0898e0f0abb95ad89a SHA256 (open-vm-tools-2009.03.18-154848.tar.gz) = 6c9d06dee94c04214526f439599ed42064d6cee62125791f7c9c07d60f09cd57
SIZE (open-vm-tools-2009.02.18-148847.tar.gz) = 3976037 SIZE (open-vm-tools-2009.03.18-154848.tar.gz) = 3964960

13
emulators/open-vm-tools/files/patch-freebsd-8
View file

@ -26,21 +26,22 @@
HgfsAccessMode accessMode = 0; HgfsAccessMode accessMode = 0;
Bool isDir = vp->v_type == VDIR; Bool isDir = vp->v_type == VDIR;
if (mode & VREAD) { if (mode & VREAD) {
--- modules/freebsd/vmblock/vnops.c.orig 2009-02-28 23:21:43.000000000 +0100 --- modules/freebsd/vmblock/vnops.c.orig 2009-03-18 03:03:21.000000000 -0400
+++ modules/freebsd/vmblock/vnops.c 2009-02-28 23:26:23.000000000 +0100 +++ modules/freebsd/vmblock/vnops.c 2009-04-04 20:33:28.000000000 -0400
@@ -723,7 +723,11 @@ @@ -726,7 +726,11 @@
* NB: Allowing only the superuser to open this directory breaks * NB: Allowing only the superuser to open this directory breaks
* readdir() of the filesystem root for non-privileged users. * readdir() of the filesystem root for non-privileged users.
*/ */
- if ((retval = suser(ap->a_td)) == 0) {
+ #if __FreeBSD_version >= 800001 + #if __FreeBSD_version >= 800001
+ if ((retval = priv_check(ap->a_td, PRIV_VFS_GETFH)) == 0) { + if ((retval = priv_check(ap->a_td, PRIV_VFS_GETFH)) == 0) {
+ #else + #else
if ((retval = suser(ap->a_td)) == 0) { + if ((retval = suser(ap->a_td)) == 0) {
+ #endif + #endif
#if __FreeBSD_version >= 700000 #if __FreeBSD_version >= 700055
fp = ap->a_fp; fp = ap->a_fp;
#else #else
@@ -1007,7 +1011,11 @@ @@ -1010,7 +1014,11 @@
*/ */
{ {
struct vnode *vp = ap->a_vp; struct vnode *vp = ap->a_vp;

31
emulators/open-vm-tools/files/patch-guestd-Makefile
View file

@ -1,31 +0,0 @@
--- guestd/Makefile.am.orig 2009-02-28 20:32:39.000000000 +0100
+++ guestd/Makefile.am 2009-02-28 20:33:09.000000000 +0100
@@ -104,8 +104,8 @@
endif LINUX
install-exec-hook:
- $(INSTALL) -d $(DESTDIR)/etc/vmware-tools
- echo 'disable-tools-version = "true"' > $(DESTDIR)/etc/vmware-tools/tools.conf
+ $(INSTALL) -d $(prefix)/etc/vmware-tools
+ echo 'disable-tools-version = "true"' > $(prefix)/etc/vmware-tools/tools.conf
uninstall-hook:
- rm -rf $(DESTDIR)/etc/vmware-tools
+ rm -rf $(prefix)/etc/vmware-tools
--- guestd/Makefile.in.orig 2009-02-28 20:43:51.000000000 +0100
+++ guestd/Makefile.in 2009-02-28 20:44:45.000000000 +0100
@@ -667,11 +667,11 @@
install-exec-hook:
- $(INSTALL) -d $(DESTDIR)/etc/vmware-tools
- echo 'disable-tools-version = "true"' > $(DESTDIR)/etc/vmware-tools/tools.conf
+ $(INSTALL) -d $(prefix)/etc/vmware-tools
+ echo 'disable-tools-version = "true"' > $(prefix)/etc/vmware-tools/tools.conf
uninstall-hook:
- rm -rf $(DESTDIR)/etc/vmware-tools
+ rm -rf $(prefix)/etc/vmware-tools
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

15
emulators/open-vm-tools/files/patch-vmblock-subr.c
View file

@ -1,6 +1,19 @@
--- modules/freebsd/vmblock/subr.c.orig 2009-02-28 23:04:14.000000000 +0100 --- modules/freebsd/vmblock/subr.c.orig 2009-02-28 23:04:14.000000000 +0100
+++ modules/freebsd/vmblock/subr.c 2009-02-28 23:05:38.000000000 +0100 +++ modules/freebsd/vmblock/subr.c 2009-02-28 23:05:38.000000000 +0100
@@ -372,6 +372,13 @@ @@ -334,7 +334,12 @@
vp->v_vnlock = &vp->v_lock;
FREE(xp, M_VMBLOCKFSNODE);
vp->v_op = &dead_vnodeops;
+
+#if __FreeBSD_version >= 800011
+ (void) vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
+#else
(void) vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, curthread);
+#endif
vgone(vp);
vput(vp);
}
@@ -405,6 +410,13 @@
return error; return error;
} }