Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[xsrc/trunk]: xsrc/external/mit/libXfont2/dist initial import of libXfont2-2.0.5
details: https://anonhg.NetBSD.org/xsrc/rev/48c162bc493c
branches: trunk
changeset: 10779:48c162bc493c
user: mrg <mrg%NetBSD.org@localhost>
date: Mon Aug 23 21:04:23 2021 +0000
description:
initial import of libXfont2-2.0.5
diffstat:
external/mit/libXfont2/dist/ChangeLog | 98 +-
external/mit/libXfont2/dist/Makefile.in | 416 +-
external/mit/libXfont2/dist/README.md | 13 +-
external/mit/libXfont2/dist/aclocal.m4 | 6992 +++---
external/mit/libXfont2/dist/compile | 17 +-
external/mit/libXfont2/dist/config.guess | 1488 +-
external/mit/libXfont2/dist/config.h.in | 110 +-
external/mit/libXfont2/dist/config.sub | 2874 +-
external/mit/libXfont2/dist/configure | 14982 ++++++------
external/mit/libXfont2/dist/configure.ac | 10 +-
external/mit/libXfont2/dist/depcomp | 10 +-
external/mit/libXfont2/dist/doc/Makefile.in | 17 +-
external/mit/libXfont2/dist/install-sh | 172 +-
external/mit/libXfont2/dist/ltmain.sh | 2 +-
external/mit/libXfont2/dist/missing | 16 +-
external/mit/libXfont2/dist/src/fc/fserve.c | 60 +-
external/mit/libXfont2/dist/src/fontfile/fontdir.c | 5 +-
external/mit/libXfont2/dist/src/util/realpath.c | 29 +
external/mit/libXfont2/dist/src/util/replace.h | 16 +
external/mit/libXfont2/dist/test/utils/font-test-utils.c | 3 +
external/mit/libXfont2/dist/test/utils/lsfontdir.c | 3 +
21 files changed, 14520 insertions(+), 12813 deletions(-)
diffs (truncated from 34386 to 300 lines):
diff -r 7c63d10260c1 -r 48c162bc493c external/mit/libXfont2/dist/ChangeLog
--- a/external/mit/libXfont2/dist/ChangeLog Sun Aug 22 23:11:58 2021 +0000
+++ b/external/mit/libXfont2/dist/ChangeLog Mon Aug 23 21:04:23 2021 +0000
@@ -1,3 +1,79 @@
+commit 3a4f68284c5aeea77789af1fe395cac35efc8562
+Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+Date: Sun Aug 1 17:36:43 2021 -0700
+
+ libXfont2 2.0.5
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+
+commit daff8876379c64c7bee126319af804896f83b5da
+Author: Alex Richardson <Alexander.Richardson%cl.cam.ac.uk@localhost>
+Date: Wed Jul 14 17:23:48 2021 +0100
+
+ Fix out-of-bounds read in FontFileMakeDir()
+
+ BuiltinReadDirectory() calls FontFileMakeDir ("", builtin_dir_count); and
+ this causes the `dirName[dirlen - 1]` access to read before the start of
+ the string. I found this while porting Xvnc to CHERI-RISC-V (which has
+ bounds and permissions on all pointers).
+
+commit ce7a3265019e4d66198c1581d9e8c859c34e8ef1
+Author: Bernd Kuhls <bernd.kuhls%t-online.de@localhost>
+Date: Sat Oct 19 09:32:41 2019 +0200
+
+ configure: define HAVE_LIBBSD when libbsd was found
+
+commit 9529d2351fe52ffaaf9342343865073d5c5b6802
+Author: Peter Harris <pharris%opentext.com@localhost>
+Date: Tue Mar 2 14:39:45 2021 -0500
+
+ Fix use after free when font server connection lost
+
+ If there are multiple blocks waiting for the same font, only one of them
+ will have ->freeFont set. The rest will be in a state of FS_DEPENDING.
+
+ If the font server dies before the font finishes opening, the block with
+ ->freeFont set will call ->unload_font, invalidating the pfont pointers
+ in the remaining FS_DEPENDING blocks.
+
+ Avoid a use after free (and potential crash) by passing conn to
+ fs_cleanup_font instead of dereferencing pfont to find the conn.
+
+ Signed-off-by: Peter Harris <pharris%opentext.com@localhost>
+
+commit e7b2cae1ad9f07c188bcad27767a2f4fa6e0c2a4
+Author: Peter Harris <pharris%opentext.com@localhost>
+Date: Fri Mar 6 10:42:03 2020 -0500
+
+ Fix crash when font server connection lost
+
+ Always initialize the return value of fs_new_block_rec. Even if the
+ conn->blockState is FS_BROKEN_CONNECTION | FS_RECONNECTING, we must not
+ return with an uninitialized blockrec on the block list. When the
+ blockrec times out, _fs_clean_aborted_blockrec calls fs_cleanup_bfont,
+ which will try to follow pointers in the blockrec (which has not been
+ initialized).
+
+ Signed-off-by: Peter Harris <pharris%opentext.com@localhost>
+
+commit 608640b87dc47233940664632e3ab8f13972be2b
+Author: Jon Turney <jon.turney%dronecode.org.uk@localhost>
+Date: Thu Oct 17 19:11:52 2019 +0100
+
+ Fix Win32 build since c4ed2e06 "Add some unit testing utilities"
+
+ Provide Win32 replacements for realpath() and err.h
+
+commit 13ebb8f32f767c596b1b8bd16b90703a8135f20b
+Author: Adam Jackson <ajax%redhat.com@localhost>
+Date: Mon Sep 16 10:47:27 2019 -0400
+
+ README: Remove mention of libXfont 1.5
+
+ xfs was ported to libXfont2 in release 1.2, and bdftopcf 1.1 includes a
+ copy of enough of the old libXfont1 code to not need an external
+ libXfont at all.
+
commit ed8b8e9fe544ec51ab1b1dfaea6fced35470ad6c
Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
Date: Sat Sep 14 11:34:03 2019 -0700
@@ -2562,25 +2638,25 @@
by the first call disappears.
commit e3642d9b2c0819a607d4cce413b9f0541285545b
-Author: Kristian Høgsberg <krh%redhat.com@localhost>
+Author: Kristian Høgsberg <krh%redhat.com@localhost>
Date: Mon Jul 2 15:01:05 2007 -0400
Bump version to 1.3.0.
commit f33f9361086db3cf1d09cec067f38fe751ed22eb
-Author: Kristian Høgsberg <krh%redhat.com@localhost>
+Author: Kristian Høgsberg <krh%redhat.com@localhost>
Date: Mon Jul 2 14:59:11 2007 -0400
Fix crash when no attributes are present for symlink.
commit 8d47483711be6076e7bfefab14aa890c5f37e1aa
-Author: Kristian Høgsberg <krh%redhat.com@localhost>
+Author: Kristian Høgsberg <krh%redhat.com@localhost>
Date: Thu Jun 21 21:44:02 2007 -0400
Bump version to 1.2.9.
commit c5ab59762c4ad5def68436d55937a2bd558d5c99
-Author: Kristian Høgsberg <krh%redhat.com@localhost>
+Author: Kristian Høgsberg <krh%redhat.com@localhost>
Date: Tue Jun 19 10:38:02 2007 -0400
Add a new 'catalogue' FPE, which takes font paths from symlinks in a dir.
@@ -2720,7 +2796,7 @@
added -flat_namespace to CFLAGS for Darwin
commit 9509d5c7ee5d5e78c6eef54e8faceede5ca5f24e
-Author: Kristian Høgsberg <krh%redhat.com@localhost>
+Author: Kristian Høgsberg <krh%redhat.com@localhost>
Date: Mon Jan 22 18:24:19 2007 -0500
Bump to 1.2.7.
@@ -2735,7 +2811,7 @@
loaded), load it as a valid font path anyway.
commit 931b777108526dd0761f948dcd9f1603ac02efc8
-Author: Kristian Høgsberg <krh%redhat.com@localhost>
+Author: Kristian Høgsberg <krh%redhat.com@localhost>
Date: Wed Jan 17 17:19:53 2007 -0500
Add stubs for the scalable renderer callbacks.
@@ -3230,7 +3306,7 @@
Default --enable-fc to yes; minor formatting changes.
commit 4534fa0c8adb77b7db47101318e0e863edb186ce
-Author: Søren Sandmann Pedersen <sandmann%daimi.au.dk@localhost>
+Author: Søren Sandmann Pedersen <sandmann%daimi.au.dk@localhost>
Date: Mon Jun 27 16:09:14 2005 +0000
- Remove fontenc from Xfont
@@ -3242,26 +3318,26 @@
- Fix xp.pc.in to add XPRINT_LIBS/CFLAGS instead of X_LIBS/CFLAGS
commit fda7215c0783ad170eb14f7dda078fac3f134470
-Author: Søren Sandmann Pedersen <sandmann%daimi.au.dk@localhost>
+Author: Søren Sandmann Pedersen <sandmann%daimi.au.dk@localhost>
Date: Tue Jun 21 21:29:40 2005 +0000
Add fontenc directory, update buildsystem
commit db8fd7e670cbd901116344212217bee8001ab460
-Author: Søren Sandmann Pedersen <sandmann%daimi.au.dk@localhost>
+Author: Søren Sandmann Pedersen <sandmann%daimi.au.dk@localhost>
Date: Fri Jun 17 20:33:33 2005 +0000
Add lbxutil to symlink.sh Add back accidentally removed include in Type1
directory Disable Speedo by default
commit e5525d268c6165318894f326be445b22a2523558
-Author: Søren Sandmann Pedersen <sandmann%daimi.au.dk@localhost>
+Author: Søren Sandmann Pedersen <sandmann%daimi.au.dk@localhost>
Date: Thu Jun 16 21:35:26 2005 +0000
Add Speedo directory to Xfont
commit b96f539005da57273dc7e2bee13651de4eedf087
-Author: Søren Sandmann Pedersen <sandmann%daimi.au.dk@localhost>
+Author: Søren Sandmann Pedersen <sandmann%daimi.au.dk@localhost>
Date: Thu Jun 16 20:50:12 2005 +0000
Add Type1 subdirectory to lib/Xfonts, update build system accordingly.
diff -r 7c63d10260c1 -r 48c162bc493c external/mit/libXfont2/dist/Makefile.in
--- a/external/mit/libXfont2/dist/Makefile.in Sun Aug 22 23:11:58 2021 +0000
+++ b/external/mit/libXfont2/dist/Makefile.in Mon Aug 23 21:04:23 2021 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.4 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -191,6 +191,7 @@
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES = xfont2.pc
CONFIG_CLEAN_VPATH_FILES =
+PROGRAMS = $(noinst_PROGRAMS)
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -223,6 +224,7 @@
LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
LIBOBJDIR = src/util/
+am__dirstamp = $(am__leading_dot)dirstamp
@XFONT_FREETYPE_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
libXfont2_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) $(LTLIBOBJS) \
@@ -253,7 +255,6 @@
src/fc/fsconvert.c src/fc/fserve.c src/fc/fserve.h \
src/fc/fservestr.h src/fc/fsio.c src/fc/fsio.h \
src/fc/fslibos.h src/fc/fstrans.c
-am__dirstamp = $(am__leading_dot)dirstamp
@XFONT_FONTFILE_TRUE@am__objects_1 = src/fontfile/bitsource.lo \
@XFONT_FONTFILE_TRUE@ src/fontfile/bufio.lo \
@XFONT_FONTFILE_TRUE@ src/fontfile/decompress.lo \
@@ -306,7 +307,6 @@
libXfont2_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libXfont2_la_LDFLAGS) $(LDFLAGS) -o $@
-PROGRAMS = $(noinst_PROGRAMS)
am__objects_11 = test/utils/font-test-utils.$(OBJEXT)
am_lsfontdir_OBJECTS = test/utils/lsfontdir.$(OBJEXT) \
$(am__objects_11)
@@ -326,7 +326,57 @@
am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = src/FreeType/$(DEPDIR)/ftenc.Plo \
+ src/FreeType/$(DEPDIR)/ftfuncs.Plo \
+ src/FreeType/$(DEPDIR)/fttools.Plo \
+ src/FreeType/$(DEPDIR)/xttcap.Plo \
+ src/bitmap/$(DEPDIR)/bdfread.Plo \
+ src/bitmap/$(DEPDIR)/bdfutils.Plo \
+ src/bitmap/$(DEPDIR)/bitmap.Plo \
+ src/bitmap/$(DEPDIR)/bitmapfunc.Plo \
+ src/bitmap/$(DEPDIR)/bitmaputil.Plo \
+ src/bitmap/$(DEPDIR)/bitscale.Plo \
+ src/bitmap/$(DEPDIR)/fontink.Plo \
+ src/bitmap/$(DEPDIR)/pcfread.Plo \
+ src/bitmap/$(DEPDIR)/pcfwrite.Plo \
+ src/bitmap/$(DEPDIR)/snfread.Plo \
+ src/builtins/$(DEPDIR)/dir.Plo src/builtins/$(DEPDIR)/file.Plo \
+ src/builtins/$(DEPDIR)/fonts.Plo \
+ src/builtins/$(DEPDIR)/fpe.Plo \
+ src/builtins/$(DEPDIR)/render.Plo \
+ src/fc/$(DEPDIR)/fsconvert.Plo src/fc/$(DEPDIR)/fserve.Plo \
+ src/fc/$(DEPDIR)/fsio.Plo src/fc/$(DEPDIR)/fstrans.Plo \
+ src/fontfile/$(DEPDIR)/bitsource.Plo \
+ src/fontfile/$(DEPDIR)/bufio.Plo \
+ src/fontfile/$(DEPDIR)/bunzip2.Plo \
+ src/fontfile/$(DEPDIR)/catalogue.Plo \
+ src/fontfile/$(DEPDIR)/decompress.Plo \
+ src/fontfile/$(DEPDIR)/defaults.Plo \
+ src/fontfile/$(DEPDIR)/dirfile.Plo \
+ src/fontfile/$(DEPDIR)/fileio.Plo \
+ src/fontfile/$(DEPDIR)/filewr.Plo \
+ src/fontfile/$(DEPDIR)/fontdir.Plo \
+ src/fontfile/$(DEPDIR)/fontencc.Plo \
+ src/fontfile/$(DEPDIR)/fontfile.Plo \
+ src/fontfile/$(DEPDIR)/fontscale.Plo \
+ src/fontfile/$(DEPDIR)/gunzip.Plo \
+ src/fontfile/$(DEPDIR)/register.Plo \
+ src/fontfile/$(DEPDIR)/renderers.Plo \
+ src/stubs/$(DEPDIR)/atom.Plo \
+ src/stubs/$(DEPDIR)/libxfontstubs.Plo \
+ src/util/$(DEPDIR)/fontaccel.Plo \
+ src/util/$(DEPDIR)/fontnames.Plo \
+ src/util/$(DEPDIR)/fontutil.Plo \
+ src/util/$(DEPDIR)/fontxlfd.Plo src/util/$(DEPDIR)/format.Plo \
+ src/util/$(DEPDIR)/miscutil.Plo \
+ src/util/$(DEPDIR)/patcache.Plo src/util/$(DEPDIR)/private.Plo \
+ src/util/$(DEPDIR)/reallocarray.Plo \
+ src/util/$(DEPDIR)/realpath.Plo src/util/$(DEPDIR)/strlcat.Plo \
+ src/util/$(DEPDIR)/strlcpy.Plo \
+ src/util/$(DEPDIR)/utilbitmap.Plo \
+ test/utils/$(DEPDIR)/font-test-utils.Po \
+ test/utils/$(DEPDIR)/lsfontdir.Po
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -370,9 +420,9 @@
$(RECURSIVE_CLEAN_TARGETS) \
$(am__extra_recursive_targets)
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
- cscope distdir dist dist-all distcheck
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
- $(LISP)config.h.in
+ cscope distdir distdir-am dist dist-all distcheck
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \
+ config.h.in
# Read a list of newline-separated strings from the standard input,
# and print each of them once, without duplicates. Input order is
# *not* preserved.
@@ -389,16 +439,14 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-CSCOPE = cscope
DIST_SUBDIRS = $(SUBDIRS)
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(srcdir)/xfont2.pc.in $(top_srcdir)/src/util/reallocarray.c \
+ $(top_srcdir)/src/util/realpath.c \
$(top_srcdir)/src/util/strlcat.c \
Home |
Main Index |
Thread Index |
Old Index