openbsd/xenocara
1
0
Fork 0
mirror of https://github.com/openbsd/xenocara.git synced 2025-12-16 22:29:21 +00:00
Code Issues Projects Releases Wiki Activity

update to sessreg 1.0.4

Browse Source
This commit is contained in:
matthieu
2008-06-13 15:43:03 +00:00
parent b0098b9c1d
commit a6907fb0c2
7 changed files with 61 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/sessreg/ChangeLog
View File

@@ -1,3 +1,27 @@
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 commit da1b5f42fcb1bd0bc9b80f6f1ab7ebb9eb506554
Author: Alan Coopersmith <alan.coopersmith@sun.com> Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Aug 17 14:30:31 2007 -0700 Date: Fri Aug 17 14:30:31 2007 -0700

2
app/sessreg/Makefile.am
View File

@@ -75,6 +75,8 @@ endif LINT
MAINTAINERCLEANFILES=ChangeLog MAINTAINERCLEANFILES=ChangeLog
.PHONY: ChangeLog
ChangeLog: ChangeLog:
git-log > ChangeLog git-log > ChangeLog

2
app/sessreg/Makefile.in
View File

@@ -656,6 +656,8 @@ filenames.sed: filenames.sed.c
@LINT_TRUE@lint: @LINT_TRUE@lint:
@LINT_TRUE@ $(LINT) $(ALL_LINT_FLAGS) $(sessreg_SOURCES) @LINT_TRUE@ $(LINT) $(ALL_LINT_FLAGS) $(sessreg_SOURCES)
.PHONY: ChangeLog
ChangeLog: ChangeLog:
git-log > ChangeLog git-log > ChangeLog

12
app/sessreg/aclocal.m4 vendored
View File

@@ -1042,7 +1042,7 @@ AC_DEFUN([XORG_MACROS_VERSION],[
XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'` 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/\..*$//'`] 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}]) 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_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e '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 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 XORG_SGML_PATH=$prefix/share/sgml
HAVE_DEFS_ENT= 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(LINUXDOC, linuxdoc)
AC_PATH_PROG(PS2PDF, ps2pdf) AC_PATH_PROG(PS2PDF, ps2pdf)
@@ -1463,14 +1467,14 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR], AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
[`echo $PACKAGE_VERSION | cut -d . -f 1`], [`echo $PACKAGE_VERSION | cut -d . -f 1`],
[Major version of this package]) [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 if test "x$PVM" = "x"; then
PVM="0" PVM="0"
fi fi
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR], AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
[$PVM], [$PVM],
[Minor version of this package]) [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 if test "x$PVP" = "x"; then
PVP="0" PVP="0"
fi fi

46
app/sessreg/configure vendored
View File

@@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # 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>. # 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. # Identity of this package.
PACKAGE_NAME='sessreg' PACKAGE_NAME='sessreg'
PACKAGE_TARNAME='sessreg' PACKAGE_TARNAME='sessreg'
PACKAGE_VERSION='1.0.3' PACKAGE_VERSION='1.0.4'
PACKAGE_STRING='sessreg 1.0.3' PACKAGE_STRING='sessreg 1.0.4'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
# Factoring default headers for most tests. # 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. # 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. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF 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]... Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -857,7 +857,7 @@ fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of sessreg 1.0.3:";; short | recursive ) echo "Configuration of sessreg 1.0.4:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
@@ -991,7 +991,7 @@ fi
test -n "$ac_init_help" && exit 0 test -n "$ac_init_help" && exit 0
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
sessreg configure 1.0.3 sessreg configure 1.0.4
generated by GNU Autoconf 2.59 generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc. Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1005,7 +1005,7 @@ cat >&5 <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. 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 generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@ $ $0 $@
@@ -1603,7 +1603,7 @@ fi
# Define the identity of the package. # Define the identity of the package.
PACKAGE='sessreg' PACKAGE='sessreg'
VERSION='1.0.3' VERSION='1.0.4'
cat >>confdefs.h <<_ACEOF 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/\..*$//'` 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 "$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 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_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e '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 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" pkg_cv_SESSREG_CFLAGS="$SESSREG_CFLAGS"
else else
if test -n "$PKG_CONFIG" && \ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11\"") >&5 { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xproto\"") >&5
($PKG_CONFIG --exists --print-errors "x11") 2>&5 ($PKG_CONFIG --exists --print-errors "xproto") 2>&5
ac_status=$? ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then (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 else
pkg_failed=yes pkg_failed=yes
fi fi
@@ -4225,12 +4225,12 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_SESSREG_LIBS="$SESSREG_LIBS" pkg_cv_SESSREG_LIBS="$SESSREG_LIBS"
else else
if test -n "$PKG_CONFIG" && \ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11\"") >&5 { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xproto\"") >&5
($PKG_CONFIG --exists --print-errors "x11") 2>&5 ($PKG_CONFIG --exists --print-errors "xproto") 2>&5
ac_status=$? ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then (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 else
pkg_failed=yes pkg_failed=yes
fi fi
@@ -4249,14 +4249,14 @@ else
_pkg_short_errors_supported=no _pkg_short_errors_supported=no
fi fi
if test $_pkg_short_errors_supported = yes; then 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 else
SESSREG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11"` SESSREG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xproto"`
fi fi
# Put the nasty error message in config.log where it belongs # Put the nasty error message in config.log where it belongs
echo "$SESSREG_PKG_ERRORS" >&5 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 $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. and SESSREG_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details. See the pkg-config man page for more details.
" >&5 " >&5
echo "$as_me: error: Package requirements (x11) were not met: echo "$as_me: error: Package requirements (xproto) were not met:
$SESSREG_PKG_ERRORS $SESSREG_PKG_ERRORS
@@ -4499,7 +4499,7 @@ cat >>confdefs.h <<_ACEOF
#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1` #define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1`
_ACEOF _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 if test "x$PVM" = "x"; then
PVM="0" PVM="0"
fi fi
@@ -4508,7 +4508,7 @@ cat >>confdefs.h <<_ACEOF
#define PACKAGE_VERSION_MINOR $PVM #define PACKAGE_VERSION_MINOR $PVM
_ACEOF _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 if test "x$PVP" = "x"; then
PVP="0" PVP="0"
fi fi
@@ -4910,7 +4910,7 @@ _ASBOX
} >&5 } >&5
cat >&5 <<_CSEOF 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 generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
@@ -4973,7 +4973,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\ ac_cs_version="\\
sessreg config.status 1.0.3 sessreg config.status 1.0.4
configured by $0, generated by GNU Autoconf 2.59, configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"

4
app/sessreg/configure.ac
View File

@@ -21,7 +21,7 @@ dnl
dnl Process this file with autoconf to create configure. dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57]) AC_PREREQ([2.57])
AC_INIT(sessreg, [1.0.3], AC_INIT(sessreg, [1.0.4],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
sessreg) sessreg)
AM_INIT_AUTOMAKE([dist-bzip2]) AM_INIT_AUTOMAKE([dist-bzip2])
@@ -47,7 +47,7 @@ AC_DEFINE_UNQUOTED(HAVE_UTMPX_UT_SYSLEN,$HAVE_SYSLEN,
AC_SYS_LARGEFILE AC_SYS_LARGEFILE
# Checks for pkg-config packages # Checks for pkg-config packages
PKG_CHECK_MODULES(SESSREG, x11) PKG_CHECK_MODULES(SESSREG, xproto)
AC_SUBST(SESSREG_CFLAGS) AC_SUBST(SESSREG_CFLAGS)
# Allow checking code with lint, sparse, etc. # Allow checking code with lint, sparse, etc.

4
app/sessreg/sessreg.c
View File

@@ -88,10 +88,6 @@
#include <time.h> #include <time.h>
#define Time_t time_t #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); static void set_utmp (struct utmp *u, char *line, char *user, char *host, Time_t date, int addp);