Update font-util to 1.3.3

10 files changed, 337 insertions, 39 deletions

diff --git a/font/util/ChangeLog b/font/util/ChangeLog
index 19f92b76b..9c642abdb 100644
--- a/font/util/ChangeLog
+++ b/font/util/ChangeLog
@@ -1,3 +1,80 @@
+commit 2ef6b22ad908c024b6c2fbde5c1de62123f82dc2
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Tue Jul 12 11:28:17 2022 -0700
+
+    font-util 1.3.3
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 88bd16463e59455cda7e45e563867988c7e70d8d
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Tue Jul 12 11:26:05 2022 -0700
+
+    Fix spelling/wording issues
+    
+    Found by using:
+        codespell --builtin clear,rare,usage,informal,code,names
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit aaddab088412777ffea435e83847f8aac9b9ce81
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Wed Dec 8 14:11:58 2021 -0800
+
+    Build xz tarballs instead of bzip2
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit e1a2c79b4edea2af1a82db24b2dc993a6e530d5a
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Wed Dec 8 14:11:54 2021 -0800
+
+    gitlab CI: add a basic build test
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 564adb96f10a0bf43d67401b05ba0fcafe7c0a83
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Mon Nov 16 18:22:23 2020 -0800
+
+    ucs2any: handle NULL returns from zquotedcpy()
+    
+    bdf file for testing:
+    
+    STARTFONT 2.1
+    FONT "Bad quotes test font-ISO10646-1
+    SIZE 7 75 75
+    FONTBOUNDINGBOX 5 7 0 -1
+    STARTPROPERTIES 3
+    SPACING "C
+    SLANT "R
+    ENDPROPERTIES
+    CHARS 0
+    ENDFONT
+    
+    Before this fix, the above segfaults when the NULL return from
+    zquotedcpy() is passed to other functions expecting a string.
+    
+    Fixes: 21063_61 & 21063_86 from https://cyber-itl.org/2020/10/28/citl-7000-defects.html
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit f78cd55ccd913855cc5569dfe2a9213e217bc469
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sun Nov 15 17:06:26 2020 -0800
+
+    ucs2any: avoid segfaults if SLANT property is missing
+    
+    Test case:
+     grep -v SLANT ../../misc-misc/5x7.bdf > 5x7-noslant.bdf
+     ucs2any 5x7-noslant.bdf ../map-ISO8859-1 -d
+    
+    Before this fix, the above segfaults in strcmp with a NULL slant pointer.
+    
+    Fixes: 21063_131 from https://cyber-itl.org/2020/10/28/citl-7000-defects.html
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
 commit d45011b8324fecebb4fc79e57491d341dd96e325
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Sun Aug 25 15:23:33 2019 -0700
@@ -345,6 +422,191 @@ Date:   Thu Apr 28 00:39:17 2011 -0700
     Found-by: clang static analyzer
     Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
 
+commit a0d43f88e563ca2fd376bbe222d4809b9976624b
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date:   Wed Oct 6 17:00:03 2010 -0700
+
+    font-util 1.2.0
+    
+    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 5cad514d15c61cdf73a7dbd6d88f3e823a0d2d99
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date:   Wed Oct 6 16:59:20 2010 -0700
+
+    fontutil.m4: Add XORG_FONT_FC_CONFDIR to find fontconfig's confdir
+    
+    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+    Acked-by: Gaetan Nadon <memsize@videotron.ca>
+    Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 62529733e57b6d6c775b1bcf584260b1cff6af5c
+Author: Michał Górny < <mgorny@gentoo.org>
+Date:   Thu Oct 7 17:31:06 2010 +0200
+
+    fontutil.m4: Add a shorthand --disable-all-encodings option.
+    
+    This option is useful to disable all possible font encodings at once,
+    without fine-graining the calling ebuilds for a list of encodings
+    supported by each font package.
+    
+    The option is parsed before all other encoding options, so it basically
+    sets defaults for all of them. Afterwards, any encoding can be
+    re-enabled back using '--enable-<encoding>' (much like
+    '--disable-all-encodings --enable-iso8859-2').
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+    Acked-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 7757000fca0f7fc6d966eb1f45c226862ed8e489
+Author: Jesse Adkins <jesserayadkins@gmail.com>
+Date:   Tue Sep 28 13:30:01 2010 -0700
+
+    Purge cvs tags.
+    
+    Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 0a715f61f878cfe22470608036c3fdfc7d89bca1
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Mon Oct 4 21:31:43 2010 -0700
+
+    font-util 1.1.2
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit a43ab24c31aa5626b3f28b813a246c4b930b0e97
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Mon Oct 4 21:30:06 2010 -0700
+
+    Sun's copyrights now belong to Oracle
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit c2112acec406c80cfc29a7af9c2a39afb9c38475
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Tue Jul 20 18:45:18 2010 -0400
+
+    config: update AC_PREREQ statement to 2.60
+    
+    Unrelated to the previous patches, the new value simply reflects
+    the reality that the minimum level for autoconf to configure
+    all x.org modules is 2.60 dated June 2006.
+    
+    ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 41bf28914ae27d8cf9a93db5fa5f65ca5a68d4bf
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Fri Aug 27 18:22:37 2010 -0400
+
+    XORG_FONT_REQUIRED_PROG: should stop when program is missing #14436
+    
+    The macro was designed to test for a program and, when missing, stop
+    the configuration. The first parameter to the macro is a variable
+    name which is used by AC_PATH_PROG to store the program path.
+    The test failed to reference the variable content, it tested the
+    variable name which is never blank.
+    
+    BDFTOPCF MKFONTSCALE MKFONTDIR COMPRESS and UCS2ANY were affected.
+    
+    Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+    Tested-by: Jesse Adkins <jesserayadkins@gmail.com>
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit e8d3097d42969fa1e32eff2ece252ff584d3d56a
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Fri Aug 20 09:27:12 2010 -0400
+
+    config: upgrade to util-macros 1.8 for additional man page support
+    
+    Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+    The value of MAN_SUBST is the same for all X.Org packages.
+    
+    Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit d310e0321f888bf2fc215587457722a73b0f127a
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Thu May 20 19:11:38 2010 -0700
+
+    Replace /usr/X11R6 mapfiles path in manpage with actual path via sed
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 6ce4badc29d599835a9f2593aa9835b1905a72a2
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Sun Mar 28 14:45:56 2010 -0400
+
+    config:  remove fontutil.pc.in from the EXTRA_DIST variable
+    
+    It is automatically distributed in the tarball by Automake
+    
+    Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 86893646727ac02b46d67ec81502451463dd9ed2
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Sat Mar 27 11:21:41 2010 -0400
+
+    config: generated fontutil.m4 is "installed", not "distributed"
+    
+    Generated files are not included in the tarball, only .in files
+    The fontutil.m4.in file is added in the tarball by Automake.
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 85e9d27df3e806106d395f66143bcc1372fece90
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Thu Jan 14 21:51:38 2010 -0800
+
+    Update Sun license notices to current X.Org standard form
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit af6b1bfacb2ebd2dc27b5c81398ec3d9f5cd35cc
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Mon Nov 23 14:59:02 2009 -0500
+
+    Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+    
+    Now that the INSTALL file is generated.
+    Allows running make maintainer-clean.
+
+commit b80d458dbe1704a7a351849a6e588c57205ac9c9
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Sun Oct 18 20:49:07 2009 -0400
+
+    Makefile.am: add INSTALL target and clean ChangeLog DIST targets
+    
+    Add INSTALL target to generate file with INSTALL_CMD #24206
+    ChangeLog is not required in EXTRA_DIST  #24432
+    ChangeLog is not required in MAINTAINERCLEANFILES #24432
+
+commit af090eb780ae74f102d6eda036e0b3bc888561b4
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Sun Oct 18 20:34:34 2009 -0400
+
+    INSTALL, NEWS, README COPYING or AUTHORS files are missing/incorrect #24206
+    
+    Add missing INSTALL file. Use standard GNU file on building tarball
+    README may have been updated
+    COPYING may have been updated
+    Remove AUTHORS file as it is empty and no content available yet.
+    Remove NEWS file as it is empty and no content available yet.
+
+commit 2ca7b784d9a53e00a393dcfd7c4ea1bf7223d98b
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Mon Nov 23 13:38:51 2009 -0500
+
+    .gitignore: use common defaults with custom section # 24239
+    
+    Using common defaults will reduce errors and maintenance.
+    Only the very small or inexistent custom section need periodic maintenance
+    when the structure of the component changes. Do not edit defaults.
+
 commit 640a11b930dde29a5a74bcecec858d0a8255c013
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Mon Oct 12 08:49:02 2009 -0700
diff --git a/font/util/Makefile.in b/font/util/Makefile.in
index 2776baed7..085b480f9 100644
--- a/font/util/Makefile.in
+++ b/font/util/Makefile.in
@@ -212,9 +212,9 @@ am__relativize = \
     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
   done; \
   reldir="$$dir2"
-DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
+DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.xz
 GZIP_ENV = --best
-DIST_TARGETS = dist-bzip2 dist-gzip
+DIST_TARGETS = dist-xz dist-gzip
 distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -332,6 +332,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -768,6 +769,7 @@ distdir: $(DISTFILES)
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	$(am__post_remove_distdir)
+
 dist-bzip2: distdir
 	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
 	$(am__post_remove_distdir)
@@ -775,7 +777,6 @@ dist-bzip2: distdir
 dist-lzip: distdir
 	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
 	$(am__post_remove_distdir)
-
 dist-xz: distdir
 	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
 	$(am__post_remove_distdir)
diff --git a/font/util/README.md b/font/util/README.md
index fa1c38e1d..6f7b0b590 100644
--- a/font/util/README.md
+++ b/font/util/README.md
@@ -11,7 +11,7 @@ Xorg mailing list:
 
   https://lists.x.org/mailman/listinfo/xorg
 
-The master development code repository can be found at:
+The primary development code repository can be found at:
 
   https://gitlab.freedesktop.org/xorg/font/util
 
diff --git a/font/util/aclocal.m4 b/font/util/aclocal.m4
index 2a518c4b6..d0a818e1e 100644
--- a/font/util/aclocal.m4
+++ b/font/util/aclocal.m4
@@ -19,9 +19,9 @@ 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'.])])
 
-dnl pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
-dnl serial 11 (pkg-config-0.29.1)
-dnl
+# pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
+# serial 12 (pkg-config-0.29.2)
+
 dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
 dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
 dnl
@@ -62,7 +62,7 @@ dnl
 dnl See the "Since" comment for each macro you use to see what version
 dnl of the macros you require.
 m4_defun([PKG_PREREQ],
-[m4_define([PKG_MACROS_VERSION], [0.29.1])
+[m4_define([PKG_MACROS_VERSION], [0.29.2])
 m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
     [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
 ])dnl PKG_PREREQ
@@ -163,7 +163,7 @@ AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
 AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
 
 pkg_failed=no
-AC_MSG_CHECKING([for $1])
+AC_MSG_CHECKING([for $2])
 
 _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
 _PKG_CONFIG([$1][_LIBS], [libs], [$2])
@@ -173,11 +173,11 @@ and $1[]_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.])
 
 if test $pkg_failed = yes; then
-   	AC_MSG_RESULT([no])
+        AC_MSG_RESULT([no])
         _PKG_SHORT_ERRORS_SUPPORTED
         if test $_pkg_short_errors_supported = yes; then
 	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
-        else 
+        else
 	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
@@ -194,7 +194,7 @@ installed software in a non-standard prefix.
 _PKG_TEXT])[]dnl
         ])
 elif test $pkg_failed = untried; then
-     	AC_MSG_RESULT([no])
+        AC_MSG_RESULT([no])
 	m4_default([$4], [AC_MSG_FAILURE(
 [The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
diff --git a/font/util/compile b/font/util/compile
index a85b723c7..df363c8fb 100644
--- a/font/util/compile
+++ b/font/util/compile
@@ -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 <tromey@cygnus.com>.
 #
 # 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:
diff --git a/font/util/configure b/font/util/configure
index 3fa9ab6ad..5941a806e 100644
--- a/font/util/configure
+++ b/font/util/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for font-util 1.3.2.
+# Generated by GNU Autoconf 2.69 for font-util 1.3.3.
 #
 # Report bugs to <https://gitlab.freedesktop.org/xorg/font/util/issues>.
 #
@@ -581,8 +581,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='font-util'
 PACKAGE_TARNAME='font-util'
-PACKAGE_VERSION='1.3.2'
-PACKAGE_STRING='font-util 1.3.2'
+PACKAGE_VERSION='1.3.3'
+PACKAGE_STRING='font-util 1.3.3'
 PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/font/util/issues'
 PACKAGE_URL=''
 
@@ -729,6 +729,7 @@ infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -809,6 +810,7 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1061,6 +1063,15 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1198,7 +1209,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+		libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1311,7 +1322,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures font-util 1.3.2 to adapt to many kinds of systems.
+\`configure' configures font-util 1.3.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1351,6 +1362,7 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -1381,7 +1393,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of font-util 1.3.2:";;
+     short | recursive ) echo "Configuration of font-util 1.3.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1493,7 +1505,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-font-util configure 1.3.2
+font-util configure 1.3.3
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1750,7 +1762,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by font-util $as_me 1.3.2, which was
+It was created by font-util $as_me 1.3.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2579,7 +2591,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='font-util'
- VERSION='1.3.2'
+ VERSION='1.3.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -10961,7 +10973,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by font-util $as_me 1.3.2, which was
+This file was extended by font-util $as_me 1.3.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -11027,7 +11039,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-font-util config.status 1.3.2
+font-util config.status 1.3.3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/font/util/configure.ac b/font/util/configure.ac
index d0e3a2648..68515c61a 100644
--- a/font/util/configure.ac
+++ b/font/util/configure.ac
@@ -23,13 +23,13 @@ dnl Process this file with autoconf to create configure.
 
 # Initialize Autoconf
 AC_PREREQ([2.60])
-AC_INIT([font-util], [1.3.2],
+AC_INIT([font-util], [1.3.3],
 	[https://gitlab.freedesktop.org/xorg/font/util/issues], [font-util])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])
 
 # Initialize Automake
-AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-xz])
 
 # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
 m4_ifndef([XORG_MACROS_VERSION],
diff --git a/font/util/man/Makefile.in b/font/util/man/Makefile.in
index 737b4d979..b7090c572 100644
--- a/font/util/man/Makefile.in
+++ b/font/util/man/Makefile.in
@@ -245,6 +245,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
diff --git a/font/util/man/ucs2any.man b/font/util/man/ucs2any.man
index 0a619f457..6c54ea388 100644
--- a/font/util/man/ucs2any.man
+++ b/font/util/man/ucs2any.man
@@ -62,7 +62,7 @@ and
 .SH FUTURE DIRECTIONS
 Hopefully a future release will have a facility similar to
 .B ucs2any
-built into the server, and reencode ISO 10646-1 on the fly, because
+built into the server, and re-encode ISO 10646-1 on the fly, because
 storing the same fonts in many different encodings is clearly a waste of
 storage capacity.
 .SH "SEE ALSO"
diff --git a/font/util/ucs2any.c b/font/util/ucs2any.c
index 1f575d14f..777ab6441 100644
--- a/font/util/ucs2any.c
+++ b/font/util/ucs2any.c
@@ -32,7 +32,7 @@
  * derive from a single ISO10646-1 master font a whole set of 8-bit
  * fonts in all ISO 8859 and various other encodings. (Hopefully
  * a future XFree86 release will have a similar facility built into
- * the server, which can reencode ISO10646-1 on the fly, because
+ * the server, which can re-encode ISO10646-1 on the fly, because
  * storing the same fonts in many different encodings is clearly
  * a waste of storage capacity).
 */
@@ -586,6 +586,12 @@ main(int argc, char *argv[])
 				char * term;
 				/* slightly simplistic check ... */
 				zquotedcpy(&fontname, nextc);
+				if (fontname == NULL) {
+					fprintf(stderr,
+						"%s: FONT name in '%s' is invalid string '%s'!\n",
+						my_name, fsource, nextc);
+					exit(1);
+				}
 				if ((term = strstr(fontname, "-ISO10646-1")) == NULL) {
 					fprintf(stderr,
 						"%s: FONT name in '%s' is '%s' and not '*-ISO10646-1'!\n",
@@ -621,11 +627,23 @@ main(int argc, char *argv[])
 			} else if ((nextc = startswith(l, "SLANT")) != NULL)
 			{
 				zquotedcpy(&slant, nextc);
+				if (slant == NULL) {
+					fprintf(stderr,
+						"%s: SLANT property in '%s' is invalid string '%s'!\n",
+						my_name, fsource, nextc);
+					exit(1);
+				}
 				slant_index = ++nextheader;
 				da_add_str(headers, slant_index, NULL);
 			} else if ((nextc = startswith(l, "SPACING")) != NULL)
 			{
 				zquotedcpy(&spacing, nextc);
+				if (spacing == NULL) {
+					fprintf(stderr,
+						"%s: SPACING property in '%s' is invalid string '%s'!\n",
+						my_name, fsource, nextc);
+					exit(1);
+				}
 				zstrtoupper(spacing);
 				spacing_index = ++nextheader;
 				da_add_str(headers, spacing_index, NULL);
@@ -707,7 +725,7 @@ main(int argc, char *argv[])
 			free(temp);
 		} else {
 			fprintf(stderr, "map file argument \"%s\" needs a "
-			    "coresponding registry-encoding argument\n", fmap);
+			    "corresponding registry-encoding argument\n", fmap);
 			exit(0);
 		}
 
@@ -752,9 +770,11 @@ main(int argc, char *argv[])
 					da_add_int(map, target, ucs);
 				} else {
 					if (!((is_blockgraphics(ucs) &&
+						slant != NULL &&
 						strcmp(slant, "R") != 0) ||
 						(ucs >= 0x200e &&
-						ucs <= 0x200f)))							{
+						ucs <= 0x200f)))
+					{
 						fprintf(stderr,
 							"No glyph for character U+%04X (0x%02x) available.\n",
 							ucs, target);
@@ -780,8 +800,9 @@ main(int argc, char *argv[])
 		}
 
 		if (dec_chars == 1 ||
-			(dec_chars == -1 && strcmp(slant, "R") == 0 &&
-			strcmp(spacing, "C") == 0))
+			(dec_chars == -1 &&
+			 (slant != NULL && strcmp(slant, "R") == 0) &&
+			 (spacing != NULL && strcmp(spacing, "C") == 0)))
 		{
 			/* add DEC VT100 graphics characters in the range 1-31
 			   (as expected by some old xterm versions) */