Update to libXau version 1.0.10.
Now uses explicit_bzero() + other bug fixespull/1/head
matthieu
parent
cc6250a176
commit
c7561e97e4
|
|
@ -38,10 +38,14 @@ XauDisposeAuth (Xauth *auth)
|
|||
free (auth->number);
|
||||
free (auth->name);
|
||||
if (auth->data) {
|
||||
#ifdef HAVE_EXPLICIT_BZERO
|
||||
(void) explicit_bzero (auth->data, auth->data_length);
|
||||
#else
|
||||
(void) bzero (auth->data, auth->data_length);
|
||||
#endif
|
||||
(void) free (auth->data);
|
||||
}
|
||||
free ((char *) auth);
|
||||
free (auth);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -56,7 +56,11 @@ read_counted_string (unsigned short *countp, char **stringp, FILE *file)
|
|||
if (!data)
|
||||
return 0;
|
||||
if (fread (data, sizeof (char), len, file) != len) {
|
||||
#ifdef HAVE_EXPLICIT_BZERO
|
||||
explicit_bzero (data, len);
|
||||
#else
|
||||
bzero (data, len);
|
||||
#endif
|
||||
free (data);
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -69,39 +73,44 @@ read_counted_string (unsigned short *countp, char **stringp, FILE *file)
|
|||
Xauth *
|
||||
XauReadAuth (FILE *auth_file)
|
||||
{
|
||||
Xauth local;
|
||||
Xauth local = { 0, 0, NULL, 0, NULL, 0, NULL, 0, NULL };
|
||||
Xauth *ret;
|
||||
|
||||
if (read_short (&local.family, auth_file) == 0)
|
||||
return NULL;
|
||||
if (read_counted_string (&local.address_length, &local.address, auth_file) == 0)
|
||||
return NULL;
|
||||
if (read_counted_string (&local.number_length, &local.number, auth_file) == 0) {
|
||||
free (local.address);
|
||||
return NULL;
|
||||
if (read_short (&local.family, auth_file) == 0) {
|
||||
goto fail;
|
||||
}
|
||||
if (read_counted_string (&local.address_length, &local.address, auth_file)
|
||||
== 0) {
|
||||
goto fail;
|
||||
}
|
||||
if (read_counted_string (&local.number_length, &local.number, auth_file)
|
||||
== 0) {
|
||||
goto fail;
|
||||
}
|
||||
if (read_counted_string (&local.name_length, &local.name, auth_file) == 0) {
|
||||
free (local.address);
|
||||
free (local.number);
|
||||
return NULL;
|
||||
goto fail;
|
||||
}
|
||||
if (read_counted_string (&local.data_length, &local.data, auth_file) == 0) {
|
||||
free (local.address);
|
||||
free (local.number);
|
||||
free (local.name);
|
||||
return NULL;
|
||||
goto fail;
|
||||
}
|
||||
ret = (Xauth *) malloc (sizeof (Xauth));
|
||||
if (!ret) {
|
||||
free (local.address);
|
||||
free (local.number);
|
||||
free (local.name);
|
||||
if (local.data) {
|
||||
bzero (local.data, local.data_length);
|
||||
free (local.data);
|
||||
}
|
||||
return NULL;
|
||||
ret = malloc (sizeof (Xauth));
|
||||
if (ret == NULL) {
|
||||
goto fail;
|
||||
}
|
||||
*ret = local;
|
||||
return ret;
|
||||
|
||||
fail:
|
||||
free (local.address);
|
||||
free (local.number);
|
||||
free (local.name);
|
||||
if (local.data) {
|
||||
#ifdef HAVE_EXPLICIT_BZERO
|
||||
explicit_bzero (local.data, local.data_length);
|
||||
#else
|
||||
bzero (local.data, local.data_length);
|
||||
#endif
|
||||
free (local.data);
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,8 +35,11 @@ int
|
|||
main (int argc, char **argv)
|
||||
{
|
||||
Xauth test_data;
|
||||
char *name = "XAU-TEST-1";
|
||||
char *data = "Do not begin the test until instructed to do so.";
|
||||
char defname[] = "XAU-TEST-1";
|
||||
char defdata[] = "Do not begin the test until instructed to do so.";
|
||||
char empty[] = "";
|
||||
char *name = defname;
|
||||
char *data = defdata;
|
||||
char *file = NULL;
|
||||
int state = 0;
|
||||
FILE *output;
|
||||
|
|
@ -54,9 +57,9 @@ main (int argc, char **argv)
|
|||
}
|
||||
test_data.family = 0;
|
||||
test_data.address_length = 0;
|
||||
test_data.address = "";
|
||||
test_data.address = empty;
|
||||
test_data.number_length = 0;
|
||||
test_data.number = "";
|
||||
test_data.number = empty;
|
||||
test_data.name_length = strlen (name);
|
||||
test_data.name = name;
|
||||
test_data.data_length = strlen (data);
|
||||
|
|
|
|||
|
|
@ -1,3 +1,90 @@
|
|||
commit 4fbefa02d6c842401ff79065d364edd7087a12a6
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Fri Aug 26 16:01:41 2022 -0700
|
||||
|
||||
libXau 1.0.10
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit 83f33926d43f6ae4cf9734e3aedbef23fb0d6b74
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Sun Jul 17 10:06:05 2022 -0700
|
||||
|
||||
XauReadAuth: move failure handling code to a common code block
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit 3db78d0fa60e07a4ffda61a19849ad30623f70cf
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Sat Jul 9 11:00:50 2022 -0700
|
||||
|
||||
Remove unnnecessary casts from malloc() and free() calls
|
||||
|
||||
These are not needed in C89 and later.
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit 7f43a321e59b998e731b36039b744138a2d5b776
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Sat Jul 9 10:54:58 2022 -0700
|
||||
|
||||
Autest.c: Fix -Wdiscarded-qualifiers warnings
|
||||
|
||||
Autest.c: In function ‘main’:
|
||||
Autest.c:38:21: warning: initialization discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
|
||||
38 | char *name = "XAU-TEST-1";
|
||||
| ^~~~~~~~~~~~
|
||||
Autest.c:39:21: warning: initialization discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
|
||||
39 | char *data = "Do not begin the test until instructed to do so.";
|
||||
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
Autest.c:57:23: warning: assignment discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
|
||||
57 | test_data.address = "";
|
||||
| ^
|
||||
Autest.c:59:22: warning: assignment discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
|
||||
59 | test_data.number = "";
|
||||
| ^
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit b98078c15874c12dfd4e01594ef9277897ade1df
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Sat Jul 9 10:50:11 2022 -0700
|
||||
|
||||
Fix spelling/wording issues
|
||||
|
||||
Found by using:
|
||||
codespell --builtin clear,rare,usage,informal,names
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit d824fa5517cf445dc1e204f05ee2098c254f2bdb
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Sat Jul 9 10:48:33 2022 -0700
|
||||
|
||||
Build xz tarballs instead of bzip2
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit 8928883477ff32cbbb97ee0e871324812e3b5c96
|
||||
Author: Tobias Stoeckmann <tobias@stoeckmann.org>
|
||||
Date: Sun Jul 3 11:52:44 2022 +0200
|
||||
|
||||
Use explicit_bzero if available
|
||||
|
||||
Optimizing compilers may remove the bzero call because it is followed
|
||||
by free. The function explicit_bzero avoids this optimization. Use it
|
||||
if it is available.
|
||||
|
||||
Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
|
||||
|
||||
commit 19b13bf20de5b15ab87fb4019ec910ef3216129f
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Sat Jul 9 10:20:45 2022 -0700
|
||||
|
||||
gitlab CI: add a basic build test
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit d9443b2c57b512cfb250b35707378654d86c7dea
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Sun Feb 10 14:42:30 2019 -0800
|
||||
|
|
@ -900,7 +987,7 @@ Date: Sat May 14 07:46:48 2005 +0000
|
|||
source can reference them with <X11/...>.
|
||||
|
||||
commit 56a655e717c5de6d91c890fdc6f9b0469ad1dd1a
|
||||
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
|
||||
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
|
||||
Date: Wed May 11 22:44:53 2005 +0000
|
||||
|
||||
lib/Xau:
|
||||
|
|
@ -918,7 +1005,7 @@ Date: Wed May 11 22:44:53 2005 +0000
|
|||
- New script that adds #include <config.h> to files
|
||||
|
||||
commit 60177d823918d9ef7575da27870796c1285a2032
|
||||
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
|
||||
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
|
||||
Date: Mon May 9 22:04:21 2005 +0000
|
||||
|
||||
Add Xau library to lib/ and symlink.sh
|
||||
|
|
|
|||
|
|
@ -213,9 +213,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$$'
|
||||
|
|
@ -355,6 +355,7 @@ pdfdir = @pdfdir@
|
|||
prefix = @prefix@
|
||||
program_transform_name = @program_transform_name@
|
||||
psdir = @psdir@
|
||||
runstatedir = @runstatedir@
|
||||
sbindir = @sbindir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
srcdir = @srcdir@
|
||||
|
|
@ -905,6 +906,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)
|
||||
|
|
@ -912,7 +914,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)
|
||||
|
|
|
|||
|
|
@ -161,7 +161,7 @@ our implementation, it is always the first in the file.
|
|||
The Family is specified in two bytes to allow out-of-band values
|
||||
(i.e. values not in the Protocol) to be used. In particular,
|
||||
two new values "FamilyLocal" and "FamilyWild" are defined. FamilyLocal
|
||||
refers to any connections using a non-network method of connetion from the
|
||||
refers to any connections using a non-network method of connection from the
|
||||
local machine (Unix domain sockets, shared memory, loopback serial line).
|
||||
In this case the host address is specified by the data returned from
|
||||
gethostname() and better be unique in a collection of machines
|
||||
|
|
|
|||
|
|
@ -8606,9 +8606,9 @@ m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])])
|
|||
m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])])
|
||||
m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
|
||||
|
||||
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
|
||||
|
|
@ -8649,7 +8649,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
|
||||
|
|
@ -8750,7 +8750,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])
|
||||
|
|
@ -8760,11 +8760,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
|
||||
|
|
@ -8781,7 +8781,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
|
||||
|
|
|
|||
|
|
@ -3,6 +3,9 @@
|
|||
/* Define to 1 if you have the <dlfcn.h> header file. */
|
||||
#undef HAVE_DLFCN_H
|
||||
|
||||
/* Define to 1 if you have the `explicit_bzero' function. */
|
||||
#undef HAVE_EXPLICIT_BZERO
|
||||
|
||||
/* Define to 1 if you have the <inttypes.h> header file. */
|
||||
#undef HAVE_INTTYPES_H
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.69 for libXau 1.0.9.
|
||||
# Generated by GNU Autoconf 2.69 for libXau 1.0.10.
|
||||
#
|
||||
# Report bugs to <https://gitlab.freedesktop.org/xorg/lib/libXau/issues>.
|
||||
# Report bugs to <https://gitlab.freedesktop.org/xorg/lib/libxau/-/issues>.
|
||||
#
|
||||
#
|
||||
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
|
||||
|
|
@ -275,7 +275,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/lib/libXau/issues
|
||||
$0: https://gitlab.freedesktop.org/xorg/lib/libxau/-/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
|
||||
|
|
@ -591,9 +591,9 @@ MAKEFLAGS=
|
|||
# Identity of this package.
|
||||
PACKAGE_NAME='libXau'
|
||||
PACKAGE_TARNAME='libXau'
|
||||
PACKAGE_VERSION='1.0.9'
|
||||
PACKAGE_STRING='libXau 1.0.9'
|
||||
PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/lib/libXau/issues'
|
||||
PACKAGE_VERSION='1.0.10'
|
||||
PACKAGE_STRING='libXau 1.0.10'
|
||||
PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/lib/libxau/-/issues'
|
||||
PACKAGE_URL=''
|
||||
|
||||
ac_unique_file="Makefile.am"
|
||||
|
|
@ -765,6 +765,7 @@ infodir
|
|||
docdir
|
||||
oldincludedir
|
||||
includedir
|
||||
runstatedir
|
||||
localstatedir
|
||||
sharedstatedir
|
||||
sysconfdir
|
||||
|
|
@ -857,6 +858,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}'
|
||||
|
|
@ -1109,6 +1111,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=* \
|
||||
|
|
@ -1246,7 +1257,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.
|
||||
|
|
@ -1359,7 +1370,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 libXau 1.0.9 to adapt to many kinds of systems.
|
||||
\`configure' configures libXau 1.0.10 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
|
|
@ -1399,6 +1410,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]
|
||||
|
|
@ -1429,7 +1441,7 @@ fi
|
|||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of libXau 1.0.9:";;
|
||||
short | recursive ) echo "Configuration of libXau 1.0.10:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
|
|
@ -1493,7 +1505,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/lib/libXau/issues>.
|
||||
Report bugs to <https://gitlab.freedesktop.org/xorg/lib/libxau/-/issues>.
|
||||
_ACEOF
|
||||
ac_status=$?
|
||||
fi
|
||||
|
|
@ -1556,7 +1568,7 @@ fi
|
|||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
libXau configure 1.0.9
|
||||
libXau configure 1.0.10
|
||||
generated by GNU Autoconf 2.69
|
||||
|
||||
Copyright (C) 2012 Free Software Foundation, Inc.
|
||||
|
|
@ -1715,9 +1727,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/lib/libXau/issues ##
|
||||
## -------------------------------------------------------------------- ##"
|
||||
( $as_echo "## ---------------------------------------------------------------------- ##
|
||||
## Report this to https://gitlab.freedesktop.org/xorg/lib/libxau/-/issues ##
|
||||
## ---------------------------------------------------------------------- ##"
|
||||
) | sed "s/^/$as_me: WARNING: /" >&2
|
||||
;;
|
||||
esac
|
||||
|
|
@ -1971,7 +1983,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 libXau $as_me 1.0.9, which was
|
||||
It was created by libXau $as_me 1.0.10, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
|
|
@ -4111,7 +4123,7 @@ fi
|
|||
|
||||
# Define the identity of the package.
|
||||
PACKAGE='libXau'
|
||||
VERSION='1.0.9'
|
||||
VERSION='1.0.10'
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
|
|
@ -18034,23 +18046,24 @@ fi
|
|||
|
||||
|
||||
# Checks for library functions.
|
||||
for ac_func in pathconf
|
||||
for ac_func in explicit_bzero pathconf
|
||||
do :
|
||||
ac_fn_c_check_func "$LINENO" "pathconf" "ac_cv_func_pathconf"
|
||||
if test "x$ac_cv_func_pathconf" = xyes; then :
|
||||
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
||||
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
|
||||
if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define HAVE_PATHCONF 1
|
||||
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
|
||||
_ACEOF
|
||||
|
||||
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 XAU" >&5
|
||||
$as_echo_n "checking for XAU... " >&6; }
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xproto" >&5
|
||||
$as_echo_n "checking for xproto... " >&6; }
|
||||
|
||||
if test -n "$XAU_CFLAGS"; then
|
||||
pkg_cv_XAU_CFLAGS="$XAU_CFLAGS"
|
||||
|
|
@ -18090,7 +18103,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
|
||||
|
|
@ -18117,7 +18130,7 @@ Alternatively, you may set the environment variables XAU_CFLAGS
|
|||
and XAU_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;}
|
||||
|
|
@ -18925,7 +18938,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 libXau $as_me 1.0.9, which was
|
||||
This file was extended by libXau $as_me 1.0.10, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
|
|
@ -18985,13 +18998,13 @@ $config_headers
|
|||
Configuration commands:
|
||||
$config_commands
|
||||
|
||||
Report bugs to <https://gitlab.freedesktop.org/xorg/lib/libXau/issues>."
|
||||
Report bugs to <https://gitlab.freedesktop.org/xorg/lib/libxau/-/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="\\
|
||||
libXau config.status 1.0.9
|
||||
libXau config.status 1.0.10
|
||||
configured by $0, generated by GNU Autoconf 2.69,
|
||||
with options \\"\$ac_cs_config\\"
|
||||
|
||||
|
|
|
|||
|
|
@ -22,14 +22,14 @@
|
|||
|
||||
# Initialize Autoconf
|
||||
AC_PREREQ([2.60])
|
||||
AC_INIT([libXau], [1.0.9],
|
||||
[https://gitlab.freedesktop.org/xorg/lib/libXau/issues], [libXau])
|
||||
AC_INIT([libXau], [1.0.10],
|
||||
[https://gitlab.freedesktop.org/xorg/lib/libxau/-/issues], [libXau])
|
||||
AC_CONFIG_SRCDIR([Makefile.am])
|
||||
AC_CONFIG_HEADERS([config.h])
|
||||
AC_USE_SYSTEM_EXTENSIONS
|
||||
|
||||
# Initialize Automake
|
||||
AM_INIT_AUTOMAKE([foreign dist-bzip2])
|
||||
AM_INIT_AUTOMAKE([foreign dist-xz])
|
||||
|
||||
# Initialize libtool
|
||||
AC_LIBTOOL_WIN32_DLL
|
||||
|
|
@ -45,9 +45,9 @@ XORG_DEFAULT_OPTIONS
|
|||
AC_PROG_LN_S
|
||||
|
||||
# Checks for library functions.
|
||||
AC_CHECK_FUNCS([pathconf])
|
||||
AC_CHECK_FUNCS([explicit_bzero pathconf])
|
||||
|
||||
# Obtain compiler/linker options for depedencies
|
||||
# Obtain compiler/linker options for dependencies
|
||||
PKG_CHECK_MODULES(XAU, xproto)
|
||||
|
||||
AC_ARG_ENABLE(xthreads,
|
||||
|
|
|
|||
|
|
@ -141,7 +141,7 @@ _XFUNCPROTOEND
|
|||
/* Return values from XauLockAuth */
|
||||
|
||||
# define LOCK_SUCCESS 0 /* lock succeeded */
|
||||
# define LOCK_ERROR 1 /* lock unexpectely failed, check errno */
|
||||
# define LOCK_ERROR 1 /* lock unexpectedly failed, check errno */
|
||||
# define LOCK_TIMEOUT 2 /* lock failed, timeouts expired */
|
||||
|
||||
#endif /* _XAUTH_STRUCT_ONLY */
|
||||
|
|
|
|||
|
|
@ -267,6 +267,7 @@ pdfdir = @pdfdir@
|
|||
prefix = @prefix@
|
||||
program_transform_name = @program_transform_name@
|
||||
psdir = @psdir@
|
||||
runstatedir = @runstatedir@
|
||||
sbindir = @sbindir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
srcdir = @srcdir@
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
#! /bin/sh
|
||||
# test-driver - basic testsuite driver script.
|
||||
|
||||
scriptversion=2013-07-13.22; # UTC
|
||||
scriptversion=2018-03-07.03; # UTC
|
||||
|
||||
# Copyright (C) 2011-2014 Free Software Foundation, Inc.
|
||||
# Copyright (C) 2011-2021 Free Software Foundation, Inc.
|
||||
#
|
||||
# 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
|
||||
|
|
@ -16,7 +16,7 @@ scriptversion=2013-07-13.22; # 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
|
||||
|
|
@ -42,11 +42,13 @@ print_usage ()
|
|||
{
|
||||
cat <<END
|
||||
Usage:
|
||||
test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
|
||||
[--expect-failure={yes|no}] [--color-tests={yes|no}]
|
||||
[--enable-hard-errors={yes|no}] [--]
|
||||
test-driver --test-name NAME --log-file PATH --trs-file PATH
|
||||
[--expect-failure {yes|no}] [--color-tests {yes|no}]
|
||||
[--enable-hard-errors {yes|no}] [--]
|
||||
TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS]
|
||||
|
||||
The '--test-name', '--log-file' and '--trs-file' options are mandatory.
|
||||
See the GNU Automake documentation for information.
|
||||
END
|
||||
}
|
||||
|
||||
|
|
@ -103,8 +105,11 @@ trap "st=130; $do_exit" 2
|
|||
trap "st=141; $do_exit" 13
|
||||
trap "st=143; $do_exit" 15
|
||||
|
||||
# Test script is run here.
|
||||
"$@" >$log_file 2>&1
|
||||
# Test script is run here. We create the file first, then append to it,
|
||||
# to ameliorate tests themselves also writing to the log file. Our tests
|
||||
# don't, but others can (automake bug#35762).
|
||||
: >"$log_file"
|
||||
"$@" >>"$log_file" 2>&1
|
||||
estatus=$?
|
||||
|
||||
if test $enable_hard_errors = no && test $estatus -eq 99; then
|
||||
|
|
@ -126,7 +131,7 @@ esac
|
|||
# know whether the test passed or failed simply by looking at the '.log'
|
||||
# file, without the need of also peaking into the corresponding '.trs'
|
||||
# file (automake bug#11814).
|
||||
echo "$res $test_name (exit status: $estatus)" >>$log_file
|
||||
echo "$res $test_name (exit status: $estatus)" >>"$log_file"
|
||||
|
||||
# Report outcome to console.
|
||||
echo "${col}${res}${std}: $test_name"
|
||||
|
|
@ -140,9 +145,9 @@ echo ":copy-in-global-log: $gcopy" >> $trs_file
|
|||
# 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:
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ libdir=@libdir@
|
|||
includedir=@includedir@
|
||||
|
||||
Name: Xau
|
||||
Description: X authorization file management libary
|
||||
Description: X authorization file management library
|
||||
Version: @PACKAGE_VERSION@
|
||||
Requires: xproto
|
||||
Cflags: -I${includedir}
|
||||
|
|
|
|||
Loading…
Reference in New Issue