x11-servers/xorg-server: close-on-exec for MIT-SHM (like Linux)

This is similar to what x11/libxshmfence already does.

MFH:		2017Q3

13 files changed, 143 insertions, 1 deletions

diff --git a/x11-servers/xorg-nestserver/files/patch-Xext_shm.c b/x11-servers/xorg-nestserver/files/patch-Xext_shm.c
new file mode 100644
index 000000000000..04106a049ab7
--- /dev/null
+++ b/x11-servers/xorg-nestserver/files/patch-Xext_shm.c
@@ -0,0 +1,14 @@
+--- Xext/shm.c.orig	2016-07-19 17:14:21 UTC
++++ Xext/shm.c
+@@ -1210,7 +1210,11 @@ shm_tmpfile(void)
+ 	}
+ 	ErrorF ("Not using O_TMPFILE\n");
+ #endif
++#ifdef HAVE_MKOSTEMP
++	fd = mkostemp(template, O_CLOEXEC);
++#else
+ 	fd = mkstemp(template);
++#endif
+ 	if (fd < 0)
+ 		return -1;
+ 	unlink(template);
diff --git a/x11-servers/xorg-nestserver/files/patch-configure b/x11-servers/xorg-nestserver/files/patch-configure
new file mode 100644
index 000000000000..f59122539cd9
--- /dev/null
+++ b/x11-servers/xorg-nestserver/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	2017-01-11 21:16:40 UTC
++++ configure
+@@ -22758,6 +22758,7 @@ fi
+ for ac_func in backtrace ffs geteuid getuid issetugid getresuid \
+ 	getdtablesize getifaddrs getpeereid getpeerucred getprogname getzoneid \
+ 	mmap posix_fallocate seteuid shmctl64 strncasecmp vasprintf vsnprintf \
++	mkostemp \
+ 	walkcontext setitimer poll epoll_create1
+ do :
+   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
diff --git a/x11-servers/xorg-nestserver/files/patch-include_dix-config.h.in b/x11-servers/xorg-nestserver/files/patch-include_dix-config.h.in
new file mode 100644
index 000000000000..270890f9bcbc
--- /dev/null
+++ b/x11-servers/xorg-nestserver/files/patch-include_dix-config.h.in
@@ -0,0 +1,12 @@
+--- include/dix-config.h.in.orig	2016-07-19 17:07:29 UTC
++++ include/dix-config.h.in
+@@ -140,6 +140,9 @@
+ /* Define to 1 if you have the <linux/fb.h> header file. */
+ #undef HAVE_LINUX_FB_H
+ 
++/* Define to 1 if you have the `mkostemp' function. */
++#undef HAVE_MKOSTEMP
++
+ /* Define to 1 if you have the `mmap' function. */
+ #undef HAVE_MMAP
+ 
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index ae2014010ddd..9070971962ea 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME?=	xorg-server
 PORTVERSION?=	1.18.4
-PORTREVISION?=	1
+PORTREVISION?=	2
 PORTEPOCH?=	1
 CATEGORIES=	x11-servers
 MASTER_SITES=	XORG/individual/xserver
diff --git a/x11-servers/xorg-server/files/patch-Xext_shm.c b/x11-servers/xorg-server/files/patch-Xext_shm.c
new file mode 100644
index 000000000000..04106a049ab7
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-Xext_shm.c
@@ -0,0 +1,14 @@
+--- Xext/shm.c.orig	2016-07-19 17:14:21 UTC
++++ Xext/shm.c
+@@ -1210,7 +1210,11 @@ shm_tmpfile(void)
+ 	}
+ 	ErrorF ("Not using O_TMPFILE\n");
+ #endif
++#ifdef HAVE_MKOSTEMP
++	fd = mkostemp(template, O_CLOEXEC);
++#else
+ 	fd = mkstemp(template);
++#endif
+ 	if (fd < 0)
+ 		return -1;
+ 	unlink(template);
diff --git a/x11-servers/xorg-server/files/patch-configure b/x11-servers/xorg-server/files/patch-configure
index 10674bc6034d..af362d5653c4 100644
--- a/x11-servers/xorg-server/files/patch-configure
+++ b/x11-servers/xorg-server/files/patch-configure
@@ -1,5 +1,13 @@
 --- configure.orig	2016-07-19 17:27:31 UTC
 +++ configure
+@@ -22742,6 +22742,7 @@ fi
+ for ac_func in backtrace ffs geteuid getuid issetugid getresuid \
+ 	getdtablesize getifaddrs getpeereid getpeerucred getprogname getzoneid \
+ 	mmap posix_fallocate seteuid shmctl64 strncasecmp vasprintf vsnprintf \
++	mkostemp \
+ 	walkcontext
+ do :
+   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 @@ -23168,9 +23168,14 @@ $as_echo "#define USE_ALPHA_PIO 1" >>con
  	esac
  	GLX_ARCH_DEFINES="-D__GLX_ALIGN64 -mieee"
diff --git a/x11-servers/xorg-server/files/patch-include_dix-config.h.in b/x11-servers/xorg-server/files/patch-include_dix-config.h.in
new file mode 100644
index 000000000000..270890f9bcbc
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-include_dix-config.h.in
@@ -0,0 +1,12 @@
+--- include/dix-config.h.in.orig	2016-07-19 17:07:29 UTC
++++ include/dix-config.h.in
+@@ -140,6 +140,9 @@
+ /* Define to 1 if you have the <linux/fb.h> header file. */
+ #undef HAVE_LINUX_FB_H
+ 
++/* Define to 1 if you have the `mkostemp' function. */
++#undef HAVE_MKOSTEMP
++
+ /* Define to 1 if you have the `mmap' function. */
+ #undef HAVE_MMAP
+ 
diff --git a/x11-servers/xorg-vfbserver/files/patch-Xext_shm.c b/x11-servers/xorg-vfbserver/files/patch-Xext_shm.c
new file mode 100644
index 000000000000..04106a049ab7
--- /dev/null
+++ b/x11-servers/xorg-vfbserver/files/patch-Xext_shm.c
@@ -0,0 +1,14 @@
+--- Xext/shm.c.orig	2016-07-19 17:14:21 UTC
++++ Xext/shm.c
+@@ -1210,7 +1210,11 @@ shm_tmpfile(void)
+ 	}
+ 	ErrorF ("Not using O_TMPFILE\n");
+ #endif
++#ifdef HAVE_MKOSTEMP
++	fd = mkostemp(template, O_CLOEXEC);
++#else
+ 	fd = mkstemp(template);
++#endif
+ 	if (fd < 0)
+ 		return -1;
+ 	unlink(template);
diff --git a/x11-servers/xorg-vfbserver/files/patch-configure b/x11-servers/xorg-vfbserver/files/patch-configure
new file mode 100644
index 000000000000..f59122539cd9
--- /dev/null
+++ b/x11-servers/xorg-vfbserver/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	2017-01-11 21:16:40 UTC
++++ configure
+@@ -22758,6 +22758,7 @@ fi
+ for ac_func in backtrace ffs geteuid getuid issetugid getresuid \
+ 	getdtablesize getifaddrs getpeereid getpeerucred getprogname getzoneid \
+ 	mmap posix_fallocate seteuid shmctl64 strncasecmp vasprintf vsnprintf \
++	mkostemp \
+ 	walkcontext setitimer poll epoll_create1
+ do :
+   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
diff --git a/x11-servers/xorg-vfbserver/files/patch-include_dix-config.h.in b/x11-servers/xorg-vfbserver/files/patch-include_dix-config.h.in
new file mode 100644
index 000000000000..270890f9bcbc
--- /dev/null
+++ b/x11-servers/xorg-vfbserver/files/patch-include_dix-config.h.in
@@ -0,0 +1,12 @@
+--- include/dix-config.h.in.orig	2016-07-19 17:07:29 UTC
++++ include/dix-config.h.in
+@@ -140,6 +140,9 @@
+ /* Define to 1 if you have the <linux/fb.h> header file. */
+ #undef HAVE_LINUX_FB_H
+ 
++/* Define to 1 if you have the `mkostemp' function. */
++#undef HAVE_MKOSTEMP
++
+ /* Define to 1 if you have the `mmap' function. */
+ #undef HAVE_MMAP
+ 
diff --git a/x11-servers/xwayland/files/patch-Xext_shm.c b/x11-servers/xwayland/files/patch-Xext_shm.c
new file mode 100644
index 000000000000..04106a049ab7
--- /dev/null
+++ b/x11-servers/xwayland/files/patch-Xext_shm.c
@@ -0,0 +1,14 @@
+--- Xext/shm.c.orig	2016-07-19 17:14:21 UTC
++++ Xext/shm.c
+@@ -1210,7 +1210,11 @@ shm_tmpfile(void)
+ 	}
+ 	ErrorF ("Not using O_TMPFILE\n");
+ #endif
++#ifdef HAVE_MKOSTEMP
++	fd = mkostemp(template, O_CLOEXEC);
++#else
+ 	fd = mkstemp(template);
++#endif
+ 	if (fd < 0)
+ 		return -1;
+ 	unlink(template);
diff --git a/x11-servers/xwayland/files/patch-configure b/x11-servers/xwayland/files/patch-configure
new file mode 100644
index 000000000000..f59122539cd9
--- /dev/null
+++ b/x11-servers/xwayland/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	2017-01-11 21:16:40 UTC
++++ configure
+@@ -22758,6 +22758,7 @@ fi
+ for ac_func in backtrace ffs geteuid getuid issetugid getresuid \
+ 	getdtablesize getifaddrs getpeereid getpeerucred getprogname getzoneid \
+ 	mmap posix_fallocate seteuid shmctl64 strncasecmp vasprintf vsnprintf \
++	mkostemp \
+ 	walkcontext setitimer poll epoll_create1
+ do :
+   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
diff --git a/x11-servers/xwayland/files/patch-include_dix-config.h.in b/x11-servers/xwayland/files/patch-include_dix-config.h.in
new file mode 100644
index 000000000000..270890f9bcbc
--- /dev/null
+++ b/x11-servers/xwayland/files/patch-include_dix-config.h.in
@@ -0,0 +1,12 @@
+--- include/dix-config.h.in.orig	2016-07-19 17:07:29 UTC
++++ include/dix-config.h.in
+@@ -140,6 +140,9 @@
+ /* Define to 1 if you have the <linux/fb.h> header file. */
+ #undef HAVE_LINUX_FB_H
+ 
++/* Define to 1 if you have the `mkostemp' function. */
++#undef HAVE_MKOSTEMP
++
+ /* Define to 1 if you have the `mmap' function. */
+ #undef HAVE_MMAP
+