Index: head/x11-servers/xorg-nestserver/files/patch-Xext_shm.c =================================================================== --- head/x11-servers/xorg-nestserver/files/patch-Xext_shm.c (nonexistent) +++ head/x11-servers/xorg-nestserver/files/patch-Xext_shm.c (revision 445076) @@ -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); Property changes on: head/x11-servers/xorg-nestserver/files/patch-Xext_shm.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-servers/xorg-nestserver/files/patch-configure =================================================================== --- head/x11-servers/xorg-nestserver/files/patch-configure (nonexistent) +++ head/x11-servers/xorg-nestserver/files/patch-configure (revision 445076) @@ -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` Property changes on: head/x11-servers/xorg-nestserver/files/patch-configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-servers/xorg-nestserver/files/patch-include_dix-config.h.in =================================================================== --- head/x11-servers/xorg-nestserver/files/patch-include_dix-config.h.in (nonexistent) +++ head/x11-servers/xorg-nestserver/files/patch-include_dix-config.h.in (revision 445076) @@ -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 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 + Property changes on: head/x11-servers/xorg-nestserver/files/patch-include_dix-config.h.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-servers/xorg-server/Makefile =================================================================== --- head/x11-servers/xorg-server/Makefile (revision 445075) +++ head/x11-servers/xorg-server/Makefile (revision 445076) @@ -1,137 +1,137 @@ # Created by: Eric Anholt # $FreeBSD$ PORTNAME?= xorg-server PORTVERSION?= 1.18.4 -PORTREVISION?= 1 +PORTREVISION?= 2 PORTEPOCH?= 1 CATEGORIES= x11-servers MASTER_SITES= XORG/individual/xserver DISTNAME= xorg-server-${PORTVERSION} MAINTAINER= x11@FreeBSD.org COMMENT?= X.Org X server and related programs LICENSE= MIT RUN_DEPENDS+= xkeyboard-config>=2.5:x11/xkeyboard-config \ xkbcomp:x11/xkbcomp XORG_CAT= xserver SLAVE_PORT?= no OPTIONS_SUB= yes OPTIONS_DEFINE= SUID OPTIONS_RADIO= CONF OPTIONS_RADIO_CONF= DEVD HAL DEVD_DESC= Use devd for autoconfiguration of input devices HAL_DESC= Use hald for autoconfiguration of input devices SUID_DESC= Install the Xorg server with setuid bit set OPTIONS_DEFAULT=DEVD SUID OPTIONS_EXCLUDE_sparc64= HAL .include USES= gmake libtool perl5 ssl tar:bzip2 USE_PERL5= build USE_GL+= gl USE_XORG+= bigreqsproto compositeproto damageproto dri2proto dri3proto \ fixesproto fontsproto glproto inputproto kbproto pixman \ presentproto randrproto recordproto renderproto \ resourceproto scrnsaverproto videoproto xau \ xcmiscproto xdmcp xextproto xf86driproto xfont \ xineramaproto xkbfile xproto xshmfence xtrans CONFIGURE_ARGS+=--without-doxygen --without-xmlto --without-fop \ --localstatedir=/var --with-shared-memory-dir=/tmp \ --disable-config-udev --disable-config-udev-kms \ --without-dtrace --enable-glamor INSTALL_TARGET= install-strip .if ${SLAVE_PORT} == "no" || ${PORTNAME} == "xephyr" || ${PORTNAME} == "xwayland" LIB_DEPENDS+= libdrm.so:graphics/libdrm \ libepoxy.so:graphics/libepoxy .else BUILD_DEPENDS+= libepoxy>0:graphics/libepoxy # only for configure .endif .if ${SLAVE_PORT} == "no" USE_GL+= gbm USE_XORG+= pciaccess xf86dgaproto xf86vidmodeproto CONFIGURE_ARGS+=--disable-dmx --disable-xephyr --disable-xnest --disable-xvfb \ --disable-xwayland SUB_FILES= pkg-install pkg-deinstall .else CONFIGURE_ARGS+=--disable-xorg # for slave ports we need to overwrite PLIST, so it doesn't overwrite # PLIST_FILES, with the masterport plist. PLIST= ${.CURDIR}/pkg-plist .endif .include .if ${SSL_DEFAULT} == base # The reason why I use this is cause openssl from base doesn't install a .pc file # and configure will fail trying to find it. Setting both of those variables to # a *non-empty* value by-passes the pkg-config check. CONFIGURE_ENV= SHA1_LIB="-L/usr/lib -lcrypto" SHA1_CFLAGS="-I/usr/include" .endif .if ${PORT_OPTIONS:MHAL} LIB_DEPENDS+= libhal.so:sysutils/hal CONFIGURE_ARGS+= --enable-config-hal .else CONFIGURE_ARGS+= --disable-config-hal .endif # We handle Xorg setuid in the plist. This allows to build xorg-server as a user. CONFIGURE_ARGS+=--disable-install-setuid .if ${ARCH} == "i386" || ${ARCH} == "amd64" LIB_DEPENDS+= libunwind.so:devel/libunwind .endif .if ${ARCH} == "sparc64" PLIST_SUB+= SPARC64="" .else PLIST_SUB+= SPARC64="@comment " .endif .if ${PORT_OPTIONS:MSUID} pre-everything:: @${ECHO_MSG} "By default, the X Server installs as a set-user-id root binary. When run by" @${ECHO_MSG} "a normal user, it checks arguments and environment as done in the x11/wrapper" @${ECHO_MSG} "port before handling them normally. If you are concerned about the security" @${ECHO_MSG} "of this, but still want to run an X Server (for example using xdm/kdm/gdm," @${ECHO_MSG} "which will still run the server as root), you can cancel the build and set" @${ECHO_MSG} "xorg-server_UNSET=SUID in /etc/make.conf." .endif post-patch: @${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \ ${WRKSRC}/configure # build libglx.so but don't install it yet. which is done in pre-install. @${REINPLACE_CMD} -e 's|@GLX_TRUE@GLXMODS =|@GLX_BOGUS@GLXMODS =|g' \ -e 's|^LTLIBRARIES = |LTLIBRARIES = libglx.la |g' \ ${WRKSRC}/hw/xfree86/dixmods/Makefile.in post-configure: .if ${PORT_OPTIONS:MDEVD} @${REINPLACE_CMD} -e 's|config\.c|config.c devd.c|g' \ -e 's|config\.lo|config.lo devd.lo|g' \ ${WRKSRC}/config/Makefile @${REINPLACE_CMD} -e 's|^/\* #undef CONFIG_UDEV \*/|#define CONFIG_DEVD 1|' \ ${WRKSRC}/include/dix-config.h .endif .if ${SLAVE_PORT} == "no" post-install: # The .xorg dir because else the xorg-server might not load the correct # libglx module. @${MKDIR} ${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/.xorg ${INSTALL_LIB} ${WRKSRC}/hw/xfree86/dixmods/.libs/libglx.so \ ${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/.xorg/ @${MKDIR} ${STAGEDIR}${PREFIX}/etc/X11/xorg.conf.d .endif # ! SLAVE_PORT .include Index: head/x11-servers/xorg-server/files/patch-Xext_shm.c =================================================================== --- head/x11-servers/xorg-server/files/patch-Xext_shm.c (nonexistent) +++ head/x11-servers/xorg-server/files/patch-Xext_shm.c (revision 445076) @@ -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); Property changes on: head/x11-servers/xorg-server/files/patch-Xext_shm.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-servers/xorg-server/files/patch-configure =================================================================== --- head/x11-servers/xorg-server/files/patch-configure (revision 445075) +++ head/x11-servers/xorg-server/files/patch-configure (revision 445076) @@ -1,27 +1,35 @@ --- 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" ;; - arm*) + arm*|aarch64*) ARM_VIDEO=yes DEFAULT_INT10="stub" + case $host_os in + *freebsd*) + $as_echo "#define USE_DEV_IO 1" >>confdefs.h + ;; + esac ;; i*86) I386_VIDEO=yes @@ -26057,7 +26062,7 @@ fi case "x$XTRANS_SEND_FDS" in xauto) case "$host_os" in - linux*|solaris*) + linux*|solaris*|freebsd*|dragonfly*|openbsd*) XTRANS_SEND_FDS=yes ;; *) Index: head/x11-servers/xorg-server/files/patch-include_dix-config.h.in =================================================================== --- head/x11-servers/xorg-server/files/patch-include_dix-config.h.in (nonexistent) +++ head/x11-servers/xorg-server/files/patch-include_dix-config.h.in (revision 445076) @@ -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 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 + Property changes on: head/x11-servers/xorg-server/files/patch-include_dix-config.h.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-servers/xorg-vfbserver/files/patch-Xext_shm.c =================================================================== --- head/x11-servers/xorg-vfbserver/files/patch-Xext_shm.c (nonexistent) +++ head/x11-servers/xorg-vfbserver/files/patch-Xext_shm.c (revision 445076) @@ -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); Property changes on: head/x11-servers/xorg-vfbserver/files/patch-Xext_shm.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-servers/xorg-vfbserver/files/patch-configure =================================================================== --- head/x11-servers/xorg-vfbserver/files/patch-configure (nonexistent) +++ head/x11-servers/xorg-vfbserver/files/patch-configure (revision 445076) @@ -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` Property changes on: head/x11-servers/xorg-vfbserver/files/patch-configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-servers/xorg-vfbserver/files/patch-include_dix-config.h.in =================================================================== --- head/x11-servers/xorg-vfbserver/files/patch-include_dix-config.h.in (nonexistent) +++ head/x11-servers/xorg-vfbserver/files/patch-include_dix-config.h.in (revision 445076) @@ -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 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 + Property changes on: head/x11-servers/xorg-vfbserver/files/patch-include_dix-config.h.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-servers/xwayland/files/patch-Xext_shm.c =================================================================== --- head/x11-servers/xwayland/files/patch-Xext_shm.c (nonexistent) +++ head/x11-servers/xwayland/files/patch-Xext_shm.c (revision 445076) @@ -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); Property changes on: head/x11-servers/xwayland/files/patch-Xext_shm.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-servers/xwayland/files/patch-configure =================================================================== --- head/x11-servers/xwayland/files/patch-configure (nonexistent) +++ head/x11-servers/xwayland/files/patch-configure (revision 445076) @@ -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` Property changes on: head/x11-servers/xwayland/files/patch-configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-servers/xwayland/files/patch-include_dix-config.h.in =================================================================== --- head/x11-servers/xwayland/files/patch-include_dix-config.h.in (nonexistent) +++ head/x11-servers/xwayland/files/patch-include_dix-config.h.in (revision 445076) @@ -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 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 + Property changes on: head/x11-servers/xwayland/files/patch-include_dix-config.h.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property