summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/xdm/Makefile.bsd-wrapper3
-rw-r--r--app/xdm/Makefile.in33
-rw-r--r--app/xdm/README2
-rw-r--r--app/xdm/auth.c25
-rw-r--r--app/xdm/config.h.in6
-rw-r--r--app/xdm/config/Makefile.in29
-rw-r--r--app/xdm/config/Xreset5
-rw-r--r--app/xdm/config/Xresources.cpp18
-rw-r--r--app/xdm/config/Xsession.cpp63
-rw-r--r--app/xdm/config/Xstartup12
-rw-r--r--app/xdm/config/Xstartup.cpp9
-rw-r--r--app/xdm/configure285
-rw-r--r--app/xdm/configure.ac25
-rw-r--r--app/xdm/greeter/Makefile.in12
14 files changed, 411 insertions, 116 deletions
diff --git a/app/xdm/Makefile.bsd-wrapper b/app/xdm/Makefile.bsd-wrapper
index 30e2031a2..be32ce652 100644
--- a/app/xdm/Makefile.bsd-wrapper
+++ b/app/xdm/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.14 2007/05/31 15:55:45 matthieu Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.15 2007/08/05 19:37:39 matthieu Exp $
.include <bsd.own.mk>
XDMCONFIGDIR=/etc/X11/xdm
@@ -15,6 +15,7 @@ CONFIGURE_ARGS= --enable-privsep \
--enable-bsdauth \
$(DEFAULT_VT) \
--disable-dynamic-greeter \
+ --without-xft \
--with-xdmlibdir=$(XDMCONFIGDIR) \
--with-pixmapdir=$(PIXMAPDIR) \
--with-bw-pixmap=OpenBSD_1bpp.xpm \
diff --git a/app/xdm/Makefile.in b/app/xdm/Makefile.in
index 2c91b9816..5eec005d4 100644
--- a/app/xdm/Makefile.in
+++ b/app/xdm/Makefile.in
@@ -260,6 +260,10 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
+LINT = @LINT@
+LINT_FALSE = @LINT_FALSE@
+LINT_FLAGS = @LINT_FLAGS@
+LINT_TRUE = @LINT_TRUE@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -311,6 +315,8 @@ XDM_LDFLAGS = @XDM_LDFLAGS@
XDM_LIBS = @XDM_LIBS@
XDM_PIXMAP = @XDM_PIXMAP@
XDM_PIXMAPDIR = @XDM_PIXMAPDIR@
+XFT_CFLAGS = @XFT_CFLAGS@
+XFT_LIBS = @XFT_LIBS@
XINERAMA_CFLAGS = @XINERAMA_CFLAGS@
XINERAMA_LIBS = @XINERAMA_LIBS@
XLIB_CFLAGS = @XLIB_CFLAGS@
@@ -393,7 +399,8 @@ appmandir = $(APP_MAN_DIR)
appman_PRE = xdm.man.cpp
appman_DATA = $(appman_PRE:man.cpp=@APP_MAN_SUFFIX@)
CLEANFILES = $(appman_DATA) $(APPDEFAULTFILES)
-EXTRA_DIST = $(appman_PRE) $(APPDEFAULTFILES:%=%.ad)
+EXTRA_DIST = $(appman_PRE) ChangeLog $(APPDEFAULTFILES:%=%.ad)
+MAINTAINERCLEANFILES = ChangeLog
SED = sed
SUFFIXES = .cpp .$(APP_MAN_SUFFIX) .man.cpp .ad
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
@@ -444,6 +451,9 @@ chooser_SOURCES = \
APPDEFAULTFILES = Chooser
appdefault_DATA = $(APPDEFAULTFILES)
+@LINT_TRUE@ALL_LINT_FLAGS = $(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@LINT_TRUE@ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
+
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -1263,6 +1273,9 @@ distdir: $(DISTFILES)
|| exit 1; \
fi; \
done
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$(top_distdir)" distdir="$(distdir)" \
+ dist-hook
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
@@ -1393,6 +1406,7 @@ distclean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
+ -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
clean: clean-recursive
clean-am: clean-binPROGRAMS clean-generic clean-libtool \
@@ -1455,8 +1469,8 @@ uninstall-info: uninstall-info-recursive
.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
check-am clean clean-binPROGRAMS clean-generic clean-libtool \
clean-recursive clean-xdmlibPROGRAMS ctags ctags-recursive \
- dist dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ \
- dist-zip distcheck distclean distclean-compile \
+ dist dist-all dist-bzip2 dist-gzip dist-hook dist-shar \
+ dist-tarZ dist-zip distcheck distclean distclean-compile \
distclean-generic distclean-hdr distclean-libtool \
distclean-recursive distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
@@ -1482,6 +1496,19 @@ uninstall-info: uninstall-info-recursive
.ad:
cp $< $@
+
+@LINT_TRUE@lint:
+@LINT_TRUE@ $(LINT) $(ALL_LINT_FLAGS) $(xdm_CFLAGS) $(xdm_SOURCES) $(xdm_LDADD)
+@LINT_TRUE@ $(LINT) $(ALL_LINT_FLAGS) $(xdmshell_CFLAGS) $(xdmshell_SOURCES)
+@LINT_TRUE@ $(LINT) $(ALL_LINT_FLAGS) $(chooser_CFLAGS) $(chooser_SOURCES) $(chooser_LDADD)
+@LINT_TRUE@ (cd greeter && $(MAKE) $(AM_MAKEFLAGS) lint)
+
+.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
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/app/xdm/README b/app/xdm/README
index 1640d44ca..537441807 100644
--- a/app/xdm/README
+++ b/app/xdm/README
@@ -19,4 +19,4 @@ For instance, some packagers/sites may prefer:
--with-xdmconfigdir=/etc/X11/xdm --with-xdmlibdir=$(prefix)/lib/xdm
--with-xdmscriptdir=/etc/X11/xdm
-$Id: README,v 1.1 2006/11/25 20:32:04 matthieu Exp $
+$Id: README,v 1.2 2007/08/05 19:37:39 matthieu Exp $
diff --git a/app/xdm/auth.c b/app/xdm/auth.c
index 50d7956d3..5015d5260 100644
--- a/app/xdm/auth.c
+++ b/app/xdm/auth.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: app/xdm/auth.c,v 1.5 2005/11/08 06:33:31 jkj Exp $ */
+/* $XdotOrg: xc/programs/xdm/auth.c,v 1.2 2004/04/23 19:54:42 eich Exp $ */
/* $Xorg: auth.c,v 1.5 2001/02/09 02:05:40 xorgcvs Exp $ */
/*
@@ -186,7 +186,7 @@ static Xauth *
GenerateAuthorization (unsigned short name_length, char *name)
{
struct AuthProtocol *a;
- Xauth *auth = 0;
+ Xauth *auth = NULL;
int i;
Debug ("GenerateAuthorization %*.*s\n",
@@ -231,7 +231,7 @@ SetProtoDisplayAuthorization (
Xauth *auth;
a = findProtocol (authorizationNameLen, authorizationName);
- pdpy->xdmcpAuthorization = pdpy->fileAuthorization = 0;
+ pdpy->xdmcpAuthorization = pdpy->fileAuthorization = NULL;
if (a)
{
if (!a->inited)
@@ -248,7 +248,7 @@ SetProtoDisplayAuthorization (
{
auth = (*a->GetAuth) (authorizationNameLen, authorizationName);
pdpy->fileAuthorization = auth;
- pdpy->xdmcpAuthorization = 0;
+ pdpy->xdmcpAuthorization = NULL;
}
if (auth)
Debug ("Got %p (%d %*.*s)\n", auth,
@@ -380,7 +380,7 @@ SaveServerAuthorizations (
int count)
{
FILE *auth_file;
- int mask;
+ mode_t mask;
int ret;
int i;
uid_t uid;
@@ -403,7 +403,6 @@ SaveServerAuthorizations (
gid = getgid();
#endif
-
mask = umask (0077);
ret = MakeServerAuthFile(d, &auth_file, uid, gid);
umask (mask);
@@ -524,7 +523,7 @@ SetAuthorization (struct display *d)
static int
openFiles (char *name, char *new_name, FILE **oldp, FILE **newp)
{
- int mask;
+ mode_t mask;
strcpy (new_name, name);
strcat (new_name, "-n");
@@ -592,7 +591,7 @@ static struct addrList *addrs;
static void
initAddrs (void)
{
- addrs = 0;
+ addrs = NULL;
}
static void
@@ -630,7 +629,7 @@ saveEntry (Xauth *auth)
}
memmove( new->address, auth->address, (int) auth->address_length);
} else
- new->address = 0;
+ new->address = NULL;
if ((new->number_length = auth->number_length) > 0) {
new->number = malloc (auth->number_length);
if (!new->number) {
@@ -641,7 +640,7 @@ saveEntry (Xauth *auth)
}
memmove( new->number, auth->number, (int) auth->number_length);
} else
- new->number = 0;
+ new->number = NULL;
if ((new->name_length = auth->name_length) > 0) {
new->name = malloc (auth->name_length);
if (!new->name) {
@@ -653,7 +652,7 @@ saveEntry (Xauth *auth)
}
memmove( new->name, auth->name, (int) auth->name_length);
} else
- new->name = 0;
+ new->name = NULL;
new->family = auth->family;
new->next = addrs;
addrs = new;
@@ -1240,9 +1239,9 @@ SetUserAuthorization (struct display *d, struct verify_info *verify)
{
FILE *old = NULL, *new;
char home_name[1024], backup_name[1024], new_name[1024];
- char *name = 0;
+ char *name = NULL;
char *home;
- char *envname = 0;
+ char *envname = NULL;
int lockStatus;
Xauth *entry, **auths;
int setenv = 0;
diff --git a/app/xdm/config.h.in b/app/xdm/config.h.in
index 7fe13813f..6690344e3 100644
--- a/app/xdm/config.h.in
+++ b/app/xdm/config.h.in
@@ -78,6 +78,9 @@
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
+/* Define to 1 if you have the `sigaction' function. */
+#undef HAVE_SIGACTION
+
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
@@ -168,6 +171,9 @@
/* Use PAM for authentication */
#undef USE_PAM
+/* Define to 1 to use Xft for text on greeter screen */
+#undef USE_XFT
+
/* Define to 1 to use XINERAMA in greeter & chooser */
#undef USE_XINERAMA
diff --git a/app/xdm/config/Makefile.in b/app/xdm/config/Makefile.in
index 7ed4849ca..a4e2911ff 100644
--- a/app/xdm/config/Makefile.in
+++ b/app/xdm/config/Makefile.in
@@ -14,7 +14,7 @@
@SET_MAKE@
-# $XdotOrg: app/xdm/config/Makefile.am,v 1.9 2006/03/18 03:43:18 alanc Exp $
+# $XdotOrg: $
#
# -*- Makefile -*-
@@ -155,6 +155,10 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
+LINT = @LINT@
+LINT_FALSE = @LINT_FALSE@
+LINT_FLAGS = @LINT_FLAGS@
+LINT_TRUE = @LINT_TRUE@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -206,6 +210,8 @@ XDM_LDFLAGS = @XDM_LDFLAGS@
XDM_LIBS = @XDM_LIBS@
XDM_PIXMAP = @XDM_PIXMAP@
XDM_PIXMAPDIR = @XDM_PIXMAPDIR@
+XFT_CFLAGS = @XFT_CFLAGS@
+XFT_LIBS = @XFT_LIBS@
XINERAMA_CFLAGS = @XINERAMA_CFLAGS@
XINERAMA_LIBS = @XINERAMA_LIBS@
XLIB_CFLAGS = @XLIB_CFLAGS@
@@ -291,22 +297,22 @@ xdmconfig_DATA = \
Xservers
xdmscript_SCRIPTS = \
- Xsession
+ Xreset \
+ Xsession \
+ Xstartup
dist_xdmscript_SCRIPTS = \
GiveConsole \
TakeConsole \
Xsetup_0 \
- Xstartup \
- Xreset \
Xwilling
pixmapdir = $(XDM_PIXMAPDIR)
dist_pixmap_DATA = xorg-bw.xpm xorg.xpm
-BUILT_SOURCES = Xservers.ws xdm-config Xresources Xsession
+BUILT_SOURCES = Xservers.ws xdm-config Xreset Xresources Xsession Xstartup
CLEANFILES = $(BUILT_SOURCES) Xservers
EXTRA_DIST = Xservers.ws.cpp Xservers.fs \
- xdm-config.cpp Xresources.cpp Xsession.cpp
+ xdm-config.cpp Xreset.cpp Xresources.cpp Xsession.cpp Xstartup.cpp
# Defines used when cpp'ing config files to replace settings in the files
@@ -320,11 +326,12 @@ XPMDEFINES = -DXPM -DBITMAPDIR=$(XDM_PIXMAPDIR) -DXDM_PIXMAP=$(XDM_PIXMAP) \
#if HAVE_MKTEMP_COMMAND
MKTEMP_DEFINES = -DMKTEMP_COMMAND=$(MKTEMP_COMMAND)
#endif
-CPP_FILES_FLAGS = -DBINDIR=$(bindir) -DDEFAULTVT=$(DEFAULTVT) \
- -DXDMDIR=$(XDMLIBDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) \
- -DXDMCONFIGDIR=$(XDMCONFIGDIR) -DXDMSCRIPTDIR=$(XDMSCRIPTDIR) \
- -DSU=$(SU) -DCHOOSERPATH=$(XDMLIBDIR)/chooser $(XPMDEFINES) \
- -DSHELL_CMD=$(SHELL_CMD) $(MKTEMP_DEFINES)
+CPP_FILES_FLAGS = -DBINDIR="$(bindir)" -DDEFAULTVT="$(DEFAULTVT)" \
+ -DXDMDIR="$(XDMLIBDIR)" -DXDMLOGDIR="$(XDMLOGDIR)" \
+ -DXDMPIDDIR="$(XDMPIDDIR)" -DXDMCONFIGDIR="$(XDMCONFIGDIR)" \
+ -DXDMSCRIPTDIR="$(XDMSCRIPTDIR)" -DSU="$(SU)" \
+ -DCHOOSERPATH="$(XDMLIBDIR)/chooser" $(XPMDEFINES) \
+ -DSHELL_CMD="$(SHELL_CMD)" $(MKTEMP_DEFINES)
all: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) all-am
diff --git a/app/xdm/config/Xreset b/app/xdm/config/Xreset
deleted file mode 100644
index d89d23708..000000000
--- a/app/xdm/config/Xreset
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-# Deregister a login. (Derived from TakeConsole as follows:)
-#
-/usr/X11R6/bin/sessreg -d -w "/var/log/wtmp" -u "/var/run/utmp" \
- -x "/etc/X11/xdm/Xservers" -l $DISPLAY -h "" $USER
diff --git a/app/xdm/config/Xresources.cpp b/app/xdm/config/Xresources.cpp
index 62d3272fb..ab5a63c5f 100644
--- a/app/xdm/config/Xresources.cpp
+++ b/app/xdm/config/Xresources.cpp
@@ -1,5 +1,5 @@
! $Xorg: Xresources,v 1.3 2000/08/17 19:54:17 cpqbld Exp $
-! $OpenBSD: Xresources.cpp,v 1.2 2006/11/28 15:41:12 matthieu Exp $
+! $OpenBSD: Xresources.cpp,v 1.3 2007/08/05 19:37:40 matthieu Exp $
!
!
!
@@ -33,11 +33,19 @@ xlogin*greetFont: -adobe-helvetica-bold-o-normal--24-240-75-75-p-138-iso8859-1
xlogin*font: -adobe-helvetica-medium-r-normal--18-180-75-75-p-98-iso8859-1
xlogin*promptFont: -adobe-helvetica-bold-r-normal--18-180-75-75-p-103-iso8859-1
xlogin*failFont: -adobe-helvetica-bold-r-normal--18-180-75-75-p-103-iso8859-1
+xlogin*greetFace: Sans-24:bold:italic
+xlogin*face: Sans-18
+xlogin*promptFace: Sans-18:bold
+xlogin*failFace: Sans-18:bold
XHASHelse
xlogin*greetFont: -adobe-helvetica-bold-o-normal--17-120-100-100-p-92-iso8859-1
xlogin*font: -adobe-helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1
xlogin*promptFont: -adobe-helvetica-bold-r-normal--12-120-75-75-p-70-iso8859-1
xlogin*failFont: -adobe-helvetica-bold-o-normal--14-140-75-75-p-82-iso8859-1
+xlogin*greetFace: Sans-16:bold:italic
+xlogin*face: Sans-12
+xlogin*promptFace: Sans-12:bold
+xlogin*failFace: Sans-12:bold
XHASHendif
#endif /* XPM */
@@ -141,15 +149,13 @@ xlogin*logoPadding: 10
! comment out to disable root logins
xlogin.Login.allowRootLogin: true
-XConsole.text.geometry: 480x130
-XConsole.verbose: true
-XConsole*iconic: true
-#ifdef XPM
XConsole*background: black
XConsole*foreground: white
XConsole*borderWidth: 2
XConsole*borderColor: grey
-#endif /* XPM */
+XConsole.text.geometry: 480x130
+XConsole.verbose: true
+XConsole*iconic: true
XConsole*font: fixed
Chooser*geometry: 700x500+300+200
diff --git a/app/xdm/config/Xsession.cpp b/app/xdm/config/Xsession.cpp
index b78c11e5b..060d17c18 100644
--- a/app/xdm/config/Xsession.cpp
+++ b/app/xdm/config/Xsession.cpp
@@ -1,23 +1,46 @@
XCOMM!SHELL_CMD
XCOMM
+XCOMM $XdotOrg: $
XCOMM $Xorg: Xsession,v 1.4 2000/08/17 19:54:17 cpqbld Exp $
-XCOMM $OpenBSD: Xsession.cpp,v 1.3 2007/04/04 22:29:12 david Exp $
+XCOMM $OpenBSD: Xsession.cpp,v 1.4 2007/08/05 19:37:40 matthieu Exp $
XCOMM $XFree86: xc/programs/xdm/config/Xsession,v 1.2 1998/01/11 03:48:32 dawes Exp $
XCOMM redirect errors to a file in user's home directory if we can
-for errfile in "$HOME/.xsession-errors" "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER"
-do
- case "$errfile" in
- "/tmp/*" | "/var/tmp/*")
- errfile=`mktemp ${errfile}.XXXXXXXXXX` || break;
- ;;
- esac
- if ( umask 077 && cp /dev/null "$errfile" 2> /dev/null )
- then
- exec > "$errfile" 2>&1
- break
- fi
-done
+
+errfile="$HOME/.xsession-errors"
+if ( umask 077 && cp /dev/null "$errfile" 2> /dev/null )
+then
+ exec > "$errfile" 2>&1
+else
+#ifdef MKTEMP_COMMAND
+ mktemp=MKTEMP_COMMAND
+ for errfile in "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER"
+ do
+ if ef="$( umask 077 && $mktemp "$errfile.XXXXXX" 2> /dev/null)"
+ then
+ exec > "$ef" 2>&1
+ mv "$ef" "$errfile" 2> /dev/null
+ break
+ fi
+ done
+#else
+XCOMM Since this system doesn't have a mktemp command to allow secure
+XCOMM creation of files in shared directories, no fallback error log
+XCOMM is being used. See https://bugs.freedesktop.org/show_bug.cgi?id=5898
+XCOMM
+XCOMM for errfile in "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER"
+XCOMM do
+XCOMM if ( umask 077 && cp /dev/null "$errfile" 2> /dev/null )
+XCOMM then
+XCOMM exec > "$errfile" 2>&1
+XCOMM break
+XCOMM fi
+XCOMM done
+
+ exec > /dev/null 2>&1
+
+#endif
+fi
XCOMM if we have private ssh key(s), start ssh-agent and add the key(s)
id1=$HOME/.ssh/identity
@@ -41,25 +64,24 @@ case $# in
1)
case $1 in
failsafe)
- BINDIR/xterm -geometry 80x24-0-0
- do_exit
+ exec BINDIR/xterm -geometry 80x24-0-0
;;
esac
esac
-XCOMM The startup script is not intended to have arguments.
+XCOMM The startup script is not intended to have arguments.
startup=$HOME/.xsession
resources=$HOME/.Xresources
if [ -s "$startup" ]; then
if [ -x "$startup" ]; then
- "$startup"
+ exec "$startup"
else
- /bin/sh "$startup"
+ exec /bin/sh "$startup"
fi
else
- if [ -f "$resources" ]; then
+ if [ -r "$resources" ]; then
BINDIR/xrdb -load "$resources"
fi
#if defined(__SCO__) || defined(__UNIXWARE__)
@@ -83,4 +105,3 @@ else
BINDIR/xterm &
BINDIR/fvwm
fi
-do_exit
diff --git a/app/xdm/config/Xstartup b/app/xdm/config/Xstartup
deleted file mode 100644
index d8ed48484..000000000
--- a/app/xdm/config/Xstartup
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-#
-# $OpenBSD: Xstartup,v 1.2 2006/11/28 15:41:12 matthieu Exp $
-#
-# Register a login (derived from GiveConsole as follows:)
-#
-if [ -f /etc/nologin ]; then
- /usr/X11R6/bin/xmessage -file /etc/nologin -timeout 30 -center
- exit 1
-fi
-/usr/X11R6/bin/sessreg -a -w "/var/log/wtmp" -u "/var/run/utmp" \
- -x "/etc/X11/xdm/Xservers" -l $DISPLAY -h "" $USER
diff --git a/app/xdm/config/Xstartup.cpp b/app/xdm/config/Xstartup.cpp
index a3f3f9e11..15b999826 100644
--- a/app/xdm/config/Xstartup.cpp
+++ b/app/xdm/config/Xstartup.cpp
@@ -1,5 +1,12 @@
XCOMM!/bin/sh
+XCOMM
+XCOMM $OpenBSD: Xstartup.cpp,v 1.2 2007/08/05 19:37:40 matthieu Exp $
+XCOMM
XCOMM Register a login (derived from GiveConsole as follows:)
XCOMM
+if [ -f /etc/nologin ]; then
+ /usr/X11R6/bin/xmessage -file /etc/nologin -timeout 30 -center
+ exit 1
+fi
BINDIR/sessreg -a -w "/var/log/wtmp" -u "/var/run/utmp" \
- -x "XDMCONFIGDIR/Xservers" -l $DISPLAY -h "" $USER
+ -x XDMCONFIGDIR/Xservers -l $DISPLAY -h "" $USER
diff --git a/app/xdm/configure b/app/xdm/configure
index cf56cf8ef..68c0ca206 100644
--- a/app/xdm/configure
+++ b/app/xdm/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for xdm 1.0.4.
+# Generated by GNU Autoconf 2.59 for xdm 1.1.4.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='xdm'
PACKAGE_TARNAME='xdm'
-PACKAGE_VERSION='1.0.4'
-PACKAGE_STRING='xdm 1.0.4'
+PACKAGE_VERSION='1.1.4'
+PACKAGE_STRING='xdm 1.1.4'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
# Factoring default headers for most tests.
@@ -464,7 +464,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL RAWCPP RAWCPPFLAGS MKTEMP_COMMAND HAVE_MKTEMP_COMMAND_TRUE HAVE_MKTEMP_COMMAND_FALSE HAS_SECURE_RPC_TRUE HAS_SECURE_RPC_FALSE SU HAS_ARC4_RANDOM_TRUE HAS_ARC4_RANDOM_FALSE RANDOMMANDEFS HAS_KERBEROS_FIVE_TRUE HAS_KERBEROS_FIVE_FALSE XDMLIBDIR XDMCONFIGDIR XDMSCRIPTDIR XDMLOGDIR XDMPIDDIR DEFAULTVT SERVERSTYPE SHELL_CMD PKG_CONFIG ac_pt_PKG_CONFIG XDM_CFLAGS XDM_LIBS XINERAMA_CFLAGS XINERAMA_LIBS XPM_CFLAGS XPM_LIBS USE_XPM_TRUE USE_XPM_FALSE XDM_PIXMAP XDM_BWPIXMAP XDM_PIXMAPDIR TMP_XAW_CFLAGS TMP_XAW_LIBS XAW_USE_XPRINT_TRUE XAW_USE_XPRINT_FALSE DMCP_CFLAGS DMCP_LIBS XLIB_CFLAGS XLIB_LIBS AUTH_CFLAGS AUTH_LIBS XDMGREET_CFLAGS XDMGREET_LIBS DEF_GREETER_LIB DYNAMIC_GREETER_TRUE DYNAMIC_GREETER_FALSE HAS_XDM_AUTH_TRUE HAS_XDM_AUTH_FALSE XDM_LDFLAGS XT_CFLAGS XT_LIBS XDMSHELL_CFLAGS XDMSHELL_LIBS CHOOSER_CFLAGS CHOOSER_LIBS DEF_SERVER_LINE XRDB_PROGRAM DEF_SESSION DEF_USER_PATH DEF_SYSTEM_PATH DEF_SYSTEM_SHELL DEF_FAILSAFE_CLIENT DEF_XDM_CONFIG DEF_CHOOSER DEF_AUTH_DIR APPDEFS_CFLAGS APPDEFS_LIBS appdefaultdir APP_MAN_SUFFIX LIB_MAN_SUFFIX FILE_MAN_SUFFIX MISC_MAN_SUFFIX DRIVER_MAN_SUFFIX ADMIN_MAN_SUFFIX APP_MAN_DIR LIB_MAN_DIR FILE_MAN_DIR MISC_MAN_DIR DRIVER_MAN_DIR ADMIN_MAN_DIR LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL RAWCPP RAWCPPFLAGS MKTEMP_COMMAND HAVE_MKTEMP_COMMAND_TRUE HAVE_MKTEMP_COMMAND_FALSE HAS_SECURE_RPC_TRUE HAS_SECURE_RPC_FALSE SU HAS_ARC4_RANDOM_TRUE HAS_ARC4_RANDOM_FALSE RANDOMMANDEFS HAS_KERBEROS_FIVE_TRUE HAS_KERBEROS_FIVE_FALSE XDMLIBDIR XDMCONFIGDIR XDMSCRIPTDIR XDMLOGDIR XDMPIDDIR DEFAULTVT SERVERSTYPE SHELL_CMD PKG_CONFIG ac_pt_PKG_CONFIG XDM_CFLAGS XDM_LIBS XINERAMA_CFLAGS XINERAMA_LIBS XFT_CFLAGS XFT_LIBS XPM_CFLAGS XPM_LIBS USE_XPM_TRUE USE_XPM_FALSE XDM_PIXMAP XDM_BWPIXMAP XDM_PIXMAPDIR TMP_XAW_CFLAGS TMP_XAW_LIBS XAW_USE_XPRINT_TRUE XAW_USE_XPRINT_FALSE DMCP_CFLAGS DMCP_LIBS XLIB_CFLAGS XLIB_LIBS AUTH_CFLAGS AUTH_LIBS XDMGREET_CFLAGS XDMGREET_LIBS DEF_GREETER_LIB DYNAMIC_GREETER_TRUE DYNAMIC_GREETER_FALSE HAS_XDM_AUTH_TRUE HAS_XDM_AUTH_FALSE XDM_LDFLAGS XT_CFLAGS XT_LIBS XDMSHELL_CFLAGS XDMSHELL_LIBS CHOOSER_CFLAGS CHOOSER_LIBS DEF_SERVER_LINE XRDB_PROGRAM DEF_SESSION DEF_USER_PATH DEF_SYSTEM_PATH DEF_SYSTEM_SHELL DEF_FAILSAFE_CLIENT DEF_XDM_CONFIG DEF_CHOOSER DEF_AUTH_DIR APPDEFS_CFLAGS APPDEFS_LIBS appdefaultdir LINT LINT_FLAGS LINT_TRUE LINT_FALSE APP_MAN_SUFFIX LIB_MAN_SUFFIX FILE_MAN_SUFFIX MISC_MAN_SUFFIX DRIVER_MAN_SUFFIX ADMIN_MAN_SUFFIX APP_MAN_DIR LIB_MAN_DIR FILE_MAN_DIR MISC_MAN_DIR DRIVER_MAN_DIR ADMIN_MAN_DIR LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -965,6 +965,14 @@ ac_env_XINERAMA_LIBS_set=${XINERAMA_LIBS+set}
ac_env_XINERAMA_LIBS_value=$XINERAMA_LIBS
ac_cv_env_XINERAMA_LIBS_set=${XINERAMA_LIBS+set}
ac_cv_env_XINERAMA_LIBS_value=$XINERAMA_LIBS
+ac_env_XFT_CFLAGS_set=${XFT_CFLAGS+set}
+ac_env_XFT_CFLAGS_value=$XFT_CFLAGS
+ac_cv_env_XFT_CFLAGS_set=${XFT_CFLAGS+set}
+ac_cv_env_XFT_CFLAGS_value=$XFT_CFLAGS
+ac_env_XFT_LIBS_set=${XFT_LIBS+set}
+ac_env_XFT_LIBS_value=$XFT_LIBS
+ac_cv_env_XFT_LIBS_set=${XFT_LIBS+set}
+ac_cv_env_XFT_LIBS_value=$XFT_LIBS
ac_env_XPM_CFLAGS_set=${XPM_CFLAGS+set}
ac_env_XPM_CFLAGS_value=$XPM_CFLAGS
ac_cv_env_XPM_CFLAGS_set=${XPM_CFLAGS+set}
@@ -1037,7 +1045,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xdm 1.0.4 to adapt to many kinds of systems.
+\`configure' configures xdm 1.1.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1103,7 +1111,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xdm 1.0.4:";;
+ short | recursive ) echo "Configuration of xdm 1.1.4:";;
esac
cat <<\_ACEOF
@@ -1167,6 +1175,7 @@ Optional Packages:
--with-config-type={ws|fs}
default config file type to use - workstation (ws)
or fileserver (fs) (default=ws)
+ --with-xft Use Xft to draw text (default is YES if installed)
--with-color-pixmap=<filename>
specify xpm file to use as color logo
(default=xorg.xpm)
@@ -1176,6 +1185,8 @@ Optional Packages:
--with-pixmapdir=<pathname>
specify directory for xpm files
(default=xdmlibdir/pixmaps)
+ --with-lint Use a lint-style source code checker (default:
+ disabled)
--with-release-version=STRING
Use release version string in package name
@@ -1199,6 +1210,8 @@ Some influential environment variables:
C compiler flags for XINERAMA, overriding pkg-config
XINERAMA_LIBS
linker flags for XINERAMA, overriding pkg-config
+ XFT_CFLAGS C compiler flags for XFT, overriding pkg-config
+ XFT_LIBS linker flags for XFT, overriding pkg-config
XPM_CFLAGS C compiler flags for XPM, overriding pkg-config
XPM_LIBS linker flags for XPM, overriding pkg-config
TMP_XAW_CFLAGS
@@ -1321,7 +1334,7 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-xdm configure 1.0.4
+xdm configure 1.1.4
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1335,7 +1348,7 @@ cat >&5 <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xdm $as_me 1.0.4, which was
+It was created by xdm $as_me 1.1.4, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1978,7 +1991,7 @@ fi
# Define the identity of the package.
PACKAGE='xdm'
- VERSION='1.0.4'
+ VERSION='1.1.4'
cat >>confdefs.h <<_ACEOF
@@ -3933,7 +3946,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 3936 "configure"' > conftest.$ac_ext
+ echo '#line 3949 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5774,7 +5787,7 @@ fi
# Provide some information about the compiler.
-echo "$as_me:5777:" \
+echo "$as_me:5790:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6837,11 +6850,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6840: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6853: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6844: \$? = $ac_status" >&5
+ echo "$as_me:6857: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7105,11 +7118,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7108: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7121: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7112: \$? = $ac_status" >&5
+ echo "$as_me:7125: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7209,11 +7222,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7212: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7225: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7216: \$? = $ac_status" >&5
+ echo "$as_me:7229: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -9558,7 +9571,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9561 "configure"
+#line 9574 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9658,7 +9671,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9661 "configure"
+#line 9674 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12002,11 +12015,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12005: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12018: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12009: \$? = $ac_status" >&5
+ echo "$as_me:12022: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -12106,11 +12119,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12109: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12122: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12113: \$? = $ac_status" >&5
+ echo "$as_me:12126: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -13676,11 +13689,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13679: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13692: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13683: \$? = $ac_status" >&5
+ echo "$as_me:13696: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13780,11 +13793,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13783: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13796: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13787: \$? = $ac_status" >&5
+ echo "$as_me:13800: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -15987,11 +16000,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15990: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16003: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15994: \$? = $ac_status" >&5
+ echo "$as_me:16007: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16255,11 +16268,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16258: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16271: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16262: \$? = $ac_status" >&5
+ echo "$as_me:16275: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16359,11 +16372,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16362: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16375: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16366: \$? = $ac_status" >&5
+ echo "$as_me:16379: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -20451,7 +20464,8 @@ _ACEOF
fi
-for ac_func in daemon
+
+for ac_func in daemon sigaction
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -20702,7 +20716,6 @@ fi
done
-
echo "$as_me:$LINENO: checking return type of signal handlers" >&5
echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
if test "${ac_cv_type_signal+set}" = set; then
@@ -20775,6 +20788,7 @@ _ACEOF
+
# Check whether --enable-unix-transport or --disable-unix-transport was given.
if test "${enable_unix_transport+set}" = set; then
enableval="$enable_unix_transport"
@@ -21927,7 +21941,7 @@ fi
case $host_os in
- linux*)
+ linux*|gnu*|*-gnu)
OS_CFLAGS="-D_XOPEN_SOURCE"
SU="su"
;;
@@ -22622,6 +22636,146 @@ fi
fi
+# Xft text drawing for the greeter screen
+
+# Check whether --with-xft or --without-xft was given.
+if test "${with_xft+set}" = set; then
+ withval="$with_xft"
+ USE_XFT="$withval"
+else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xft\"") >&5
+ ($PKG_CONFIG --exists --print-errors "xft") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ USE_XFT="yes"
+else
+ USE_XFT="no"
+fi
+fi;
+
+if test "x$USE_XFT" = "xyes" ; then
+
+pkg_failed=no
+echo "$as_me:$LINENO: checking for XFT" >&5
+echo $ECHO_N "checking for XFT... $ECHO_C" >&6
+
+if test -n "$PKG_CONFIG"; then
+ if test -n "$XFT_CFLAGS"; then
+ pkg_cv_XFT_CFLAGS="$XFT_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xft\"") >&5
+ ($PKG_CONFIG --exists --print-errors "xft") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_XFT_CFLAGS=`$PKG_CONFIG --cflags "xft" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$XFT_LIBS"; then
+ pkg_cv_XFT_LIBS="$XFT_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xft\"") >&5
+ ($PKG_CONFIG --exists --print-errors "xft") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_XFT_LIBS=`$PKG_CONFIG --libs "xft" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ XFT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xft"`
+ else
+ XFT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xft"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$XFT_PKG_ERRORS" >&5
+
+ { { echo "$as_me:$LINENO: error: Package requirements (xft) were not met:
+
+$XFT_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables XFT_CFLAGS
+and XFT_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&5
+echo "$as_me: error: Package requirements (xft) were not met:
+
+$XFT_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables XFT_CFLAGS
+and XFT_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&2;}
+ { (exit 1); exit 1; }; }
+elif test $pkg_failed = untried; then
+ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables XFT_CFLAGS
+and XFT_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+See \`config.log' for more details." >&5
+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables XFT_CFLAGS
+and XFT_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+else
+ XFT_CFLAGS=$pkg_cv_XFT_CFLAGS
+ XFT_LIBS=$pkg_cv_XFT_LIBS
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ :
+fi
+ GREETER_CFLAGS="$GREETER_CFLAGS $XFT_CFLAGS"
+ GREETER_LIBS="$GREETER_LIBS $XFT_LIBS"
+
+cat >>confdefs.h <<\_ACEOF
+#define USE_XFT 1
+_ACEOF
+
+fi
+
# XPM logos for the greeter screen
# Check whether --enable-xpm-logos or --disable-xpm-logos was given.
if test "${enable_xpm_logos+set}" = set; then
@@ -24241,6 +24395,48 @@ appdefaultdir=$(pkg-config --variable=appdefaultdir xt)
+# Allow checking code with lint, sparse, etc.
+
+# Check whether --with-lint or --without-lint was given.
+if test "${with_lint+set}" = set; then
+ withval="$with_lint"
+ use_lint=$withval
+else
+ use_lint=no
+fi;
+if test "x$use_lint" = "xyes" ; then
+ LINT="lint"
+else
+ LINT="$use_lint"
+fi
+if test "x$LINT_FLAGS" = "x" -a "x$LINT" != "xno" ; then
+ case $LINT in
+ lint|*/lint)
+ case $host_os in
+ solaris*)
+ LINT_FLAGS="-u -b -h -erroff=E_INDISTING_FROM_TRUNC2"
+ ;;
+ esac
+ ;;
+ esac
+fi
+
+
+
+
+
+if test x$LINT != xno; then
+ LINT_TRUE=
+ LINT_FALSE='#'
+else
+ LINT_TRUE='#'
+ LINT_FALSE=
+fi
+
+
+
+
+
if test x$APP_MAN_SUFFIX = x ; then
APP_MAN_SUFFIX=1
@@ -24526,6 +24722,13 @@ echo "$as_me: error: conditional \"HAS_XDM_AUTH\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${LINT_TRUE}" && test -z "${LINT_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"LINT\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"LINT\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
@@ -24797,7 +25000,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
-This file was extended by xdm $as_me 1.0.4, which was
+This file was extended by xdm $as_me 1.1.4, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -24860,7 +25063,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-xdm config.status 1.0.4
+xdm config.status 1.1.4
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
@@ -25161,6 +25364,8 @@ s,@XDM_CFLAGS@,$XDM_CFLAGS,;t t
s,@XDM_LIBS@,$XDM_LIBS,;t t
s,@XINERAMA_CFLAGS@,$XINERAMA_CFLAGS,;t t
s,@XINERAMA_LIBS@,$XINERAMA_LIBS,;t t
+s,@XFT_CFLAGS@,$XFT_CFLAGS,;t t
+s,@XFT_LIBS@,$XFT_LIBS,;t t
s,@XPM_CFLAGS@,$XPM_CFLAGS,;t t
s,@XPM_LIBS@,$XPM_LIBS,;t t
s,@USE_XPM_TRUE@,$USE_XPM_TRUE,;t t
@@ -25205,6 +25410,10 @@ s,@DEF_AUTH_DIR@,$DEF_AUTH_DIR,;t t
s,@APPDEFS_CFLAGS@,$APPDEFS_CFLAGS,;t t
s,@APPDEFS_LIBS@,$APPDEFS_LIBS,;t t
s,@appdefaultdir@,$appdefaultdir,;t t
+s,@LINT@,$LINT,;t t
+s,@LINT_FLAGS@,$LINT_FLAGS,;t t
+s,@LINT_TRUE@,$LINT_TRUE,;t t
+s,@LINT_FALSE@,$LINT_FALSE,;t t
s,@APP_MAN_SUFFIX@,$APP_MAN_SUFFIX,;t t
s,@LIB_MAN_SUFFIX@,$LIB_MAN_SUFFIX,;t t
s,@FILE_MAN_SUFFIX@,$FILE_MAN_SUFFIX,;t t
diff --git a/app/xdm/configure.ac b/app/xdm/configure.ac
index f6cef32dd..14a459664 100644
--- a/app/xdm/configure.ac
+++ b/app/xdm/configure.ac
@@ -21,10 +21,10 @@ dnl PERFORMANCE OF THIS SOFTWARE.
dnl
dnl Process this file with autoconf to create configure.
-dnl $XdotOrg: app/xdm/configure.ac,v 1.40 2006/04/27 21:21:15 alanc Exp $
+dnl $XdotOrg: app/xdm/configure.ac,v 1.42 2006/06/03 01:01:21 alanc Exp $
AC_PREREQ([2.57])
-AC_INIT(xdm,[1.0.4],[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xdm)
+AC_INIT(xdm,[1.1.4],[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xdm)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
@@ -76,8 +76,9 @@ if test "x$HAS_SETUSERCONTEXT" = "xyes" ; then
[Define to 1 if you have the 'setusercontext' function.])
fi
-AC_CHECK_FUNCS([daemon])
+AC_CHECK_FUNCS([daemon sigaction])
AC_CHECK_HEADERS([grp.h])
+AC_TYPE_SIGNAL
XTRANS_CONNECTION_FLAGS
dnl Sets $SECURE_RPC to "yes" or "no"
@@ -121,7 +122,7 @@ fi
case $host_os in
- linux*)
+ linux*|gnu*|*-gnu)
OS_CFLAGS="-D_XOPEN_SOURCE"
SU="su"
;;
@@ -272,6 +273,21 @@ PKG_CHECK_EXISTS(xinerama, [
GREETER_LIBS="$GREETER_LIBS $XINERAMA_LIBS"
])
+# Xft text drawing for the greeter screen
+AC_ARG_WITH(xft,
+ AC_HELP_STRING([--with-xft],
+ [Use Xft to draw text (default is YES if installed)]),
+ [USE_XFT="$withval"],
+ PKG_CHECK_EXISTS(xft, [USE_XFT="yes"], [USE_XFT="no"]))
+
+if test "x$USE_XFT" = "xyes" ; then
+ PKG_CHECK_MODULES(XFT, xft)
+ GREETER_CFLAGS="$GREETER_CFLAGS $XFT_CFLAGS"
+ GREETER_LIBS="$GREETER_LIBS $XFT_LIBS"
+ AC_DEFINE([USE_XFT], 1,
+ [Define to 1 to use Xft for text on greeter screen])
+fi
+
# XPM logos for the greeter screen
AC_ARG_ENABLE(xpm-logos,
AC_HELP_STRING([--enable-xpm-logos],
@@ -511,6 +527,7 @@ appdefaultdir=$(pkg-config --variable=appdefaultdir xt)
AC_SUBST(appdefaultdir)
AC_SUBST(MKTEMP_COMMAND)
+XORG_WITH_LINT
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
diff --git a/app/xdm/greeter/Makefile.in b/app/xdm/greeter/Makefile.in
index 46dccbbbc..ec0fa4edd 100644
--- a/app/xdm/greeter/Makefile.in
+++ b/app/xdm/greeter/Makefile.in
@@ -161,6 +161,10 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
+LINT = @LINT@
+LINT_FALSE = @LINT_FALSE@
+LINT_FLAGS = @LINT_FLAGS@
+LINT_TRUE = @LINT_TRUE@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -212,6 +216,8 @@ XDM_LDFLAGS = @XDM_LDFLAGS@
XDM_LIBS = @XDM_LIBS@
XDM_PIXMAP = @XDM_PIXMAP@
XDM_PIXMAPDIR = @XDM_PIXMAPDIR@
+XFT_CFLAGS = @XFT_CFLAGS@
+XFT_LIBS = @XFT_LIBS@
XINERAMA_CFLAGS = @XINERAMA_CFLAGS@
XINERAMA_LIBS = @XINERAMA_LIBS@
XLIB_CFLAGS = @XLIB_CFLAGS@
@@ -279,6 +285,9 @@ target_alias = @target_alias@
@DYNAMIC_GREETER_TRUE@libXdmGreet_la_LIBADD = $(XDMGREET_LIBS)
@DYNAMIC_GREETER_TRUE@AM_CFLAGS = $(XDMGREET_CFLAGS) -I$(top_srcdir)
@DYNAMIC_GREETER_TRUE@libXdmGreet_la_LDFLAGS = -module -avoid-version
+@LINT_TRUE@ALL_LINT_FLAGS = $(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@LINT_TRUE@ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
+
all: all-am
.SUFFIXES:
@@ -553,6 +562,9 @@ uninstall-am: uninstall-info-am uninstall-xdmlibLTLIBRARIES
tags uninstall uninstall-am uninstall-info-am \
uninstall-xdmlibLTLIBRARIES
+
+@LINT_TRUE@lint:
+@LINT_TRUE@ $(LINT) $(ALL_LINT_FLAGS) $(libXdmGreet_la_SOURCES)
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 16:59:14 +0000