Blame SOURCES/sessreg-1.1.0-get-rid-of-sed.patch

185bf5
diff -Naur sessreg-1.1.0.old/man/filenames.sed.c sessreg-1.1.0/man/filenames.sed.c
185bf5
--- sessreg-1.1.0.old/man/filenames.sed.c	2015-04-30 13:58:47.780569645 +0200
185bf5
+++ sessreg-1.1.0/man/filenames.sed.c	1970-01-01 01:00:00.000000000 +0100
185bf5
@@ -1,36 +0,0 @@
185bf5
-#include "sessreg.h"
185bf5
-
185bf5
-#ifdef UTMPX_FILE
185bf5
-# define UTF UTMPX_FILE
185bf5
-# define UTM utmpx
185bf5
-/* delete utmp-only content */
185bf5
-/__BEGIN_UTMP_ONLY__/,/__END_UTMP_ONLY__/ d
185bf5
-#else
185bf5
-# define UTF UTMP_FILE
185bf5
-# define UTM utmp
185bf5
-/* delete utmpx-only content */
185bf5
-/__BEGIN_UTMPX_ONLY__/,/__END_UTMPX_ONLY__/ d
185bf5
-#endif
185bf5
-
185bf5
-#ifdef WTMPX_FILE
185bf5
-# define WTF WTMPX_FILE
185bf5
-# define WTM wtmpx
185bf5
-#else
185bf5
-# define WTF WTMP_FILE
185bf5
-# define WTM wtmp
185bf5
-#endif
185bf5
-
185bf5
-#ifndef TTYS_FILE
185bf5
-# define TTYS_FILE "/etc/ttys"
185bf5
-#endif
185bf5
-
185bf5
-#ifndef LLOG_FILE
185bf5
-# define LLOG_FILE "/var/log/lastlog"
185bf5
-#endif
185bf5
-
185bf5
-s|__utmp_manpage__|UTM|g
185bf5
-s|__utmp_file__|UTF|g
185bf5
-s|__wtmp_manpage__|WTM|g
185bf5
-s|__wtmp_file__|WTF|g
185bf5
-s|__ttys_file__|TTYS_FILE|g
185bf5
-s|__lastlog_file__|LLOG_FILE|g
185bf5
diff -Naur sessreg-1.1.0.old/man/Makefile.am sessreg-1.1.0/man/Makefile.am
185bf5
--- sessreg-1.1.0.old/man/Makefile.am	2015-04-30 13:58:47.780569645 +0200
185bf5
+++ sessreg-1.1.0/man/Makefile.am	2015-04-30 14:10:41.420249238 +0200
185bf5
@@ -3,20 +3,11 @@
185bf5
 appman_PRE = sessreg.man
185bf5
 appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX))
185bf5
 
185bf5
-EXTRA_DIST = $(appman_PRE) filenames.sed.c
185bf5
-CLEANFILES = $(appman_DATA) filenames.sed
185bf5
+EXTRA_DIST = $(appman_PRE)
185bf5
+CLEANFILES = $(appman_DATA)
185bf5
 SUFFIXES = .$(APP_MAN_SUFFIX) .man
185bf5
 
185bf5
 AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
185bf5
-filenames.sed: filenames.sed.c
185bf5
-	$(AM_V_GEN)$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
185bf5
-	    $(AM_CPPFLAGS) $(CPPFLAGS) $(srcdir)/filenames.sed.c | \
185bf5
-	    $(SED) -n -e '/s|__/ p' -e '/^\/__/ p' > $@
185bf5
-
185bf5
-# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
185bf5
-MAN_SUBSTS += -f filenames.sed
185bf5
-
185bf5
-sessreg.$(APP_MAN_SUFFIX): filenames.sed
185bf5
 
185bf5
 .man.$(APP_MAN_SUFFIX):
185bf5
 	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
185bf5
diff -Naur sessreg-1.1.0.old/man/sessreg.man sessreg-1.1.0/man/sessreg.man
185bf5
--- sessreg-1.1.0.old/man/sessreg.man	2015-04-30 13:58:47.780569645 +0200
185bf5
+++ sessreg-1.1.0/man/sessreg.man	2015-04-30 14:11:47.134127555 +0200
185bf5
@@ -24,11 +24,11 @@
185bf5
 .\"
185bf5
 .TH SESSREG __appmansuffix__ __xorgversion__
185bf5
 .SH NAME
185bf5
-sessreg \- manage __utmp_manpage__/__wtmp_manpage__ entries for non-init clients
185bf5
+sessreg \- manage utmp (__filemansuffix__)/wtmp (__filemansuffix__) entries for non-init clients
185bf5
 .SH SYNOPSIS
185bf5
 .B sessreg
185bf5
-[-w \fI__wtmp_manpage__-file\fP]
185bf5
-[-u \fI__utmp_manpage__-file\fP]
185bf5
+[-w \fIwtmp (__filemansuffix__)-file\fP]
185bf5
+[-u \fIutmp (__filemansuffix__)-file\fP]
185bf5
 [-L \fIlastlog-file\fP]
185bf5
 [-l \fIline-name\fP]
185bf5
 [-h \fIhost-name\fP]
185bf5
@@ -41,25 +41,25 @@
185bf5
 \fIuser-name\fP
185bf5
 .SH DESCRIPTION
185bf5
 .PP
185bf5
-\fISessreg\fP is a simple program for managing __utmp_manpage__/__wtmp_manpage__ and lastlog
185bf5
+\fISessreg\fP is a simple program for managing utmp (__filemansuffix__)/wtmp (__filemansuffix__) and lastlog
185bf5
 entries for xdm sessions.
185bf5
 .\" __BEGIN_UTMP_ONLY__
185bf5
 .PP
185bf5
 System V has a better interface to utmp than BSD; it
185bf5
 dynamically allocates entries in the file, instead of writing them at fixed
185bf5
 positions indexed by position in
185bf5
-.BR __ttys_file__ .
185bf5
+.BR /etc/ttys .
185bf5
 .PP
185bf5
 To manage BSD-style utmp files, \fIsessreg\fP has two strategies.  In
185bf5
 conjunction with xdm, the -x option counts the number of lines in
185bf5
-.B __ttys_file__
185bf5
+.B /etc/ttys
185bf5
 and then adds to that the number of the line in the Xservers file which
185bf5
 specifies the display.  The display name must be specified as the
185bf5
 "line-name" using the -l option.  This sum is used as the "slot-number" in
185bf5
 the utmp file that this entry will be written at.  In the more general case,
185bf5
 the -s option specifies the slot-number directly.  If for some strange reason
185bf5
 your system uses a file other than
185bf5
-.B __ttys_file__
185bf5
+.B /etc/ttys
185bf5
 to manage init, the -t option can direct
185bf5
 \fIsessreg\fP to look elsewhere for a count of terminal sessions.
185bf5
 .PP
185bf5
@@ -95,17 +95,17 @@
185bf5
        sessreg -d -l $DISPLAY -x /etc/X11/xdm/Xservers $USER
185bf5
 .fi
185bf5
 .SH OPTIONS
185bf5
-.IP "\fB-w\fP \fI__wtmp_manpage__-file\fP"
185bf5
-This specifies an alternate __wtmp_manpage__ file, instead of
185bf5
-.BR __wtmp_file__ .
185bf5
-The special name "none" disables writing records to the __wtmp_manpage__ file.
185bf5
-.IP "\fB-u\fP \fI__utmp_manpage__-file\fP"
185bf5
-This specifies an alternate __utmp_manpage__ file, instead of
185bf5
-.BR __utmp_file__ .
185bf5
-The special name "none" disables writing records to the __utmp_manpage__ file.
185bf5
+.IP "\fB-w\fP \fIwtmp (__filemansuffix__)-file\fP"
185bf5
+This specifies an alternate wtmp (__filemansuffix__) file, instead of
185bf5
+.BR /var/log/wtmp .
185bf5
+The special name "none" disables writing records to the wtmp (__filemansuffix__) file.
185bf5
+.IP "\fB-u\fP \fIutmp (__filemansuffix__)-file\fP"
185bf5
+This specifies an alternate utmp (__filemansuffix__) file, instead of
185bf5
+.BR /var/run/utmp .
185bf5
+The special name "none" disables writing records to the utmp (__filemansuffix__) file.
185bf5
 .IP "\fB-L\fP \fIlastlog-file\fP"
185bf5
 This specifies an alternate lastlog file, instead of
185bf5
-.BR __lastlog_file__ ,
185bf5
+.BR /var/log/lastlog ,
185bf5
 if the platform supports lastlog files.
185bf5
 The special name "none" disables writing records to the lastlog file.
185bf5
 .IP "\fB-l\fP \fIline-name\fP"
185bf5
@@ -122,7 +122,7 @@
185bf5
 .\" __BEGIN_UTMP_ONLY__
185bf5
 Each potential session has a unique slot number in BSD systems, most are
185bf5
 identified by the position of the \fIline-name\fP in the
185bf5
-.BR __ttys_file__ file.
185bf5
+.BR /etc/ttys file.
185bf5
 This option overrides the default position determined with ttyslot(__libmansuffix__).
185bf5
 This option is inappropriate for use with xdm, the -x option is more useful.
185bf5
 .\" __END_UTMP_ONLY__
185bf5
@@ -153,13 +153,13 @@
185bf5
 .IP "\fB-V\fP"
185bf5
 This option causes the command to print its version and exit.
185bf5
 .IP "\fB-a\fP"
185bf5
-This session should be added to __utmp_manpage__/__wtmp_manpage__.
185bf5
+This session should be added to utmp/wtmp.
185bf5
 .IP "\fB-d\fP"
185bf5
-This session should be deleted from __utmp_manpage__/__wtmp_manpage__.  One of -a/-d must
185bf5
+This session should be deleted from utmp/wtmp.  One of -a/-d must
185bf5
 be specified.
185bf5
 .SH "SEE ALSO"
185bf5
 .BR xdm (__appmansuffix__),
185bf5
-.BR __utmp_manpage__ (__filemansuffix__),
185bf5
-.BR __wtmp_manpage__ (__filemansuffix__)
185bf5
+.BR utmp (__filemansuffix__),
185bf5
+.BR wtmp (__filemansuffix__)
185bf5
 .SH AUTHOR
185bf5
 Keith Packard, MIT X Consortium