Update sessreg to version 1.1.3

pull/1/head
matthieu 2022-11-06 12:34:23 +00:00
parent b8d205656f
commit d0d6948f3d
9 changed files with 155 additions and 53 deletions

View File

@ -1,3 +1,89 @@
commit 1649c040f8123b96a9a5f1784555d433b07d09e6
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Oct 29 10:51:07 2022 -0700
sessreg 1.1.3
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 1649bbf0300c086d98b855c03b1867e962883e9a
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Oct 15 09:29:35 2022 -0700
Fix -Wstringop-truncation warnings in safe_strncpy()
In function safe_strncpy,
inlined from set_utmpx at sessreg.c:540:3,
inlined from main at sessreg.c:357:2:
sessreg.c:204:11: warning: strncpy specified bound 32 equals destination size [-Wstringop-truncation]
204 | (void)strncpy(dest, src, n);
| ^~~~~~~~~~~~~~~~~~~~~
In function safe_strncpy,
inlined from set_utmpx at sessreg.c:530:4,
inlined from main at sessreg.c:357:2:
sessreg.c:204:11: warning: strncpy specified bound 32 equals destination size [-Wstringop-truncation]
204 | (void)strncpy(dest, src, n);
| ^~~~~~~~~~~~~~~~~~~~~
In function safe_strncpy,
inlined from set_utmpx at sessreg.c:532:3,
inlined from main at sessreg.c:357:2:
sessreg.c:204:11: warning: strncpy specified bound 257 equals destination size [-Wstringop-truncation]
204 | (void)strncpy(dest, src, n);
| ^~~~~~~~~~~~~~~~~~~~~
In function safe_strncpy,
inlined from set_utmpx at sessreg.c:540:3,
inlined from main at sessreg.c:357:2:
sessreg.c:204:11: warning: strncpy specified bound 32 equals destination size [-Wstringop-truncation]
204 | (void)strncpy(dest, src, n);
| ^~~~~~~~~~~~~~~~~~~~~
In function safe_strncpy,
inlined from main at sessreg.c:423:5:
sessreg.c:204:11: warning: strncpy specified bound 8 equals destination size [-Wstringop-truncation]
204 | (void)strncpy(dest, src, n);
| ^~~~~~~~~~~~~~~~~~~~~
In function safe_strncpy,
inlined from main at sessreg.c:425:5:
sessreg.c:204:11: warning: strncpy specified bound 16 equals destination size [-Wstringop-truncation]
204 | (void)strncpy(dest, src, n);
| ^~~~~~~~~~~~~~~~~~~~~
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 5e791f5e412de52c2e110c38f3091102afb4a8a0
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Jul 28 17:30:21 2022 -0700
gitlab CI: stop requiring Signed-off-by in commits
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit f25e9a59be6b25d52e35036bb357c14f86155df8
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Dec 3 16:32:40 2021 -0800
Build xz tarballs instead of bzip2
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit a96dae0fa4754875d71a73e212faeb60516f11b8
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Dec 3 16:32:34 2021 -0800
gitlab CI: add a basic build test
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 3d66d6c70b33380ae4d3008ce62971825da8e8fb
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Nov 28 14:53:09 2021 -0800
Fix spelling/wording issues
Found by using:
codespell --builtin clear,rare,usage,informal,code,names
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 3a91ab7d228f4c1a28970e447cff7d1a960db2fe
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Jun 9 11:39:22 2019 -0700
@ -965,7 +1051,7 @@ Date: Mon Oct 3 17:18:44 2005 +0000
wtmpx/lastlogs Set version string in man page
commit 26e33eae6ff593878b1402ef6d5596dc1f7c7fe3
Author: Kristian Høgsberg <krh@redhat.com>
Author: Kristian Høgsberg <krh@redhat.com>
Date: Tue Sep 27 18:07:40 2005 +0000
Add ChangeLog so autogen.sh will run.

View File

@ -177,9 +177,9 @@ am__relativize = \
dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
done; \
reldir="$$dir2"
DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.xz
GZIP_ENV = --best
DIST_TARGETS = dist-bzip2 dist-gzip
DIST_TARGETS = dist-xz dist-gzip
distuninstallcheck_listfiles = find . -type f -print
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@ -299,6 +299,7 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@ -644,6 +645,7 @@ distdir: $(DISTFILES)
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(am__post_remove_distdir)
dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
$(am__post_remove_distdir)
@ -651,7 +653,6 @@ dist-bzip2: distdir
dist-lzip: distdir
tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
$(am__post_remove_distdir)
dist-xz: distdir
tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
$(am__post_remove_distdir)

View File

@ -7,7 +7,7 @@ Xorg mailing list:
https://lists.x.org/mailman/listinfo/xorg
The master development code repository can be found at:
The primary development code repository can be found at:
https://gitlab.freedesktop.org/xorg/app/sessreg

View File

@ -19,9 +19,9 @@ You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
dnl serial 11 (pkg-config-0.29.1)
dnl
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
# serial 12 (pkg-config-0.29.2)
dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
dnl
@ -62,7 +62,7 @@ dnl
dnl See the "Since" comment for each macro you use to see what version
dnl of the macros you require.
m4_defun([PKG_PREREQ],
[m4_define([PKG_MACROS_VERSION], [0.29.1])
[m4_define([PKG_MACROS_VERSION], [0.29.2])
m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
[m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
])dnl PKG_PREREQ
@ -163,7 +163,7 @@ AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
pkg_failed=no
AC_MSG_CHECKING([for $1])
AC_MSG_CHECKING([for $2])
_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
_PKG_CONFIG([$1][_LIBS], [libs], [$2])
@ -173,11 +173,11 @@ and $1[]_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.])
if test $pkg_failed = yes; then
AC_MSG_RESULT([no])
AC_MSG_RESULT([no])
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
else
else
$1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
@ -194,7 +194,7 @@ installed software in a non-standard prefix.
_PKG_TEXT])[]dnl
])
elif test $pkg_failed = untried; then
AC_MSG_RESULT([no])
AC_MSG_RESULT([no])
m4_default([$4], [AC_MSG_FAILURE(
[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

View File

@ -1,9 +1,9 @@
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
scriptversion=2012-10-14.11; # UTC
scriptversion=2018-03-07.03; # UTC
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Copyright (C) 1999-2021 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC
# 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, see <http://www.gnu.org/licenses/>.
# along with this program. If not, see <https://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@ -53,7 +53,7 @@ func_file_conv ()
MINGW*)
file_conv=mingw
;;
CYGWIN*)
CYGWIN* | MSYS*)
file_conv=cygwin
;;
*)
@ -67,7 +67,7 @@ func_file_conv ()
mingw/*)
file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
;;
cygwin/*)
cygwin/* | msys/*)
file=`cygpath -m "$file" || echo "$file"`
;;
wine/*)
@ -255,7 +255,8 @@ EOF
echo "compile $scriptversion"
exit $?
;;
cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
func_cl_wrapper "$@" # Doesn't return...
;;
esac
@ -339,10 +340,10 @@ exit $ret
# Local Variables:
# mode: shell-script
# sh-indentation: 2
# eval: (add-hook 'write-file-hooks 'time-stamp)
# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC"
# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
#! /bin/sh

60
app/sessreg/configure vendored
View File

@ -1,8 +1,8 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for sessreg 1.1.2.
# Generated by GNU Autoconf 2.69 for sessreg 1.1.3.
#
# Report bugs to <https://gitlab.freedesktop.org/xorg/app/sessreg/issues>.
# Report bugs to <https://gitlab.freedesktop.org/xorg/app/sessreg/-/issues>.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@ -267,7 +267,7 @@ fi
$as_echo "$0: be upgraded to zsh 4.3.4 or later."
else
$as_echo "$0: Please tell bug-autoconf@gnu.org and
$0: https://gitlab.freedesktop.org/xorg/app/sessreg/issues
$0: https://gitlab.freedesktop.org/xorg/app/sessreg/-/issues
$0: about your system, including any error possibly output
$0: before this message. Then install a modern shell, or
$0: manually run the script under such a shell if you do
@ -581,9 +581,9 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='sessreg'
PACKAGE_TARNAME='sessreg'
PACKAGE_VERSION='1.1.2'
PACKAGE_STRING='sessreg 1.1.2'
PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/app/sessreg/issues'
PACKAGE_VERSION='1.1.3'
PACKAGE_STRING='sessreg 1.1.3'
PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/app/sessreg/-/issues'
PACKAGE_URL=''
ac_unique_file="Makefile.am"
@ -733,6 +733,7 @@ infodir
docdir
oldincludedir
includedir
runstatedir
localstatedir
sharedstatedir
sysconfdir
@ -817,6 +818,7 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@ -1069,6 +1071,15 @@ do
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
-runstatedir | --runstatedir | --runstatedi | --runstated \
| --runstate | --runstat | --runsta | --runst | --runs \
| --run | --ru | --r)
ac_prev=runstatedir ;;
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
| --run=* | --ru=* | --r=*)
runstatedir=$ac_optarg ;;
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@ -1206,7 +1217,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
libdir localedir mandir
libdir localedir mandir runstatedir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
@ -1319,7 +1330,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.1.2 to adapt to many kinds of systems.
\`configure' configures sessreg 1.1.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1359,6 +1370,7 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@ -1389,7 +1401,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of sessreg 1.1.2:";;
short | recursive ) echo "Configuration of sessreg 1.1.3:";;
esac
cat <<\_ACEOF
@ -1444,7 +1456,7 @@ Some influential environment variables:
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
Report bugs to <https://gitlab.freedesktop.org/xorg/app/sessreg/issues>.
Report bugs to <https://gitlab.freedesktop.org/xorg/app/sessreg/-/issues>.
_ACEOF
ac_status=$?
fi
@ -1507,7 +1519,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
sessreg configure 1.1.2
sessreg configure 1.1.3
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@ -1666,9 +1678,9 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
( $as_echo "## --------------------------------------------------------------------- ##
## Report this to https://gitlab.freedesktop.org/xorg/app/sessreg/issues ##
## --------------------------------------------------------------------- ##"
( $as_echo "## ----------------------------------------------------------------------- ##
## Report this to https://gitlab.freedesktop.org/xorg/app/sessreg/-/issues ##
## ----------------------------------------------------------------------- ##"
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@ -2033,7 +2045,7 @@ cat >config.log <<_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.1.2, which was
It was created by sessreg $as_me 1.1.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@ -4373,7 +4385,7 @@ fi
# Define the identity of the package.
PACKAGE='sessreg'
VERSION='1.1.2'
VERSION='1.1.3'
cat >>confdefs.h <<_ACEOF
@ -11160,11 +11172,11 @@ fi
done
# Obtain compiler/linker options for depedencies
# Obtain compiler/linker options for dependencies
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SESSREG" >&5
$as_echo_n "checking for SESSREG... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xproto >= 7.0.25" >&5
$as_echo_n "checking for xproto >= 7.0.25... " >&6; }
if test -n "$SESSREG_CFLAGS"; then
pkg_cv_SESSREG_CFLAGS="$SESSREG_CFLAGS"
@ -11204,7 +11216,7 @@ fi
if test $pkg_failed = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@ -11231,7 +11243,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." "$LINENO" 5
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@ -11793,7 +11805,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by sessreg $as_me 1.1.2, which was
This file was extended by sessreg $as_me 1.1.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -11853,13 +11865,13 @@ $config_headers
Configuration commands:
$config_commands
Report bugs to <https://gitlab.freedesktop.org/xorg/app/sessreg/issues>."
Report bugs to <https://gitlab.freedesktop.org/xorg/app/sessreg/-/issues>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
sessreg config.status 1.1.2
sessreg config.status 1.1.3
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"

View File

@ -22,15 +22,15 @@ dnl Process this file with autoconf to create configure.
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([sessreg], [1.1.2],
[https://gitlab.freedesktop.org/xorg/app/sessreg/issues], [sessreg])
AC_INIT([sessreg], [1.1.3],
[https://gitlab.freedesktop.org/xorg/app/sessreg/-/issues], [sessreg])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
AC_USE_SYSTEM_EXTENSIONS
AC_SYS_LARGEFILE
# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_INIT_AUTOMAKE([foreign dist-xz])
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
@ -66,7 +66,7 @@ AC_CHECK_TYPES([
# Checks for library functions.
AC_CHECK_FUNCS([pututline updwtmpx utmpxname])
# Obtain compiler/linker options for depedencies
# Obtain compiler/linker options for dependencies
PKG_CHECK_MODULES(SESSREG, [xproto >= 7.0.25])
AC_CONFIG_FILES([

View File

@ -226,6 +226,7 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@

View File

@ -201,9 +201,10 @@ sysnerr (int x, const char *s)
static void
safe_strncpy(char *dest, const char *src, size_t n)
{
(void)strncpy(dest, src, n);
if (n > 0)
if (n > 0) {
strncpy(dest, src, n - 1);
dest[n - 1] = '\0';
}
}
int
@ -603,7 +604,7 @@ set_utmpx (struct utmpx *u, const char *line, const char *user,
* compute the slot-number for an X display. This is computed
* by counting the lines in /etc/ttys and adding the line-number
* that the display appears on in Xservers. This is a poor
* design, but is limited by the non-existant interface to utmp.
* design, but is limited by the non-existent interface to utmp.
* If host_name is non-NULL, assume it contains the display name,
* otherwise use the tty_line argument (i.e., the tty name).
*/
@ -658,7 +659,7 @@ Xslot (char *ttys_file, char *servers_file, char *tty_line, char *host_name,
column0 = 1;
}
/*
* display not found in Xservers file - allocate utmp entry dinamically
* display not found in Xservers file - allocate utmp entry dynamically
*/
return findslot (tty_line, host_name, addp, slot);
}