xfs: Changes to 'upstream-unstable'
ChangeLog | 52 ------
Makefile.am | 27 ++-
acinclude.m4 | 47 +++++
configure.ac | 35 +++-
difs/fontinfo.c | 5
difs/main.c | 6
include/os.h | 2
include/servermd.h | 11 +
os/config.c | 40 ++++
os/xfstrans.c | 4
xfs.man | 430 ++++++++++++++++++++++++++++++++---------------------
11 files changed, 417 insertions(+), 242 deletions(-)
New commits:
commit 8337bcb5650581874510514cce7d9df89db54d5c
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Mar 6 17:06:25 2008 -0500
xfs 1.0.6
diff --git a/configure.ac b/configure.ac
index 1ef1394..abedf43 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,3 @@
-
dnl Copyright 2005 Red Hat, Inc.
dnl
dnl Permission to use, copy, modify, distribute, and sell this software and its
@@ -22,7 +21,7 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(xfs,[1.0.5], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xfs)
+AC_INIT(xfs,[1.0.6], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xfs)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
commit f253f56e9ff33e7424317be7fa54a60eec4053a8
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Feb 5 21:57:21 2008 +0100
Install config file in $(sysconfdir) by default instead of $(libdir)
diff --git a/Makefile.am b/Makefile.am
index 8433d61..27c3742 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,7 @@
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
-configdir = $(libdir)/X11/fs
+configdir = $(sysconfdir)/X11/fs
bin_PROGRAMS = xfs
diff --git a/configure.ac b/configure.ac
index a5ac20a..1ef1394 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,8 +49,8 @@ AC_CHECK_HEADERS([stdint.h])
AC_ARG_WITH(default-config-file,
AS_HELP_STRING([--with-default-config-file=PATH],
- [comma-separated list of paths to look for config file when not specified (default: ${libdir}/X11/fs/config)]),
- [CONFIG_FILE="$withval"], [CONFIG_FILE="${libdir}/X11/fs/config"])
+ [comma-separated list of paths to look for config file when not specified (default: ${sysconfdir}/X11/fs/config)]),
+ [CONFIG_FILE="$withval"], [CONFIG_FILE="${sysconfdir}/X11/fs/config"])
DEFAULT_CONFIG_FILE=`echo ${CONFIG_FILE} | sed 's/,/\\\\\\\\\\\",\\\\\\\\\\\"/'`
AC_DEFINE_DIR([DEFAULT_CONFIG_FILE], DEFAULT_CONFIG_FILE,
commit 71c2acc3d0fecc5c6c3d63cfae8f38ee2ce72d9d
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jan 9 16:08:54 2008 -0800
List multiple config files in man page if specified in --with-default-config-file
diff --git a/Makefile.am b/Makefile.am
index 609fc7d..8433d61 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -132,6 +132,8 @@ MAN_SUBSTS = \
-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' \
+ -e 's|__configfiledesc__|$(CONFIG_FILE_DESC)|g' \
+ -e 's|__configfilepath__|$(CONFIG_FILE_PATH)|g' \
-e 's|XCOMM|\#|g'
SUFFIXES = .$(APP_MAN_SUFFIX) .man
diff --git a/configure.ac b/configure.ac
index c038187..a5ac20a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,10 +52,24 @@ AC_ARG_WITH(default-config-file,
[comma-separated list of paths to look for config file when not specified (default: ${libdir}/X11/fs/config)]),
[CONFIG_FILE="$withval"], [CONFIG_FILE="${libdir}/X11/fs/config"])
-CONFIG_FILE=`echo ${CONFIG_FILE} | sed 's/,/\\\\\\\\\\\",\\\\\\\\\\\"/'`
-AC_DEFINE_DIR([DEFAULT_CONFIG_FILE], CONFIG_FILE,
+DEFAULT_CONFIG_FILE=`echo ${CONFIG_FILE} | sed 's/,/\\\\\\\\\\\",\\\\\\\\\\\"/'`
+AC_DEFINE_DIR([DEFAULT_CONFIG_FILE], DEFAULT_CONFIG_FILE,
[comma-separated list of strings for config file paths when not specified])
+# generate text for the man page
+case $CONFIG_FILE in
+ *,*)
+ CONFIG_FILE_DESC="the first file found from the list:"
+ CONFIG_FILE_PATH=`echo ${CONFIG_FILE} | sed 's/,/\\\\\\\\fR, \\\\\\\\fI/g'`
+ ;;
+ *)
+ CONFIG_FILE_DESC="the default file,"
+ CONFIG_FILE_PATH="${CONFIG_FILE}"
+ ;;
+esac
+AC_SUBST([CONFIG_FILE_DESC])
+AC_SUBST([CONFIG_FILE_PATH])
+
# Checks for pkg-config packages
PKG_CHECK_MODULES(XFS, libfs xfont xtrans)
XFS_CFLAGS="$XFS_CFLAGS $OS_CFLAGS"
diff --git a/xfs.man b/xfs.man
index 7c66e65..4f71ce2 100644
--- a/xfs.man
+++ b/xfs.man
@@ -82,9 +82,8 @@ section of
specifies the configuration file
.B xfs
will use.
-If this parameter is not specified, the default file,
-.IR __configdir__/config ,
-will be used.
+If this parameter is not specified, xfs will read its configuration from
+__configfiledesc__ \fI__configfilepath__\fR.
.TP
.B \-daemon
instructs
@@ -164,9 +163,7 @@ which is declared in
configuration file.
.SS "Configuration File Format"
.B xfs
-reads its configuration from
-.I __configdir__/config
-by default (see the
+reads its configuration from a text file (see the
.B \-config
option in the \(lqOPTIONS\(rq section above).
The configuration language is a list of keyword and value pairs.
commit 5a5d003bfc400471693f88a16d2ed6ed98ca8111
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Jan 7 18:04:36 2008 -0800
Add xfsinfo & fslsfonts to See Also section of man page
diff --git a/xfs.man b/xfs.man
index 2779da1..7c66e65 100644
--- a/xfs.man
+++ b/xfs.man
@@ -368,6 +368,8 @@ Dave Lemke, Network Computing Devices, Inc
Keith Packard, Massachusetts Institute of Technology
.SH "SEE ALSO"
.BR X (__miscmansuffix__),
+.BR xfsinfo (__appmansuffix__),
+.BR fslsfonts (__appmansuffix__),
.BR init (__adminmansuffix__),
.BR syslog (__libmansuffix__),
.IR "The X Font Service Protocol" ,
commit 9d19ae3b4d6fcaa01bcb88b9fde644aec3f191b1
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Jan 7 15:08:33 2008 -0800
Remove another extraneous + from man page
diff --git a/xfs.man b/xfs.man
index 4245feb..2779da1 100644
--- a/xfs.man
+++ b/xfs.man
@@ -351,7 +351,7 @@ to reset, closing all active connections and re-reading the configuration
file.
.SH BUGS
Multiple catalogues should be supported.
-+.SH "FUTURE DIRECTIONS"
+.SH "FUTURE DIRECTIONS"
Significant further development of
.B xfs
is unlikely.
commit c398fae4cf2119f467970a0af4b408948aff12ef
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 4 15:56:31 2008 -0800
Add hooks for checking sources with tools like sparse & lint
diff --git a/Makefile.am b/Makefile.am
index 0a940d5..609fc7d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,7 @@ bin_PROGRAMS = xfs
FONT_FLAGS = -DFONT_PCF -DFONT_FS -DFONT_SPEEDO
-AM_CFLAGS = $(XFS_CFLAGS) -I$(top_srcdir)/include -DXFSPIDDIR=\"/var/run\" \
+AM_CPPFLAGS = $(XFS_CFLAGS) -I$(top_srcdir)/include -DXFSPIDDIR=\"/var/run\" \
$(FONT_FLAGS) -D_BSD_SOURCE -DFONT_t -DTRANS_SERVER -DTRANS_REOPEN
LDADD = $(XFS_LIBS)
@@ -148,3 +148,11 @@ ChangeLog:
(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
dist-hook: ChangeLog
+
+if LINT
+ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS)
+
+lint:
+ $(LINT) $(ALL_LINT_FLAGS) $(xfs_SOURCES)
+endif LINT
diff --git a/configure.ac b/configure.ac
index c691935..c038187 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,6 +28,10 @@ AM_MAINTAINER_MODE
AM_CONFIG_HEADER(xfs-config.h)
+# Require xorg-macros version 1.1.0 or newer for XORG_WITH_LINT macro
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.1)
+
AC_PROG_CC
AC_PROG_INSTALL
AC_CANONICAL_HOST
@@ -61,6 +65,9 @@ AC_SUBST(XFS_LIBS)
# Transport selection macro from xtrans.m4
XTRANS_CONNECTION_FLAGS
+dnl Allow checking code with lint, sparse, etc.
+XORG_WITH_LINT
+
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
commit 04e94c3d22e6115f40bcced43e78a336613789a9
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 4 15:55:53 2008 -0800
Remove duplicated section & extra + in xfs.man
diff --git a/xfs.man b/xfs.man
index ad29788..4245feb 100644
--- a/xfs.man
+++ b/xfs.man
@@ -64,7 +64,7 @@ xfs \- X font server
.BI "\-user " username
]
.SH DESCRIPTION
-+.B xfs
+.B xfs
is the X Window System font server.
It supplies fonts to X Window System display servers.
The server is usually run by a system administrator, and started via
@@ -229,9 +229,6 @@ indicates the filename of the error file.
All warnings and errors will be logged here, unless
.B use\-syslog
is set to a true value (see below).
-.IP "no-listen (trans-type)"
-Disable a transport type. For example, TCP/IP connections can
-be disabled with no-listen tcp
.TP
.BR no\-listen " (\fItrans-type\fP)"
disables the specified transport type.
commit bc3d7ac63b801b22214ce5d04fa0a585a6223fee
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Jan 3 17:12:58 2008 -0800
Rename autoconf-generated header to xfs-config.h to avoid clash with os/config.h
diff --git a/configure.ac b/configure.ac
index 9430a65..c691935 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ AC_INIT(xfs,[1.0.5], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],x
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
-AM_CONFIG_HEADER(config.h)
+AM_CONFIG_HEADER(xfs-config.h)
AC_PROG_CC
AC_PROG_INSTALL
diff --git a/difs/fontinfo.c b/difs/fontinfo.c
index e7e627d..a5615d4 100644
--- a/difs/fontinfo.c
+++ b/difs/fontinfo.c
@@ -48,6 +48,8 @@ in this Software without prior written authorization from The Open Group.
*/
/* $XFree86: xc/programs/xfs/difs/fontinfo.c,v 1.10 2001/12/14 20:01:34 dawes Exp $ */
+#include <xfs-config.h>
+
#include <X11/fonts/FS.h>
#include <X11/fonts/FSproto.h>
#include <stdio.h>
@@ -62,9 +64,6 @@ in this Software without prior written authorization from The Open Group.
#include <swapreq.h>
#include <swaprep.h>
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
#ifdef HAVE_STDINT_H
#include <stdint.h>
#endif
diff --git a/include/servermd.h b/include/servermd.h
index b076b21..ccd6629 100644
--- a/include/servermd.h
+++ b/include/servermd.h
@@ -49,7 +49,7 @@ in this Software without prior written authorization from The Open Group.
#ifndef _SERVERMD_H_
#define _SERVERMD_H_
-#include "config.h"
+#include <xfs-config.h>
#ifndef VENDOR_RELEASE
# if defined PACKAGE_VERSION_MAJOR
diff --git a/os/config.c b/os/config.c
index 3e23075..4623390 100644
--- a/os/config.c
+++ b/os/config.c
@@ -49,7 +49,7 @@ in this Software without prior written authorization from The Open Group.
*/
/* $XFree86: xc/programs/xfs/os/config.c,v 3.15 2002/05/31 18:46:12 dawes Exp $ */
-#include <config.h>
+#include <xfs-config.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/os/xfstrans.c b/os/xfstrans.c
index 573e6a9..81ec773 100644
--- a/os/xfstrans.c
+++ b/os/xfstrans.c
@@ -22,9 +22,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include <xfs-config.h>
#define FONT_t
#define TRANS_REOPEN
commit c0b33d044edc89ec882ac425c91a79cd738167a4
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Jan 3 16:47:59 2008 -0800
Add --with-default-config-file configure option
Allow specifying multiple files, using the first one found at runtime.
diff --git a/Makefile.am b/Makefile.am
index cfa8eaa..0a940d5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,8 +26,7 @@ bin_PROGRAMS = xfs
FONT_FLAGS = -DFONT_PCF -DFONT_FS -DFONT_SPEEDO
AM_CFLAGS = $(XFS_CFLAGS) -I$(top_srcdir)/include -DXFSPIDDIR=\"/var/run\" \
- -DDEFAULT_CONFIG_FILE=\"$(configdir)/config\" $(FONT_FLAGS) \
- -D_BSD_SOURCE -DFONT_t -DTRANS_SERVER -DTRANS_REOPEN
+ $(FONT_FLAGS) -D_BSD_SOURCE -DFONT_t -DTRANS_SERVER -DTRANS_REOPEN
LDADD = $(XFS_LIBS)
diff --git a/acinclude.m4 b/acinclude.m4
new file mode 100644
index 0000000..f3d8734
--- /dev/null
+++ b/acinclude.m4
@@ -0,0 +1,47 @@
+##### http://autoconf-archive.cryp.to/ac_define_dir.html
+#
+# SYNOPSIS
+#
+# AC_DEFINE_DIR(VARNAME, DIR [, DESCRIPTION])
+#
+# DESCRIPTION
+#
+# This macro sets VARNAME to the expansion of the DIR variable,
+# taking care of fixing up ${prefix} and such.
+#
+# VARNAME is then offered as both an output variable and a C
+# preprocessor symbol.
+#
+# Example:
+#
+# AC_DEFINE_DIR([DATADIR], [datadir], [Where data are placed to.])
+#
+# LAST MODIFICATION
+#
+# 2006-10-13
+#
+# COPYLEFT
+#
+# Copyright (c) 2006 Stepan Kasal <kasal@ucw.cz>
+# Copyright (c) 2006 Andreas Schwab <schwab@suse.de>
+# Copyright (c) 2006 Guido U. Draheim <guidod@gmx.de>
+# Copyright (c) 2006 Alexandre Oliva
+#
+# Copying and distribution of this file, with or without
+# modification, are permitted in any medium without royalty provided
+# the copyright notice and this notice are preserved.
+
+AC_DEFUN([AC_DEFINE_DIR], [
+ prefix_NONE=
+ exec_prefix_NONE=
+ test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
+ test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
+dnl In Autoconf 2.60, ${datadir} refers to ${datarootdir}, which in turn
+dnl refers to ${prefix}. Thus we have to use `eval' twice.
+ eval ac_define_dir="\"[$]$2\""
+ eval ac_define_dir="\"$ac_define_dir\""
+ AC_SUBST($1, "$ac_define_dir")
+ AC_DEFINE_UNQUOTED($1, "$ac_define_dir", [$3])
+ test "$prefix_NONE" && prefix=NONE
+ test "$exec_prefix_NONE" && exec_prefix=NONE
+])
diff --git a/configure.ac b/configure.ac
index a4ebb65..9430a65 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,6 +43,15 @@ esac
AC_CHECK_HEADERS([stdint.h])
+AC_ARG_WITH(default-config-file,
+ AS_HELP_STRING([--with-default-config-file=PATH],
+ [comma-separated list of paths to look for config file when not specified (default: ${libdir}/X11/fs/config)]),
+ [CONFIG_FILE="$withval"], [CONFIG_FILE="${libdir}/X11/fs/config"])
+
+CONFIG_FILE=`echo ${CONFIG_FILE} | sed 's/,/\\\\\\\\\\\",\\\\\\\\\\\"/'`
+AC_DEFINE_DIR([DEFAULT_CONFIG_FILE], CONFIG_FILE,
+ [comma-separated list of strings for config file paths when not specified])
+
# Checks for pkg-config packages
PKG_CHECK_MODULES(XFS, libfs xfont xtrans)
XFS_CFLAGS="$XFS_CFLAGS $OS_CFLAGS"
diff --git a/difs/main.c b/difs/main.c
index 4e6272c..4b3a5cc 100644
--- a/difs/main.c
+++ b/difs/main.c
@@ -69,10 +69,6 @@ int ConnInfoLen;
Cache serverCache;
-#ifndef DEFAULT_CONFIG_FILE
-#define DEFAULT_CONFIG_FILE "/usr/lib/X11/fs/config"
-#endif
-
#define SERVER_CACHE_SIZE 10000 /* for random server cacheables */
static Bool create_connection_block(void);
@@ -91,7 +87,7 @@ main(int argc, char *argv[])
argcGlobal = argc;
argvGlobal = argv;
- configfilename = DEFAULT_CONFIG_FILE;
+ configfilename = NULL;
/* init stuff */
ProcessCmdLine(argc, argv);
diff --git a/include/os.h b/include/os.h
index 2448552..e98778a 100644
--- a/include/os.h
+++ b/include/os.h
@@ -91,7 +91,7 @@ extern FontCacheSettings cacheSettings;
struct _osComm; /* FIXME: osCommPtr */
/* os/config.c */
-extern int ReadConfigFile(char *filename);
+extern int ReadConfigFile(const char *filename);
/* os/connection.c */
extern void AttendClient(ClientPtr client);
diff --git a/os/config.c b/os/config.c
index e5dbc48..3e23075 100644
--- a/os/config.c
+++ b/os/config.c
@@ -49,6 +49,8 @@ in this Software without prior written authorization from The Open Group.
*/
/* $XFree86: xc/programs/xfs/os/config.c,v 3.15 2002/05/31 18:46:12 dawes Exp $ */
+#include <config.h>
+
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
@@ -66,6 +68,15 @@ in this Software without prior written authorization from The Open Group.
#include <X11/fonts/fontutil.h>
#include "difs.h"
+static const char * const default_config_files[] = {
+#ifdef DEFAULT_CONFIG_FILE
+ DEFAULT_CONFIG_FILE,
+#else
+ "/usr/lib/X11/fs/config",
+#endif
+ NULL
+};
+
extern int portFromCmdline;
static char *font_catalogue = NULL;
@@ -315,12 +326,14 @@ char *__XFSRedirRoot(char *fname)
}
#endif
+/* If argument is NULL, uses first file found from default_config_files */
int
-ReadConfigFile(char *filename)
+ReadConfigFile(const char *filename)
{
FILE *fp;
int ret;
int len;
+ int i;
char *data;
data = (char *) fsalloc(CONFIG_MAX_FILESIZE);
@@ -328,12 +341,31 @@ ReadConfigFile(char *filename)
ErrorF(ConfigErrors[CONFIG_ERR_MEMORY], filename);
return FSBadAlloc;
}
+ if (filename != NULL) {
#ifdef __UNIXOS2__
- filename = __XFSRedirRoot(filename);
+ filename = __XFSRedirRoot(filename);
#endif
- if ((fp = fopen(filename, "r")) == NULL) {
+ fp = fopen(filename, "r");
+ if (fp == NULL) {
+ ErrorF(ConfigErrors[CONFIG_ERR_OPEN], filename);
+ }
+ } else {
+ for (i = 0; default_config_files[i] != NULL; i++) {
+ filename = default_config_files[i];
+#ifdef __UNIXOS2__
+ filename = __XFSRedirRoot(filename);
+#endif
+ if ((fp = fopen(filename, "r")) != NULL)
+ break;
+ }
+ if (fp == NULL) {
+ for (i = 0; default_config_files[i] != NULL; i++) {
+ ErrorF(ConfigErrors[CONFIG_ERR_OPEN], default_config_files[i]);
+ }
+ }
+ }
+ if (fp == NULL) {
fsfree(data);
- ErrorF(ConfigErrors[CONFIG_ERR_OPEN], filename);
return FSBadName;
}
ret = fread(data, sizeof(char), CONFIG_MAX_FILESIZE, fp);
commit c7b49319ac3ba99002074021f0cd493aa122439a
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Jan 3 13:58:18 2008 -0800
xfs.man: Replace Speedo with TrueType, fix typos
diff --git a/xfs.man b/xfs.man
index d794ab3..ad29788 100644
--- a/xfs.man
+++ b/xfs.man
@@ -159,7 +159,7 @@ runs with the user and group IDs of the user who invoked it.
reads and serves any font file format recognized by the X server itself.
It locates font files through the specification of a
.IR catalogue ,
-which is delcared in
+which is declared in
.BR xfs 's
configuration file.
.SS "Configuration File Format"
@@ -242,7 +242,7 @@ tcp\(cq.
indicates the TCP port on which the server will listen for connections.
.\" .TP
.\" .BR trusted-clients " (list of \fIstring\fPs)"
-.\" idefntifies the clients the font server will talk to.
+.\" identifies the clients the font server will talk to.
.\" Others will be refused for the initial connection.
.\" An empty list means the server will talk to any client.
.TP
@@ -300,10 +300,10 @@ XCOMM Identify alternate font servers for clients to use.
alternate\-servers = hansen:7101,hansen:7102
XCOMM Look for fonts in the following directories. The first is a set of
-XCOMM Speedo outlines, the second is a set of misc bitmaps (such as terminal
+XCOMM TrueType outlines, the second is a set of misc bitmaps (such as terminal
XCOMM and cursor fonts), and the last is a set of 100dpi bitmaps.
XCOMM
-catalogue = /usr/X11R6/lib/X11/fonts/speedo,
+catalogue = /usr/X11R6/lib/X11/fonts/TTF,
/usr/X11R6/lib/X11/fonts/misc,
/usr/X11R6/lib/X11/fonts/100dpi/
commit cfbf2d673d0b764f6f5aa3d802c4796c94b407d0
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Jan 3 13:10:01 2008 -0800
Use PACKAGE_VERSION_* to set default VENDOR_RELEASE version string
diff --git a/include/servermd.h b/include/servermd.h
index 6e5cc8a..b076b21 100644
--- a/include/servermd.h
+++ b/include/servermd.h
@@ -49,8 +49,17 @@ in this Software without prior written authorization from The Open Group.
#ifndef _SERVERMD_H_
#define _SERVERMD_H_
+#include "config.h"
+
#ifndef VENDOR_RELEASE
-#define VENDOR_RELEASE 6700
+# if defined PACKAGE_VERSION_MAJOR
+# define VENDOR_RELEASE \
+ (((PACKAGE_VERSION_MAJOR) * 10000000) + \
+ ((PACKAGE_VERSION_MINOR) * 100000) + \
+ ((PACKAGE_VERSION_PATCHLEVEL) * 1000))
+# else
+# define VENDOR_RELEASE 7000
+# endif
#endif
#ifndef VENDOR_STRING
commit 33f185cc94d11279aa3c08ebebf8461225dad4be
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Dec 6 16:37:15 2007 -0500
Replace static ChangeLog with dist-hook to generate from git log
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index c726ca2..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,52 +0,0 @@
-2006-04-26 Adam Jackson <ajax@freedesktop.org>
-
- * configure.ac:
- Bump to 1.0.2
-
-2006-03-13 Alan Coopersmith <alan.coopersmith@sun.com>
-
- * difs/cache.c (rebuild_cache):
- Check for alloc error was reversed, causing memory leak, NULL
- pointer dereference (if fsalloc actually failed), and failure
- to rebuild cache. (Coverity ids #560 & #127).
-
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version for X11R7 release.
-
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for final X11R7 release candidate.
-
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
-
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for X11R7 RC3 release.
-
-2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update dependencies to work with separate build roots.
-
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for X11R7 RC2 release.
-
-2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update pkgcheck depedencies to work with separate build roots.
-
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for RC1 release.
-
diff --git a/Makefile.am b/Makefile.am
index 5d5ba4d..cfa8eaa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -139,3 +139,13 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+
+dist-hook: ChangeLog
commit ec8bfac7c5ab048d86bd60ec97526300ef41d2a9
Author: David Nusinow <dnusinow@debian.org>
Date: Wed Oct 3 21:37:46 2007 -0400
Perform massive manpage cleanup and reformatting.
Add "FUTURE DIRECTIONS" section.
This patch by Branden Robinson, forward ported by David Nusinow and
probably a few others.
diff --git a/xfs.man b/xfs.man
index 049e60a..d794ab3 100644
--- a/xfs.man
+++ b/xfs.man
@@ -37,137 +37,221 @@
.\" suitability of this software for any purpose. It is provided "as is"
.\" without express or implied warranty.
.\" $Xorg: xfs.man,v 1.4 2001/02/09 02:05:42 xorgcvs Exp $
-.TH XFS 1 __xorgversion__
+.TH xfs __appmansuffix__ __xorgversion__
.SH NAME
xfs \- X font server
.SH SYNOPSIS
-.B "xfs"
-[\-config \fIconfiguration_file\fP]
-[\-daemon]
-[\-droppriv]
-[\-ls \fIlisten_socket\fP]
-[\-nodaemon]
-[\-port \fItcp_port\fP]
-[\-user \fIusername\fP]
+.B xfs
+[
+.BI "\-config " configuration_file
+]
+[
+.B \-daemon
+]
+[
+.B \-droppriv
+]
+[
+.BI "\-ls " listen_socket
+]
+[
+.B \-nodaemon
+]
+[
+.BI "\-port " tcp_port
+]
+[
+.BI "\-user " username
+]
.SH DESCRIPTION
++.B xfs
+is the X Window System font server.
+It supplies fonts to X Window System display servers.
+The server is usually run by a system administrator, and started via
+.BR init (__adminmansuffix__).
+Users may also wish to start private font servers for specific sets of
+fonts.
.PP
-.I Xfs
-is the X Window System font server. It supplies fonts to X Window
-System display servers.
-.SH "STARTING THE SERVER"
-The server is usually run by a system administrator, and started via
-boot files like \fI/etc/rc.local\fR. Users may also wish to start
-private font servers for specific sets of fonts.
-.SH "OPTIONS"
-.TP 8
-.B \-config configuration_file
-Specifies the configuration file the font server will use. If this
-parameter is not specified, the default file, \fI__configdir__/config\fR
+To connect to a font server, see the documentation for your X server; it
+likely supports the syntax documented in the \(lqFONT SERVER NAMES\(rq
+section of
+.BR X (__miscmansuffix__).
+.SH OPTIONS
+.TP
+.BI "\-config " configuration_file
+specifies the configuration file
+.B xfs
+will use.
+If this parameter is not specified, the default file,
+.IR __configdir__/config ,
will be used.
-.TP 8
-.B \-ls listen_socket
-Specifies a file descriptor which is already set up to be used as the
-listen socket. This option is only intended to be used by the font server
-itself when automatically spawning another copy of itself to handle
-additional connections.
-.TP 8
-.B \-port tcp_port
-Specifies the TCP port number on which the server will listen for connections.
-The default port number is 7100.
-.TP 8
+.TP
.B \-daemon
-Instructs xfs to fork and go into the background automatically at
-startup If this option is not specified, xfs will run as a regular
-process (unless xfs was built to daemonize by default).
-.TP 8
+instructs
+.B xfs
+to fork and go into the background automatically at startup.
+If this option is not specified,
+.B xfs
+will run as a regular process (unless it was built to daemonize by
+default).
+When running as a daemon,
+.B xfs
+will attempt to create a file in which it stores its process ID, and will
+delete that file upon exit;
+.TP
.B \-droppriv
-If specified, xfs will attempt to run as user and group \fIxfs\fR (unless
-the
+instructs
+.B xfs
+to attempt to run as user and group
+.I xfs
+(unless the
.B \-user
-option is used). This
-has been implemented for security reasons, as xfs may have undiscovered
-buffer overflows or other paths for possible exploit, both local and
-remote. With this option, you may also wish to specify
-"no-listen = tcp"
-in the config file, which ensures that xfs will not to use a TCP port at all.
-.TP 8
+option is used).
+This has been implemented for security reasons, as
+.B xfs
+may have undiscovered buffer overflows or other paths for possible exploit,
+both local and remote.
+When using this option, you may also wish to specify \(oqno\-listen =
+tcp\(cq in the config file, which ensures that
+.B xfs
+will not to use a TCP port at all.
+By default,
+.B xfs
+runs with the user and group IDs of the user who invoked it.
+.TP
+.BI "\-ls " listen_socket
+specifies a file descriptor which is already set up to be used as the
+listen socket.
+This option is only intended to be used by the font server itself when
+automatically spawning another copy of itself to handle additional
+connections.
+.TP
.B \-nodaemon
-When xfs is built to daemonize (run in the background) by default,
-this prevents that and starts xfs up as a regular process.
-.TP 8
-.B \-user username
-This is equivalent to
+instructs
+.B xfs
+not to daemonize (fork and detach from its controlling terminal).
+This option only has an effect if
+.B xfs
+is built to daemonize by default, which is not the stock configuration.
+.TP
+.BI "\-port " tcp_port
+specifies the TCP port number on which the server will listen for
+connections.
+The default port number is 7100.
+This option is ignored if
+.B xfs
+is configured to not listen to TCP transports at all (see \(lqConfiguration
+File Format\(rq below).
+.TP
+.BI "\-user " username
+instructs
+.B xfs
+to run as the user
+.IR username.
+See
.B \-droppriv
-except that xfs will run as user \fIusername\fR.
-.SH "SIGNALS"
-.TP 8
-.I SIGTERM
-This causes the font server to exit cleanly.
-.TP 8
-.I SIGUSR1
-This signal is used to cause the server to re-read its configuration file.
-.TP 8
-.I SIGUSR2
-This signal is used to cause the server to flush any cached data it
-may have.
-.TP 8
-.I SIGHUP
-This signal is used to cause the server to reset, closing all active
-connections and re-reading the configuration file.
-.SH "CONFIGURATION"
+for why this may be desired.
+By default,
+.B xfs
+runs with the user and group IDs of the user who invoked it.
+.SH "INPUT FILES"
+.B xfs
+reads and serves any font file format recognized by the X server itself.
+It locates font files through the specification of a
+.IR catalogue ,
+which is delcared in
+.BR xfs 's
+configuration file.
+.SS "Configuration File Format"
+.B xfs
+reads its configuration from
+.I __configdir__/config
+by default (see the
+.B \-config
+option in the \(lqOPTIONS\(rq section above).
The configuration language is a list of keyword and value pairs.
-Each keyword is followed by an '=' and then the desired value.
+Each keyword is followed by an equals sign (\(oq=\(cq) and then the desired
+value.
.PP
Recognized keywords include:
-.sp
-.\" .IP "cache-size (cardinal)"
-.\" Size in bytes of the font server cache.
-.IP "catalogue (list of string)"
-Ordered list of font path element names.
+.TP
+.BR alternate\-servers " (list of \fIstring\fPs)"
+lists alternate servers for this font server.
+See the \(lqFONT SERVER NAMES\(rq section of
+.BR X (__miscmansuffix__)
+for the syntax of the string.
+.\" .TP
+.\" .BR cache\-size " (\fIcardinal\fP)"
+.\" determines the size (in bytes) of the font server cache.
+.TP
+.BR catalogue " (list of \fIstring\fPs)"
+declares as ordered list of font path element names from which fonts will
+be served.
The current implementation only supports a single catalogue ("all")
containing all of the specified fonts. A special directory with
symlinks to font paths can be specified using a catalogue:<dir>
entry. See the CATALOGUE DIR section below for details.
-.IP "alternate-servers (list of string)"
-List of alternate servers for this font server.
-.IP "client-limit (cardinal)"
-Number of clients this font server will support
-before refusing service. This is useful for tuning
-the load on each individual font server.
-.IP "clone-self (boolean)"
-Whether this font server should attempt to clone itself
-when it reachs the client-limit.
-.IP "default-point-size (cardinal)"
-The default pointsize (in decipoints) for fonts that
-don't specify. The default is 120.
-.IP "default-resolutions (list of resolutions)"
-Resolutions the server supports by default.
-This information may be used as a hint for
-pre-rendering, and substituted for scaled fonts
-which do not specify a resolution.
-A resolution is a comma-separated pair of x and y resolutions in
-pixels per inch.
+.TP
+.BR client\-limit " (\fIcardinal\fP)"
+determines the number of clients this font server will support before
+refusing service.
Reply to: