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.4
details: https://anonhg.NetBSD.org/xsrc/rev/6e95a4fdf90a
branches: trunk
changeset: 10441:6e95a4fdf90a
user: mrg <mrg%NetBSD.org@localhost>
date: Sun Feb 23 09:01:43 2020 +0000
description:
initial import of libXfont2-2.0.4
diffstat:
external/mit/libXfont2/dist/ChangeLog | 251 ++++-
external/mit/libXfont2/dist/Makefile.am | 18 +-
external/mit/libXfont2/dist/Makefile.in | 109 +-
external/mit/libXfont2/dist/README.md | 90 ++
external/mit/libXfont2/dist/aclocal.m4 | 70 +-
external/mit/libXfont2/dist/config.guess | 675 +++++++-------
external/mit/libXfont2/dist/config.h.in | 9 +
external/mit/libXfont2/dist/config.sub | 286 +++---
external/mit/libXfont2/dist/configure | 205 +++-
external/mit/libXfont2/dist/configure.ac | 7 +-
external/mit/libXfont2/dist/doc/Makefile.in | 1 -
external/mit/libXfont2/dist/include/X11/fonts/fntfil.h | 3 -
external/mit/libXfont2/dist/include/X11/fonts/fntfilst.h | 6 -
external/mit/libXfont2/dist/install-sh | 23 +-
external/mit/libXfont2/dist/ltmain.sh | 35 +-
external/mit/libXfont2/dist/src/FreeType/ftenc.c | 4 +-
external/mit/libXfont2/dist/src/FreeType/ftfuncs.c | 41 +-
external/mit/libXfont2/dist/src/bitmap/bdfread.c | 9 +-
external/mit/libXfont2/dist/src/bitmap/bitmaputil.c | 3 +-
external/mit/libXfont2/dist/src/bitmap/bitscale.c | 17 +-
external/mit/libXfont2/dist/src/bitmap/pcfread.c | 13 +-
external/mit/libXfont2/dist/src/bitmap/pcfwrite.c | 3 +-
external/mit/libXfont2/dist/src/bitmap/snfread.c | 5 +-
external/mit/libXfont2/dist/src/fc/fsconvert.c | 3 +-
external/mit/libXfont2/dist/src/fc/fserve.c | 45 +-
external/mit/libXfont2/dist/src/fontfile/bitsource.c | 3 +-
external/mit/libXfont2/dist/src/fontfile/catalogue.c | 10 +-
external/mit/libXfont2/dist/src/fontfile/dirfile.c | 29 +-
external/mit/libXfont2/dist/src/fontfile/fontdir.c | 13 +-
external/mit/libXfont2/dist/src/fontfile/fontfile.c | 25 +-
external/mit/libXfont2/dist/src/fontfile/fontscale.c | 3 +-
external/mit/libXfont2/dist/src/fontfile/renderers.c | 3 +-
external/mit/libXfont2/dist/src/stubs/atom.c | 7 +-
external/mit/libXfont2/dist/src/util/fontnames.c | 9 +-
external/mit/libXfont2/dist/src/util/fontutil.c | 9 +-
external/mit/libXfont2/dist/src/util/fontxlfd.c | 128 +-
external/mit/libXfont2/dist/src/util/private.c | 5 +-
external/mit/libXfont2/dist/src/util/reallocarray.c | 43 +
external/mit/libXfont2/dist/src/util/replace.h | 61 +
external/mit/libXfont2/dist/src/util/strlcat.c | 58 +
external/mit/libXfont2/dist/src/util/strlcpy.c | 53 +
external/mit/libXfont2/dist/test/utils/README | 18 +
external/mit/libXfont2/dist/test/utils/font-test-utils.c | 337 +++++++
external/mit/libXfont2/dist/test/utils/font-test-utils.h | 49 +
external/mit/libXfont2/dist/test/utils/lsfontdir.c | 74 +
45 files changed, 2019 insertions(+), 849 deletions(-)
diffs (truncated from 5813 to 300 lines):
diff -r 261518522991 -r 6e95a4fdf90a external/mit/libXfont2/dist/ChangeLog
--- a/external/mit/libXfont2/dist/ChangeLog Sun Feb 23 09:01:34 2020 +0000
+++ b/external/mit/libXfont2/dist/ChangeLog Sun Feb 23 09:01:43 2020 +0000
@@ -1,3 +1,194 @@
+commit ed8b8e9fe544ec51ab1b1dfaea6fced35470ad6c
+Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+Date: Sat Sep 14 11:34:03 2019 -0700
+
+ libXfont2 2.0.4
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+
+commit b46cd2fef2bfe192579930f29a830051670d4d00
+Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+Date: Sat Sep 14 11:32:02 2019 -0700
+
+ Add src/util/replace.h to noinst_HEADERS so it gets included in tarballs
+
+ Found when "make distcheck" failed.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+
+commit 5561a9dc835a249e58cfdb3c384547f6f401a15d
+Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+Date: Sat Aug 17 14:31:24 2019 -0700
+
+ fs_read_glyphs: check if rep is null before dereferencing
+
+ Resolves coverity warning def16 from the list in
+ https://gitlab.freedesktop.org/xorg/lib/libxfont/issues/6
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+
+commit c84ce6be6a7e2e70c9ab20b60bc7198699690d50
+Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+Date: Sat Aug 17 14:19:04 2019 -0700
+
+ CatalogueRescan: if opendir() fails, unref fpes, but don't free the cat
+
+ None of the callers of CatalogueRescan check for failure before accessing
+ the cat pointer so don't free it (especially without clearing the pointer
+ to it in fpe->private), just unref the contents.
+
+ Can only be triggered if somehow stat() succeeds on the directory, but
+ opendir fails anyway (removed between the calls? permission problem?).
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+
+commit c1c5c9aa4cacb9138d6a2e5d37619f7960b54536
+Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+Date: Sat Aug 17 13:56:03 2019 -0700
+
+ ComputeScaledProperties: check for valid pointers before making atoms
+
+ Resolves coverity warning def23 from the list in
+ https://gitlab.freedesktop.org/xorg/lib/libxfont/issues/6
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+
+commit 78085e6b683b4e5a13b38508597a0c93ac2ed9ea
+Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+Date: Sat Aug 17 13:41:02 2019 -0700
+
+ stubs/atom.c: check for ResizeHashTable failure
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+
+commit 3e0e36e4a9fee32105aa7c5cb6e089c495b92b10
+Author: Maya Rashish <maya%NetBSD.org@localhost>
+Date: Fri Aug 9 12:53:48 2019 +0300
+
+ Fix whitespace
+
+commit 194cb45ceb510c3e580460919cd7e5dd31a285c8
+Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+Date: Sun Aug 4 11:14:39 2019 -0700
+
+ fontxlfd.c: tell gcc that switch fallthrough is intentional
+
+ Quiets:
+ src/util/fontxlfd.c: In function â??FontParseXLFDNameâ??:
+ src/util/fontxlfd.c:450:14: warning: this statement may fall through [-Wimplicit-fallthrough=]
+ replaceChar = '*';
+ ~~~~~~~~~~~~^~~~~
+ src/util/fontxlfd.c:451:5: note: here
+ case FONT_XLFD_REPLACE_ZERO:
+ ^~~~
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+
+commit ddbee30d3525cdd66b84056affc407601680cc29
+Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+Date: Sat Aug 3 19:29:05 2019 -0700
+
+ Convert multiplying malloc calls to use mallocarray instead
+
+ Introduces mallocarray as a macro calling reallocarray with a NULL
+ pointer for the old allocation.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+
+commit f54470dab5b392380df61a22b4b4bef685b6cee2
+Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+Date: Sat Aug 3 19:09:19 2019 -0700
+
+ Convert multiplying realloc calls to use reallocarray instead
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+
+commit 27207d35d4b4bbd5d2b2c5f7e13a61ea43d04a4a
+Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+Date: Sat Aug 3 16:13:21 2019 -0700
+
+ Add reallocarray fallback if not provided by libc nor libbsd
+
+ Implementation copied from the Xserver
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+
+commit 2178c7445a3464bd69637ad91a2dd0320a60e0df
+Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+Date: Sat Aug 3 18:19:11 2019 -0700
+
+ Use bounds checking string functions everywhere
+
+ Replace strcpy, strcat, sprintf with strlcpy, strlcat, snprintf
+ everywhere, even where there were already bounds checks in place,
+ to reduce time spent checking static analysis results.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+
+commit d4c941ea8b1dc07a14efce656bff58d31a14c985
+Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+Date: Sat Aug 3 16:05:21 2019 -0700
+
+ Add strlcat & strlcpy fallbacks if not provided by libc nor libbsd
+
+ Implementations copied from the Xserver
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+
+commit c4ed2e069dc8aa5b8b7ef2fc926ae8584ff2a67b
+Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+Date: Sat Aug 3 13:45:54 2019 -0700
+
+ Add some unit testing utilities
+
+ The test/utils directory contains some standalone test programs for testing
+ libXfont funtionality without needing a full X server session. They could
+ be used to generate automated unit testing in the future, but that work has
+ not yet been done.
+
+ [v2: updated original work from libXfont 1.5 to 2.0 API & makefiles]
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+
+commit 77ae4048564eff2e96b80cedfac013877e46d506
+Author: Adam Jackson <ajax%redhat.com@localhost>
+Date: Wed Jan 4 12:13:04 2017 -0500
+
+ fontfile: Remove unused 'bc' slot from _FontEntry
+
+ Whatever this is, we're not using it. On my machine we allocate about
+ 1100 of these structs, and this change reduces the struct from 152 to 48
+ bytes, so this saves about 100k of memory.
+
+ Signed-off-by: Adam Jackson <ajax%redhat.com@localhost>
+
+commit 6624b5e705da8333a3bc63d1ddeea6b11e831e24
+Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+Date: Sat Mar 16 12:40:03 2019 -0700
+
+ Update configure.ac bug URL for gitlab migration
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+
+commit 66a26687b2b86b53c315544483b740deb6f01c1e
+Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+Date: Mon Nov 19 22:05:10 2018 -0800
+
+ Update README for gitlab migration
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+
+commit 099ed6fa9f293d283163b138830d43bbd47c5df1
+Author: Rin Okuyama <rin%NetBSD.org@localhost>
+Date: Tue Feb 21 06:18:37 2017 +0000
+
+ avoid -Wformat errors from clang when building with -DDEBUG
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=99882
+
+ Reviewed-by: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+
commit cdb2f990348c3bd1407022f7e0e5fcba552d539f
Author: Matthieu Herrb <matthieu%herrb.eu@localhost>
Date: Sat Nov 25 12:01:16 2017 +0100
@@ -118,9 +309,9 @@
configure: Use -fvisibility=hidden if available
- text data bss dec hex filename
- 233732 8168 1616 243516 3b73c .libs/libXfont2.so.2.before
- 217113 6816 1616 225545 37109 .libs/libXfont2.so.2.after
+ text data bss dec hex filename
+ 233732 8168 1616 243516 3b73c .libs/libXfont2.so.2.before
+ 217113 6816 1616 225545 37109 .libs/libXfont2.so.2.after
Signed-off-by: Adam Jackson <ajax%redhat.com@localhost>
Reviewed-by: Emil Velikov <emil.l.velikov%gmail.com@localhost>
@@ -135,21 +326,21 @@
Found by clang's Address Sanitizer
- crac.num_auths = set_font_authorizations(&authorizations, &authlen,
- client);
- /* Work around bug in xfs versions up through modular release 1.0.8
- which rejects CreateAC packets with num_auths = 0 & authlen < 4 */
- if (crac.num_auths == 0) {
- authorizations = padding;
- authlen = 4;
- } else {
- authlen = (authlen + 3) & ~0x3;
- }
- crac.length = (sizeof (fsCreateACReq) + authlen) >> 2;
- crac.acid = cur->acid;
- _fs_add_req_log(conn, FS_CreateAC);
- _fs_write(conn, (char *) &crac, sizeof (fsCreateACReq));
- _fs_write(conn, authorizations, authlen);
+ crac.num_auths = set_font_authorizations(&authorizations, &authlen,
+ client);
+ /* Work around bug in xfs versions up through modular release 1.0.8
+ which rejects CreateAC packets with num_auths = 0 & authlen < 4 */
+ if (crac.num_auths == 0) {
+ authorizations = padding;
+ authlen = 4;
+ } else {
+ authlen = (authlen + 3) & ~0x3;
+ }
+ crac.length = (sizeof (fsCreateACReq) + authlen) >> 2;
+ crac.acid = cur->acid;
+ _fs_add_req_log(conn, FS_CreateAC);
+ _fs_write(conn, (char *) &crac, sizeof (fsCreateACReq));
+ _fs_write(conn, authorizations, authlen);
In the case in the report, set_font_authorizations setup authorizations as a
34 byte buffer (and authlen set to 34 as one would expect). The following
@@ -1584,7 +1775,7 @@
Conflicts:
- ChangeLog
+ ChangeLog
Signed-off-by: Yaakov Selkowitz <yselkowitz%users.sourceforge.net@localhost>
@@ -2397,7 +2588,7 @@
This patch adds a new FPE type, which will match font path elements of the
form
- catalogue:<dir>
+ catalogue:<dir>
The dir specified after the catalogue: prefix will be scanned for symlinks
and each symlink destination will be added as a local fontfile FPE.
@@ -2407,22 +2598,22 @@
An example configuration:
- 75dpi:unscaled:pri=20 -> /usr/share/X11/fonts/75dpi
- ghostscript:pri=60 -> /usr/share/fonts/default/ghostscript
- misc:unscaled:pri=10 -> /usr/share/X11/fonts/misc
- type1:pri=40 -> /usr/share/X11/fonts/Type1
- type1:pri=50 -> /usr/share/fonts/default/Type1
+ 75dpi:unscaled:pri=20 -> /usr/share/X11/fonts/75dpi
+ ghostscript:pri=60 -> /usr/share/fonts/default/ghostscript
+ misc:unscaled:pri=10 -> /usr/share/X11/fonts/misc
+ type1:pri=40 -> /usr/share/X11/fonts/Type1
+ type1:pri=50 -> /usr/share/fonts/default/Type1
will add /usr/share/X11/fonts/misc as the first FPE with the attribute
'unscaled', second FPE will be /usr/share/X11/fonts/75dpi, also with
the attribute unscaled etc. This is functionally equivalent to setting
the following font path:
- /usr/share/X11/fonts/misc:unscaled,
- /usr/share/X11/fonts/75dpi:unscaled,
- /usr/share/X11/fonts/Type1,
- /usr/share/fonts/default/Type1,
- /usr/share/fonts/default/ghostscript
+ /usr/share/X11/fonts/misc:unscaled,
+ /usr/share/X11/fonts/75dpi:unscaled,
+ /usr/share/X11/fonts/Type1,
+ /usr/share/fonts/default/Type1,
+ /usr/share/fonts/default/ghostscript
The motivation is to let font packages add a symlink to the new font
directory they provide instead of rewriting either the Xorg config file
diff -r 261518522991 -r 6e95a4fdf90a external/mit/libXfont2/dist/Makefile.am
Home |
Main Index |
Thread Index |
Old Index