xrdb 1.1.1

2018-03-18 23:17:05 +01:00 · 2018-03-18 23:17:05 +01:00 · 98dc0f7dea
parent 5120f4f71d
commit 98dc0f7dea
16 changed files with 3675 additions and 3243 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -7,6 +7,7 @@ x11-xserver-utils (7.7+8) UNRELEASED; urgency=medium
      drop, applied upstream
  * Update packaging VCS URLs for move to salsa.
  * iceauth 1.0.8
  * xrdb 1.1.1
 -- Julien Cristau <jcristau@debian.org>  Sun, 21 Aug 2016 17:49:57 +0200
--- a/xrdb/ChangeLog
+++ b/xrdb/ChangeLog
@ -1,3 +1,158 @@
 commit 74e8f61bd2f6857b8f242ffd34b3fe0ba1a04aa9
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Fri Mar 9 18:28:18 2018 -0800
    xrdb 1.1.1
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
 commit ae86081a92522653ff1523c92524ff892f75d496
 Author: Mihail Konev <k.mvc@ya.ru>
 Date:   Thu Jan 26 14:00:21 2017 +1000
    autogen: add default patch prefix
    Signed-off-by: Mihail Konev <k.mvc@ya.ru>
 commit b8909fc97335fae5bffa43914379787b27171b17
 Author: Emil Velikov <emil.l.velikov@gmail.com>
 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>
    Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
 commit d65dc2a5fe6566b13c4b4a55f7d6977365ad1865
 Author: Peter Hutterer <peter.hutterer@who-t.net>
 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>
    Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
 commit 3ae3e2f9d2b86fc3808a4631f79b6087bd1a81a4
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Fri Apr 24 00:25:04 2015 -0700
    Use reallocarray() for array allocations & resizing
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
    Reviewed-by: Matthieu Herrb <matthieu@herrb.eu>
 commit b21b44b214e9f4728665fcfd13da6e43ee93069a
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Fri Apr 24 00:11:47 2015 -0700
    Fix "editting" typo in comment
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
 commit 843b15fc3c3be5effef78fe6b5abaa11788f0908
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Fri Apr 24 00:09:18 2015 -0700
    Reformat code to X.Org standard coding style
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
 commit 8b8d03f970115df28232c588b585d3751f1780fb
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Sat Nov 8 09:24:04 2014 -0800
    Use SEEK_* names instead of raw numbers for fseek whence argument
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
 commit ae495ec8de483ab99fe51bb36b95af4f50973387
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Tue Jun 3 22:45:20 2014 -0700
    Print which option was in error along with usage message
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
 commit 01a023d7078f3325f626e8d499307b0d92eef64d
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Tue Jun 3 22:28:54 2014 -0700
    unifdef -U__UNIXOS2__
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
 commit 8a051c45632ee88a4ca0ca492fe8c5cae4b71299
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Tue Jun 3 22:27:10 2014 -0700
    Stop casting free() arguments to (char *)
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
 commit 7a464b04727516775c0a23325a2c69ba1357b00d
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Tue Jun 3 22:24:40 2014 -0700
    Clean up sign/size conversion warnings from clang
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
 commit 074f6439a8606d9d191280ccffb37daa3c15e868
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Tue Jun 3 20:16:28 2014 -0700
    Remove unused macro RESOURCE_PROPERTY_NAME
    Flagged by clang:
    xrdb.c:92:9: warning: macro is not used [-Wunused-macros]
            ^
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
 commit 118f7d099b99432d7f7013ae51de85b9561ee413
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Tue Jun 3 20:13:28 2014 -0700
    configure: add more m4 quoting to quiet autoconf complaints
    Gets rid of these warnings:
    configure.ac:54: warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected in body
    ../../lib/autoconf/lang.m4:194: AC_LANG_CONFTEST is expanded from...
    ../../lib/autoconf/general.m4:2591: _AC_COMPILE_IFELSE is expanded from...
    ../../lib/autoconf/general.m4:2607: AC_COMPILE_IFELSE is expanded from...
    configure.ac:54: the top level
    configure.ac:61: warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected in body
    ../../lib/autoconf/lang.m4:194: AC_LANG_CONFTEST is expanded from...
    ../../lib/autoconf/general.m4:2591: _AC_COMPILE_IFELSE is expanded from...
    ../../lib/autoconf/general.m4:2607: AC_COMPILE_IFELSE is expanded from...
    configure.ac:61: the top level
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
 commit 6699bfcb0bcc148a4659c5c2434594a6e7fbe757
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Tue Jun 3 18:47:31 2014 -0700
    autogen.sh: Honor NOCONFIGURE=1
    See http://people.gnome.org/~walters/docs/build-api.txt
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
 commit 1b1793b6bc469415b152918204dbc9e999e9815e
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Tue Jun 3 18:47:31 2014 -0700
    configure: Drop AM_MAINTAINER_MODE
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
 commit 17eda976c8dca736ef63fc45ff7de8c73c0e2936
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Sun Sep 8 10:16:42 2013 -0700
--- a/xrdb/INSTALL
+++ b/xrdb/INSTALL
@ -1,11 +1,13 @@
 Installation Instructions
 *************************
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
-2006, 2007, 2008 Free Software Foundation, Inc.
+Inc.
-   This file is free documentation; the Free Software Foundation gives
+   Copying and distribution of this file, with or without modification,
-unlimited permission to copy, distribute and modify it.
+are permitted in any medium without royalty provided the copyright
 notice and this notice are preserved.  This file is offered as-is,
 without warranty of any kind.
 Basic Installation
 ==================
@ -13,7 +15,11 @@ Basic Installation
   Briefly, the shell commands `./configure; make; make install' should
 configure, build, and install this package.  The following
 more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
+instructions specific to this package.  Some packages provide this
 `INSTALL' file but do not implement all of the features documented
 below.  The lack of an optional feature in a given package is not
 necessarily a bug.  More recommendations for GNU packages can be found
 in *note Makefile Conventions: (standards)Makefile Conventions.
   The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
@ -53,12 +59,22 @@ The simplest way to compile this package is:
  2. Type `make' to compile the package.
  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
+     the package, generally using the just-built uninstalled binaries.
  4. Type `make install' to install the programs and any data files and
-     documentation.
+     documentation.  When installing into a prefix owned by root, it is
     recommended that the package be configured and built as a regular
     user, and only the `make install' phase executed with root
     privileges.
-  5. You can remove the program binaries and object files from the
+  5. Optionally, type `make installcheck' to repeat any self-tests, but
     this time using the binaries in their final installed location.
     This target does not install anything.  Running this target as a
     regular user, particularly if the prior `make install' required
     root privileges, verifies that the installation completed
     correctly.
  6. You can remove the program binaries and object files from the
     source code directory by typing `make clean'.  To also remove the
     files that `configure' created (so you can compile the package for
     a different kind of computer), type `make distclean'.  There is
@ -67,8 +83,15 @@ The simplest way to compile this package is:
     all sorts of other programs in order to regenerate files that came
     with the distribution.
-  6. Often, you can also type `make uninstall' to remove the installed
+  7. Often, you can also type `make uninstall' to remove the installed
-     files again.
+     files again.  In practice, not all packages have tested that
     uninstallation works correctly, even though it is required by the
     GNU Coding Standards.
  8. Some packages, particularly those that use Automake, provide `make
     distcheck', which can by used by developers to test that all other
     targets like `make install' and `make uninstall' work correctly.
     This target is generally not run by end users.
 Compilers and Options
 =====================
@ -93,7 +116,8 @@ same time, by placing the object files for each architecture in their
 own directory.  To do this, you can use GNU `make'.  `cd' to the
 directory where you want the object files and executables to go and run
 the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
+source code in the directory that `configure' is in and in `..'.  This
 is known as a "VPATH" build.
   With a non-GNU `make', it is safer to compile the package for one
 architecture at a time in the source code directory.  After you have
@ -120,7 +144,8 @@ Installation Names
   By default, `make install' installs the package's commands under
 `/usr/local/bin', include files under `/usr/local/include', etc.  You
 can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
 absolute file name.
   You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
@ -131,15 +156,46 @@ Documentation and other data files still use the regular prefix.
   In addition, if you use an unusual directory layout you can give
 options like `--bindir=DIR' to specify different values for particular
 kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
+you can set and what kinds of files go in them.  In general, the
 default for these options is expressed in terms of `${prefix}', so that
 specifying just `--prefix' will affect all of the other directory
 specifications that were not explicitly provided.
   The most portable way to affect installation locations is to pass the
 correct locations to `configure'; however, many packages provide one or
 both of the following shortcuts of passing variable assignments to the
 `make install' command line to change installation locations without
 having to reconfigure or recompile.
   The first method involves providing an override variable for each
 affected directory.  For example, `make install
 prefix=/alternate/directory' will choose an alternate location for all
 directory configuration variables that were expressed in terms of
 `${prefix}'.  Any directories that were specified during `configure',
 but not in terms of `${prefix}', must each be overridden at install
 time for the entire installation to be relocated.  The approach of
 makefile variable overrides for each directory variable is required by
 the GNU Coding Standards, and ideally causes no recompilation.
 However, some platforms have known limitations with the semantics of
 shared libraries that end up requiring recompilation when using this
 method, particularly noticeable in packages that use GNU Libtool.
   The second method involves providing the `DESTDIR' variable.  For
 example, `make install DESTDIR=/alternate/directory' will prepend
 `/alternate/directory' before all installation names.  The approach of
 `DESTDIR' overrides is not required by the GNU Coding Standards, and
 does not work on platforms that have drive letters.  On the other hand,
 it does better at avoiding recompilation issues, and works well even
 when some directory options were not specified in terms of `${prefix}'
 at `configure' time.
 Optional Features
 =================
   If the package supports it, you can cause programs to be installed
 with an extra prefix or suffix on their names by giving `configure' the
 option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
 Optional Features
 =================
   Some packages pay attention to `--enable-FEATURE' options to
 `configure', where FEATURE indicates an optional part of the package.
 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
@ -152,6 +208,13 @@ find the X include and library files automatically, but if it doesn't,
 you can use the `configure' options `--x-includes=DIR' and
 `--x-libraries=DIR' to specify their locations.
   Some packages offer the ability to configure how verbose the
 execution of `make' will be.  For these packages, running `./configure
 --enable-silent-rules' sets the default to minimal output, which can be
 overridden with `make V=1'; while running `./configure
 --disable-silent-rules' sets the default to verbose, which can be
 overridden with `make V=0'.
 Particular systems
 ==================
@ -159,10 +222,15 @@ Particular systems
 CC is not installed, it is recommended to use the following options in
 order to use an ANSI C compiler:
-     ./configure CC="cc -Ae"
+     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
   HP-UX `make' updates targets which have the same time stamps as
 their prerequisites, which makes it generally unusable when shipped
 generated files such as `configure' are involved.  Use GNU `make'
 instead.
   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
 parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
 a workaround.  If GNU CC is not installed, it is therefore recommended
@ -174,6 +242,16 @@ and if that doesn't work, try
     ./configure CC="cc -nodtk"
   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
 directory contains several dysfunctional programs; working variants of
 these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
 in your `PATH', put it _after_ `/usr/bin'.
   On Haiku, software installed for all users goes in `/boot/common',
 not `/usr/local'.  It is recommended to use the following options:
     ./configure --prefix=/boot/common
 Specifying the System Type
 ==========================
@ -189,7 +267,8 @@ type, such as `sun4', or a canonical name which has the form:
 where SYSTEM can have one of these forms:
-     OS KERNEL-OS
+     OS
     KERNEL-OS
   See the file `config.sub' for the possible values of each field.  If
 `config.sub' isn't included in this package, then this package doesn't
@ -277,7 +356,7 @@ operates.
     `configure' can determine that directory automatically.
 `--prefix=DIR'
-     Use DIR as the installation prefix.  *Note Installation Names::
+     Use DIR as the installation prefix.  *note Installation Names::
     for more details, including other options available for fine-tuning
     the installation locations.
--- a/xrdb/Makefile.in
+++ b/xrdb/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -36,7 +36,17 @@
 #  PERFORMANCE OF THIS SOFTWARE.
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
  if test -z '$(MAKELEVEL)'; then \
    false; \
  elif test -n '$(MAKE_HOST)'; then \
    true; \
  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
    true; \
  else \
    false; \
  fi; \
 }
 am__make_running_with_option = \
  case $${target_option-} in \
      ?) ;; \
@ -101,15 +111,12 @@ build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = xrdb$(EXEEXT)
 subdir = .
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/configure $(am__configure_deps) \
 	$(srcdir)/config.h.in depcomp AUTHORS COPYING ChangeLog \
 	INSTALL README compile config.guess config.sub install-sh \
 	missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
 	$(am__configure_deps) $(am__DIST_COMMON)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
 configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
@ -195,6 +202,9 @@ ETAGS = etags
 CTAGS = ctags
 CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in AUTHORS \
 	COPYING ChangeLog INSTALL README compile config.guess \
 	config.sub depcomp install-sh missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@ -282,7 +292,6 @@ LIBS = @LIBS@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAN_SUBSTS = @MAN_SUBSTS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
@ -298,6 +307,8 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@ -371,7 +382,7 @@ all: config.h
 .SUFFIXES: .c .o .obj
 am--refresh: Makefile
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@ -384,7 +395,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@ -398,9 +408,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure:  $(am__configure_deps)
 	$(am__cd) $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 $(am__aclocal_m4_deps):
@ -411,7 +421,7 @@ config.h: stamp-h1
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
 	cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
+$(srcdir)/config.h.in:  $(am__configure_deps) 
 	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
 	rm -f stamp-h1
 	touch $@
@ -676,15 +686,15 @@ dist-xz: distdir
 	$(am__post_remove_distdir)
 dist-tarZ: distdir
-	@echo WARNING: "Support for shar distribution archives is" \
+	@echo WARNING: "Support for distribution archives compressed with" \
-	               "deprecated." >&2
+		       "legacy program 'compress' is deprecated." >&2
 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__post_remove_distdir)
 dist-shar: distdir
-	@echo WARNING: "Support for distribution archives compressed with" \
+	@echo WARNING: "Support for shar distribution archives is" \
-		       "legacy program 'compress' is deprecated." >&2
+	               "deprecated." >&2
 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
 	$(am__post_remove_distdir)
@ -720,16 +730,17 @@ distcheck: dist
 	esac
 	chmod -R a-w $(distdir)
 	chmod u+w $(distdir)
-	mkdir $(distdir)/_build $(distdir)/_inst
+	mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
 	chmod a-w $(distdir)
 	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && am__cwd=`pwd` \
-	  && $(am__cd) $(distdir)/_build \
+	  && $(am__cd) $(distdir)/_build/sub \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	  && ../../configure \
 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
 	    --srcdir=../.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
@ -913,6 +924,8 @@ uninstall-am: uninstall-binPROGRAMS
 	ps ps-am tags tags-am uninstall uninstall-am \
 	uninstall-binPROGRAMS
 .PRECIOUS: Makefile
 .PHONY: ChangeLog INSTALL
--- a/xrdb/aclocal.m4
+++ b/xrdb/aclocal.m4
--- a/xrdb/compile
+++ b/xrdb/compile
@ -3,7 +3,7 @@
 scriptversion=2012-10-14.11; # UTC
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
--- a/xrdb/config.guess
+++ b/xrdb/config.guess
--- a/xrdb/config.h.in
+++ b/xrdb/config.h.in
@ -15,6 +15,9 @@
 /* Define to 1 if you have the `mkstemp' function. */
 #undef HAVE_MKSTEMP
 /* Define to 1 if you have the `reallocarray' function. */
 #undef HAVE_REALLOCARRAY
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
--- a/xrdb/config.sub
+++ b/xrdb/config.sub
@ -1,8 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2013 Free Software Foundation, Inc.
+#   Copyright 1992-2018 Free Software Foundation, Inc.
-timestamp='2013-04-24'
+timestamp='2018-02-28'
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@ -15,7 +15,7 @@ timestamp='2013-04-24'
 # 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
@ -25,7 +25,7 @@ timestamp='2013-04-24'
 # of the GNU General Public License, version 3 ("GPLv3").
-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+# Please send patches to <config-patches@gnu.org>.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@ -33,7 +33,7 @@ timestamp='2013-04-24'
 # Otherwise, we print the canonical config type on stdout and succeed.
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
@ -53,12 +53,11 @@ timestamp='2013-04-24'
 me=`echo "$0" | sed -e 's,.*/,,'`
 usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
+Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
       $0 [OPTION] ALIAS
 Canonicalize a configuration name.
-Operation modes:
+Options:
  -h, --help         print this help, then exit
  -t, --time-stamp   print date of last modification, then exit
  -v, --version      print version number, then exit
@ -68,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
-Copyright 1992-2013 Free Software Foundation, Inc.
+Copyright 1992-2018 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@ -95,7 +94,7 @@ while test $# -gt 0 ; do
    *local*)
       # First pass through any local machine types.
-       echo $1
+       echo "$1"
       exit ;;
    * )
@ -113,24 +112,24 @@ esac
 # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
 # Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-  knetbsd*-gnu* | netbsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
-  kopensolaris*-gnu* | \
+  kopensolaris*-gnu* | cloudabi*-eabi* | \
  storm-chaos* | os2-emx* | rtmk-nova*)
    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
    ;;
  android-linux)
    os=-linux-android
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+    basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
    ;;
  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    basic_machine=`echo "$1" | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
+    if [ "$basic_machine" != "$1" ]
-    then os=`echo $1 | sed 's/.*-/-/'`
+    then os=`echo "$1" | sed 's/.*-/-/'`
    else os=; fi
    ;;
 esac
@ -179,44 +178,44 @@ case $os in
 		;;
 	-sco6)
 		os=-sco5v6
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco5)
 		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco4)
 		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco3.2.[4-9]*)
 		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco3.2v[4-9]*)
 		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco5v6*)
 		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco*)
 		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-isc)
 		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-clix*)
 		basic_machine=clipper-intergraph
 		;;
 	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-lynx*178)
 		os=-lynxos178
@ -228,10 +227,7 @@ case $os in
 		os=-lynxos
 		;;
 	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'`
 		;;
 	-windowsnt*)
 		os=`echo $os | sed -e 's/windowsnt/winnt/'`
 		;;
 	-psos*)
 		os=-psos
@ -255,16 +251,18 @@ case $basic_machine in
 	| arc | arceb \
 	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
 	| avr | avr32 \
 	| ba \
 	| be32 | be64 \
 	| bfin \
-	| c4x | clipper \
+	| c4x | c8051 | clipper \
 	| d10v | d30v | dlx | dsp16xx \
-	| epiphany \
+	| e2k | epiphany \
-	| fido | fr30 | frv \
+	| fido | fr30 | frv | ft32 \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| hexagon \
-	| i370 | i860 | i960 | ia64 \
+	| i370 | i860 | i960 | ia16 | ia64 \
 	| ip2k | iq2000 \
 	| k1om \
 	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
@ -282,8 +280,10 @@ case $basic_machine in
 	| mips64vr5900 | mips64vr5900el \
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
 	| mipsisa32r6 | mipsisa32r6el \
 	| mipsisa64 | mipsisa64el \
 	| mipsisa64r2 | mipsisa64r2el \
 	| mipsisa64r6 | mipsisa64r6el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipsr5900 | mipsr5900el \
@ -295,14 +295,15 @@ case $basic_machine in
 	| nds32 | nds32le | nds32be \
 	| nios | nios2 | nios2eb | nios2el \
 	| ns16k | ns32k \
-	| open8 \
+	| open8 | or1k | or1knd | or32 \
-	| or1k | or32 \
+	| pdp10 | pj | pjl \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pru \
 	| pyramid \
 	| riscv32 | riscv64 \
 	| rl78 | rx \
 	| score \
-	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
@ -310,7 +311,8 @@ case $basic_machine in
 	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 	| ubicom32 \
 	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
-	| we32k \
+	| visium \
 	| wasm32 \
 	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
 		basic_machine=$basic_machine-unknown
@ -324,11 +326,14 @@ case $basic_machine in
 	c6x)
 		basic_machine=tic6x-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
+	leon|leon[3-9])
 		basic_machine=sparc-$basic_machine
 		;;
 	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
 		;;
 	ms1)
 		basic_machine=mt-unknown
@ -357,7 +362,7 @@ case $basic_machine in
 	  ;;
 	# Object if more than one company name word.
 	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
 		exit 1
 		;;
 	# Recognize the basic CPU types with company name.
@ -369,18 +374,20 @@ case $basic_machine in
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
 	| ba-* \
 	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
-	| clipper-* | craynv-* | cydra-* \
+	| c8051-* | clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
+	| e2k-* | elxsi-* \
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| hexagon-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
+	| i*86-* | i860-* | i960-* | ia16-* | ia64-* \
 	| ip2k-* | iq2000-* \
 	| k1om-* \
 	| le32-* | le64-* \
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
@ -400,8 +407,10 @@ case $basic_machine in
 	| mips64vr5900-* | mips64vr5900el-* \
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
 	| mipsisa32r6-* | mipsisa32r6el-* \
 	| mipsisa64-* | mipsisa64el-* \
 	| mipsisa64r2-* | mipsisa64r2el-* \
 	| mipsisa64r6-* | mipsisa64r6el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipsr5900-* | mipsr5900el-* \
@ -413,16 +422,19 @@ case $basic_machine in
 	| nios-* | nios2-* | nios2eb-* | nios2el-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| open8-* \
 	| or1k*-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
 	| pru-* \
 	| pyramid-* \
 	| riscv32-* | riscv64-* \
 	| rl78-* | romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
 	| tahoe-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tile*-* \
@ -430,6 +442,8 @@ case $basic_machine in
 	| ubicom32-* \
 	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
 	| vax-* \
 	| visium-* \
 	| wasm32-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
@ -443,7 +457,7 @@ case $basic_machine in
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
-		basic_machine=i386-unknown
+		basic_machine=i386-pc
 		os=-bsd
 		;;
 	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
@ -477,7 +491,7 @@ case $basic_machine in
 		basic_machine=x86_64-pc
 		;;
 	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	amdahl)
 		basic_machine=580-amdahl
@ -506,6 +520,9 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-aros
 		;;
 	asmjs)
 		basic_machine=asmjs-unknown
 		;;
 	aux)
 		basic_machine=m68k-apple
 		os=-aux
@ -519,7 +536,7 @@ case $basic_machine in
 		os=-linux
 		;;
 	blackfin-*)
-		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		os=-linux
 		;;
 	bluegene*)
@ -527,13 +544,13 @@ case $basic_machine in
 		os=-cnk
 		;;
 	c54x-*)
-		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	c55x-*)
-		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	c6x-*)
-		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	c90)
 		basic_machine=c90-cray
@ -622,10 +639,18 @@ case $basic_machine in
 		basic_machine=rs6000-bull
 		os=-bosx
 		;;
-	dpx2* | dpx2*-bull)
+	dpx2*)
 		basic_machine=m68k-bull
 		os=-sysv3
 		;;
 	e500v[12])
 		basic_machine=powerpc-unknown
 		os=$os"spe"
 		;;
 	e500v[12]-*)
 		basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		os=$os"spe"
 		;;
 	ebmon29k)
 		basic_machine=a29k-amd
 		os=-ebmon
@ -715,9 +740,6 @@ case $basic_machine in
 	hp9k8[0-9][0-9] | hp8[0-9][0-9])
 		basic_machine=hppa1.0-hp
 		;;
 	hppa-next)
 		os=-nextstep3
 		;;
 	hppaosf)
 		basic_machine=hppa1.1-hp
 		os=-osf
@ -730,26 +752,26 @@ case $basic_machine in
 		basic_machine=i370-ibm
 		;;
 	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
 		;;
 	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
 		os=-sysv4
 		;;
 	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
 		os=-sysv
 		;;
 	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
 		os=-solaris2
 		;;
 	i386mach)
 		basic_machine=i386-mach
 		os=-mach
 		;;
-	i386-vsta | vsta)
+	vsta)
 		basic_machine=i386-unknown
 		os=-vsta
 		;;
@ -767,17 +789,17 @@ case $basic_machine in
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
 	leon-*|leon[3-9]-*)
 		basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'`
 		;;
 	m68knommu)
 		basic_machine=m68k-unknown
 		os=-linux
 		;;
 	m68knommu-*)
-		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		os=-linux
 		;;
 	m88k-omron*)
 		basic_machine=m88k-omron
 		;;
 	magnum | m3230)
 		basic_machine=mips-mips
 		os=-sysv
@ -794,7 +816,7 @@ case $basic_machine in
 		os=-mingw64
 		;;
 	mingw32)
-		basic_machine=i386-pc
+		basic_machine=i686-pc
 		os=-mingw32
 		;;
 	mingw32ce)
@ -809,10 +831,10 @@ case $basic_machine in
 		os=-mint
 		;;
 	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+		basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`
 		;;
 	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+		basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown
 		;;
 	monitor)
 		basic_machine=m68k-rom68k
@ -822,15 +844,19 @@ case $basic_machine in
 		basic_machine=powerpc-unknown
 		os=-morphos
 		;;
 	moxiebox)
 		basic_machine=moxie-unknown
 		os=-moxiebox
 		;;
 	msdos)
 		basic_machine=i386-pc
 		os=-msdos
 		;;
 	ms1-*)
-		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'`
 		;;
 	msys)
-		basic_machine=i386-pc
+		basic_machine=i686-pc
 		os=-msys
 		;;
 	mvs)
@ -914,6 +940,12 @@ case $basic_machine in
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
 	nsv-tandem)
 		basic_machine=nsv-tandem
 		;;
 	nsx-tandem)
 		basic_machine=nsx-tandem
 		;;
 	op50n-* | op60c-*)
 		basic_machine=hppa1.1-oki
 		os=-proelf
@ -946,7 +978,7 @@ case $basic_machine in
 		os=-linux
 		;;
 	parisc-*)
-		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		os=-linux
 		;;
 	pbd)
@ -962,7 +994,7 @@ case $basic_machine in
 		basic_machine=i386-pc
 		;;
 	pc98-*)
-		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
@ -977,16 +1009,16 @@ case $basic_machine in
 		basic_machine=i786-pc
 		;;
 	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	pn)
 		basic_machine=pn-gould
@ -996,23 +1028,23 @@ case $basic_machine in
 	ppc | ppcbe)	basic_machine=powerpc-unknown
 		;;
 	ppc-* | ppcbe-*)
-		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
+	ppcle | powerpclittle)
 		basic_machine=powerpcle-unknown
 		;;
 	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	ppc64)	basic_machine=powerpc64-unknown
 		;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+	ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+	ppc64le | powerpc64little)
 		basic_machine=powerpc64le-unknown
 		;;
 	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	ps2)
 		basic_machine=i386-ibm
@ -1066,17 +1098,10 @@ case $basic_machine in
 	sequent)
 		basic_machine=i386-sequent
 		;;
 	sh)
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
 	sh5el)
 		basic_machine=sh5le-unknown
 		;;
-	sh64)
+	simso-wrs)
 		basic_machine=sh64-unknown
 		;;
 	sparclite-wrs | simso-wrs)
 		basic_machine=sparclite-wrs
 		os=-vxworks
 		;;
@ -1095,7 +1120,7 @@ case $basic_machine in
 		os=-sysv4
 		;;
 	strongarm-* | thumb-*)
-		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	sun2)
 		basic_machine=m68000-sun
@ -1217,6 +1242,9 @@ case $basic_machine in
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
 	x64)
 		basic_machine=x86_64-pc
 		;;
 	xbox)
 		basic_machine=i686-pc
 		os=-mingw32
@ -1225,20 +1253,12 @@ case $basic_machine in
 		basic_machine=xps100-honeywell
 		;;
 	xscale-* | xscalee[bl]-*)
-		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+		basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'`
 		;;
 	ymp)
 		basic_machine=ymp-cray
 		os=-unicos
 		;;
 	z8k-*-coff)
 		basic_machine=z8k-unknown
 		os=-sim
 		;;
 	z80-*-coff)
 		basic_machine=z80-unknown
 		os=-sim
 		;;
 	none)
 		basic_machine=none-none
 		os=-none
@ -1267,10 +1287,6 @@ case $basic_machine in
 	vax)
 		basic_machine=vax-dec
 		;;
 	pdp10)
 		# there are many clones, so DEC is not a safe bet
 		basic_machine=pdp10-unknown
 		;;
 	pdp11)
 		basic_machine=pdp11-dec
 		;;
@ -1280,9 +1296,6 @@ case $basic_machine in
 	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
 	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
 		basic_machine=sparc-sun
 		;;
 	cydra)
 		basic_machine=cydra-cydrome
 		;;
@ -1302,7 +1315,7 @@ case $basic_machine in
 		# Make sure to match an already-canonicalized machine name.
 		;;
 	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
 		exit 1
 		;;
 esac
@ -1310,10 +1323,10 @@ esac
 # Here we canonicalize certain aliases for manufacturers.
 case $basic_machine in
 	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+		basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'`
 		;;
 	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+		basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'`
 		;;
 	*)
 		;;
@ -1324,8 +1337,8 @@ esac
 if [ x"$os" != x"" ]
 then
 case $os in
-	# First match some system type aliases
+	# First match some system type aliases that might get confused
-	# that might get confused with valid system types.
+	# with valid system types.
 	# -solaris* is a basic system type, with this one exception.
 	-auroraux)
 		os=-auroraux
@ -1336,45 +1349,48 @@ case $os in
 	-solaris)
 		os=-solaris2
 		;;
 	-svr4*)
 		os=-sysv4
 		;;
 	-unixware*)
 		os=-sysv4.2uw
 		;;
 	-gnu/linux*)
 		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
 		;;
-	# First accept the basic system types.
+	# es1800 is here to avoid being matched by es* (a different OS)
 	-es1800*)
 		os=-ose
 		;;
 	# Now accept the basic system types.
 	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
+	# Each alternative MUST end in a * to match a version number.
 	# -sysv* is not here because it comes later, after sysvr4.
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
 	      | -sym* | -kopensolaris* | -plan9* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* | -aros* \
+	      | -aos* | -aros* | -cloudabi* | -sortix* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -bitrig* | -openbsd* | -solidbsd* \
+	      | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* | -hcos* \
-	      | -chorusos* | -chorusrdb* | -cegcc* \
+	      | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
 	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+	      | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
 	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+	      | -morphos* | -superux* | -rtmk* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
 	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \
 	      | -midnightbsd*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@ -1391,12 +1407,12 @@ case $os in
 	-nto*)
 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+	-sim | -xray | -os68k* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+	      | -windows* | -osx | -abug | -netware* | -os9* \
 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 		;;
 	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
+		os=`echo "$os" | sed -e 's|mac|macos|'`
 		;;
 	-linux-dietlibc)
 		os=-linux-dietlibc
@ -1405,10 +1421,10 @@ case $os in
 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
 		;;
 	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+		os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
 		;;
 	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
+		os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
 		;;
 	-opened*)
 		os=-openedition
@ -1419,12 +1435,6 @@ case $os in
 	-wince*)
 		os=-wince
 		;;
 	-osfrose*)
 		os=-osfrose
 		;;
 	-osf*)
 		os=-osf
 		;;
 	-utek*)
 		os=-bsd
 		;;
@ -1471,7 +1481,7 @@ case $os in
 	-oss*)
 		os=-sysv3
 		;;
-	-svr4)
+	-svr4*)
 		os=-sysv4
 		;;
 	-svr3)
@ -1486,32 +1496,38 @@ case $os in
 	-ose*)
 		os=-ose
 		;;
 	-es1800*)
 		os=-ose
 		;;
 	-xenix)
 		os=-xenix
 		;;
 	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
 		os=-mint
 		;;
 	-aros*)
 		os=-aros
 		;;
 	-zvmoe)
 		os=-zvmoe
 		;;
 	-dicos*)
 		os=-dicos
 		;;
 	-pikeos*)
 		# Until real need of OS specific support for
 		# particular features comes up, bare metal
 		# configurations are quite functional.
 		case $basic_machine in
 		    arm*)
 			os=-eabi
 			;;
 		    *)
 			os=-elf
 			;;
 		esac
 		;;
 	-nacl*)
 		;;
 	-ios)
 		;;
 	-none)
 		;;
 	*)
 		# Get rid of the `-' at the beginning of $os.
 		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+		echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2
 		exit 1
 		;;
 esac
@ -1546,6 +1562,9 @@ case $basic_machine in
 	c4x-* | tic4x-*)
 		os=-coff
 		;;
 	c8051-*)
 		os=-elf
 		;;
 	hexagon-*)
 		os=-elf
 		;;
@ -1589,9 +1608,6 @@ case $basic_machine in
 	mips*-*)
 		os=-elf
 		;;
 	or1k-*)
 		os=-elf
 		;;
 	or32-*)
 		os=-coff
 		;;
@ -1601,12 +1617,12 @@ case $basic_machine in
 	sparc-* | *-sun)
 		os=-sunos4.1.1
 		;;
 	pru-*)
 		os=-elf
 		;;
 	*-be)
 		os=-beos
 		;;
 	*-haiku)
 		os=-haiku
 		;;
 	*-ibm)
 		os=-aix
 		;;
@ -1661,9 +1677,6 @@ case $basic_machine in
 	i370-*)
 		os=-mvs
 		;;
 	*-next)
 		os=-nextstep3
 		;;
 	*-gould)
 		os=-sysv
 		;;
@ -1773,15 +1786,15 @@ case $basic_machine in
 				vendor=stratus
 				;;
 		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+		basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"`
 		;;
 esac
-echo $basic_machine$os
+echo "$basic_machine$os"
 exit
 # Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'write-file-functions 'time-stamp)
 # time-stamp-start: "timestamp='"
 # time-stamp-format: "%:y-%02m-%02d"
 # time-stamp-end: "'"
--- a/xrdb/configure
+++ b/xrdb/configure
--- a/xrdb/configure.ac
+++ b/xrdb/configure.ac
@ -22,7 +22,7 @@ dnl Process this file with autoconf to create configure.
 # Initialize Autoconf
 AC_PREREQ([2.60])
-AC_INIT([xrdb], [1.1.0],
+AC_INIT([xrdb], [1.1.1],
        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xrdb])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])
@ -30,7 +30,6 @@ AC_USE_SYSTEM_EXTENSIONS
 # Initialize Automake
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
 m4_ifndef([XORG_MACROS_VERSION],
@ -38,7 +37,7 @@ m4_ifndef([XORG_MACROS_VERSION],
 XORG_MACROS_VERSION(1.8)
 XORG_DEFAULT_OPTIONS
-AC_CHECK_FUNCS([mkstemp asprintf])
+AC_CHECK_FUNCS([mkstemp asprintf reallocarray])
 # Find MAXHOSTNAMELEN definition
 # Common hidey holes:
@ -53,15 +52,15 @@ if test x$FOUND_MAXHOSTNAMELEN != xyes ; then
 	FOUND_MAXHOSTNAMELEN='not found'
 	AC_COMPILE_IFELSE(
-	    AC_LANG_PROGRAM([#include <sys/param.h>],
+	    [AC_LANG_PROGRAM([#include <sys/param.h>],
-			    [int h = MAXHOSTNAMELEN;]),
+			    [int h = MAXHOSTNAMELEN;])],
 	    [FOUND_MAXHOSTNAMELEN='sys/param.h'
 	     AC_DEFINE(NEED_SYS_PARAM_H,1,
 	       [Define to 1 if you need <sys/param.h> to define MAXHOSTNAMELEN])])
 	AC_COMPILE_IFELSE(
-	    AC_LANG_PROGRAM([#include <netdb.h>],
+	    [AC_LANG_PROGRAM([#include <netdb.h>],
-			    [int h = MAXHOSTNAMELEN;]),
+			    [int h = MAXHOSTNAMELEN;])],
 	    [FOUND_MAXHOSTNAMELEN='netdb.h'
 	     AC_DEFINE(NEED_NETDB_H,1,
 	       [Define to 1 if you need <netdb.h> to define MAXHOSTNAMELEN])])
@ -83,7 +82,7 @@ CPP_PATH=`echo ${CPP_PATH} | sed 's/,/\\",\\"/g'`
 AC_DEFINE_UNQUOTED([CPP], "$CPP_PATH", [Path to CPP program])
 # Checks for pkg-config packages
-PKG_CHECK_MODULES(XRDB, [xmuu x11 xproto >= 7.0.17])
+PKG_CHECK_MODULES(XRDB, [xmuu x11 xproto >= 7.0.25])
 AC_CONFIG_FILES([
 	Makefile
--- a/xrdb/depcomp
+++ b/xrdb/depcomp
@ -3,7 +3,7 @@
 scriptversion=2013-05-30.07; # UTC
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/xrdb/install-sh
+++ b/xrdb/install-sh
@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
-scriptversion=2011-11-20.07; # UTC
+scriptversion=2013-12-25.23; # UTC
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@ -41,19 +41,15 @@ scriptversion=2011-11-20.07; # UTC
 # This script is compatible with the BSD install script, but was written
 # from scratch.
 tab='	'
 nl='
 '
-IFS=" ""	$nl"
+IFS=" $tab$nl"
-# set DOITPROG to echo to test this script
+# Set DOITPROG to "echo" to test this script.
 # Don't use :- since 4.3BSD and earlier shells don't like it.
 doit=${DOITPROG-}
-if test -z "$doit"; then
+doit_exec=${doit:-exec}
  doit_exec=exec
 else
  doit_exec=$doit
 fi
 # Put in absolute file names if you don't have them in your path;
 # or use environment vars.
@ -68,17 +64,6 @@ mvprog=${MVPROG-mv}
 rmprog=${RMPROG-rm}
 stripprog=${STRIPPROG-strip}
 posix_glob='?'
 initialize_posix_glob='
  test "$posix_glob" != "?" || {
    if (set -f) 2>/dev/null; then
      posix_glob=
    else
      posix_glob=:
    fi
  }
 '
 posix_mkdir=
 # Desired mode of installed file.
@ -97,7 +82,7 @@ dir_arg=
 dst_arg=
 copy_on_change=false
-no_target_directory=
+is_target_a_directory=possibly
 usage="\
 Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
@ -143,8 +128,7 @@ while test $# -ne 0; do
    -m) mode=$2
        case $mode in
-	  *' '* | *'	'* | *'
+          *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
 '*	  | *'*'* | *'?'* | *'['*)
            echo "$0: invalid mode: $mode" >&2
            exit 1;;
        esac
@ -155,14 +139,16 @@ while test $# -ne 0; do
    -s) stripcmd=$stripprog;;
-    -t) dst_arg=$2
+    -t)
        is_target_a_directory=always
        dst_arg=$2
        # Protect names problematic for 'test' and other utilities.
        case $dst_arg in
          -* | [=\(\)!]) dst_arg=./$dst_arg;;
        esac
        shift;;
-    -T) no_target_directory=true;;
+    -T) is_target_a_directory=never;;
    --version) echo "$0 $scriptversion"; exit $?;;
@ -177,6 +163,16 @@ while test $# -ne 0; do
  shift
 done
 # We allow the use of options -d and -T together, by making -d
 # take the precedence; this is for compatibility with GNU install.
 if test -n "$dir_arg"; then
  if test -n "$dst_arg"; then
    echo "$0: target directory not allowed when installing a directory." >&2
    exit 1
  fi
 fi
 if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
  # When -d is used, all remaining arguments are directories to create.
  # When -t is used, the destination is already specified.
@ -207,6 +203,15 @@ if test $# -eq 0; then
  exit 0
 fi
 if test -z "$dir_arg"; then
  if test $# -gt 1 || test "$is_target_a_directory" = always; then
    if test ! -d "$dst_arg"; then
      echo "$0: $dst_arg: Is not a directory." >&2
      exit 1
    fi
  fi
 fi
 if test -z "$dir_arg"; then
  do_exit='(exit $ret); exit $ret'
  trap "ret=129; $do_exit" 1
@ -269,7 +274,7 @@ do
    # If destination is a directory, append the input filename; won't work
    # if double slashes aren't ignored.
    if test -d "$dst"; then
-      if test -n "$no_target_directory"; then
+      if test "$is_target_a_directory" = never; then
        echo "$0: $dst_arg: Is a directory" >&2
        exit 1
      fi
@ -277,33 +282,7 @@ do
      dst=$dstdir/`basename "$src"`
      dstdir_status=0
    else
-      # Prefer dirname, but fall back on a substitute if dirname fails.
+      dstdir=`dirname "$dst"`
      dstdir=`
 	(dirname "$dst") 2>/dev/null ||
 	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	     X"$dst" : 'X\(//\)[^/]' \| \
 	     X"$dst" : 'X\(//\)$' \| \
 	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
 	echo X"$dst" |
 	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 		   s//\1/
 		   q
 		 }
 		 /^X\(\/\/\)[^/].*/{
 		   s//\1/
 		   q
 		 }
 		 /^X\(\/\/\)$/{
 		   s//\1/
 		   q
 		 }
 		 /^X\(\/\).*/{
 		   s//\1/
 		   q
 		 }
 		 s/.*/./; q'
      `
      test -d "$dstdir"
      dstdir_status=$?
    fi
@ -396,14 +375,12 @@ do
        *)  prefix='';;
      esac
      eval "$initialize_posix_glob"
      oIFS=$IFS
      IFS=/
-      $posix_glob set -f
+      set -f
      set fnord $dstdir
      shift
-      $posix_glob set +f
+      set +f
      IFS=$oIFS
      prefixes=
@ -474,13 +451,10 @@ do
    if $copy_on_change &&
       old=`LC_ALL=C ls -dlL "$dst"     2>/dev/null` &&
       new=`LC_ALL=C ls -dlL "$dsttmp"  2>/dev/null` &&
-
+       set -f &&
       eval "$initialize_posix_glob" &&
       $posix_glob set -f &&
       set X $old && old=:$2:$4:$5:$6 &&
       set X $new && new=:$2:$4:$5:$6 &&
-       $posix_glob set +f &&
+       set +f &&
       test "$old" = "$new" &&
       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
    then
--- a/xrdb/man/Makefile.in
+++ b/xrdb/man/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -15,7 +15,17 @@
@SET_MAKE@
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
  if test -z '$(MAKELEVEL)'; then \
    false; \
  elif test -n '$(MAKE_HOST)'; then \
    true; \
  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
    true; \
  else \
    false; \
  fi; \
 }
 am__make_running_with_option = \
  case $${target_option-} in \
      ?) ;; \
@ -79,11 +89,11 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = man
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
@ -137,6 +147,7 @@ am__uninstall_files_from_dir = { \
 am__installdirs = "$(DESTDIR)$(appmandir)"
 DATA = $(appman_DATA)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
@ -183,7 +194,6 @@ LIBS = @LIBS@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAN_SUBSTS = @MAN_SUBSTS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
@ -199,6 +209,8 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@ -268,7 +280,7 @@ all: all-am
 .SUFFIXES:
 .SUFFIXES: .$(APP_MAN_SUFFIX) .man
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@ -280,7 +292,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign man/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@ -293,9 +304,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 install-appmanDATA: $(appman_DATA)
@ -474,6 +485,8 @@ uninstall-am: uninstall-appmanDATA
 	pdf-am ps ps-am tags-am uninstall uninstall-am \
 	uninstall-appmanDATA
 .PRECIOUS: Makefile
 # String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
 .man.$(APP_MAN_SUFFIX):
--- a/xrdb/missing
+++ b/xrdb/missing
@ -1,9 +1,9 @@
 #! /bin/sh
 # Common wrapper for a few potentially missing GNU programs.
-scriptversion=2012-06-26.16; # UTC
+scriptversion=2013-10-28.13; # UTC
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 # This program is free software; you can redistribute it and/or modify
@ -160,7 +160,7 @@ give_advice ()
      ;;
   autom4te*)
      echo "You might have modified some maintainer files that require"
-      echo "the 'automa4te' program to be rebuilt."
+      echo "the 'autom4te' program to be rebuilt."
      program_details 'autom4te'
      ;;
    bison*|yacc*)
--- a/xrdb/xrdb.c
+++ b/xrdb/xrdb.c
@ -53,6 +53,7 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <stdint.h>
 #ifdef NEED_SYS_PARAM_H
 # include <sys/param.h>         /* defines MAXHOSTNAMELEN on BSD & Linux */
@ -65,12 +66,7 @@
 #define SCREEN_RESOURCES "SCREEN_RESOURCES"
 #ifndef CPP
 #ifdef __UNIXOS2__
 /* expected to be in path */
 #define CPP "cpp"
 #else
 #define CPP "/usr/lib/cpp"
 #endif /* __UNIXOS2__ */
 #endif                          /* CPP */
 #define INIT_BUFFER_SIZE 10000
@ -89,28 +85,29 @@
 #define OPMERGE 5
 #define OPOVERRIDE 6
-#define RESOURCE_PROPERTY_NAME "RESOURCE_MANAGER"
+#define BACKUP_SUFFIX ".bak"    /* for editing */
 #define BACKUP_SUFFIX ".bak"		/* for editting */
 typedef struct _Entry {
    char *tag, *value;
    int lineno;
    Bool usable;
 } Entry;
 typedef struct _Buffer {
    char *buff;
-    int  room, used;
+    size_t room, used;
 } Buffer;
 typedef struct _Entries {
    Entry *entry;
-    int   room, used;
+    size_t room, used;
 } Entries;
 /* dynamically allocated strings */
 #define CHUNK_SIZE 4096
 typedef struct _String {
    char *val;
-    int room, used;
+    size_t room, used;
 } String;
 static char *ProgramName;
@ -131,7 +128,7 @@ static const char* const cpp_locations[] = { CPP };
 static const char *backup_suffix = BACKUP_SUFFIX;
 static Bool dont_execute = False;
 static String defines;
-static int defines_base;
+static size_t defines_base;
 #define MAX_CMD_DEFINES 512
 static char *cmd_defines[MAX_CMD_DEFINES];
 static int num_cmd_defines = 0;
@ -140,14 +137,15 @@ static Display *dpy;
 static Buffer buffer;
 static Entries newDB;
-static void fatal(const char *, ...) _X_ATTRIBUTE_PRINTF(1,2) _X_NORETURN;
+static void fatal(const char *, ...)
    _X_ATTRIBUTE_PRINTF(1, 2)_X_NORETURN _X_COLD;
 static void addstring(String *arg, const char *s);
 static void addescapedstring(String *arg, const char *s);
 static void addtokstring(String *arg, const char *s);
 static void FormatEntries(Buffer *b, Entries * entries);
 static void StoreProperty(Display *display, Window root, Atom res_prop);
 static void Process(int scrno, Bool doScreen, Bool execute);
-static void ShuffleEntries ( Entries *db, Entries *dbs, int num );
+static void ShuffleEntries(Entries *db, Entries *dbs, unsigned int num);
 static void ReProcess(int scrno, Bool doScreen);
 #ifndef HAVE_ASPRINTF
@ -166,15 +164,12 @@ asprintf(char ** ret, const char *format, ...)
    if (len < 0)
        return -1;
-    if (len < sizeof(buf))
+    if (len < sizeof(buf)) {
    {
        *ret = strdup(buf);
    }
-    else
+    else {
    {
        *ret = malloc(len + 1); /* snprintf doesn't count trailing '\0' */
-	if (*ret != NULL)
+        if (*ret != NULL) {
 	{
            va_start(ap, format);
            len = vsnprintf(*ret, len + 1, format, ap);
            va_end(ap);
@ -192,12 +187,27 @@ asprintf(char ** ret, const char *format, ...)
 }
 #endif                          /* HAVE_ASPRINTF */
 #ifndef HAVE_REALLOCARRAY
 /* overflow checking realloc API from OpenBSD libc */
 static inline void *
 reallocarray(void *optr, size_t n, size_t s)
 {
    if (n > 0 && (SIZE_MAX / n) < s)
        return NULL;
    return realloc(optr, n * s);
 }
 #endif
 # define mallocarray(n, s) reallocarray(NULL, n, s)
 static void
 InitBuffer(Buffer *b)
 {
    b->room = INIT_BUFFER_SIZE;
    b->used = 0;
-    b->buff = malloc(INIT_BUFFER_SIZE*sizeof(char));
+    b->buff = mallocarray(INIT_BUFFER_SIZE, sizeof(char));
    if (b->buff == NULL)
        fatal("%s: Can't allocate memory in %s\n", ProgramName, __func__);
 }
 #ifdef notyet
@ -209,10 +219,12 @@ FreeBuffer(Buffer *b)
 #endif
 static void
-AppendToBuffer(Buffer *b, const char *str, int len)
+AppendToBuffer(Buffer *b, const char *str, size_t len)
 {
    while (b->used + len > b->room) {
-	b->buff = realloc(b->buff, 2*b->room*(sizeof(char)));
+        b->buff = reallocarray(b->buff, b->room, 2 * sizeof(char));
        if (b->buff == NULL)
            fatal("%s: Can't allocate memory in %s\n", ProgramName, __func__);
        b->room *= 2;
    }
    strncpy(b->buff + b->used, str, len);
@ -224,13 +236,16 @@ InitEntries(Entries *e)
 {
    e->room = INIT_ENTRY_SIZE;
    e->used = 0;
-    e->entry = malloc(INIT_ENTRY_SIZE*sizeof(Entry));
+    e->entry = mallocarray(INIT_ENTRY_SIZE, sizeof(Entry));
    if (e->entry == NULL)
        fatal("%s: Can't allocate memory in %s\n", ProgramName, __func__);
 }
 static void
 FreeEntries(Entries *e)
 {
-    register int i;
+    size_t i;
    for (i = 0; i < e->used; i++) {
        if (e->entry[i].usable) {
@ -238,13 +253,13 @@ FreeEntries(Entries *e)
            free(e->entry[i].value);
        }
    }
-    free((char *)e->entry);
+    free(e->entry);
 }
 static void
 AddEntry(Entries *e, Entry *entry)
 {
-    register int n;
+    size_t n;
    for (n = 0; n < e->used; n++) {
        if (!strcmp(e->entry[n].tag, entry->tag)) {
@ -264,14 +279,15 @@ AddEntry(Entries *e, Entry *entry)
    }
    if (e->used == e->room) {
-	e->entry = realloc(e->entry, 2 * e->room * (sizeof(Entry)));
+        e->entry = reallocarray(e->entry, e->room, 2 * sizeof(Entry));
        if (e->entry == NULL)
            fatal("%s: Can't allocate memory in %s\n", ProgramName, __func__);
        e->room *= 2;
    }
    entry->usable = True;
    e->entry[e->used++] = *entry;
 }
 static int
 CompareEntries(const void *e1, const void *e2)
 {
@ -302,7 +318,8 @@ FindFirst(const char *string, char dest, int *lines)
        if (*string == '\\') {
            if (*++string == '\0')
                return NULL;
-	} else if (*string == dest)
+        }
        else if (*string == dest)
            return string;
        if (*string == '\n' && lines)
            (*lines)++;
@ -315,12 +332,13 @@ GetEntries(Entries *entries, Buffer *buff, int bequiet)
 {
    const char *line, *colon, *temp, *str;
    Entry entry;
-    register int length;
+    size_t length;
    int lineno = 0;
    int lines_skipped;
    str = buff->buff;
-    if (!str) return;
+    if (!str)
        return;
    for (; str < buff->buff + buff->used;
         str = line + 1, lineno += lines_skipped) {
        line = FindFirst(str, '\n', &lines_skipped);
@ -333,6 +351,7 @@ GetEntries(Entries *entries, Buffer *buff, int bequiet)
            continue;
        if (!bequiet && *str == '#') {
            int dummy;
            if (sscanf(str, "# %d", &dummy) == 1 ||
                sscanf(str, "# line %d", &dummy) == 1)
                lineno = dummy - 1;
@ -341,7 +360,8 @@ GetEntries(Entries *entries, Buffer *buff, int bequiet)
        for (temp = str;
             *temp && *temp != '\n' && isascii(*temp) && isspace(*temp);
             temp++);
-	if (!*temp || *temp == '\n') continue;
+        if (!*temp || *temp == '\n')
            continue;
        colon = FindFirst(str, ':', NULL);
        if (!colon || colon > line) {
@ -392,12 +412,13 @@ static void
 ReadFile(Buffer *b, FILE *input)
 {
    char	buf[BUFSIZ + 1];
-    register int	bytes;
+    size_t	bytes;
    b->used = 0;
    while (!feof(input) && (bytes = fread(buf, 1, BUFSIZ, input)) > 0) {
 #ifdef WIN32
        char *p;
        buf[bytes] = '\0';
        for (p = buf; p = strchr(p, '\r');) {
            if (p[-1] == '\\' && p[1] == '\n') {
@ -430,7 +451,8 @@ AddDef(String *buff, const char *title, const char *value)
            addstring(buff, "\n-D");
        else
            addstring(buff, " -D");
-    } else
+    }
    else
        addstring(buff, "-D");
    addtokstring(buff, title);
    if (value && (value[0] != '\0')) {
@ -458,7 +480,8 @@ AddDefQ(String *buff, const char *title, const char *value)
        addstring(buff, "=\"");
        addescapedstring(buff, value);
        addstring(buff, "\"");
-    } else
+    }
    else
        AddDef(buff, title, NULL);
 }
@ -466,6 +489,7 @@ static void
 AddNum(String *buff, const char *title, int value)
 {
    char num[20];
    snprintf(num, sizeof(num), "%d", value);
    AddDef(buff, title, num);
 }
@ -489,7 +513,8 @@ AddDefHostname(String *buff, const char *title, const char *value)
    strncpy(name, value, sizeof(name) - 1);
    name[sizeof(name) - 1] = '\0';
    for (s = name; (c = *s); s++) {
-	if (!isalpha(c) && !isdigit(c) && c != '_' && c != '.' && c != ':' && c != '-')
+        if (!isalpha(c) && !isdigit(c) &&
            c != '_' && c != '.' && c != ':' && c != '-')
            *s = '_';
    }
    AddDef(buff, title, name);
@ -510,7 +535,8 @@ AddUndef(String *buff, const char *title)
            addstring(buff, "\n-U");
        else
            addstring(buff, " -U");
-    } else
+    }
    else
        addstring(buff, "-U");
    addtokstring(buff, title);
 }
@ -529,11 +555,14 @@ DoCmdDefines(String *buff)
                *val = '\0';
                AddDefQ(buff, arg + 2, val + 1);
                *val = '=';
-	    } else
+            }
            else
                AddSimpleDef(buff, arg + 2);
-	} else if (arg[1] == 'U') {
+        }
        else if (arg[1] == 'U') {
            AddUndef(buff, arg + 2);
-	} else if (!strcmp(arg, "-undef") && oper != OPSYMBOLS) {
+        }
        else if (!strcmp(arg, "-undef") && oper != OPSYMBOLS) {
            addstring(buff, " -undef");
        }
    }
@ -548,7 +577,6 @@ Resolution(int pixels, int mm)
        return ((pixels * 100000 / mm) + 50) / 100;
 }
 static void
 DoDisplayDefines(Display *display, String *defs, char *host)
 {
@ -664,13 +692,13 @@ DoScreenDefines(Display *display, int scrno, String *defs)
            }
        }
    }
-    XFree((char *)vinfos);
+    XFree(vinfos);
 }
 static Entry *
 FindEntry(Entries *db, Buffer *b)
 {
-    int i;
+    size_t i;
    register Entry *e;
    Entries phoney;
    Entry entry;
@ -705,7 +733,7 @@ EditFile(Entries *new, FILE *in, FILE *out)
    char buff[BUFSIZ];
    register Entry *e;
    register char *c;
-    int i;
+    size_t i;
    InitBuffer(&b);
    while (in) {
@ -732,9 +760,12 @@ cleanup:
    }
 }
-static void _X_NORETURN
+static void _X_NORETURN _X_COLD
-Syntax (void)
+Syntax(const char *errmsg)
 {
    if (errmsg != NULL)
        fprintf(stderr, "%s: %s\n", ProgramName, errmsg);
    fprintf(stderr,
            "usage:  %s [-options ...] [filename]\n\n"
            "where options include:\n"
@ -771,22 +802,25 @@ Syntax (void)
 */
 static Bool
-isabbreviation(const char *arg, const char *s, int minslen)
+isabbreviation(const char *arg, const char *s, size_t minslen)
 {
-    int arglen;
+    size_t arglen;
-    int slen;
+    size_t slen;
    /* exact match */
-    if (!strcmp (arg, s)) return (True);
+    if (!strcmp(arg, s))
        return (True);
    arglen = strlen(arg);
    slen = strlen(s);
    /* too long or too short */
-    if (slen >= arglen || slen < minslen) return (False);
+    if (slen >= arglen || slen < minslen)
        return (False);
    /* abbreviation */
-    if (strncmp (arg, s, slen) == 0) return (True);
+    if (strncmp(arg, s, slen) == 0)
        return (True);
    /* bad */
    return (False);
@ -818,8 +852,11 @@ addescapedstring(String *arg, const char *s)
    for (c = copy; *s && c < &copy[sizeof(copy) - 1]; s++) {
        switch (*s) {
-	case '"':       case '\'':      case '`':
+        case '"':
-	case '$':       case '\\':
+        case '\'':
        case '`':
        case '$':
        case '\\':
            *c++ = '_';
            break;
        default:
@ -874,6 +911,7 @@ main(int argc, char *argv[])
        for (j = 0; j < number_of_elements; j++) {
            char *end, *dup;
            /* cut off arguments */
            dup = strdup(cpp_locations[j]);
            end = strchr(dup, ' ');
@ -897,96 +935,130 @@ main(int argc, char *argv[])
            if (arg[1] == '\0') {
                filename = NULL;
                continue;
-	    } else if (isabbreviation ("-help", arg, 2)) {
+            }
-		Syntax ();
+            else if (isabbreviation("-help", arg, 2)) {
                Syntax(NULL);
                /* doesn't return */
-	    } else if (isabbreviation ("-version", arg, 2)) {
+            }
            else if (isabbreviation("-version", arg, 2)) {
                printf("%s\n", PACKAGE_STRING);
                exit(0);
-	    } else if (isabbreviation ("-display", arg, 2)) {
+            }
-		if (++i >= argc) Syntax ();
+            else if (isabbreviation("-display", arg, 2)) {
                if (++i >= argc)
                    Syntax("-display requires an argument");
                displayname = argv[i];
                continue;
-	    } else if (isabbreviation ("-geometry", arg, 3)) {
+            }
-		if (++i >= argc) Syntax ();
+            else if (isabbreviation("-geometry", arg, 3)) {
                if (++i >= argc)
                    Syntax("-geometry requires an argument");
                /* ignore geometry */
                continue;
-	    } else if (isabbreviation ("-cpp", arg, 2)) {
+            }
-		if (++i >= argc) Syntax ();
+            else if (isabbreviation("-cpp", arg, 2)) {
                if (++i >= argc)
                    Syntax("-cpp requires an argument");
                cpp_program = argv[i];
                continue;
-	    } else if (!strcmp ("-n", arg)) {
+            }
            else if (!strcmp("-n", arg)) {
                dont_execute = True;
                continue;
-	    } else if (isabbreviation ("-nocpp", arg, 3)) {
+            }
            else if (isabbreviation("-nocpp", arg, 3)) {
                cpp_program = NULL;
                continue;
-	    } else if (isabbreviation ("-query", arg, 2)) {
+            }
            else if (isabbreviation("-query", arg, 2)) {
                oper = OPQUERY;
                continue;
-	    } else if (isabbreviation ("-load", arg, 2)) {
+            }
            else if (isabbreviation("-load", arg, 2)) {
                oper = OPLOAD;
                continue;
-	    } else if (isabbreviation ("-merge", arg, 2)) {
+            }
            else if (isabbreviation("-merge", arg, 2)) {
                oper = OPMERGE;
                continue;
-	    } else if (isabbreviation ("-override", arg, 2)) {
+            }
            else if (isabbreviation("-override", arg, 2)) {
                oper = OPOVERRIDE;
                continue;
-	    } else if (isabbreviation ("-symbols", arg, 3)) {
+            }
            else if (isabbreviation("-symbols", arg, 3)) {
                oper = OPSYMBOLS;
                continue;
-	    } else if (isabbreviation ("-remove", arg, 4)) {
+            }
            else if (isabbreviation("-remove", arg, 4)) {
                oper = OPREMOVE;
                continue;
-	    } else if (isabbreviation ("-edit", arg, 2)) {
+            }
-		if (++i >= argc) Syntax ();
+            else if (isabbreviation("-edit", arg, 2)) {
                if (++i >= argc)
                    Syntax("-edit requires an argument");
                oper = OPEDIT;
                editFile = argv[i];
                continue;
-	    } else if (isabbreviation ("-backup", arg, 2)) {
+            }
-		if (++i >= argc) Syntax ();
+            else if (isabbreviation("-backup", arg, 2)) {
                if (++i >= argc)
                    Syntax("-backup requires an argument");
                backup_suffix = argv[i];
                continue;
-	    } else if (isabbreviation ("-all", arg, 2)) {
+            }
            else if (isabbreviation("-all", arg, 2)) {
                whichResources = RALL;
                continue;
-	    } else if (isabbreviation ("-global", arg, 3)) {
+            }
            else if (isabbreviation("-global", arg, 3)) {
                whichResources = RGLOBAL;
                continue;
-	    } else if (isabbreviation ("-screen", arg, 3)) {
+            }
            else if (isabbreviation("-screen", arg, 3)) {
                whichResources = RSCREEN;
                continue;
-	    } else if (!strcmp ("-screens", arg)) {
+            }
            else if (!strcmp("-screens", arg)) {
                whichResources = RSCREENS;
                continue;
-	    } else if (isabbreviation ("-retain", arg, 4)) {
+            }
            else if (isabbreviation("-retain", arg, 4)) {
                retainProp = 1;
                continue;
-	    } else if (isabbreviation ("-quiet", arg, 2)) {
+            }
            else if (isabbreviation("-quiet", arg, 2)) {
                quiet = True;
                continue;
-	    } else if (arg[1] == 'I') {
+            }
            else if (arg[1] == 'I') {
                addstring(&includes, " ");
                addescapedstring(&includes, arg);
                continue;
-	    } else if (arg[1] == 'U' || arg[1] == 'D') {
+            }
            else if (arg[1] == 'U' || arg[1] == 'D') {
                if (num_cmd_defines < MAX_CMD_DEFINES) {
                    cmd_defines[num_cmd_defines++] = arg;
-		} else {
+                }
                else {
                    fatal("%s: Too many -U/-D arguments\n", ProgramName);
                }
                continue;
-	    } else if (!strcmp ("-undef", arg)) {
+            }
            else if (!strcmp("-undef", arg)) {
                if (num_cmd_defines < MAX_CMD_DEFINES) {
                    cmd_defines[num_cmd_defines++] = "-undef";
-		} else {
+                }
                else {
                    fatal("%s: Too many cpp arguments\n", ProgramName);
                }
                continue;
            }
-	    Syntax ();
+            fprintf(stderr, "%s: unrecognized argument '%s'\n",
-	} else if (arg[0] == '=')
+                    ProgramName, arg);
            Syntax(NULL);
        }
        else if (arg[0] == '=')
            continue;
        else
            filename = arg;
@ -1012,15 +1084,8 @@ main(int argc, char *argv[])
 #ifdef WIN32
        strcpy(tmpname2, "xrdbD_XXXXXX");
        strcpy(tmpname3, "\\temp\\xrdbD_XXXXXX");
 #else
 #ifdef __UNIXOS2__
 	{ char *tmpdir=getenv("TMP");
 	  if (!tmpdir) tmpdir="/";
 	  sprintf(tmpname2, "%s/xrdbD_XXXXXX",tmpdir);
 	}
 #else
        strcpy(tmpname2, "/tmp/xrdbD_XXXXXX");
 #endif
 #endif
        (void) mktemp(tmpname2);
    }
@ -1035,18 +1100,12 @@ main(int argc, char *argv[])
 #endif
        ) {
        char inputbuf[1024];
 #ifdef WIN32
        strcpy(tmpname, "\\temp\\xrdb_XXXXXX");
 #else
 #ifdef __UNIXOS2__
 	{ char *tmpdir=getenv("TMP");
 	  if (!tmpdir) tmpdir="/";
 	  sprintf(tmpname, "%s/xrdb_XXXXXX",tmpdir);
 	}
 #else
        strcpy(tmpname, "/tmp/xrdb_XXXXXX");
 #endif
 #endif
 #ifndef HAVE_MKSTEMP
        (void) mktemp(tmpname);
        filename = tmpname;
@ -1054,13 +1113,13 @@ main(int argc, char *argv[])
 #else
        {
            int fd = mkstemp(tmpname);
            filename = tmpname;
            fp = fdopen(fd, "w");
        }
 #endif                          /* MKSTEMP */
        if (!fp)
-	    fatal("%s: Failed to open temp file: %s\n", ProgramName,
+            fatal("%s: Failed to open temp file: %s\n", ProgramName, filename);
 		  filename);
        while (fgets(inputbuf, sizeof(inputbuf), stdin) != NULL)
            fputs(inputbuf, fp);
        fclose(fp);
@ -1105,7 +1164,9 @@ main(int argc, char *argv[])
    else {
        Entries *dbs;
-	dbs = malloc(ScreenCount(dpy) * sizeof(Entries));
+        dbs = mallocarray(ScreenCount(dpy), sizeof(Entries));
        if (dbs == NULL)
            fatal("%s: Can't allocate memory in %s\n", ProgramName, __func__);
        for (i = 0; i < ScreenCount(dpy); i++) {
            Process(i, True, False);
            dbs[i] = newDB;
@ -1113,7 +1174,7 @@ main(int argc, char *argv[])
        InitEntries(&newDB);
        if (oper == OPMERGE || oper == OPOVERRIDE)
            GetEntriesString(&newDB, XResourceManagerString(dpy));
-	ShuffleEntries(&newDB, dbs, ScreenCount(dpy));
+        ShuffleEntries(&newDB, dbs, (unsigned) ScreenCount(dpy));
        if (need_newline)
            printf("! screen-independent resources\n");
        ReProcess(0, False);
@ -1146,14 +1207,13 @@ main(int argc, char *argv[])
 static void
 FormatEntries(Buffer *b, Entries *entries)
 {
-    register int i;
+    size_t i;
    b->used = 0;
    if (!entries->used)
        return;
    if (oper == OPMERGE)
-	qsort(entries->entry, entries->used, sizeof(Entry),
+        qsort(entries->entry, entries->used, sizeof(Entry), CompareEntries);
 	      CompareEntries);
    for (i = 0; i < entries->used; i++) {
        if (entries->entry[i].usable)
            AppendEntryToBuffer(b, &entries->entry[i]);
@ -1163,21 +1223,23 @@ FormatEntries(Buffer *b, Entries *entries)
 static void
 StoreProperty(Display *display, Window root, Atom res_prop)
 {
-    int len = buffer.used;
+    size_t len = buffer.used;
    int mode = PropModeReplace;
    unsigned char *buf = (unsigned char *) buffer.buff;
-    int max = (XMaxRequestSize(display) << 2) - 28;
+    size_t max = ((unsigned) XMaxRequestSize(display) << 2) - 28;
    if (len > max) {
        XGrabServer(display);
        do {
-	    XChangeProperty(display, root, res_prop, XA_STRING, 8, mode, buf, max);
+            XChangeProperty(display, root, res_prop, XA_STRING, 8, mode, buf,
                            (int) max);
            buf += max;
            len -= max;
            mode = PropModeAppend;
        } while (len > max);
    }
-    XChangeProperty(display, root, res_prop, XA_STRING, 8, mode, buf, len);
+    XChangeProperty(display, root, res_prop, XA_STRING, 8, mode, buf,
                    (int) len);
    if (mode != PropModeReplace)
        XUngrabServer(display);
 }
@ -1201,20 +1263,24 @@ Process(int scrno, Bool doScreen, Bool execute)
        xdefs = XScreenResourceString(ScreenOfDisplay(dpy, scrno));
        root = RootWindow(dpy, scrno);
        res_prop = XInternAtom(dpy, SCREEN_RESOURCES, False);
-    } else {
+    }
    else {
        xdefs = XResourceManagerString(dpy);
        root = RootWindow(dpy, 0);
        res_prop = XA_RESOURCE_MANAGER;
    }
    if (oper == OPSYMBOLS) {
        printf("%s\n", defines.val);
-    } else if (oper == OPQUERY) {
+    }
    else if (oper == OPQUERY) {
        if (xdefs)
            printf("%s", xdefs);        /* fputs broken in SunOS 4.0 */
-    } else if (oper == OPREMOVE) {
+    }
    else if (oper == OPREMOVE) {
        if (xdefs)
            XDeleteProperty(dpy, root, res_prop);
-    } else if (oper == OPEDIT) {
+    }
    else if (oper == OPEDIT) {
        char template[100], old[100];
        input = fopen(editFile, "r");
@ -1225,11 +1291,13 @@ Process(int scrno, Bool doScreen, Bool execute)
 #else
        {
            int fd = mkstemp(template);
            output = fdopen(fd, "w");
        }
 #endif
        if (!output)
-	    fatal("%s: can't open temporary file '%s'\n", ProgramName, template);
+            fatal("%s: can't open temporary file '%s'\n", ProgramName,
                  template);
        GetEntriesString(&newDB, xdefs);
        EditFile(&newDB, input, output);
        if (input)
@ -1238,7 +1306,7 @@ Process(int scrno, Bool doScreen, Bool execute)
        snprintf(old, sizeof(old), "%s%s", editFile, backup_suffix);
        if (dont_execute) {     /* then write to standard out */
            char buf[BUFSIZ];
-	    int n;
+            size_t n;
            output = fopen(template, "r");
            if (output) {
@ -1248,13 +1316,15 @@ Process(int scrno, Bool doScreen, Bool execute)
                fclose(output);
            }
            unlink(template);
-	} else {
+        }
        else {
            rename(editFile, old);
            if (rename(template, editFile))
                fatal("%s: can't rename file '%s' to '%s'\n", ProgramName,
                      template, editFile);
        }
-    } else {
+    }
    else {
        const char *cpp_addflags = "";
        if (oper == OPMERGE || oper == OPOVERRIDE)
@ -1290,7 +1360,7 @@ Process(int scrno, Bool doScreen, Bool execute)
            fputs(defines.val, stdin);
            fprintf(stdin, "\n#include \"%s\"\n", filename);
            fflush(stdin);
-	    fseek(stdin, 0, 0);
+            fseek(stdin, 0, SEEK_SET);
            if (asprintf(&cmd, "%s %s %s", cpp_program, cpp_addflags,
                         includes.val) == -1)
                fatal("%s: Out of memory\n", ProgramName);
@ -1298,7 +1368,8 @@ Process(int scrno, Bool doScreen, Bool execute)
                fatal("%s: cannot run '%s'\n", ProgramName, cmd);
            free(cmd);
 #endif
-	} else {
+        }
        else {
 #endif
            if (filename) {
                if (!freopen(filename, "r", stdin))
@ -1325,7 +1396,8 @@ Process(int scrno, Bool doScreen, Bool execute)
                    fatal("%s: cannot run '%s'\n", ProgramName, cmd);
                free(cmd);
 #endif
-	} else {
+            }
            else {
                input = stdin;
            }
 #ifdef PATHETICCPP
@ -1354,9 +1426,11 @@ Process(int scrno, Bool doScreen, Bool execute)
            if (dont_execute) {
                if (buffer.used > 0) {
                    fwrite(buffer.buff, 1, buffer.used, stdout);
-		    if (buffer.buff[buffer.used - 1] != '\n') putchar ('\n');
+                    if (buffer.buff[buffer.used - 1] != '\n')
                        putchar('\n');
                }
-	    } else if (buffer.used > 1 || !doScreen)
+            }
            else if (buffer.used > 1 || !doScreen)
                StoreProperty(dpy, root, res_prop);
            else
                XDeleteProperty(dpy, root, res_prop);
@ -1369,14 +1443,16 @@ Process(int scrno, Bool doScreen, Bool execute)
 }
 static void
-ShuffleEntries(Entries *db, Entries *dbs, int num)
+ShuffleEntries(Entries *db, Entries *dbs, unsigned int num)
 {
-    int *hits;
+    unsigned int *hits;
-    register int i, j, k;
+    unsigned int i, j, k;
    Entries cur, cmp;
    char *curtag, *curvalue;
-    hits = malloc(num * sizeof(int));
+    hits = mallocarray(num, sizeof(int));
    if (hits == NULL)
        fatal("%s: Can't allocate memory in %s\n", ProgramName, __func__);
    cur = dbs[0];
    for (i = 0; i < cur.used; i++) {
        curtag = cur.entry[i].tag;
@ -1386,8 +1462,7 @@ ShuffleEntries(Entries *db, Entries *dbs, int num)
            for (k = 0; k < cmp.used; k++) {
                if (cmp.entry[k].usable &&
                    !strcmp(curtag, cmp.entry[k].tag) &&
-		    !strcmp(curvalue, cmp.entry[k].value))
+                    !strcmp(curvalue, cmp.entry[k].value)) {
 		{
                    hits[j] = k;
                    break;
                }
@ -1402,7 +1477,7 @@ ShuffleEntries(Entries *db, Entries *dbs, int num)
                dbs[j].entry[hits[j]].usable = False;
        }
    }
-    free((char *)hits);
+    free(hits);
 }
 static void
@ -1415,16 +1490,19 @@ ReProcess(int scrno, Bool doScreen)
    if (doScreen) {
        root = RootWindow(dpy, scrno);
        res_prop = XInternAtom(dpy, SCREEN_RESOURCES, False);
-    } else {
+    }
    else {
        root = RootWindow(dpy, 0);
        res_prop = XA_RESOURCE_MANAGER;
    }
    if (dont_execute) {
        if (buffer.used > 0) {
            fwrite(buffer.buff, 1, buffer.used, stdout);
-	    if (buffer.buff[buffer.used - 1] != '\n') putchar ('\n');
+            if (buffer.buff[buffer.used - 1] != '\n')
                putchar('\n');
        }
-    } else {
+    }
    else {
        if (buffer.used > 1 || !doScreen)
            StoreProperty(dpy, root, res_prop);
        else