mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-03 06:04:53 +00:00
x11-servers/xorg-server: back out r445076
Requested by: x11 (rezny)
This commit is contained in:
parent
770ebfbd43
commit
49e8c0410b
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=445323
@ -1,14 +0,0 @@
|
||||
--- 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);
|
@ -1,10 +0,0 @@
|
||||
--- 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`
|
@ -1,12 +0,0 @@
|
||||
--- 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
|
||||
|
@ -3,7 +3,7 @@
|
||||
|
||||
PORTNAME?= xorg-server
|
||||
PORTVERSION?= 1.18.4
|
||||
PORTREVISION?= 2
|
||||
PORTREVISION?= 3
|
||||
PORTEPOCH?= 1
|
||||
CATEGORIES= x11-servers
|
||||
MASTER_SITES= XORG/individual/xserver
|
||||
|
@ -1,14 +0,0 @@
|
||||
--- 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);
|
@ -1,13 +1,5 @@
|
||||
--- 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"
|
||||
|
@ -1,12 +0,0 @@
|
||||
--- 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
|
||||
|
@ -1,14 +0,0 @@
|
||||
--- 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);
|
@ -1,10 +0,0 @@
|
||||
--- 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`
|
@ -1,12 +0,0 @@
|
||||
--- 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
|
||||
|
@ -1,14 +0,0 @@
|
||||
--- 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);
|
@ -1,10 +0,0 @@
|
||||
--- 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`
|
@ -1,12 +0,0 @@
|
||||
--- 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
|
||||
|
Loading…
Reference in New Issue
Block a user