Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[xsrc/xorg]: xsrc/external/mit/libXdmcp/dist initial import of libXdmcp-1.1.3
details: https://anonhg.NetBSD.org/xsrc/rev/2537950db76c
branches: xorg
changeset: 10228:2537950db76c
user: mrg <mrg%NetBSD.org@localhost>
date: Mon Mar 18 02:29:58 2019 +0000
description:
initial import of libXdmcp-1.1.3
diffstat:
external/mit/libXdmcp/dist/ChangeLog | 101 +
external/mit/libXdmcp/dist/Key.c | 35 +-
external/mit/libXdmcp/dist/Makefile.am | 2 +-
external/mit/libXdmcp/dist/Makefile.in | 7 +-
external/mit/libXdmcp/dist/README.md | 18 +
external/mit/libXdmcp/dist/aclocal.m4 | 5305 +++++++++++++----------
external/mit/libXdmcp/dist/autogen.sh | 11 +-
external/mit/libXdmcp/dist/config.guess | 679 +-
external/mit/libXdmcp/dist/config.h.in | 9 +-
external/mit/libXdmcp/dist/config.sub | 304 +-
external/mit/libXdmcp/dist/configure | 2336 ++++++----
external/mit/libXdmcp/dist/configure.ac | 12 +-
external/mit/libXdmcp/dist/doc/Makefile.in | 3 +
external/mit/libXdmcp/dist/doc/xdmcp.xml | 2 +-
external/mit/libXdmcp/dist/ltmain.sh | 5812 ++++++++++++++++----------
external/mit/libXdmcp/dist/test/Makefile.in | 3 +
16 files changed, 8708 insertions(+), 5931 deletions(-)
diffs (truncated from 25788 to 300 lines):
diff -r 3bd4d3f2499b -r 2537950db76c external/mit/libXdmcp/dist/ChangeLog
--- a/external/mit/libXdmcp/dist/ChangeLog Mon Mar 11 06:59:37 2019 +0000
+++ b/external/mit/libXdmcp/dist/ChangeLog Mon Mar 18 02:29:58 2019 +0000
@@ -1,3 +1,104 @@
+commit 618b3ba5f826d930df2ca6a6a0ce212fa75cef42
+Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+Date: Sat Mar 16 09:19:02 2019 -0700
+
+ libXdmcp 1.1.3
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+
+commit 7d4c69183b9838c684c1bcedb4e6184301d2816f
+Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+Date: Mon Nov 19 21:51:24 2018 -0800
+
+ Update README for gitlab migration
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+
+commit 6d1aee0310001eca8f6ded9814a2a70b3a774896
+Author: Benjamin Tissoires <benjamin.tissoires%gmail.com@localhost>
+Date: Thu May 4 11:12:13 2017 +0200
+
+ Fix compilation error when arc4random_buf is not available
+
+ Not sure how I missed that, but I did.
+
+ Also rename emulate_getrandom_buf() into insecure_getrandom_buf() as
+ requested in the previous patch reviews.
+
+ Last, getbits() expects an unsigned char, so remove the warning.
+
+ Signed-off-by: Benjamin Tissoires <benjamin.tissoires%gmail.com@localhost>
+ Reviewed-by: Peter Hutterer <peter.hutterer%who-t.net@localhost>
+ Signed-off-by: Peter Hutterer <peter.hutterer%who-t.net@localhost>
+
+commit 0554324ec6bbc2071f5d1f8ad211a1643e29eb1f
+Author: Benjamin Tissoires <benjamin.tissoires%gmail.com@localhost>
+Date: Tue Apr 4 19:13:38 2017 +0200
+
+ Use getentropy() if arc4random_buf() is not available
+
+ This allows to fix CVE-2017-2625 on Linux platforms without pulling in
+ libbsd.
+ The libc getentropy() is available since glibc 2.25 but also on OpenBSD.
+ For Linux, we need at least a v3.17 kernel. If the recommended
+ arc4random_buf() function is not available, emulate it by first trying
+ to use getentropy() on a supported glibc and kernel. If the call fails,
+ fall back to the current (vulnerable) code.
+
+ Signed-off-by: Benjamin Tissoires <benjamin.tissoires%gmail.com@localhost>
+ Reviewed-by: Mark Kettenis <kettenis%openbsd.org@localhost>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+ Signed-off-by: Peter Hutterer <peter.hutterer%who-t.net@localhost>
+
+commit f1bf902c52884e35d48f4d03915f019337f84717
+Author: Mihail Konev <k.mvc%ya.ru@localhost>
+Date: Thu Jan 26 13:52:49 2017 +1000
+
+ autogen: add default patch prefix
+
+ Signed-off-by: Mihail Konev <k.mvc%ya.ru@localhost>
+
+commit 34ac12e5eb93ba1c4685bd25f5d9a25288d2d89e
+Author: Emil Velikov <emil.l.velikov%gmail.com@localhost>
+Date: Mon Mar 9 12:00:52 2015 +0000
+
+ autogen.sh: use quoted string variables
+
+ Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent
+ fall-outs, when they contain space.
+
+ Signed-off-by: Emil Velikov <emil.l.velikov%gmail.com@localhost>
+ Reviewed-by: Peter Hutterer <peter.hutterer%who-t.net@localhost>
+ Signed-off-by: Peter Hutterer <peter.hutterer%who-t.net@localhost>
+
+commit 3d813e1a45fb5d1b4b566c35218b9bcf0261b74a
+Author: Peter Hutterer <peter.hutterer%who-t.net@localhost>
+Date: Tue Jan 24 10:32:07 2017 +1000
+
+ autogen.sh: use exec instead of waiting for configure to finish
+
+ Syncs the invocation of configure with the one from the server.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer%who-t.net@localhost>
+ Reviewed-by: Emil Velikov <emil.velikov%collabora.com@localhost>
+
+commit 5021b93d68c499831ad65a2abf1bfb7e6ed2724f
+Author: Helmut Grohne <helmut%subdivi.de@localhost>
+Date: Wed Nov 11 22:23:15 2015 +0100
+
+ do not use &fullrelvers; in xdmcp.xml (Debian bug 761628)
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+
+commit b10f382e3aa2e86cd5a2bc27d6758da55f0ab1f6
+Author: Jon TURNEY <jon.turney%dronecode.org.uk@localhost>
+Date: Sat Sep 13 20:28:38 2014 +0100
+
+ Link with winsock library for socket functions on MinGW
+
+ Signed-off-by: Jon TURNEY <jon.turney%dronecode.org.uk@localhost>
+ Reviewed-by: David Macek <david.macek.0%gmail.com@localhost>
+
commit 0c09444d276fbf46a0e8b427a4f6a325d0625742
Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
Date: Sat Mar 21 09:39:14 2015 -0700
diff -r 3bd4d3f2499b -r 2537950db76c external/mit/libXdmcp/dist/Key.c
--- a/external/mit/libXdmcp/dist/Key.c Mon Mar 11 06:59:37 2019 +0000
+++ b/external/mit/libXdmcp/dist/Key.c Mon Mar 18 02:29:58 2019 +0000
@@ -62,20 +62,41 @@
#define getpid(x) _getpid(x)
#endif
-void
-XdmcpGenerateKey (XdmAuthKeyPtr key)
+#ifndef HAVE_ARC4RANDOM_BUF
+
+static void
+insecure_getrandom_buf (unsigned char *auth, int len)
{
-#ifndef HAVE_ARC4RANDOM_BUF
long lowbits, highbits;
srandom ((int)getpid() ^ time((Time_t *)0));
lowbits = random ();
highbits = random ();
- getbits (lowbits, key->data);
- getbits (highbits, key->data + 4);
-#else
+ getbits (lowbits, auth);
+ getbits (highbits, auth + 4);
+}
+
+static void
+arc4random_buf (void *auth, int len)
+{
+ int ret;
+
+#if HAVE_GETENTROPY
+ /* weak emulation of arc4random through the getentropy libc call */
+ ret = getentropy (auth, len);
+ if (ret == 0)
+ return;
+#endif /* HAVE_GETENTROPY */
+
+ insecure_getrandom_buf (auth, len);
+}
+
+#endif /* !defined(HAVE_ARC4RANDOM_BUF) */
+
+void
+XdmcpGenerateKey (XdmAuthKeyPtr key)
+{
arc4random_buf(key->data, 8);
-#endif
}
int
diff -r 3bd4d3f2499b -r 2537950db76c external/mit/libXdmcp/dist/Makefile.am
--- a/external/mit/libXdmcp/dist/Makefile.am Mon Mar 11 06:59:37 2019 +0000
+++ b/external/mit/libXdmcp/dist/Makefile.am Mon Mar 18 02:29:58 2019 +0000
@@ -33,7 +33,7 @@
pkgconfig_DATA = xdmcp.pc
MAINTAINERCLEANFILES = ChangeLog INSTALL
-EXTRA_DIST = autogen.sh Wraphelp.c Wraphelp.README.crypto
+EXTRA_DIST = autogen.sh Wraphelp.c Wraphelp.README.crypto README.md
if LINT
ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
diff -r 3bd4d3f2499b -r 2537950db76c external/mit/libXdmcp/dist/Makefile.in
--- a/external/mit/libXdmcp/dist/Makefile.in Mon Mar 11 06:59:37 2019 +0000
+++ b/external/mit/libXdmcp/dist/Makefile.in Mon Mar 18 02:29:58 2019 +0000
@@ -230,7 +230,7 @@
CSCOPE = cscope
DIST_SUBDIRS = $(SUBDIRS)
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
- $(srcdir)/xdmcp.pc.in AUTHORS COPYING ChangeLog INSTALL README \
+ $(srcdir)/xdmcp.pc.in AUTHORS COPYING ChangeLog INSTALL \
compile config.guess config.sub depcomp install-sh ltmain.sh \
missing
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -333,6 +333,7 @@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MAN_SUBSTS = @MAN_SUBSTS@
@@ -354,6 +355,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
@@ -450,7 +453,7 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xdmcp.pc
MAINTAINERCLEANFILES = ChangeLog INSTALL
-EXTRA_DIST = autogen.sh Wraphelp.c Wraphelp.README.crypto
+EXTRA_DIST = autogen.sh Wraphelp.c Wraphelp.README.crypto README.md
@LINT_TRUE@ALL_LINT_FLAGS = $(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@LINT_TRUE@ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
diff -r 3bd4d3f2499b -r 2537950db76c external/mit/libXdmcp/dist/README.md
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/libXdmcp/dist/README.md Mon Mar 18 02:29:58 2019 +0000
@@ -0,0 +1,18 @@
+libXdmcp - X Display Manager Control Protocol library
+-----------------------------------------------------
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ https://lists.x.org/mailman/listinfo/xorg
+
+The master development code repository can be found at:
+
+ https://gitlab.freedesktop.org/xorg/lib/libXdmcp
+
+Please submit bug reports and requests to merge patches there.
+
+For patch submission instructions, see:
+
+ https://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
diff -r 3bd4d3f2499b -r 2537950db76c external/mit/libXdmcp/dist/aclocal.m4
--- a/external/mit/libXdmcp/dist/aclocal.m4 Mon Mar 11 06:59:37 2019 +0000
+++ b/external/mit/libXdmcp/dist/aclocal.m4 Mon Mar 18 02:29:58 2019 +0000
@@ -20,1141 +20,9 @@
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-# (This private macro should not be called outside this file.)
-AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.15'
-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.15], [],
- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-])
-
-# _AM_AUTOCONF_VERSION(VERSION)
-# -----------------------------
-# aclocal traces this macro to find the Autoconf version.
-# This is a private macro too. Using m4_define simplifies
-# the logic in aclocal, which can simply ignore this definition.
-m4_define([_AM_AUTOCONF_VERSION], [])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.15])dnl
-m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-
-# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to
-# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory. The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run. This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-# fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-# fails if $ac_aux_dir is absolute,
-# fails when called from a subdirectory in a VPATH build with
Home |
Main Index |
Thread Index |
Old Index