Module Name: xsrc
Committed By: mrg
Date: Sun Jan 8 09:19:55 UTC 2023
Modified Files:
xsrc/external/mit/xdm/dist/xdm: session.c xdmauth.c
xsrc/external/mit/xfd/dist: compile
Removed Files:
xsrc/external/mit/lndir/dist: README
xsrc/external/mit/transset/dist: README
xsrc/external/mit/xgamma/dist: README
Log Message:
merge lndir 1.0.4, transset 1.0.3, xdm 1.1.14, xfd 1.1.4, and xgamma 1.0.7
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/lndir/dist/README
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/transset/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xdm/dist/xdm/session.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xdm/dist/xdm/xdmauth.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xfd/dist/compile
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xgamma/dist/README
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/xdm/dist/xdm/session.c
diff -u xsrc/external/mit/xdm/dist/xdm/session.c:1.3 xsrc/external/mit/xdm/dist/xdm/session.c:1.4
--- xsrc/external/mit/xdm/dist/xdm/session.c:1.3 Tue Mar 5 08:34:27 2019
+++ xsrc/external/mit/xdm/dist/xdm/session.c Sun Jan 8 09:19:54 2023
@@ -53,11 +53,7 @@ from The Open Group.
# ifdef HAVE_SETPROCTITLE
# include <sys/types.h>
-# ifdef __linux__
-# include <bsd/unistd.h>
-# else
-# include <unistd.h>
-# endif
+# include <unistd.h>
# endif
#ifndef USE_PAM /* PAM modules should handle these */
Index: xsrc/external/mit/xdm/dist/xdm/xdmauth.c
diff -u xsrc/external/mit/xdm/dist/xdm/xdmauth.c:1.5 xsrc/external/mit/xdm/dist/xdm/xdmauth.c:1.6
--- xsrc/external/mit/xdm/dist/xdm/xdmauth.c:1.5 Tue Mar 5 08:34:27 2019
+++ xsrc/external/mit/xdm/dist/xdm/xdmauth.c Sun Jan 8 09:19:54 2023
@@ -111,7 +111,7 @@ XdmGetAuthHelper (unsigned short namelen
free (new);
return (Xauth *) 0;
}
- memmove( (char *)new->name, name, namelen);
+ memcpy(new->name, name, namelen);
new->name_length = namelen;
if (!GenerateAuthData ((char *)new->data, new->data_length))
{
@@ -172,9 +172,9 @@ XdmGetXdmcpAuth (struct protoDisplay *pd
* which is simply the number we've been passing back and
* forth via XDMCP
*/
- memmove( fileauth->name, xdmcpauth->name, xdmcpauth->name_length);
- memmove( fileauth->data, pdpy->authenticationData.data, 8);
- memmove( fileauth->data + 8, xdmcpauth->data, 8);
+ memcpy(fileauth->name, xdmcpauth->name, xdmcpauth->name_length);
+ memcpy(fileauth->data, pdpy->authenticationData.data, 8);
+ memcpy(fileauth->data + 8, xdmcpauth->data, 8);
XdmPrintDataHex ("Accept packet auth", xdmcpauth->data, xdmcpauth->data_length);
XdmPrintDataHex ("Auth file auth", fileauth->data, fileauth->data_length);
/* encrypt the session key for its trip back to the server */
@@ -245,7 +245,7 @@ XdmGetKey(struct protoDisplay *pdpy, ARR
while (keylen < 7)
key[keylen++] = '\0';
pdpy->key.data[0] = '\0';
- memmove( pdpy->key.data + 1, key, 7);
+ memcpy(pdpy->key.data + 1, key, 7);
bzero(key, sizeof(key));
fclose (keys);
return TRUE;
Index: xsrc/external/mit/xfd/dist/compile
diff -u xsrc/external/mit/xfd/dist/compile:1.4 xsrc/external/mit/xfd/dist/compile:1.5
--- xsrc/external/mit/xfd/dist/compile:1.4 Mon Mar 11 06:45:03 2019
+++ xsrc/external/mit/xfd/dist/compile Sun Jan 8 09:19:54 2023
@@ -1,9 +1,9 @@
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
# Written by Tom Tromey <[email protected]>.
#
# This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -53,7 +53,7 @@ func_file_conv ()
MINGW*)
file_conv=mingw
;;
- CYGWIN*)
+ CYGWIN* | MSYS*)
file_conv=cygwin
;;
*)
@@ -67,7 +67,7 @@ func_file_conv ()
mingw/*)
file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
;;
- cygwin/*)
+ cygwin/* | msys/*)
file=`cygpath -m "$file" || echo "$file"`
;;
wine/*)
@@ -255,7 +255,8 @@ EOF
echo "compile $scriptversion"
exit $?
;;
- cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+ cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+ icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
func_cl_wrapper "$@" # Doesn't return...
;;
esac
@@ -339,9 +340,9 @@ exit $ret
# Local Variables:
# mode: shell-script
# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
