Module Name: xsrc
Committed By: mrg
Date: Tue Feb 7 04:45:32 UTC 2023
Modified Files:
xsrc/external/mit/xorg-server/dist: configure configure.ac
xsrc/external/mit/xorg-server/dist/dix: events.c
xsrc/external/mit/xorg-server/dist/os: access.c connection.c
xsrc/external/mit/xorg-server/include: dix-config.h version-config.h
xorg-config.h xorg-server.h
Log Message:
merge xorg-server 21.1.7.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 xsrc/external/mit/xorg-server/dist/configure
cvs rdiff -u -r1.17 -r1.18 xsrc/external/mit/xorg-server/dist/configure.ac
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xorg-server/dist/dix/events.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xorg-server/dist/os/access.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xorg-server/dist/os/connection.c
cvs rdiff -u -r1.48 -r1.49 xsrc/external/mit/xorg-server/include/dix-config.h
cvs rdiff -u -r1.18 -r1.19 \
xsrc/external/mit/xorg-server/include/version-config.h
cvs rdiff -u -r1.28 -r1.29 \
xsrc/external/mit/xorg-server/include/xorg-config.h \
xsrc/external/mit/xorg-server/include/xorg-server.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server/dist/configure
diff -u xsrc/external/mit/xorg-server/dist/configure:1.15 xsrc/external/mit/xorg-server/dist/configure:1.16
--- xsrc/external/mit/xorg-server/dist/configure:1.15 Sun Jan 8 00:24:51 2023
+++ xsrc/external/mit/xorg-server/dist/configure Tue Feb 7 04:45:31 2023
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for xorg-server 21.1.6.
+# Generated by GNU Autoconf 2.71 for xorg-server 21.1.7.
#
# Report bugs to <https://gitlab.freedesktop.org/xorg/xserver/issues>.
#
@@ -682,8 +682,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='xorg-server'
PACKAGE_TARNAME='xorg-server'
-PACKAGE_VERSION='21.1.6'
-PACKAGE_STRING='xorg-server 21.1.6'
+PACKAGE_VERSION='21.1.7'
+PACKAGE_STRING='xorg-server 21.1.7'
PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/xserver/issues'
PACKAGE_URL=''
@@ -2000,7 +2000,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xorg-server 21.1.6 to adapt to many kinds of systems.
+\`configure' configures xorg-server 21.1.7 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -2071,7 +2071,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xorg-server 21.1.6:";;
+ short | recursive ) echo "Configuration of xorg-server 21.1.7:";;
esac
cat <<\_ACEOF
@@ -2256,10 +2256,10 @@ Optional Packages:
org.x)
--with-bundle-version=VERSION
Version to use for X11.app's CFBundleVersion
- (default: 21.1.6)
+ (default: 21.1.7)
--with-bundle-version-string=VERSION
Version to use for X11.app's
- CFBundleShortVersionString (default: 21.1.6)
+ CFBundleShortVersionString (default: 21.1.7)
--with-sparkle-feed-url=URL
URL for the Sparkle feed (default:
https://www.xquartz.org/releases/sparkle/release.xml)
@@ -2473,7 +2473,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xorg-server configure 21.1.6
+xorg-server configure 21.1.7
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
@@ -3130,7 +3130,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xorg-server $as_me 21.1.6, which was
+It was created by xorg-server $as_me 21.1.7, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
@@ -3887,7 +3887,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-RELEASE_DATE="2022-12-19"
+RELEASE_DATE="2023-02-07"
RELEASE_NAME="Caramel Ice Cream"
@@ -4405,7 +4405,7 @@ fi
# Define the identity of the package.
PACKAGE='xorg-server'
- VERSION='21.1.6'
+ VERSION='21.1.7'
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -25180,7 +25180,7 @@ if test ${with_bundle_version+y}
then :
withval=$with_bundle_version; BUNDLE_VERSION="${withval}"
else $as_nop
- BUNDLE_VERSION="21.1.6"
+ BUNDLE_VERSION="21.1.7"
fi
@@ -26229,7 +26229,6 @@ printf "%s\n" "$xorg_cv_Carbon_framework
XVFB=no
XNEST=no
- COMPOSITE=no
DGA=no
DPMSExtension=no
XF86VIDMODE=no
@@ -32163,7 +32162,7 @@ printf "%s\n" "#define XQUARTZ 1" >>conf
printf "%s\n" "#define ROOTLESS 1" >>confdefs.h
- XQUARTZ_LIBS="$FB_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $XPSTUBS_LIB $PRESENT_LIB"
+ XQUARTZ_LIBS="$COMPOSITE_LIB $FB_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $XPSTUBS_LIB $PRESENT_LIB"
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for xp_init in -lXplugin" >&5
@@ -33750,7 +33749,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xorg-server $as_me 21.1.6, which was
+This file was extended by xorg-server $as_me 21.1.7, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -33818,7 +33817,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
-xorg-server config.status 21.1.6
+xorg-server config.status 21.1.7
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
Index: xsrc/external/mit/xorg-server/dist/configure.ac
diff -u xsrc/external/mit/xorg-server/dist/configure.ac:1.17 xsrc/external/mit/xorg-server/dist/configure.ac:1.18
--- xsrc/external/mit/xorg-server/dist/configure.ac:1.17 Sun Jan 8 00:24:51 2023
+++ xsrc/external/mit/xorg-server/dist/configure.ac Tue Feb 7 04:45:31 2023
@@ -26,8 +26,8 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.60)
-AC_INIT([xorg-server], 21.1.6, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server)
-RELEASE_DATE="2022-12-19"
+AC_INIT([xorg-server], 21.1.7, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server)
+RELEASE_DATE="2023-02-07"
RELEASE_NAME="Caramel Ice Cream"
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_MACRO_DIR([m4])
@@ -680,7 +680,6 @@ case $host_os in
XVFB=no
XNEST=no
- COMPOSITE=no
DGA=no
DPMSExtension=no
XF86VIDMODE=no
@@ -2135,7 +2134,7 @@ if test "x$XQUARTZ" = xyes; then
AC_DEFINE(XQUARTZ,1,[Have Quartz])
AC_DEFINE(ROOTLESS,1,[Build Rootless code])
- XQUARTZ_LIBS="$FB_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $XPSTUBS_LIB $PRESENT_LIB"
+ XQUARTZ_LIBS="$COMPOSITE_LIB $FB_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $XPSTUBS_LIB $PRESENT_LIB"
AC_SUBST([XQUARTZ_LIBS])
AC_CHECK_LIB([Xplugin],[xp_init],[:])
Index: xsrc/external/mit/xorg-server/dist/dix/events.c
diff -u xsrc/external/mit/xorg-server/dist/dix/events.c:1.7 xsrc/external/mit/xorg-server/dist/dix/events.c:1.8
--- xsrc/external/mit/xorg-server/dist/dix/events.c:1.7 Fri Jul 15 09:10:38 2022
+++ xsrc/external/mit/xorg-server/dist/dix/events.c Tue Feb 7 04:45:31 2023
@@ -1215,7 +1215,7 @@ EnqueueEvent(InternalEvent *ev, DeviceIn
qe->pScreen = pSprite->hotPhys.pScreen;
qe->months = currentTime.months;
qe->event = (InternalEvent *) (qe + 1);
- memcpy(qe->event, event, eventlen);
+ CopyPartialInternalEvent(qe->event, (InternalEvent *)event);
xorg_list_append(&qe->next, &syncEvents.pending);
}
Index: xsrc/external/mit/xorg-server/dist/os/access.c
diff -u xsrc/external/mit/xorg-server/dist/os/access.c:1.6 xsrc/external/mit/xorg-server/dist/os/access.c:1.7
--- xsrc/external/mit/xorg-server/dist/os/access.c:1.6 Fri Jul 15 02:19:01 2022
+++ xsrc/external/mit/xorg-server/dist/os/access.c Tue Feb 7 04:45:32 2023
@@ -116,6 +116,10 @@ SOFTWARE.
#endif
#endif
+#ifdef HAVE_SYS_UN_H
+#include <sys/un.h>
+#endif
+
#if defined(SVR4) || (defined(SYSV) && defined(__i386__)) || defined(__GNU__)
#include <sys/utsname.h>
#endif
@@ -1167,15 +1171,19 @@ GetLocalClientCreds(ClientPtr client, Lo
XtransConnInfo ci;
LocalClientCredRec *lcc;
-#ifdef HAVE_GETPEEREID
- uid_t uid;
- gid_t gid;
-#elif defined(HAVE_GETPEERUCRED)
+#if defined(HAVE_GETPEERUCRED)
ucred_t *peercred = NULL;
const gid_t *gids;
#elif defined(SO_PEERCRED)
struct ucred peercred;
socklen_t so_len = sizeof(peercred);
+#elif defined(HAVE_GETPEEREID)
+ uid_t uid;
+ gid_t gid;
+#if defined(LOCAL_PEERPID)
+ pid_t pid;
+ socklen_t so_len = sizeof(pid);
+#endif
#endif
if (client == NULL)
@@ -1197,16 +1205,7 @@ GetLocalClientCreds(ClientPtr client, Lo
lcc = *lccp;
fd = _XSERVTransGetConnectionNumber(ci);
-#ifdef HAVE_GETPEEREID
- if (getpeereid(fd, &uid, &gid) == -1) {
- FreeLocalClientCreds(lcc);
- return -1;
- }
- lcc->euid = uid;
- lcc->egid = gid;
- lcc->fieldsSet = LCC_UID_SET | LCC_GID_SET;
- return 0;
-#elif defined(HAVE_GETPEERUCRED)
+#if defined(HAVE_GETPEERUCRED)
if (getpeerucred(fd, &peercred) < 0) {
FreeLocalClientCreds(lcc);
return -1;
@@ -1254,6 +1253,25 @@ GetLocalClientCreds(ClientPtr client, Lo
lcc->pid = peercred.pid;
lcc->fieldsSet = LCC_UID_SET | LCC_GID_SET | LCC_PID_SET;
return 0;
+#elif defined(HAVE_GETPEEREID)
+ if (getpeereid(fd, &uid, &gid) == -1) {
+ FreeLocalClientCreds(lcc);
+ return -1;
+ }
+ lcc->euid = uid;
+ lcc->egid = gid;
+ lcc->fieldsSet = LCC_UID_SET | LCC_GID_SET;
+
+#if defined(LOCAL_PEERPID)
+ if (getsockopt(fd, SOL_LOCAL, LOCAL_PEERPID, &pid, &so_len) != 0) {
+ ErrorF("getsockopt failed to determine pid of socket %d: %s\n", fd, strerror(errno));
+ } else {
+ lcc->pid = pid;
+ lcc->fieldsSet |= LCC_PID_SET;
+ }
+#endif
+
+ return 0;
#endif
#else
/* No system call available to get the credentials of the peer */
Index: xsrc/external/mit/xorg-server/dist/os/connection.c
diff -u xsrc/external/mit/xorg-server/dist/os/connection.c:1.7 xsrc/external/mit/xorg-server/dist/os/connection.c:1.8
--- xsrc/external/mit/xorg-server/dist/os/connection.c:1.7 Fri Jul 15 09:10:38 2022
+++ xsrc/external/mit/xorg-server/dist/os/connection.c Tue Feb 7 04:45:32 2023
@@ -639,8 +639,8 @@ AllocNewConnection(XtransConnInfo trans_
set_poll_client(client);
#ifdef DEBUG
- ErrorF("AllocNewConnection: client index = %d, socket fd = %d\n",
- client->index, fd);
+ ErrorF("AllocNewConnection: client index = %d, socket fd = %d, local = %d\n",
+ client->index, fd, client->local);
#endif
#ifdef XSERVER_DTRACE
XSERVER_CLIENT_CONNECT(client->index, fd);
Index: xsrc/external/mit/xorg-server/include/dix-config.h
diff -u xsrc/external/mit/xorg-server/include/dix-config.h:1.48 xsrc/external/mit/xorg-server/include/dix-config.h:1.49
--- xsrc/external/mit/xorg-server/include/dix-config.h:1.48 Sun Jan 8 00:24:51 2023
+++ xsrc/external/mit/xorg-server/include/dix-config.h Tue Feb 7 04:45:32 2023
@@ -349,7 +349,7 @@
#define XINERAMA 1
/* Current Xorg version */
-#define XORG_VERSION_CURRENT ((10000000) + ((21) * 100000) + ((1) * 1000) + 6)
+#define XORG_VERSION_CURRENT ((10000000) + ((21) * 100000) + ((1) * 1000) + 7)
/* Build Xv Extension */
#define XvExtension 1
Index: xsrc/external/mit/xorg-server/include/version-config.h
diff -u xsrc/external/mit/xorg-server/include/version-config.h:1.18 xsrc/external/mit/xorg-server/include/version-config.h:1.19
--- xsrc/external/mit/xorg-server/include/version-config.h:1.18 Sun Jan 8 00:24:51 2023
+++ xsrc/external/mit/xorg-server/include/version-config.h Tue Feb 7 04:45:32 2023
@@ -5,13 +5,13 @@
#define VERSION_CONFIG_H
/* Vendor man version */
-#define VENDOR_MAN_VERSION "Version 21.1.6"
+#define VENDOR_MAN_VERSION "Version 21.1.7"
/* Vendor name */
#define VENDOR_NAME "The X.Org Foundation"
/* Vendor release */
-#define VENDOR_RELEASE ((10000000) + ((21) * 100000) + ((1) * 1000) + 6)
+#define VENDOR_RELEASE ((10000000) + ((21) * 100000) + ((1) * 1000) + 7)
#endif /* VERSION_CONFIG_H */
Index: xsrc/external/mit/xorg-server/include/xorg-config.h
diff -u xsrc/external/mit/xorg-server/include/xorg-config.h:1.28 xsrc/external/mit/xorg-server/include/xorg-config.h:1.29
--- xsrc/external/mit/xorg-server/include/xorg-config.h:1.28 Sun Jan 8 00:24:51 2023
+++ xsrc/external/mit/xorg-server/include/xorg-config.h Tue Feb 7 04:45:32 2023
@@ -17,7 +17,7 @@
#define XORGSERVER 1
/* Current X.Org version. */
-#define XORG_VERSION_CURRENT ((10000000) + ((21) * 100000) + ((1) * 1000) + 6)
+#define XORG_VERSION_CURRENT ((10000000) + ((21) * 100000) + ((1) * 1000) + 7)
/* Name of X server. */
#define __XSERVERNAME__ "Xorg"
Index: xsrc/external/mit/xorg-server/include/xorg-server.h
diff -u xsrc/external/mit/xorg-server/include/xorg-server.h:1.28 xsrc/external/mit/xorg-server/include/xorg-server.h:1.29
--- xsrc/external/mit/xorg-server/include/xorg-server.h:1.28 Sun Jan 8 00:24:51 2023
+++ xsrc/external/mit/xorg-server/include/xorg-server.h Tue Feb 7 04:45:32 2023
@@ -140,7 +140,7 @@
#define XORGSERVER 1
/* Current Xorg version */
-#define XORG_VERSION_CURRENT ((10000000) + ((21) * 100000) + ((1) * 1000) + 6)
+#define XORG_VERSION_CURRENT ((10000000) + ((21) * 100000) + ((1) * 1000) + 7)
/* Build Xv Extension */
#define XvExtension 1
