Date: Tue, 8 Jul 2014 21:06:41 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r361292 - in head/x11/libxshmfence: . files Message-ID: <201407082106.s68L6fQY094369@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Tue Jul 8 21:06:40 2014 New Revision: 361292 URL: http://svnweb.freebsd.org/changeset/ports/361292 QAT: https://qat.redports.org/buildarchive/r361292/ Log: Fix xshmfence_alloc_shm() on 8.3 and 9.x. O_CLOEXEC is available on all supported versions but mkostemp(3) is only available from 10.0. Therfore, the fd was not properly initialized on them. Modified: head/x11/libxshmfence/Makefile head/x11/libxshmfence/files/patch-src__xshmfence_alloc.c Modified: head/x11/libxshmfence/Makefile ============================================================================== --- head/x11/libxshmfence/Makefile Tue Jul 8 21:05:36 2014 (r361291) +++ head/x11/libxshmfence/Makefile Tue Jul 8 21:06:40 2014 (r361292) @@ -2,7 +2,7 @@ PORTNAME= libxshmfence PORTVERSION= 1.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org Modified: head/x11/libxshmfence/files/patch-src__xshmfence_alloc.c ============================================================================== --- head/x11/libxshmfence/files/patch-src__xshmfence_alloc.c Tue Jul 8 21:05:36 2014 (r361291) +++ head/x11/libxshmfence/files/patch-src__xshmfence_alloc.c Tue Jul 8 21:06:40 2014 (r361292) @@ -1,8 +1,11 @@ ---- src/xshmfence_alloc.c 2013-11-20 17:13:08.000000000 -0500 -+++ src/xshmfence_alloc.c 2013-12-09 16:06:17.000000000 -0500 -@@ -41,11 +41,15 @@ +--- src/xshmfence_alloc.c.orig 2013-11-20 17:13:08.000000000 -0500 ++++ src/xshmfence_alloc.c 2014-07-08 16:39:18.000000000 -0400 +@@ -39,10 +39,14 @@ + xshmfence_alloc_shm(void) + { char template[] = SHMDIR "/shmfd-XXXXXX"; - int fd; +- int fd; ++ int fd = -1; -#ifdef O_TMPFILE +#if defined(O_CLOEXEC) @@ -10,11 +13,7 @@ + fd = mkostemp(template, O_CLOEXEC); +#elif defined(O_TMPFILE) fd = open(SHMDIR, O_TMPFILE|O_RDWR|O_CLOEXEC|O_EXCL, 0666); -- if (fd < 0) ++#endif + if (fd < 0) #endif -+ if (fd < 0) { -+#endif - fd = mkstemp(template); - if (fd < 0) - return fd;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407082106.s68L6fQY094369>