jcarr
/
x11-xserver-utils
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sessreg 1.0.3

This commit is contained in:
Brice Goglin 2007-08-22 08:36:07 +02:00
parent 3a5bf30526
commit b79820b560
12 changed files with 627 additions and 389 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -17,6 +17,7 @@ x11-xserver-utils (7.2+4) UNRELEASED; urgency=low
[ Brice Goglin ] [ Brice Goglin ]
* Add menu entries for xrefresh and xvidtune. * Add menu entries for xrefresh and xvidtune.
* sessreg 1.0.3.
-- Brice Goglin <bgoglin@debian.org> Fri, 17 Aug 2007 09:58:34 +0200 -- Brice Goglin <bgoglin@debian.org> Fri, 17 Aug 2007 09:58:34 +0200

305
sessreg/ChangeLog
View File

@ -1,38 +1,295 @@
2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> commit da1b5f42fcb1bd0bc9b80f6f1ab7ebb9eb506554
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Aug 17 14:30:31 2007 -0700
* configure.ac: Version bump: 1.0.3
Update package version number for final X11R7 release candidate.
2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org> commit 12982c07b44c15a621fc548a4448f9a04bf5907e
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Aug 16 17:17:06 2007 -0700
* Makefile.am: Change sessreg_CFLAGS to AM_CFLAGS to make automake-1.10 happier
Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> commit 136525f01e4ce8e60e8c78b44654d8f6861233d2
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Jun 11 16:38:00 2007 -0700
* configure.ac: X.Org Bug #9887: sessreg should include sys/types.h on FreeBSD
Update package version number for X11R7 RC3 release.
X.Org Bugzilla #9887: <https://bugs.freedesktop.org/show_bug.cgi?id=9887>
2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org> commit 9b2ddf6c779553c2cb5e185d2046e8817a89e03e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Nov 30 19:44:25 2006 +0200
* Makefile.am: bump to 1.0.3
* configure.ac:
Update dependencies to work with separate build roots.
2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org> commit 05d36d40bb2018a96cdd1345a390db3fbff0fd65
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Nov 19 17:32:07 2006 +0100
* configure.ac: include <time.h> before <utmp.h>. Required on some systems.
Update package version number for RC1 release.
2005-10-17 Kevin E. Martin <kem-at-freedesktop-dot-org> commit 37e89cbf2bc3b6266fa47ff1f956d173658bb9a5
Author: Jürg Billeter <j@bitron.ch>
Date: Thu Nov 9 13:21:55 2006 +0100
* Makefile.am: Fix grep pattern in Makefile.am
Fixed man page processing
Don't escape | in basic regex mode as it breaks build with GNU grep.
2005-10-06 Kevin E. Martin <kem-at-freedesktop-dot-org> commit 6fc58644148039261c21f699a14c839356f501ed
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Nov 8 15:38:21 2006 -0800
* Makefile.am: Version bump to 1.0.1
Get sessreg.man from $(srcdir) to fix make distcheck
* configure.ac: commit 82fbb553114e8d00b6b3886aee4554dfd178cb01
Add check for utmpx.ut_syslen structure member Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Nov 8 13:51:50 2006 -0800
Improve formatting of file names in sessreg.man
commit 02379845b074cb252c0cb42d18c6cb8effcdc9f5
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Nov 8 13:48:05 2006 -0800
Fix builds when $(srcdir) != $(objdir)
commit c472f5f9257e6dcb9e82042a99ef028e3390e93e
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Nov 7 18:46:11 2006 -0800
Replace static ChangeLog with dist-hook to generate from git log
commit aa27f60ff70230990bd7351bbfda3d38f95afe3b
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Nov 7 18:39:58 2006 -0800
Add hooks for checking code with lint/sparse/etc.
commit fd251f039f74f2ef8ef8a019566eebf9d22be098
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Nov 7 18:32:54 2006 -0800
Clear unused variable warnings from lint
commit 21bee0694be43d4be1d93a8bcafbcd0f0ef9a9b4
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Nov 7 18:28:20 2006 -0800
AC_CHECK_MEMBER needs to include <utmpx.h> when checking for utmpx.ut_syslen
commit 63f21c67aa6d025d8fa06793dc7f83f37e7c3fb4
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Nov 7 18:27:45 2006 -0800
Substitute correct pathnames for utmp/wtmp files in man pages
ifdefs to find the paths on each platform have been broken out into a new
sessreg.h header that is also preprocessed into sed rules applied to the
man page. Old ifdefs left for Imake compatibility in the 6.9/7.0 hybrid
release have been dropped now that autoconf is required to build.
commit 98a651ec2ac289b966e0a09557e81b33e202ee9c
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Nov 7 16:49:53 2006 -0800
Add *~ to .gitignore to skip emacs/patch droppings
commit 5d7eed376aa9e8e623b0c46790a70b0cb3278207
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Nov 7 16:49:26 2006 -0800
renamed: .cvsignore -> .gitignore
commit de39e20707b0affebf4c4c0e8485bdf08cf88a82
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Nov 7 16:48:27 2006 -0800
List default Xservers path as /etc/X11/xdm instead of /usr/X11R6/lib/xdm
commit 8e657d70ef4fe5b4dfa51b506a8adca16b0ca8a0
Author: Kevin E Martin <kem@kem.org>
Date: Thu Dec 15 00:24:04 2005 +0000
Update package version number for final X11R7 release candidate.
commit 7a587391f1b18192731e611ff65d74e414b67d60
Author: Kevin E Martin <kem@kem.org>
Date: Tue Dec 6 22:48:18 2005 +0000
Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
commit fbfb7cb1e77418310e42cf38fc4faa411c103bec
Author: Kevin E Martin <kem@kem.org>
Date: Sat Dec 3 05:49:17 2005 +0000
Update package version number for X11R7 RC3 release.
commit 021e9ec8d71ea9de9fa14743792e7528e0417daf
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Nov 28 22:01:38 2005 +0000
Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
commit 88f5deb277ffdf8253463eb0470f49306ac036de
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Nov 21 10:34:57 2005 +0000
Another pass at .cvsignores for apps.
commit eab9fb30fe89009f7791f4ab502c89d99cb2b84d
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Nov 20 22:08:49 2005 +0000
Add/improve .cvsignore files for apps.
commit e35111966e6d66c176ed0955c1c25942c567632b
Author: Kevin E Martin <kem@kem.org>
Date: Sat Nov 19 07:15:36 2005 +0000
Update pkgconfig files to separate library build-time dependencies from
application build-time dependencies, and update package deps to work
with separate build roots.
commit d90d5ab54582b04ad93e9cf6182652fdd6d3b4a3
Author: Kevin E Martin <kem@kem.org>
Date: Wed Oct 19 02:47:50 2005 +0000
Update package version number for RC1 release.
commit 5e79e3663bf5e14c7ae4f97798ee4430a02687f5
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Oct 17 23:56:20 2005 +0000
Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
work better with BSD make
commit 5ec50a516f66a7a57477dfc1ec51f8215084d29a
Author: Kevin E Martin <kem@kem.org>
Date: Mon Oct 17 18:08:25 2005 +0000
Fixed man page processing
commit adbf0a45e0c68512eb46c8bd8e024d5cdfd6b68f
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Fri Oct 14 00:25:42 2005 +0000
Use sed to fill in variables in man page
commit f7e326bd50466f9197e75b2b71ccf0fb1996f4f8
Author: Kevin E Martin <kem@kem.org>
Date: Wed Oct 5 04:10:02 2005 +0000
Add check for utmpx.ut_syslen structure member
commit e33c62dfa7641e8e37a2ef64d98aa5171f2ef705
Author: Kevin E Martin <kem@kem.org>
Date: Wed Oct 5 04:06:35 2005 +0000
Get sessreg.man from $(srcdir) to fix make distcheck
Add check for utmpx.ut_syslen structure member
commit af48c05e4b8639935e8e0738dc0269708c2e929c
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Oct 3 17:50:57 2005 +0000
Bug #4678 <https://bugs.freedesktop.org/show_bug.cgi?id=4678> Patch #3472
<https://bugs.freedesktop.org/attachment.cgi?id=3472> Use SysV-style
utmp on GNU/kFreeBSD (Robert Millan)
commit 5932bb94ffc5c10ab00831b70e703451acdc76b5
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Oct 3 17:18:44 2005 +0000
Add AC_SYS_LARGEFILE for systems that need it to access large
wtmpx/lastlogs Set version string in man page
commit 26e33eae6ff593878b1402ef6d5596dc1f7c7fe3
Author: Kristian Høgsberg <krh@redhat.com>
Date: Tue Sep 27 18:07:40 2005 +0000
Add ChangeLog so autogen.sh will run.
commit 95c055a072fe0b7b6e6b50b89c5ff7264b25e1a4
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Aug 18 22:40:09 2005 +0000
Undo regression in checking for lastlog support in monolithic builds
(reported by Dan McNichol of IBM)
commit defb333b8190b058a437985bedd4bff90ea2d98c
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Wed Aug 10 21:33:09 2005 +0000
Merge in utmpx code from Solaris sessreg. Add #ifdefs for autoconf defines.
commit 8cd395d3bd86ba74888b7ea8cec2d0228c00c312
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Wed Aug 10 21:20:03 2005 +0000
AUTHORS: Copy info from comments in sessreg.c configure.ac: Add checks for
lastlog.h, utmpx.h, & sys/param.h to replace OS-specific #ifdefs
commit c8bfcd300e8da2510c101211db7bffb2955e593d
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Wed Aug 10 20:51:27 2005 +0000
Add sessreg.man to app/sessreg module
commit a487143d0b4f0183d602346adc7dedcccf158336
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 10 11:17:07 2005 +0000
Add build system for sessreg, broken out from xdm.
commit e3025b01b3fdd32bde8120dec1b0061e1449c6e9
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Oct 13 22:14:22 2004 +0000
Bug #1627: Zero out struct utmp before writing it to prevent garbage
fields. (Egmont Koblinger)
commit 922a3ce29d3fe91f57fd41ea87e0e56b72ee9670
Author: Egbert Eich <eich@suse.de>
Date: Fri Apr 23 19:54:42 2004 +0000
Merging XORG-CURRENT into trunk
commit 67ee3273cd7cc450e73b0f8a9a9178ae67b17ea3
Author: Egbert Eich <eich@suse.de>
Date: Sun Mar 14 08:35:12 2004 +0000
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
commit aadb852d2af964c29514d9c345ab91f267223754
Author: Egbert Eich <eich@suse.de>
Date: Wed Mar 3 12:13:00 2004 +0000
Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
commit 730d1970ee78e5f98452d2b6ef28972678522308
Author: Egbert Eich <eich@suse.de>
Date: Thu Feb 26 13:36:17 2004 +0000
readding XFree86's cvs IDs
commit 90395833b58cf129800f7372d0dd957fbe277afa
Author: Egbert Eich <eich@suse.de>
Date: Thu Feb 26 09:24:04 2004 +0000
Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
commit 83d734abd26ba5e3cf8c197de581da2379290860
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Fri Nov 14 16:49:22 2003 +0000
XFree86 4.3.0.1
commit 4a979ad921e2733b8e3e178928240cf8a60ad07b
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Fri Nov 14 15:54:53 2003 +0000
R6.6 is the Xorg base-line

30
sessreg/Makefile.am
View File

@ -20,9 +20,10 @@
bin_PROGRAMS = sessreg bin_PROGRAMS = sessreg
sessreg_CFLAGS = $(SESSREG_CFLAGS) AM_CFLAGS = $(SESSREG_CFLAGS)
sessreg_SOURCES = \ sessreg_SOURCES = \
sessreg.h \
sessreg.c sessreg.c
appman_PRE = sessreg.man appman_PRE = sessreg.man
@ -31,8 +32,8 @@ appmandir = $(APP_MAN_DIR)
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
EXTRA_DIST = $(appman_PRE) EXTRA_DIST = $(appman_PRE) filenames.sed.c ChangeLog
CLEANFILES = $(appman_DATA) CLEANFILES = $(appman_DATA) filenames.sed
SED = sed SED = sed
@ -40,7 +41,7 @@ SED = sed
XORGRELSTRING = @PACKAGE_STRING@ XORGRELSTRING = @PACKAGE_STRING@
XORGMANNAME = X Version 11 XORGMANNAME = X Version 11
MAN_SUBSTS = \ MAN_SUBSTS = -f filenames.sed \
-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-e 's|__xservername__|Xorg|g' \ -e 's|__xservername__|Xorg|g' \
@ -57,3 +58,24 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX): .man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@ sed $(MAN_SUBSTS) < $< > $@
sessreg.$(APP_MAN_SUFFIX): filenames.sed
filenames.sed: filenames.sed.c
$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(srcdir)/filenames.sed.c | grep 's|__' > $@
if LINT
ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS)
lint:
$(LINT) $(ALL_LINT_FLAGS) $(sessreg_SOURCES)
endif LINT
MAINTAINERCLEANFILES=ChangeLog
ChangeLog:
git-log > ChangeLog
dist-hook: ChangeLog

57
sessreg/Makefile.in
View File

@ -76,7 +76,7 @@ CONFIG_CLEAN_FILES =
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)" am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)"
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS) PROGRAMS = $(bin_PROGRAMS)
am_sessreg_OBJECTS = sessreg-sessreg.$(OBJEXT) am_sessreg_OBJECTS = sessreg.$(OBJEXT)
sessreg_OBJECTS = $(am_sessreg_OBJECTS) sessreg_OBJECTS = $(am_sessreg_OBJECTS)
sessreg_LDADD = $(LDADD) sessreg_LDADD = $(LDADD)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I. DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
@ -148,6 +148,10 @@ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@ LIBS = @LIBS@
LIB_MAN_DIR = @LIB_MAN_DIR@ LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
LTLIBOBJS = @LTLIBOBJS@ LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
@ -213,21 +217,22 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@ sysconfdir = @sysconfdir@
target_alias = @target_alias@ target_alias = @target_alias@
sessreg_CFLAGS = $(SESSREG_CFLAGS) AM_CFLAGS = $(SESSREG_CFLAGS)
sessreg_SOURCES = \ sessreg_SOURCES = \
sessreg.h \
sessreg.c sessreg.c
appman_PRE = sessreg.man appman_PRE = sessreg.man
appmandir = $(APP_MAN_DIR) appmandir = $(APP_MAN_DIR)
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
EXTRA_DIST = $(appman_PRE) EXTRA_DIST = $(appman_PRE) filenames.sed.c ChangeLog
CLEANFILES = $(appman_DATA) CLEANFILES = $(appman_DATA) filenames.sed
SED = sed SED = sed
# Strings to replace in man pages # Strings to replace in man pages
XORGRELSTRING = @PACKAGE_STRING@ XORGRELSTRING = @PACKAGE_STRING@
XORGMANNAME = X Version 11 XORGMANNAME = X Version 11
MAN_SUBSTS = \ MAN_SUBSTS = -f filenames.sed \
-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-e 's|__xservername__|Xorg|g' \ -e 's|__xservername__|Xorg|g' \
@ -241,6 +246,10 @@ MAN_SUBSTS = \
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
SUFFIXES = .$(APP_MAN_SUFFIX) .man SUFFIXES = .$(APP_MAN_SUFFIX) .man
@LINT_TRUE@ALL_LINT_FLAGS = $(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@LINT_TRUE@ $(AM_CPPFLAGS) $(CPPFLAGS)
MAINTAINERCLEANFILES = ChangeLog
all: config.h all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am $(MAKE) $(AM_MAKEFLAGS) all-am
@ -329,7 +338,7 @@ mostlyclean-compile:
distclean-compile: distclean-compile:
-rm -f *.tab.c -rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sessreg-sessreg.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sessreg.Po@am__quote@
.c.o: .c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@ -344,20 +353,6 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
sessreg-sessreg.o: sessreg.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sessreg_CFLAGS) $(CFLAGS) -MT sessreg-sessreg.o -MD -MP -MF "$(DEPDIR)/sessreg-sessreg.Tpo" -c -o sessreg-sessreg.o `test -f 'sessreg.c' || echo '$(srcdir)/'`sessreg.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/sessreg-sessreg.Tpo" "$(DEPDIR)/sessreg-sessreg.Po"; else rm -f "$(DEPDIR)/sessreg-sessreg.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sessreg.c' object='sessreg-sessreg.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sessreg_CFLAGS) $(CFLAGS) -c -o sessreg-sessreg.o `test -f 'sessreg.c' || echo '$(srcdir)/'`sessreg.c
sessreg-sessreg.obj: sessreg.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sessreg_CFLAGS) $(CFLAGS) -MT sessreg-sessreg.obj -MD -MP -MF "$(DEPDIR)/sessreg-sessreg.Tpo" -c -o sessreg-sessreg.obj `if test -f 'sessreg.c'; then $(CYGPATH_W) 'sessreg.c'; else $(CYGPATH_W) '$(srcdir)/sessreg.c'; fi`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/sessreg-sessreg.Tpo" "$(DEPDIR)/sessreg-sessreg.Po"; else rm -f "$(DEPDIR)/sessreg-sessreg.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sessreg.c' object='sessreg-sessreg.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sessreg_CFLAGS) $(CFLAGS) -c -o sessreg-sessreg.obj `if test -f 'sessreg.c'; then $(CYGPATH_W) 'sessreg.c'; else $(CYGPATH_W) '$(srcdir)/sessreg.c'; fi`
uninstall-info-am: uninstall-info-am:
install-appmanDATA: $(appman_DATA) install-appmanDATA: $(appman_DATA)
@$(NORMAL_INSTALL) @$(NORMAL_INSTALL)
@ -454,6 +449,9 @@ distdir: $(DISTFILES)
|| exit 1; \ || exit 1; \
fi; \ fi; \
done done
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$(top_distdir)" distdir="$(distdir)" \
dist-hook
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ -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 -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
@ -583,6 +581,7 @@ distclean-generic:
maintainer-clean-generic: maintainer-clean-generic:
@echo "This command is intended for maintainers to use" @echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild." @echo "it deletes files that may require special tools to rebuild."
-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
clean: clean-am clean: clean-am
clean-am: clean-binPROGRAMS clean-generic mostlyclean-am clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
@ -638,8 +637,8 @@ uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \ .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \ clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \
dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \ dist-gzip dist-hook dist-shar dist-tarZ dist-zip distcheck \
distclean-compile distclean-generic distclean-hdr \ distclean distclean-compile distclean-generic distclean-hdr \
distclean-tags distcleancheck distdir distuninstallcheck dvi \ distclean-tags distcleancheck distdir distuninstallcheck dvi \
dvi-am html html-am info info-am install install-am \ dvi-am html html-am info info-am install install-am \
install-appmanDATA install-binPROGRAMS install-data \ install-appmanDATA install-binPROGRAMS install-data \
@ -654,6 +653,20 @@ uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
.man.$(APP_MAN_SUFFIX): .man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@ sed $(MAN_SUBSTS) < $< > $@
sessreg.$(APP_MAN_SUFFIX): filenames.sed
filenames.sed: filenames.sed.c
$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(srcdir)/filenames.sed.c | grep 's|__' > $@
@LINT_TRUE@lint:
@LINT_TRUE@ $(LINT) $(ALL_LINT_FLAGS) $(sessreg_SOURCES)
ChangeLog:
git-log > ChangeLog
dist-hook: ChangeLog
# Tell versions [3.59,3.63) of GNU make to not export all variables. # 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. # Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT: .NOEXPORT:

2
sessreg/aclocal.m4 vendored
View File

@ -159,7 +159,7 @@ path to pkg-config.
_PKG_TEXT _PKG_TEXT
To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])], To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
[$4]) [$4])
else else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS

142
sessreg/compile
View File

@ -1,142 +0,0 @@
#! /bin/sh
# Wrapper for compilers which do not understand `-c -o'.
scriptversion=2005-05-14.22
# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
# This file is maintained in Automake, please report
# bugs to <bug-automake@gnu.org> or send patches to
# <automake-patches@gnu.org>.
case $1 in
'')
echo "$0: No command. Try \`$0 --help' for more information." 1>&2
exit 1;
;;
-h | --h*)
cat <<\EOF
Usage: compile [--help] [--version] PROGRAM [ARGS]
Wrapper for compilers which do not understand `-c -o'.
Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
arguments, and rename the output as expected.
If you are trying to build a whole package this is not the
right script to run: please start by reading the file `INSTALL'.
Report bugs to <bug-automake@gnu.org>.
EOF
exit $?
;;
-v | --v*)
echo "compile $scriptversion"
exit $?
;;
esac
ofile=
cfile=
eat=
for arg
do
if test -n "$eat"; then
eat=
else
case $1 in
-o)
# configure might choose to run compile as `compile cc -o foo foo.c'.
# So we strip `-o arg' only if arg is an object.
eat=1
case $2 in
*.o | *.obj)
ofile=$2
;;
*)
set x "$@" -o "$2"
shift
;;
esac
;;
*.c)
cfile=$1
set x "$@" "$1"
shift
;;
*)
set x "$@" "$1"
shift
;;
esac
fi
shift
done
if test -z "$ofile" || test -z "$cfile"; then
# If no `-o' option was seen then we might have been invoked from a
# pattern rule where we don't need one. That is ok -- this is a
# normal compilation that the losing compiler can handle. If no
# `.c' file was seen then we are probably linking. That is also
# ok.
exec "$@"
fi
# Name of file we expect compiler to create.
cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
# Create the lock directory.
# Note: use `[/.-]' here to ensure that we don't use the same name
# that we are using for the .o file. Also, base the name on the expected
# object file name, since that is what matters with a parallel build.
lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
while true; do
if mkdir "$lockdir" >/dev/null 2>&1; then
break
fi
sleep 1
done
# FIXME: race condition here if user kills between mkdir and trap.
trap "rmdir '$lockdir'; exit 1" 1 2 15
# Run the compile.
"$@"
ret=$?
if test -f "$cofile"; then
mv "$cofile" "$ofile"
elif test -f "${cofile}bj"; then
mv "${cofile}bj" "$ofile"
fi
rmdir "$lockdir"
exit $ret
# Local Variables:
# mode: shell-script
# sh-indentation: 2
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-end: "$"
# End:

126
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.61 for sessreg 1.0.0. # Generated by GNU Autoconf 2.61 for sessreg 1.0.3.
# #
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
# #
@ -574,8 +574,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.0' PACKAGE_VERSION='1.0.3'
PACKAGE_STRING='sessreg 1.0.0' PACKAGE_STRING='sessreg 1.0.3'
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.
@ -697,6 +697,10 @@ EGREP
PKG_CONFIG PKG_CONFIG
SESSREG_CFLAGS SESSREG_CFLAGS
SESSREG_LIBS SESSREG_LIBS
LINT
LINT_FLAGS
LINT_TRUE
LINT_FALSE
build build
build_cpu build_cpu
build_vendor build_vendor
@ -1234,7 +1238,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.0 to adapt to many kinds of systems. \`configure' configures sessreg 1.0.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1304,7 +1308,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.0:";; short | recursive ) echo "Configuration of sessreg 1.0.3:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
@ -1320,6 +1324,8 @@ Optional Features:
Optional Packages: Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-lint Use a lint-style source code checker (default:
disabled)
--with-release-version=STRING --with-release-version=STRING
Use release version string in package name Use release version string in package name
@ -1402,7 +1408,7 @@ fi
test -n "$ac_init_help" && exit $ac_status test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
sessreg configure 1.0.0 sessreg configure 1.0.3
generated by GNU Autoconf 2.61 generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@ -1416,7 +1422,7 @@ cat >config.log <<_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.0, which was It was created by sessreg $as_me 1.0.3, which was
generated by GNU Autoconf 2.61. Invocation command line was generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@ $ $0 $@
@ -2086,7 +2092,7 @@ fi
# Define the identity of the package. # Define the identity of the package.
PACKAGE='sessreg' PACKAGE='sessreg'
VERSION='1.0.0' VERSION='1.0.3'
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
@ -2260,6 +2266,31 @@ fi
ac_config_headers="$ac_config_headers config.h" ac_config_headers="$ac_config_headers config.h"
# Require xorg-macros version 1.1.0 or newer for XORG_WITH_LINT macro
XORG_MACROS_needed_version=1.1
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/\..*$//'`
{ 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_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
{ { echo "$as_me:$LINENO: error: configure built with incompatible version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.x" >&5
echo "$as_me: error: configure built with incompatible version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.x" >&2;}
{ (exit 1); exit 1; }; }
fi
if test $XORG_MACROS_minor -lt $XORG_MACROS_needed_minor ; then
{ { echo "$as_me:$LINENO: error: configure built with too old of a version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.${XORG_MACROS_minor}.0 or newer" >&5
echo "$as_me: error: configure built with too old of a version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.${XORG_MACROS_minor}.0 or newer" >&2;}
{ (exit 1); exit 1; }; }
fi
{ echo "$as_me:$LINENO: result: yes, $XORG_MACROS_version" >&5
echo "${ECHO_T}yes, $XORG_MACROS_version" >&6; }
ac_ext=c ac_ext=c
ac_cpp='$CPP $CPPFLAGS' ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@ -4229,7 +4260,8 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */ /* end confdefs.h. */
$ac_includes_default #include <utmpx.h>
int int
main () main ()
{ {
@ -4268,7 +4300,8 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */ /* end confdefs.h. */
$ac_includes_default #include <utmpx.h>
int int
main () main ()
{ {
@ -4886,7 +4919,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.
To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5 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 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 is in your PATH or set the PKG_CONFIG environment variable to the full
@ -4896,7 +4929,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.
To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&2;} See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
else else
@ -4908,6 +4941,50 @@ echo "${ECHO_T}yes" >&6; }
fi fi
# Allow checking code with lint, sparse, etc.
# Allow checking code with lint, sparse, etc.
# Check whether --with-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
# Make sure we can run config.sub. # Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
{ { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
@ -5221,6 +5298,13 @@ echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;} Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi 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} : ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files ac_clean_files_save=$ac_clean_files
@ -5521,7 +5605,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their # report actual input values of CONFIG_FILES etc. instead of their
# values after options handling. # values after options handling.
ac_log=" ac_log="
This file was extended by sessreg $as_me 1.0.0, which was This file was extended by sessreg $as_me 1.0.3, which was
generated by GNU Autoconf 2.61. Invocation command line was generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
@ -5574,7 +5658,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\ ac_cs_version="\\
sessreg config.status 1.0.0 sessreg config.status 1.0.3
configured by $0, generated by GNU Autoconf 2.61, configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@ -5835,6 +5919,10 @@ EGREP!$EGREP$ac_delim
PKG_CONFIG!$PKG_CONFIG$ac_delim PKG_CONFIG!$PKG_CONFIG$ac_delim
SESSREG_CFLAGS!$SESSREG_CFLAGS$ac_delim SESSREG_CFLAGS!$SESSREG_CFLAGS$ac_delim
SESSREG_LIBS!$SESSREG_LIBS$ac_delim SESSREG_LIBS!$SESSREG_LIBS$ac_delim
LINT!$LINT$ac_delim
LINT_FLAGS!$LINT_FLAGS$ac_delim
LINT_TRUE!$LINT_TRUE$ac_delim
LINT_FALSE!$LINT_FALSE$ac_delim
build!$build$ac_delim build!$build$ac_delim
build_cpu!$build_cpu$ac_delim build_cpu!$build_cpu$ac_delim
build_vendor!$build_vendor$ac_delim build_vendor!$build_vendor$ac_delim
@ -5845,10 +5933,6 @@ host_vendor!$host_vendor$ac_delim
host_os!$host_os$ac_delim host_os!$host_os$ac_delim
APP_MAN_SUFFIX!$APP_MAN_SUFFIX$ac_delim APP_MAN_SUFFIX!$APP_MAN_SUFFIX$ac_delim
LIB_MAN_SUFFIX!$LIB_MAN_SUFFIX$ac_delim LIB_MAN_SUFFIX!$LIB_MAN_SUFFIX$ac_delim
FILE_MAN_SUFFIX!$FILE_MAN_SUFFIX$ac_delim
MISC_MAN_SUFFIX!$MISC_MAN_SUFFIX$ac_delim
DRIVER_MAN_SUFFIX!$DRIVER_MAN_SUFFIX$ac_delim
ADMIN_MAN_SUFFIX!$ADMIN_MAN_SUFFIX$ac_delim
_ACEOF _ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@ -5890,6 +5974,10 @@ _ACEOF
ac_delim='%!_!# ' ac_delim='%!_!# '
for ac_last_try in false false false false false :; do for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF cat >conf$$subs.sed <<_ACEOF
FILE_MAN_SUFFIX!$FILE_MAN_SUFFIX$ac_delim
MISC_MAN_SUFFIX!$MISC_MAN_SUFFIX$ac_delim
DRIVER_MAN_SUFFIX!$DRIVER_MAN_SUFFIX$ac_delim
ADMIN_MAN_SUFFIX!$ADMIN_MAN_SUFFIX$ac_delim
APP_MAN_DIR!$APP_MAN_DIR$ac_delim APP_MAN_DIR!$APP_MAN_DIR$ac_delim
LIB_MAN_DIR!$LIB_MAN_DIR$ac_delim LIB_MAN_DIR!$LIB_MAN_DIR$ac_delim
FILE_MAN_DIR!$FILE_MAN_DIR$ac_delim FILE_MAN_DIR!$FILE_MAN_DIR$ac_delim
@ -5900,7 +5988,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF _ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 8; then if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 12; then
break break
elif $ac_last_try; then elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

12
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.0], AC_INIT(sessreg, [1.0.3],
[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])
@ -29,13 +29,18 @@ AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(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_CC
AC_PROG_INSTALL AC_PROG_INSTALL
AC_CHECK_HEADERS([lastlog.h utmpx.h sys/param.h]) AC_CHECK_HEADERS([lastlog.h utmpx.h sys/param.h])
AC_CHECK_MEMBER([struct utmpx.ut_syslen], AC_CHECK_MEMBER([struct utmpx.ut_syslen],
HAVE_SYSLEN=1, HAVE_SYSLEN=1,
HAVE_SYSLEN=0) HAVE_SYSLEN=0,
[#include <utmpx.h>])
AC_DEFINE_UNQUOTED(HAVE_UTMPX_UT_SYSLEN,$HAVE_SYSLEN, AC_DEFINE_UNQUOTED(HAVE_UTMPX_UT_SYSLEN,$HAVE_SYSLEN,
[utmpx structure includes ut_syslen field]) [utmpx structure includes ut_syslen field])
@ -45,6 +50,9 @@ AC_SYS_LARGEFILE
PKG_CHECK_MODULES(SESSREG, x11) PKG_CHECK_MODULES(SESSREG, x11)
AC_SUBST(SESSREG_CFLAGS) AC_SUBST(SESSREG_CFLAGS)
# Allow checking code with lint, sparse, etc.
XORG_WITH_LINT
XORG_MANPAGE_SECTIONS XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION XORG_RELEASE_VERSION

21
sessreg/filenames.sed.c Normal file
View File

@ -0,0 +1,21 @@
#include "sessreg.h"
#ifdef UTMPX_FILE
# define UTF UTMPX_FILE
#else
# define UTF UTMP_FILE
#endif
#ifdef WTMPX_FILE
# define WTF WTMPX_FILE
#else
# define WTF WTMP_FILE
#endif
#ifndef TTYS_FILE
# define TTYS_FILE "/etc/ttys"
#endif
s|__utmp_file__|UTF|g
s|__wtmp_file__|WTF|g
s|__ttys_file__|TTYS_FILE|g

158
sessreg/mkinstalldirs
View File

@ -1,158 +0,0 @@
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
scriptversion=2005-06-29.22
# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
# Created: 1993-05-16
# Public domain.
#
# This file is maintained in Automake, please report
# bugs to <bug-automake@gnu.org> or send patches to
# <automake-patches@gnu.org>.
errstatus=0
dirmode=
usage="\
Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
Create each directory DIR (with mode MODE, if specified), including all
leading file name components.
Report bugs to <bug-automake@gnu.org>."
# process command line arguments
while test $# -gt 0 ; do
case $1 in
-h | --help | --h*) # -h for help
echo "$usage"
exit $?
;;
-m) # -m PERM arg
shift
test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
dirmode=$1
shift
;;
--version)
echo "$0 $scriptversion"
exit $?
;;
--) # stop option processing
shift
break
;;
-*) # unknown option
echo "$usage" 1>&2
exit 1
;;
*) # first non-opt arg
break
;;
esac
done
for file
do
if test -d "$file"; then
shift
else
break
fi
done
case $# in
0) exit 0 ;;
esac
# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and
# mkdir -p a/c at the same time, both will detect that a is missing,
# one will create a, then the other will try to create a and die with
# a "File exists" error. This is a problem when calling mkinstalldirs
# from a parallel make. We use --version in the probe to restrict
# ourselves to GNU mkdir, which is thread-safe.
case $dirmode in
'')
if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
echo "mkdir -p -- $*"
exec mkdir -p -- "$@"
else
# On NextStep and OpenStep, the `mkdir' command does not
# recognize any option. It will interpret all options as
# directories to create, and then abort because `.' already
# exists.
test -d ./-p && rmdir ./-p
test -d ./--version && rmdir ./--version
fi
;;
*)
if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
test ! -d ./--version; then
echo "mkdir -m $dirmode -p -- $*"
exec mkdir -m "$dirmode" -p -- "$@"
else
# Clean up after NextStep and OpenStep mkdir.
for d in ./-m ./-p ./--version "./$dirmode";
do
test -d $d && rmdir $d
done
fi
;;
esac
for file
do
case $file in
/*) pathcomp=/ ;;
*) pathcomp= ;;
esac
oIFS=$IFS
IFS=/
set fnord $file
shift
IFS=$oIFS
for d
do
test "x$d" = x && continue
pathcomp=$pathcomp$d
case $pathcomp in
-*) pathcomp=./$pathcomp ;;
esac
if test ! -d "$pathcomp"; then
echo "mkdir $pathcomp"
mkdir "$pathcomp" || lasterr=$?
if test ! -d "$pathcomp"; then
errstatus=$lasterr
else
if test ! -z "$dirmode"; then
echo "chmod $dirmode $pathcomp"
lasterr=
chmod "$dirmode" "$pathcomp" || lasterr=$?
if test ! -z "$lasterr"; then
errstatus=$lasterr
fi
fi
fi
fi
pathcomp=$pathcomp/
done
done
exit $errstatus
# Local Variables:
# mode: shell-script
# sh-indentation: 2
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-end: "$"
# End:

123
sessreg/sessreg.h Normal file
View File

@ -0,0 +1,123 @@
/*
* Copyright 1990, 1998 The Open Group
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
* the above copyright notice appear in all copies and that both that
* copyright notice and this permission notice appear in supporting
* documentation.
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
* IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*
* Except as contained in this notice, the name of The Open Group shall
* not be used in advertising or otherwise to promote the sale, use or
* other dealings in this Software without prior written authorization
* from The Open Group.
*
*/
/* Copyright 2005 Sun Microsystems, Inc. All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, and/or sell copies of the Software, and to permit persons
* to whom the Software is furnished to do so, provided that the above
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
* OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
* HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
* INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
* FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
* NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* Except as contained in this notice, the name of a copyright holder
* shall not be used in advertising or otherwise to promote the sale, use
* or other dealings in this Software without prior written authorization
* of the copyright holder.
*/
#include "config.h"
#include <sys/types.h>
#include <time.h>
#include <utmp.h>
#ifdef HAVE_UTMPX_H
# if HAVE_UTMPX_UT_SYSLEN
# include <utmpx.h>
# define USE_UTMPX
# endif
#endif
#ifdef HAVE_SYS_PARAM_H
# include <sys/param.h>
#endif
#ifndef HAVE_LASTLOG_H
# define NO_LASTLOG
#endif
#ifndef NO_LASTLOG
# ifdef CSRG_BASED
# if (BSD < 199103)
# include <lastlog.h>
# endif
# else
# include <lastlog.h>
# endif
# include <pwd.h>
#endif
#ifdef CSRG_BASED
#if !defined(__FreeBSD__) && !defined(__OpenBSD__)
/* *BSD doesn't like a ':0' type entry in utmp */
#define NO_UTMP
#endif
#endif
#ifndef WTMP_FILE
# ifdef _PATH_WTMP
# define WTMP_FILE _PATH_WTMP
# else
# define WTMP_FILE "/usr/adm/wtmp"
# endif
#endif
#ifndef UTMP_FILE
# ifdef _PATH_UTMP
# define UTMP_FILE _PATH_UTMP
# else
# define UTMP_FILE "/etc/utmp"
# endif
#endif
#ifndef NO_LASTLOG
# ifndef LLOG_FILE
# ifdef _PATH_LASTLOG
# define LLOG_FILE _PATH_LASTLOG
# else
# define LLOG_FILE "/usr/adm/lastlog"
# endif
# endif
#endif
#ifndef SYSV
# ifndef TTYS_FILE
# define TTYS_FILE "/etc/ttys"
# endif
#endif

39
sessreg/sessreg.man
View File

@ -25,7 +25,7 @@
.\" .\"
.\" $XFree86: xc/programs/xdm/sessreg.man,v 1.7 2001/04/23 20:31:09 dawes Exp $ .\" $XFree86: xc/programs/xdm/sessreg.man,v 1.7 2001/04/23 20:31:09 dawes Exp $
.\" .\"
.TH SESSREG 1 __xorgversion__ .TH SESSREG __appmansuffix__ __xorgversion__
.SH NAME .SH NAME
sessreg \- manage utmp/wtmp entries for non-init clients sessreg \- manage utmp/wtmp entries for non-init clients
.SH SYNOPSIS .SH SYNOPSIS
@ -45,19 +45,22 @@ sessreg \- manage utmp/wtmp entries for non-init clients
\fISessreg\fP is a simple program for managing utmp/wtmp \fISessreg\fP is a simple program for managing utmp/wtmp
entries for xdm sessions. entries for xdm sessions.
.PP .PP
System V has a better interface to /etc/utmp than BSD; it System V has a better interface to utmp than BSD; it
dynamically allocates entries in the file, instead of writing them at fixed dynamically allocates entries in the file, instead of writing them at fixed
positions indexed by position in /etc/ttys. positions indexed by position in
.BR __ttys_file__ .
.PP .PP
To manage BSD-style utmp files, \fIsessreg\fP has two strategies. In To manage BSD-style utmp files, \fIsessreg\fP has two strategies. In
conjunction with xdm, the -x option counts the number of lines in /etc/ttys conjunction with xdm, the -x option counts the number of lines in
.B __ttys_file__
and then adds to that the number of the line in the Xservers file which and then adds to that the number of the line in the Xservers file which
specifies the display. The display name must be specified as the specifies the display. The display name must be specified as the
"line-name" using the -l option. This sum is used as the "slot-number" in "line-name" using the -l option. This sum is used as the "slot-number" in
/etc/utmp that this entry will be written at. In the more general case, the the utmp file that this entry will be written at. In the more general case,
-s option specifies the slot-number directly. If for some strange reason the -s option specifies the slot-number directly. If for some strange reason
your system uses a file other that /etc/ttys to manage init, the -t option your system uses a file other than
can direct .B __ttys_file__
to manage init, the -t option can direct
\fIsessreg\fP to look elsewhere for a count of terminal sessions. \fIsessreg\fP to look elsewhere for a count of terminal sessions.
.PP .PP
Conversely, System V managers will not ever need to use these options (-x, Conversely, System V managers will not ever need to use these options (-x,
@ -73,22 +76,23 @@ exist in System V. This option is also ignored by the System V version of
In Xstartup, place a call like: In Xstartup, place a call like:
.nf .nf
sessreg -a -l $DISPLAY -x /usr/X11R6/lib/xdm/Xservers $USER sessreg -a -l $DISPLAY -x /etc/X11/xdm/Xservers $USER
.fi .fi
and in Xreset: and in Xreset:
.nf .nf
sessreg -d -l $DISPLAY -x /usr/X11R6/lib/xdm/Xservers $USER sessreg -d -l $DISPLAY -x /etc/X11/xdm/Xservers $USER
.fi .fi
.SH OPTIONS .SH OPTIONS
.IP "\fB-w\fP \fIwtmp-file\fP" .IP "\fB-w\fP \fIwtmp-file\fP"
This specifies an alternate wtmp file, instead of /usr/adm/wtmp for BSD or This specifies an alternate wtmp file, instead of
/etc/wtmp for sysV. The special name "none" disables writing records to .BR __wtmp_file__ .
/usr/adm/wtmp. The special name "none" disables writing records to the wtmp file.
.IP "\fB-u\fP \fIutmp-file\fP" .IP "\fB-u\fP \fIutmp-file\fP"
This specifies an alternate utmp file, instead of "/etc/utmp". The special This specifies an alternate utmp file, instead of
name "none" disables writing records to /etc/utmp. .BR __utmp_file__ .
The special name "none" disables writing records to the utmp file.
.IP "\fB-l\fP \fIline-name\fP" .IP "\fB-l\fP \fIline-name\fP"
This describes the "line" name of the entry. For terminal sessions, This describes the "line" name of the entry. For terminal sessions,
this is the final pathname segment of the terminal device filename this is the final pathname segment of the terminal device filename
@ -101,7 +105,8 @@ This is set for BSD hosts to indicate that the session was initiated from
a remote host. In typical xdm usage, this options is not used. a remote host. In typical xdm usage, this options is not used.
.IP "\fB-s\fP \fIslot-number\fP" .IP "\fB-s\fP \fIslot-number\fP"
Each potential session has a unique slot number in BSD systems, most are Each potential session has a unique slot number in BSD systems, most are
identified by the position of the \fIline-name\fP in the /etc/ttys file. identified by the position of the \fIline-name\fP in the
.BR __ttys_file__ file.
This option overrides the default position determined with ttyslot(3). This option overrides the default position determined with ttyslot(3).
This option is inappropriate for use with xdm, the -x option is more useful. This option is inappropriate for use with xdm, the -x option is more useful.
.IP "\fB-x\fP \fIXservers-file\fP" .IP "\fB-x\fP \fIXservers-file\fP"
@ -118,6 +123,6 @@ This session should be added to utmp/wtmp.
This session should be deleted from utmp/wtmp. One of -a/-d must This session should be deleted from utmp/wtmp. One of -a/-d must
be specified. be specified.
.SH "SEE ALSO" .SH "SEE ALSO"
xdm(1) xdm(__appmansuffix__)
.SH AUTHOR .SH AUTHOR
Keith Packard, MIT X Consortium Keith Packard, MIT X Consortium