Date: Thu, 6 Jul 2017 17:56:38 -0400 From: Steve Wills <steve@mouf.net> To: Jan Beich <jbeich@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Cc: x11@FreeBSD.org Subject: Re: svn commit: r445076 - in head/x11-servers: xorg-nestserver/files xorg-server xorg-server/files xorg-vfbserver/files xwayland/files Message-ID: <a7c2da3b-e802-eb82-f345-080d320a3c40@mouf.net> In-Reply-To: <201707051241.v65CfvFD096993@repo.freebsd.org> References: <201707051241.v65CfvFD096993@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --EKRLKDctJUCE07hbgb4f90xIOXl5G4ICW Content-Type: multipart/mixed; boundary="nMUEuHxIkbNNkDPP0WTtN7QhUkvfuHTVI"; protected-headers="v1" From: Steve Wills <steve@mouf.net> To: Jan Beich <jbeich@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Cc: x11@FreeBSD.org Message-ID: <a7c2da3b-e802-eb82-f345-080d320a3c40@mouf.net> Subject: Re: svn commit: r445076 - in head/x11-servers: xorg-nestserver/files xorg-server xorg-server/files xorg-vfbserver/files xwayland/files References: <201707051241.v65CfvFD096993@repo.freebsd.org> In-Reply-To: <201707051241.v65CfvFD096993@repo.freebsd.org> --nMUEuHxIkbNNkDPP0WTtN7QhUkvfuHTVI Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable Hi, Should these patches not go in the master and avoid the duplication? Also, should commits to these not have gotten review from x11@? They don't seem to fall under and sort of blanket approval or timeout to me. Please, let me know what I'm missing? Thanks, Steve On 07/05/2017 08:41, Jan Beich wrote: > Author: jbeich > Date: Wed Jul 5 12:41:57 2017 > New Revision: 445076 > URL: https://svnweb.freebsd.org/changeset/ports/445076 >=20 > Log: > x11-servers/xorg-server: close-on-exec for MIT-SHM (like Linux) > =20 > This is similar to what x11/libxshmfence already does. > =20 > MFH: 2017Q3 >=20 > Added: > head/x11-servers/xorg-nestserver/files/ > head/x11-servers/xorg-nestserver/files/patch-Xext_shm.c (contents, = props changed) > head/x11-servers/xorg-nestserver/files/patch-configure (contents, p= rops changed) > head/x11-servers/xorg-nestserver/files/patch-include_dix-config.h.in = (contents, props changed) > head/x11-servers/xorg-server/files/patch-Xext_shm.c (contents, prop= s changed) > head/x11-servers/xorg-server/files/patch-include_dix-config.h.in (c= ontents, props changed) > head/x11-servers/xorg-vfbserver/files/ > head/x11-servers/xorg-vfbserver/files/patch-Xext_shm.c (contents, p= rops changed) > head/x11-servers/xorg-vfbserver/files/patch-configure (contents, pr= ops changed) > head/x11-servers/xorg-vfbserver/files/patch-include_dix-config.h.in = (contents, props changed) > head/x11-servers/xwayland/files/ > head/x11-servers/xwayland/files/patch-Xext_shm.c (contents, props c= hanged) > head/x11-servers/xwayland/files/patch-configure (contents, props ch= anged) > head/x11-servers/xwayland/files/patch-include_dix-config.h.in (cont= ents, props changed) > Modified: > head/x11-servers/xorg-server/Makefile (contents, props changed) > head/x11-servers/xorg-server/files/patch-configure (contents, props= changed) >=20 > Added: head/x11-servers/xorg-nestserver/files/patch-Xext_shm.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/x11-servers/xorg-nestserver/files/patch-Xext_shm.c Wed Jul 5 = 12:41:57 2017 (r445076) > @@ -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 =3D mkostemp(template, O_CLOEXEC); > ++#else > + fd =3D mkstemp(template); > ++#endif > + if (fd < 0) > + return -1; > + unlink(template); >=20 > Added: head/x11-servers/xorg-nestserver/files/patch-configure > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/x11-servers/xorg-nestserver/files/patch-configure Wed Jul 5 1= 2:41:57 2017 (r445076) > @@ -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 getzone= id \ > + mmap posix_fallocate seteuid shmctl64 strncasecmp vasprintf vsnprint= f \ > ++ mkostemp \ > + walkcontext setitimer poll epoll_create1 > + do : > + as_ac_var=3D`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` >=20 > Added: head/x11-servers/xorg-nestserver/files/patch-include_dix-config.= h.in > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/x11-servers/xorg-nestserver/files/patch-include_dix-config.h.i= n Wed Jul 5 12:41:57 2017 (r445076) > @@ -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 > +=20 > ++/* Define to 1 if you have the `mkostemp' function. */ > ++#undef HAVE_MKOSTEMP > ++ > + /* Define to 1 if you have the `mmap' function. */ > + #undef HAVE_MMAP > +=20 >=20 > Modified: head/x11-servers/xorg-server/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/x11-servers/xorg-server/Makefile Wed Jul 5 12:41:43 2017 (r44= 5075) > +++ head/x11-servers/xorg-server/Makefile Wed Jul 5 12:41:57 2017 (r44= 5076) > @@ -3,7 +3,7 @@ > =20 > PORTNAME?=3D xorg-server > PORTVERSION?=3D 1.18.4 > -PORTREVISION?=3D 1 > +PORTREVISION?=3D 2 > PORTEPOCH?=3D 1 > CATEGORIES=3D x11-servers > MASTER_SITES=3D XORG/individual/xserver >=20 > Added: head/x11-servers/xorg-server/files/patch-Xext_shm.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/x11-servers/xorg-server/files/patch-Xext_shm.c Wed Jul 5 12:4= 1:57 2017 (r445076) > @@ -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 =3D mkostemp(template, O_CLOEXEC); > ++#else > + fd =3D mkstemp(template); > ++#endif > + if (fd < 0) > + return -1; > + unlink(template); >=20 > Modified: head/x11-servers/xorg-server/files/patch-configure > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/x11-servers/xorg-server/files/patch-configure Wed Jul 5 12:41= :43 2017 (r445075) > +++ head/x11-servers/xorg-server/files/patch-configure Wed Jul 5 12:41= :57 2017 (r445076) > @@ -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 getzone= id \ > + mmap posix_fallocate seteuid shmctl64 strncasecmp vasprintf vsnprint= f \ > ++ mkostemp \ > + walkcontext > + do : > + as_ac_var=3D`$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=3D"-D__GLX_ALIGN64 -mieee" >=20 > Added: head/x11-servers/xorg-server/files/patch-include_dix-config.h.in= > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/x11-servers/xorg-server/files/patch-include_dix-config.h.in We= d Jul 5 12:41:57 2017 (r445076) > @@ -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 > +=20 > ++/* Define to 1 if you have the `mkostemp' function. */ > ++#undef HAVE_MKOSTEMP > ++ > + /* Define to 1 if you have the `mmap' function. */ > + #undef HAVE_MMAP > +=20 >=20 > Added: head/x11-servers/xorg-vfbserver/files/patch-Xext_shm.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/x11-servers/xorg-vfbserver/files/patch-Xext_shm.c Wed Jul 5 1= 2:41:57 2017 (r445076) > @@ -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 =3D mkostemp(template, O_CLOEXEC); > ++#else > + fd =3D mkstemp(template); > ++#endif > + if (fd < 0) > + return -1; > + unlink(template); >=20 > Added: head/x11-servers/xorg-vfbserver/files/patch-configure > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/x11-servers/xorg-vfbserver/files/patch-configure Wed Jul 5 12= :41:57 2017 (r445076) > @@ -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 getzone= id \ > + mmap posix_fallocate seteuid shmctl64 strncasecmp vasprintf vsnprint= f \ > ++ mkostemp \ > + walkcontext setitimer poll epoll_create1 > + do : > + as_ac_var=3D`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` >=20 > Added: head/x11-servers/xorg-vfbserver/files/patch-include_dix-config.h= =2Ein > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/x11-servers/xorg-vfbserver/files/patch-include_dix-config.h.in= Wed Jul 5 12:41:57 2017 (r445076) > @@ -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 > +=20 > ++/* Define to 1 if you have the `mkostemp' function. */ > ++#undef HAVE_MKOSTEMP > ++ > + /* Define to 1 if you have the `mmap' function. */ > + #undef HAVE_MMAP > +=20 >=20 > Added: head/x11-servers/xwayland/files/patch-Xext_shm.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/x11-servers/xwayland/files/patch-Xext_shm.c Wed Jul 5 12:41:5= 7 2017 (r445076) > @@ -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 =3D mkostemp(template, O_CLOEXEC); > ++#else > + fd =3D mkstemp(template); > ++#endif > + if (fd < 0) > + return -1; > + unlink(template); >=20 > Added: head/x11-servers/xwayland/files/patch-configure > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/x11-servers/xwayland/files/patch-configure Wed Jul 5 12:41:57= 2017 (r445076) > @@ -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 getzone= id \ > + mmap posix_fallocate seteuid shmctl64 strncasecmp vasprintf vsnprint= f \ > ++ mkostemp \ > + walkcontext setitimer poll epoll_create1 > + do : > + as_ac_var=3D`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` >=20 > Added: head/x11-servers/xwayland/files/patch-include_dix-config.h.in > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/x11-servers/xwayland/files/patch-include_dix-config.h.in Wed J= ul 5 12:41:57 2017 (r445076) > @@ -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 > +=20 > ++/* Define to 1 if you have the `mkostemp' function. */ > ++#undef HAVE_MKOSTEMP > ++ > + /* Define to 1 if you have the `mmap' function. */ > + #undef HAVE_MMAP > +=20 >=20 --nMUEuHxIkbNNkDPP0WTtN7QhUkvfuHTVI-- --EKRLKDctJUCE07hbgb4f90xIOXl5G4ICW Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQGjBAEBCgCNFiEEmPpBSlwqDvnP0K0N9c9isyB7G6EFAlleshZfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDk4 RkE0MTRBNUMyQTBFRjlDRkQwQUQwREY1Q0Y2MkIzMjA3QjFCQTEPHHN0ZXZlQG1v dWYubmV0AAoJEPXPYrMgexuhnW4IAIzsf3HX//V+PG8/jhDPXNmZd0B7RnlHkzlJ hlNhj1sLpKfDs1Iyrm21qSquu4t3q+nLDtGnqKyximyas45pH3GXEwjhQB0eOo1t 044zJBnPtktHQ1T/BTCFObx59GuA1v/baDDJ65FwWX6neEE0jJTYTecfw35oRJit itWp/56SWLRKEbkONGL4ru9Pl8n1YKnbqsHSc3SywGIIRwr/RwObYEfPIGdQQ4AS mRM1zI3pin4oDWWjd179sUvBnXc9MEPhBo2XfvciN76Z9iys0wZZIu6yECXKMlyv 8TW0TNXeRP7hT2h4biCgLho7gkUqfyUpTntpBzAdwMfzEriGG/I= =0He4 -----END PGP SIGNATURE----- --EKRLKDctJUCE07hbgb4f90xIOXl5G4ICW--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?a7c2da3b-e802-eb82-f345-080d320a3c40>