diff --git a/app/xenodm/aclocal.m4 b/app/xenodm/aclocal.m4 index 044fc927b..a2168f154 100644 --- a/app/xenodm/aclocal.m4 +++ b/app/xenodm/aclocal.m4 @@ -1248,7 +1248,7 @@ m4_include([m4/ltversion.m4]) m4_include([m4/lt~obsolete.m4]) dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure. dnl -dnl Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. +dnl Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. dnl dnl Permission is hereby granted, free of charge, to any person obtaining a dnl copy of this software and associated documentation files (the "Software"), @@ -1285,7 +1285,7 @@ dnl DEALINGS IN THE SOFTWARE. # See the "minimum version" comment for each macro you use to see what # version you require. m4_defun([XORG_MACROS_VERSION],[ -m4_define([vers_have], [1.19.0]) +m4_define([vers_have], [1.19.2]) m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.]))) m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.]))) m4_if(m4_cmp(maj_have, maj_needed), 0,, @@ -1363,6 +1363,17 @@ AC_DEFUN([XORG_MANPAGE_SECTIONS],[ AC_REQUIRE([AC_CANONICAL_HOST]) AC_REQUIRE([AC_PROG_SED]) +case $host_os in + solaris*) + # Solaris 2.0 - 11.3 use SysV man page section numbers, so we + # check for a man page file found in later versions that use + # traditional section numbers instead + AC_CHECK_FILE([/usr/share/man/man7/attributes.7], + [SYSV_MAN_SECTIONS=false], [SYSV_MAN_SECTIONS=true]) + ;; + *) SYSV_MAN_SECTIONS=false ;; +esac + if test x$APP_MAN_SUFFIX = x ; then APP_MAN_SUFFIX=1 fi @@ -1378,9 +1389,9 @@ if test x$LIB_MAN_DIR = x ; then fi if test x$FILE_MAN_SUFFIX = x ; then - case $host_os in - solaris*) FILE_MAN_SUFFIX=4 ;; - *) FILE_MAN_SUFFIX=5 ;; + case $SYSV_MAN_SECTIONS in + true) FILE_MAN_SUFFIX=4 ;; + *) FILE_MAN_SUFFIX=5 ;; esac fi if test x$FILE_MAN_DIR = x ; then @@ -1388,9 +1399,9 @@ if test x$FILE_MAN_DIR = x ; then fi if test x$MISC_MAN_SUFFIX = x ; then - case $host_os in - solaris*) MISC_MAN_SUFFIX=5 ;; - *) MISC_MAN_SUFFIX=7 ;; + case $SYSV_MAN_SECTIONS in + true) MISC_MAN_SUFFIX=5 ;; + *) MISC_MAN_SUFFIX=7 ;; esac fi if test x$MISC_MAN_DIR = x ; then @@ -1398,9 +1409,9 @@ if test x$MISC_MAN_DIR = x ; then fi if test x$DRIVER_MAN_SUFFIX = x ; then - case $host_os in - solaris*) DRIVER_MAN_SUFFIX=7 ;; - *) DRIVER_MAN_SUFFIX=4 ;; + case $SYSV_MAN_SECTIONS in + true) DRIVER_MAN_SUFFIX=7 ;; + *) DRIVER_MAN_SUFFIX=4 ;; esac fi if test x$DRIVER_MAN_DIR = x ; then @@ -1408,9 +1419,9 @@ if test x$DRIVER_MAN_DIR = x ; then fi if test x$ADMIN_MAN_SUFFIX = x ; then - case $host_os in - solaris*) ADMIN_MAN_SUFFIX=1m ;; - *) ADMIN_MAN_SUFFIX=8 ;; + case $SYSV_MAN_SECTIONS in + true) ADMIN_MAN_SUFFIX=1m ;; + *) ADMIN_MAN_SUFFIX=8 ;; esac fi if test x$ADMIN_MAN_DIR = x ; then @@ -1671,13 +1682,24 @@ m4_ifval([$1], fi]) # Test for the ability of xmlto to generate a text target +# +# NOTE: xmlto 0.0.27 or higher return a non-zero return code in the +# following test for empty XML docbook files. +# For compatibility reasons use the following empty XML docbook file and if +# it fails try it again with a non-empty XML file. have_xmlto_text=no cat > conftest.xml << "EOF" EOF AS_IF([test "$have_xmlto" = yes], [AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1], [have_xmlto_text=yes], - [AC_MSG_WARN([xmlto cannot generate text format, this format skipped])])]) + [# Try it again with a non-empty XML file. + cat > conftest.xml << "EOF" + +EOF + AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1], + [have_xmlto_text=yes], + [AC_MSG_WARN([xmlto cannot generate text format, this format skipped])])])]) rm -f conftest.xml AM_CONDITIONAL([HAVE_XMLTO_TEXT], [test $have_xmlto_text = yes]) AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes]) @@ -3073,8 +3095,9 @@ AC_REQUIRE([PKG_PROG_PKG_CONFIG]) macros_datadir=`$PKG_CONFIG --print-errors --variable=pkgdatadir xorg-macros` INSTALL_CMD="(cp -f "$macros_datadir/INSTALL" \$(top_srcdir)/.INSTALL.tmp && \ mv \$(top_srcdir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \ -|| (rm -f \$(top_srcdir)/.INSTALL.tmp; touch \$(top_srcdir)/INSTALL; \ -echo 'util-macros \"pkgdatadir\" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2)" +|| (rm -f \$(top_srcdir)/.INSTALL.tmp; test -e \$(top_srcdir)/INSTALL || ( \ +touch \$(top_srcdir)/INSTALL; \ +echo 'failed to copy INSTALL from util-macros: installing empty INSTALL.' >&2))" AC_SUBST([INSTALL_CMD]) ]) # XORG_INSTALL dnl Copyright 2005 Red Hat, Inc @@ -3135,10 +3158,11 @@ AC_DEFUN([XORG_RELEASE_VERSION],[ # # AC_DEFUN([XORG_CHANGELOG], [ -CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp && \ +CHANGELOG_CMD="((GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp) 2>/dev/null && \ mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \ -|| (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \ -echo 'git directory not found: installing possibly empty changelog.' >&2)" +|| (rm -f \$(top_srcdir)/.changelog.tmp; test -e \$(top_srcdir)/ChangeLog || ( \ +touch \$(top_srcdir)/ChangeLog; \ +echo 'git failed to create ChangeLog: installing empty ChangeLog.' >&2))" AC_SUBST([CHANGELOG_CMD]) ]) # XORG_CHANGELOG diff --git a/app/xenodm/config/Makefile.in b/app/xenodm/config/Makefile.in index b87f2b7d1..cf49024ef 100644 --- a/app/xenodm/config/Makefile.in +++ b/app/xenodm/config/Makefile.in @@ -56,9 +56,8 @@ host_triplet = @host@ subdir = config DIST_COMMON = README $(dist_pixmap_DATA) $(dist_xenodmscript_SCRIPTS) \ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/Xreset.in $(srcdir)/Xresources.in \ - $(srcdir)/Xservers.in $(srcdir)/Xsession.in \ - $(srcdir)/Xstartup.in $(srcdir)/xenodm-config.in + $(srcdir)/Xresources.in $(srcdir)/Xservers.in \ + $(srcdir)/Xsession.in $(srcdir)/xenodm-config.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_define_dir.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -68,8 +67,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = Xreset Xresources Xservers Xsession Xstartup \ - xenodm-config +CONFIG_CLEAN_FILES = Xresources Xservers Xsession xenodm-config CONFIG_CLEAN_VPATH_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -311,9 +309,7 @@ xenodmconfig_DATA = \ Xservers xenodmscript_SCRIPTS = \ - Xreset \ - Xsession \ - Xstartup + Xsession dist_xenodmscript_SCRIPTS = \ GiveConsole \ @@ -358,16 +354,12 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -Xreset: $(top_builddir)/config.status $(srcdir)/Xreset.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ Xresources: $(top_builddir)/config.status $(srcdir)/Xresources.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ Xservers: $(top_builddir)/config.status $(srcdir)/Xservers.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ Xsession: $(top_builddir)/config.status $(srcdir)/Xsession.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -Xstartup: $(top_builddir)/config.status $(srcdir)/Xstartup.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ xenodm-config: $(top_builddir)/config.status $(srcdir)/xenodm-config.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-dist_xenodmscriptSCRIPTS: $(dist_xenodmscript_SCRIPTS) diff --git a/app/xenodm/config/Xreset.in b/app/xenodm/config/Xreset.in deleted file mode 100644 index a3949e48e..000000000 --- a/app/xenodm/config/Xreset.in +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -# Deregister a login. (Derived from TakeConsole as follows:) -# -prefix=@prefix@ -exec_prefix=@exec_prefix@ -@bindir@/sessreg -d -w @WTMP_FILE@ -u @UTMP_FILE@ \ - -x @XENODMCONFIGDIR@/Xservers -l $DISPLAY -h "" $USER diff --git a/app/xenodm/config/Xstartup.in b/app/xenodm/config/Xstartup.in deleted file mode 100644 index 7cad65f0f..000000000 --- a/app/xenodm/config/Xstartup.in +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# -# $OpenBSD: Xstartup.in,v 1.1 2017/07/26 21:14:54 matthieu Exp $ -# -prefix="@prefix@" -exec_prefix="@exec_prefix@" - -if [ -f /etc/nologin ]; then - /usr/X11R6/bin/xmessage -file /etc/nologin -timeout 30 -center - exit 1 -fi -exec @bindir@/sessreg -a -w @WTMP_FILE@ -u @UTMP_FILE@ \ - -x @XENODMCONFIGDIR@/Xservers -l $DISPLAY -h "" $USER diff --git a/app/xenodm/configure b/app/xenodm/configure index 1686d7e24..6c76595f2 100755 --- a/app/xenodm/configure +++ b/app/xenodm/configure @@ -17819,10 +17819,11 @@ _ACEOF -CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp && \ +CHANGELOG_CMD="((GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp) 2>/dev/null && \ mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \ -|| (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \ -echo 'git directory not found: installing possibly empty changelog.' >&2)" +|| (rm -f \$(top_srcdir)/.changelog.tmp; test -e \$(top_srcdir)/ChangeLog || ( \ +touch \$(top_srcdir)/ChangeLog; \ +echo 'git failed to create ChangeLog: installing empty ChangeLog.' >&2))" @@ -17830,14 +17831,45 @@ echo 'git directory not found: installing possibly empty changelog.' >&2)" macros_datadir=`$PKG_CONFIG --print-errors --variable=pkgdatadir xorg-macros` INSTALL_CMD="(cp -f "$macros_datadir/INSTALL" \$(top_srcdir)/.INSTALL.tmp && \ mv \$(top_srcdir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \ -|| (rm -f \$(top_srcdir)/.INSTALL.tmp; touch \$(top_srcdir)/INSTALL; \ -echo 'util-macros \"pkgdatadir\" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2)" +|| (rm -f \$(top_srcdir)/.INSTALL.tmp; test -e \$(top_srcdir)/INSTALL || ( \ +touch \$(top_srcdir)/INSTALL; \ +echo 'failed to copy INSTALL from util-macros: installing empty INSTALL.' >&2))" +case $host_os in + solaris*) + # Solaris 2.0 - 11.3 use SysV man page section numbers, so we + # check for a man page file found in later versions that use + # traditional section numbers instead + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/man/man7/attributes.7" >&5 +$as_echo_n "checking for /usr/share/man/man7/attributes.7... " >&6; } +if ${ac_cv_file__usr_share_man_man7_attributes_7+:} false; then : + $as_echo_n "(cached) " >&6 +else + test "$cross_compiling" = yes && + as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 +if test -r "/usr/share/man/man7/attributes.7"; then + ac_cv_file__usr_share_man_man7_attributes_7=yes +else + ac_cv_file__usr_share_man_man7_attributes_7=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_man_man7_attributes_7" >&5 +$as_echo "$ac_cv_file__usr_share_man_man7_attributes_7" >&6; } +if test "x$ac_cv_file__usr_share_man_man7_attributes_7" = xyes; then : + SYSV_MAN_SECTIONS=false +else + SYSV_MAN_SECTIONS=true +fi + + ;; + *) SYSV_MAN_SECTIONS=false ;; +esac + if test x$APP_MAN_SUFFIX = x ; then APP_MAN_SUFFIX=1 fi @@ -17853,9 +17885,9 @@ if test x$LIB_MAN_DIR = x ; then fi if test x$FILE_MAN_SUFFIX = x ; then - case $host_os in - solaris*) FILE_MAN_SUFFIX=4 ;; - *) FILE_MAN_SUFFIX=5 ;; + case $SYSV_MAN_SECTIONS in + true) FILE_MAN_SUFFIX=4 ;; + *) FILE_MAN_SUFFIX=5 ;; esac fi if test x$FILE_MAN_DIR = x ; then @@ -17863,9 +17895,9 @@ if test x$FILE_MAN_DIR = x ; then fi if test x$MISC_MAN_SUFFIX = x ; then - case $host_os in - solaris*) MISC_MAN_SUFFIX=5 ;; - *) MISC_MAN_SUFFIX=7 ;; + case $SYSV_MAN_SECTIONS in + true) MISC_MAN_SUFFIX=5 ;; + *) MISC_MAN_SUFFIX=7 ;; esac fi if test x$MISC_MAN_DIR = x ; then @@ -17873,9 +17905,9 @@ if test x$MISC_MAN_DIR = x ; then fi if test x$DRIVER_MAN_SUFFIX = x ; then - case $host_os in - solaris*) DRIVER_MAN_SUFFIX=7 ;; - *) DRIVER_MAN_SUFFIX=4 ;; + case $SYSV_MAN_SECTIONS in + true) DRIVER_MAN_SUFFIX=7 ;; + *) DRIVER_MAN_SUFFIX=4 ;; esac fi if test x$DRIVER_MAN_DIR = x ; then @@ -17883,9 +17915,9 @@ if test x$DRIVER_MAN_DIR = x ; then fi if test x$ADMIN_MAN_SUFFIX = x ; then - case $host_os in - solaris*) ADMIN_MAN_SUFFIX=1m ;; - *) ADMIN_MAN_SUFFIX=8 ;; + case $SYSV_MAN_SECTIONS in + true) ADMIN_MAN_SUFFIX=1m ;; + *) ADMIN_MAN_SUFFIX=8 ;; esac fi if test x$ADMIN_MAN_DIR = x ; then @@ -20105,7 +20137,7 @@ fi -ac_config_files="$ac_config_files Makefile config/Makefile greeter/Makefile include/Makefile man/Makefile xenodm/Makefile config/Xreset config/Xresources config/Xservers config/Xsession config/Xstartup config/xenodm-config" +ac_config_files="$ac_config_files Makefile config/Makefile greeter/Makefile include/Makefile man/Makefile xenodm/Makefile config/Xresources config/Xservers config/Xsession config/xenodm-config" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -21130,11 +21162,9 @@ do "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; "xenodm/Makefile") CONFIG_FILES="$CONFIG_FILES xenodm/Makefile" ;; - "config/Xreset") CONFIG_FILES="$CONFIG_FILES config/Xreset" ;; "config/Xresources") CONFIG_FILES="$CONFIG_FILES config/Xresources" ;; "config/Xservers") CONFIG_FILES="$CONFIG_FILES config/Xservers" ;; "config/Xsession") CONFIG_FILES="$CONFIG_FILES config/Xsession" ;; - "config/Xstartup") CONFIG_FILES="$CONFIG_FILES config/Xstartup" ;; "config/xenodm-config") CONFIG_FILES="$CONFIG_FILES config/xenodm-config" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; diff --git a/app/xenodm/xenodm/error.c b/app/xenodm/xenodm/error.c index e3732521a..6dc4362bf 100644 --- a/app/xenodm/xenodm/error.c +++ b/app/xenodm/xenodm/error.c @@ -49,6 +49,9 @@ LogVWrite(const char *fmt, va_list args) char buf[1024]; int len; + len = snprintf(buf, sizeof(buf), "[%5d] ", getpid()); + write(STDERR_FILENO, buf, len); + len = vsnprintf (buf, sizeof(buf), fmt, args); if (len >= sizeof(buf)) { len = sizeof(buf) - 1;