From 92ea0d614b10bd99ce43a611721c7c4003cd79a5 Mon Sep 17 00:00:00 2001 From: Niclas Zeising Date: Sat, 25 May 2013 14:37:02 +0000 Subject: The FreeBSD x11 team proudly presents an zeising, kwm, miwi, bapt, eadler production: Xorg 7.7 Starring: xserver 1.12.4 (new xorg only) Mesa 8.0.4, including libGL, libGLU and dri (new xorg only) libX11 1.5.0 libxcb 1.9 libdrm 2.4.42 (new xorg only) freeglut 2.8.1 Also starring: Updates to drivers and other libraries and utilities Additional notes: Change pkgconf to be a build dependency. Add a new USE_XORG, xcb, to depend on libxcb and update all ports to use this. Trim makefile headers. Take maintanership of x11/xcb-proto, ok'd by ashish. If you are running WITH_NEW_XORG=, you need to rebuild all installed drivers, see UPDATING for more information. Various fixes to make ports compile. PR: ports/177942 Exp-run by: miwi Approved by: portmgr (miwi) Thanks to all who helped testing! --- x11-servers/xorg-server/files/extra-os-utils.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 x11-servers/xorg-server/files/extra-os-utils.c (limited to 'x11-servers/xorg-server/files/extra-os-utils.c') diff --git a/x11-servers/xorg-server/files/extra-os-utils.c b/x11-servers/xorg-server/files/extra-os-utils.c new file mode 100644 index 000000000000..2980ded6fd7d --- /dev/null +++ b/x11-servers/xorg-server/files/extra-os-utils.c @@ -0,0 +1,20 @@ +--- os/utils.c.orig 2010-05-04 02:48:00.000000000 +0200 ++++ os/utils.c 2011-10-18 20:08:10.000000000 +0200 +@@ -315,7 +315,7 @@ + FatalError("Could not create lock file in %s\n", tmp); + (void) sprintf(pid_str, "%10ld\n", (long)getpid()); + (void) write(lfd, pid_str, 11); +- (void) chmod(tmp, 0444); ++ (void) fchmod(tmp, 0444); + (void) close(lfd); + + /* +@@ -336,7 +336,7 @@ + /* + * Read the pid from the existing file + */ +- lfd = open(LockFile, O_RDONLY); ++ lfd = open(LockFile, O_RDONLY|O_NOFOLLOW); + if (lfd < 0) { + unlink(tmp); + FatalError("Can't read lock file %s\n", LockFile); -- cgit v1.2.3