Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[xsrc/trunk]: xsrc/external/mit/libX11/dist initial import of libX11-1.7.2
details: https://anonhg.NetBSD.org/xsrc/rev/7a9498597e4e
branches: trunk
changeset: 10745:7a9498597e4e
user: mrg <mrg%NetBSD.org@localhost>
date: Sat Jul 10 23:20:18 2021 +0000
description:
initial import of libX11-1.7.2
diffstat:
external/mit/libX11/dist/ChangeLog | 45 +
external/mit/libX11/dist/Makefile.in | 21 +-
external/mit/libX11/dist/README.md | 5 +
external/mit/libX11/dist/aclocal.m4 | 11338 +++++++-
external/mit/libX11/dist/compile | 6 +-
external/mit/libX11/dist/config.guess | 582 +-
external/mit/libX11/dist/config.sub | 2854 +-
external/mit/libX11/dist/configure | 16056 ++++++-----
external/mit/libX11/dist/configure.ac | 2 +-
external/mit/libX11/dist/depcomp | 2 +-
external/mit/libX11/dist/include/Makefile.in | 9 +-
external/mit/libX11/dist/install-sh | 157 +-
external/mit/libX11/dist/ltmain.sh | 258 +-
external/mit/libX11/dist/man/Makefile.in | 9 +-
external/mit/libX11/dist/man/xkb/Makefile.in | 9 +-
external/mit/libX11/dist/missing | 2 +-
external/mit/libX11/dist/modules/Makefile.in | 9 +-
external/mit/libX11/dist/modules/im/Makefile.in | 9 +-
external/mit/libX11/dist/modules/im/ximcp/Makefile.in | 9 +-
external/mit/libX11/dist/modules/lc/Makefile.in | 9 +-
external/mit/libX11/dist/modules/lc/Utf8/Makefile.in | 9 +-
external/mit/libX11/dist/modules/lc/def/Makefile.in | 9 +-
external/mit/libX11/dist/modules/lc/gen/Makefile.in | 9 +-
external/mit/libX11/dist/modules/om/Makefile.in | 9 +-
external/mit/libX11/dist/modules/om/generic/Makefile.in | 9 +-
external/mit/libX11/dist/nls/Makefile.in | 12 +-
external/mit/libX11/dist/specs/Makefile.in | 9 +-
external/mit/libX11/dist/specs/XIM/Makefile.in | 9 +-
external/mit/libX11/dist/specs/XKB/Makefile.in | 9 +-
external/mit/libX11/dist/specs/i18n/Makefile.in | 9 +-
external/mit/libX11/dist/specs/i18n/compose/Makefile.in | 9 +-
external/mit/libX11/dist/specs/i18n/framework/Makefile.in | 9 +-
external/mit/libX11/dist/specs/i18n/localedb/Makefile.in | 9 +-
external/mit/libX11/dist/specs/i18n/trans/Makefile.in | 9 +-
external/mit/libX11/dist/specs/libX11/Makefile.in | 9 +-
external/mit/libX11/dist/src/FontInfo.c | 2 +-
external/mit/libX11/dist/src/GetColor.c | 2 +-
external/mit/libX11/dist/src/LoadFont.c | 2 +-
external/mit/libX11/dist/src/LookupCol.c | 6 +-
external/mit/libX11/dist/src/Makefile.in | 18 +-
external/mit/libX11/dist/src/ParseCol.c | 8 +-
external/mit/libX11/dist/src/QuExt.c | 2 +-
external/mit/libX11/dist/src/StNColor.c | 2 +-
external/mit/libX11/dist/src/StName.c | 4 +-
external/mit/libX11/dist/src/config.h.in | 103 +-
external/mit/libX11/dist/src/util/Makefile.in | 9 +-
external/mit/libX11/dist/src/xcms/Makefile.in | 9 +-
external/mit/libX11/dist/src/xkb/Makefile.in | 9 +-
external/mit/libX11/dist/src/xlibi18n/Makefile.in | 9 +-
external/mit/libX11/dist/test-driver | 10 +-
50 files changed, 21067 insertions(+), 10657 deletions(-)
diffs (truncated from 39652 to 300 lines):
diff -r 4d38abe6e624 -r 7a9498597e4e external/mit/libX11/dist/ChangeLog
--- a/external/mit/libX11/dist/ChangeLog Sat Jul 10 23:20:16 2021 +0000
+++ b/external/mit/libX11/dist/ChangeLog Sat Jul 10 23:20:18 2021 +0000
@@ -1,3 +1,48 @@
+commit f906fe8e9769e4313294b68e61c402610ade69da
+Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+Date: Sat Jun 5 09:12:13 2021 -0700
+
+ libX11 1.7.2
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+
+commit 51b73ac0acda65005c8a9f17ca4ea7281b00ca84
+Author: Tobias Stoeckmann <tobias%stoeckmann.org@localhost>
+Date: Sun May 23 15:05:17 2021 +0200
+
+ Protect against overly long strings
+
+ Checking against upper limit of USHRT_MAX must happen before truncating
+ size_t to int. On 64 bit systems with strings larger than 2 GB this
+ could otherwise lead to negative ints or ints smaller than USHRT_MAX.
+
+ In XParseColor this could lead to out of boundary access with strings
+ starting with a # (color sequence). A modulo 12 operation is performed
+ to validate the string length, but with an overflown length, the for
+ loop would eventually read behind terminating '\0' character.
+
+ Signed-off-by: Tobias Stoeckmann <tobias%stoeckmann.org@localhost>
+
+commit ab2f59530b16bdfbf023b8e025c7c8aba3b6fd0c
+Author: Matthieu Herrb <matthieu%herrb.eu@localhost>
+Date: Sun May 30 16:33:48 2021 +0200
+
+ Check for NULL strings before getting their lengths
+
+ Problem reported by Karsten Trulsen
+
+ Signed-off-by: Matthieu Herrb <matthieu%herrb.eu@localhost>
+
+commit a8216e8653a246db664e1443ecf707b27de65067
+Author: Matthieu Herrb <matthieu%herrb.eu@localhost>
+Date: Sat May 22 17:35:47 2021 +0200
+
+ include <limits.h> always, not if HAVE_CONFIG_H is set.
+
+ via Matthew Green from the NetBSD project
+
+ Signed-off-by: Matthieu Herrb <matthieu%herrb.eu@localhost>
+
commit 6953a586df4819143c4d55e011b3a5e5377981b8
Author: Matthieu Herrb <matthieu.herrb%laas.fr@localhost>
Date: Tue May 18 15:27:58 2021 +0200
diff -r 4d38abe6e624 -r 7a9498597e4e external/mit/libX11/dist/Makefile.in
--- a/external/mit/libX11/dist/Makefile.in Sat Jul 10 23:20:16 2021 +0000
+++ b/external/mit/libX11/dist/Makefile.in Sat Jul 10 23:20:18 2021 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -91,10 +91,7 @@
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_define_dir.m4 \
- $(top_srcdir)/m4/ax_gcc_builtin.m4 $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/ax_gcc_builtin.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
@@ -233,6 +230,8 @@
DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
GZIP_ENV = --best
DIST_TARGETS = dist-bzip2 dist-gzip
+# Exists only to be overridden by the user if desired.
+AM_DISTCHECK_DVI_TARGET = dvi
distuninstallcheck_listfiles = find . -type f -print
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -704,6 +703,10 @@
tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
$(am__post_remove_distdir)
+dist-zstd: distdir
+ tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst
+ $(am__post_remove_distdir)
+
dist-tarZ: distdir
@echo WARNING: "Support for distribution archives compressed with" \
"legacy program 'compress' is deprecated." >&2
@@ -746,6 +749,8 @@
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
+ *.tar.zst*) \
+ zstd -dc $(distdir).tar.zst | $(am__untar) ;;\
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
@@ -761,7 +766,7 @@
$(DISTCHECK_CONFIGURE_FLAGS) \
--srcdir=../.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
- && $(MAKE) $(AM_MAKEFLAGS) dvi \
+ && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \
&& $(MAKE) $(AM_MAKEFLAGS) check \
&& $(MAKE) $(AM_MAKEFLAGS) install \
&& $(MAKE) $(AM_MAKEFLAGS) installcheck \
@@ -927,7 +932,7 @@
am--refresh check check-am clean clean-cscope clean-generic \
clean-libtool cscope cscopelist-am ctags ctags-am dist \
dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \
- dist-tarZ dist-xz dist-zip distcheck distclean \
+ dist-tarZ dist-xz dist-zip dist-zstd distcheck distclean \
distclean-generic distclean-hdr distclean-libtool \
distclean-tags distcleancheck distdir distuninstallcheck dvi \
dvi-am html html-am info info-am install install-am \
diff -r 4d38abe6e624 -r 7a9498597e4e external/mit/libX11/dist/README.md
--- a/external/mit/libX11/dist/README.md Sat Jul 10 23:20:16 2021 +0000
+++ b/external/mit/libX11/dist/README.md Sat Jul 10 23:20:18 2021 +0000
@@ -31,6 +31,11 @@
https://www.x.org/wiki/Development/Documentation/SubmittingPatches
+## Release 1.7.2
+
+This is a bug fix release, correcting a regression introduced by and
+improving the checks from the fix for CVE-2021-31535.
+
## Release 1.7.1
This is a bug fix release, including a security fix for
diff -r 4d38abe6e624 -r 7a9498597e4e external/mit/libX11/dist/aclocal.m4
--- a/external/mit/libX11/dist/aclocal.m4 Sat Jul 10 23:20:16 2021 +0000
+++ b/external/mit/libX11/dist/aclocal.m4 Sat Jul 10 23:20:18 2021 +0000
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
-
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+# generated automatically by aclocal 1.16.3 -*- Autoconf -*-
+
+# Copyright (C) 1996-2020 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,14 +14,10165 @@
m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
-[m4_warning([this file was generated for autoconf 2.69.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.71],,
+[m4_warning([this file was generated for autoconf 2.71.
You have another version of autoconf. It may work, but is not guaranteed to.
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-2020 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.16'
+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.16.3], [],
+ [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.16.3])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-2020 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
+# a relative $ac_aux_dir
+#
+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+# are both prefixed by $srcdir. In an in-source build this is usually
+# harmless because $srcdir is '.', but things will broke when you
+# start a VPATH build or use an absolute $srcdir.
+#
+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
+# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
+# and then we would define $MISSING as
+# MISSING="\${SHELL} $am_aux_dir/missing"
+# This will work as long as MISSING is not called from configure, because
+# unfortunately $(top_srcdir) has no meaning in configure.
+# However there are other variables, like CC, which are often used in
+# configure, and could therefore not use this "fixed" $ac_aux_dir.
+#
+# Another solution, used here, is to always expand $ac_aux_dir to an
+# absolute PATH. The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
+
+AC_DEFUN([AM_AUX_DIR_EXPAND],
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
+])
+
+# AM_CONDITIONAL -*- Autoconf -*-
+
+# Copyright (C) 1997-2020 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_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+AC_DEFUN([AM_CONDITIONAL],
+[AC_PREREQ([2.52])dnl
+ m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+m4_define([_AM_COND_VALUE_$1], [$2])dnl
+if $2; then
+ $1_TRUE=
+ $1_FALSE='#'
+else
+ $1_TRUE='#'
+ $1_FALSE=
+fi
+AC_CONFIG_COMMANDS_PRE(
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+ AC_MSG_ERROR([[conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.]])
+fi])])
+
+# Copyright (C) 1999-2020 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.
+
+
+# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery. Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
+
+# _AM_DEPENDENCIES(NAME)
Home |
Main Index |
Thread Index |
Old Index