update to sessreg 1.0.4

7 files changed, 107 insertions, 33 deletions

diff --git a/app/sessreg/ChangeLog b/app/sessreg/ChangeLog
index 9e6a59732..006a580be 100644
--- a/app/sessreg/ChangeLog
+++ b/app/sessreg/ChangeLog
@@ -1,3 +1,73 @@
+commit 3db21d655b0a2988ae0fd47e360d29bb8763cd03
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Wed Jun 11 14:46:29 2008 -0700
+
+    Version bump: 1.0.4
+
+commit accc7988851b983d1589d64e32a707c0b44fee0e
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Wed Jun 11 14:44:10 2008 -0700
+
+    X_NOT_POSIX bits for pre-POSIX-1990 systems not needed any more
+
+commit c9973031a696cc00c509d7013145b1116093bf82
+Author: David Nusinow <dnusinow@debian.org>
+Date:   Sat Mar 1 13:53:21 2008 -0500
+
+    Require xproto instead of libX11 for building (bug #9631)
+
+commit a888e809b4e1c9576e667cb50cc62009a1bf391e
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Thu Dec 6 15:51:04 2007 -0500
+
+    Add missing PHONY line for automatic ChangeLog generation
+
+commit da1b5f42fcb1bd0bc9b80f6f1ab7ebb9eb506554
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Fri Aug 17 14:30:31 2007 -0700
+
+    Version bump: 1.0.3
+
+commit 12982c07b44c15a621fc548a4448f9a04bf5907e
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Thu Aug 16 17:17:06 2007 -0700
+
+    Change sessreg_CFLAGS to AM_CFLAGS to make automake-1.10 happier
+
+commit 136525f01e4ce8e60e8c78b44654d8f6861233d2
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Mon Jun 11 16:38:00 2007 -0700
+
+    X.Org Bug #9887: sessreg should include sys/types.h on FreeBSD
+    
+    X.Org Bugzilla #9887: <https://bugs.freedesktop.org/show_bug.cgi?id=9887>
+
+commit 9b2ddf6c779553c2cb5e185d2046e8817a89e03e
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Thu Nov 30 19:44:25 2006 +0200
+
+    bump to 1.0.3
+
+commit 05d36d40bb2018a96cdd1345a390db3fbff0fd65
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date:   Sun Nov 19 17:32:07 2006 +0100
+
+    include <time.h> before <utmp.h>. Required on some systems.
+
+commit 37e89cbf2bc3b6266fa47ff1f956d173658bb9a5
+Author: Jürg Billeter <j@bitron.ch>
+Date:   Thu Nov 9 13:21:55 2006 +0100
+
+    Fix grep pattern in Makefile.am
+    
+    Don't escape | in basic regex mode as it breaks build with GNU grep.
+
+commit 6fc58644148039261c21f699a14c839356f501ed
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Wed Nov 8 15:38:21 2006 -0800
+
+    Version bump to 1.0.1
+
 commit 82fbb553114e8d00b6b3886aee4554dfd178cb01
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Wed Nov 8 13:51:50 2006 -0800
diff --git a/app/sessreg/Makefile.am b/app/sessreg/Makefile.am
index f3d41a784..8a7f6e3f0 100644
--- a/app/sessreg/Makefile.am
+++ b/app/sessreg/Makefile.am
@@ -75,6 +75,8 @@ endif LINT
 
 MAINTAINERCLEANFILES=ChangeLog
 
+.PHONY: ChangeLog
+
 ChangeLog:
 	git-log > ChangeLog
 
diff --git a/app/sessreg/Makefile.in b/app/sessreg/Makefile.in
index a92804ab5..828e9f358 100644
--- a/app/sessreg/Makefile.in
+++ b/app/sessreg/Makefile.in
@@ -656,6 +656,8 @@ filenames.sed: filenames.sed.c
 @LINT_TRUE@lint:
 @LINT_TRUE@	$(LINT) $(ALL_LINT_FLAGS) $(sessreg_SOURCES)
 
+.PHONY: ChangeLog
+
 ChangeLog:
 	git-log > ChangeLog
 
diff --git a/app/sessreg/aclocal.m4 b/app/sessreg/aclocal.m4
index 5419cfb3c..48f9f8de2 100644
--- a/app/sessreg/aclocal.m4
+++ b/app/sessreg/aclocal.m4
@@ -1042,7 +1042,7 @@ AC_DEFUN([XORG_MACROS_VERSION],[
 	XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
 	XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
 	AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
-	[XORG_MACROS_version=1.1.5
+	[XORG_MACROS_version=1.1.6
 	XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
 	XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
 	if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
@@ -1191,7 +1191,11 @@ AC_DEFUN([XORG_CHECK_LINUXDOC],[
 XORG_SGML_PATH=$prefix/share/sgml
 HAVE_DEFS_ENT=
 
-AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
+if test x"$cross_compiling" = x"yes" ; then
+  HAVE_DEFS_ENT=no
+else
+  AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
+fi
 
 AC_PATH_PROG(LINUXDOC, linuxdoc)
 AC_PATH_PROG(PS2PDF, ps2pdf)
@@ -1463,14 +1467,14 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
 	AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
 		[`echo $PACKAGE_VERSION | cut -d . -f 1`],
 		[Major version of this package])
-	PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
+	PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
 	if test "x$PVM" = "x"; then
 		PVM="0"
 	fi
 	AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
 		[$PVM],
 		[Minor version of this package])
-	PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
+	PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
 	if test "x$PVP" = "x"; then
 		PVP="0"
 	fi
diff --git a/app/sessreg/configure b/app/sessreg/configure
index 655a7a754..33148eb05 100644
--- a/app/sessreg/configure
+++ b/app/sessreg/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for sessreg 1.0.3.
+# Generated by GNU Autoconf 2.59 for sessreg 1.0.4.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
 #
@@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='sessreg'
 PACKAGE_TARNAME='sessreg'
-PACKAGE_VERSION='1.0.3'
-PACKAGE_STRING='sessreg 1.0.3'
+PACKAGE_VERSION='1.0.4'
+PACKAGE_STRING='sessreg 1.0.4'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 
 # Factoring default headers for most tests.
@@ -791,7 +791,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 sessreg 1.0.3 to adapt to many kinds of systems.
+\`configure' configures sessreg 1.0.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -857,7 +857,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of sessreg 1.0.3:";;
+     short | recursive ) echo "Configuration of sessreg 1.0.4:";;
    esac
   cat <<\_ACEOF
 
@@ -991,7 +991,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-sessreg configure 1.0.3
+sessreg configure 1.0.4
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1005,7 +1005,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 sessreg $as_me 1.0.3, which was
+It was created by sessreg $as_me 1.0.4, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1603,7 +1603,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='sessreg'
- VERSION='1.0.3'
+ VERSION='1.0.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -1769,7 +1769,7 @@ fi
 	XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`
 	echo "$as_me:$LINENO: checking if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}" >&5
 echo $ECHO_N "checking if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}... $ECHO_C" >&6
-	XORG_MACROS_version=1.1.5
+	XORG_MACROS_version=1.1.6
 	XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
 	XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`
 	if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
@@ -4207,12 +4207,12 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_SESSREG_CFLAGS="$SESSREG_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11\"") >&5
-  ($PKG_CONFIG --exists --print-errors "x11") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xproto\"") >&5
+  ($PKG_CONFIG --exists --print-errors "xproto") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_SESSREG_CFLAGS=`$PKG_CONFIG --cflags "x11" 2>/dev/null`
+  pkg_cv_SESSREG_CFLAGS=`$PKG_CONFIG --cflags "xproto" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -4225,12 +4225,12 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_SESSREG_LIBS="$SESSREG_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11\"") >&5
-  ($PKG_CONFIG --exists --print-errors "x11") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xproto\"") >&5
+  ($PKG_CONFIG --exists --print-errors "xproto") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_SESSREG_LIBS=`$PKG_CONFIG --libs "x11" 2>/dev/null`
+  pkg_cv_SESSREG_LIBS=`$PKG_CONFIG --libs "xproto" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -4249,14 +4249,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        SESSREG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11"`
+	        SESSREG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xproto"`
         else
-	        SESSREG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11"`
+	        SESSREG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xproto"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$SESSREG_PKG_ERRORS" >&5
 
-	{ { echo "$as_me:$LINENO: error: Package requirements (x11) were not met:
+	{ { echo "$as_me:$LINENO: error: Package requirements (xproto) were not met:
 
 $SESSREG_PKG_ERRORS
 
@@ -4267,7 +4267,7 @@ Alternatively, you may set the environment variables SESSREG_CFLAGS
 and SESSREG_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 (x11) were not met:
+echo "$as_me: error: Package requirements (xproto) were not met:
 
 $SESSREG_PKG_ERRORS
 
@@ -4499,7 +4499,7 @@ cat >>confdefs.h <<_ACEOF
 #define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1`
 _ACEOF
 
-	PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
+	PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
 	if test "x$PVM" = "x"; then
 		PVM="0"
 	fi
@@ -4508,7 +4508,7 @@ cat >>confdefs.h <<_ACEOF
 #define PACKAGE_VERSION_MINOR $PVM
 _ACEOF
 
-	PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
+	PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
 	if test "x$PVP" = "x"; then
 		PVP="0"
 	fi
@@ -4910,7 +4910,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by sessreg $as_me 1.0.3, which was
+This file was extended by sessreg $as_me 1.0.4, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4973,7 +4973,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-sessreg config.status 1.0.3
+sessreg config.status 1.0.4
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/app/sessreg/configure.ac b/app/sessreg/configure.ac
index fdcfc0cd4..26a414081 100644
--- a/app/sessreg/configure.ac
+++ b/app/sessreg/configure.ac
@@ -21,7 +21,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.57])
-AC_INIT(sessreg, [1.0.1],
+AC_INIT(sessreg, [1.0.4],
 	[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 	sessreg)
 AM_INIT_AUTOMAKE([dist-bzip2])
@@ -47,7 +47,7 @@ AC_DEFINE_UNQUOTED(HAVE_UTMPX_UT_SYSLEN,$HAVE_SYSLEN,
 AC_SYS_LARGEFILE
 
 # Checks for pkg-config packages
-PKG_CHECK_MODULES(SESSREG, x11)
+PKG_CHECK_MODULES(SESSREG, xproto)
 AC_SUBST(SESSREG_CFLAGS)
 
 # Allow checking code with lint, sparse, etc.
diff --git a/app/sessreg/sessreg.c b/app/sessreg/sessreg.c
index 4d8acbe4b..eed181690 100644
--- a/app/sessreg/sessreg.c
+++ b/app/sessreg/sessreg.c
@@ -88,10 +88,6 @@
 
 #include <time.h>
 #define Time_t time_t
-#ifdef X_NOT_POSIX
-extern long	lseek ();
-extern char	*ttyname ();
-#endif
 
 static void set_utmp (struct utmp *u, char *line, char *user, char *host, Time_t date, int addp);