Update to xauth 1.0.9
This commit is contained in:
matthieu
parent
a88567318b
commit
6a61ea14b8
@ -1,3 +1,84 @@
|
||||
commit 0b120e37be8ed44188b3497bf02db48e9cf638bc
|
||||
Author: Dr. Tilmann Bubeck <tilmann@bubecks.de>
|
||||
Date: Wed Apr 2 20:02:00 2014 +0200
|
||||
|
||||
Third version bump to 1.0.9.
|
||||
|
||||
Minor change in README to include 1.0.9 in diff so that release.sh
|
||||
is happy.
|
||||
|
||||
Signed-off-by: Dr. Tilmann Bubeck <tilmann@bubecks.de>
|
||||
|
||||
commit e204395a7ccf403999ffa2515379784b641745d1
|
||||
Author: Dr. Tilmann Bubeck <tilmann@bubecks.de>
|
||||
Date: Wed Apr 2 19:52:43 2014 +0200
|
||||
|
||||
Second version bump to 1.0.9.
|
||||
|
||||
Minor change in README to push the version bump.
|
||||
|
||||
Signed-off-by: Dr. Tilmann Bubeck <tilmann@bubecks.de>
|
||||
|
||||
commit c36e9838294a6042eb7ae61fc476cbc3280aef2d
|
||||
Author: Dr. Tilmann Bubeck <tilmann@bubecks.de>
|
||||
Date: Wed Apr 2 19:44:37 2014 +0200
|
||||
|
||||
Fixed missing EXTRA_DIST in tests. Extended README for releasing.
|
||||
|
||||
The tests/Makefile.am missed the EXTRA_DIST definition which resulted in
|
||||
missing files for the test done with "make check". This was fixed.
|
||||
README was extended to describe howto release a new version of this
|
||||
software and to clarify something from ReleaseHOWTO of x.org.
|
||||
Prepare anything for releasing 1.0.9.
|
||||
|
||||
Signed-off-by: Dr. Tilmann Bubeck <tilmann@bubecks.de>
|
||||
|
||||
commit ce4bfd951160eabdb28f5534c34aa7549dba7fba
|
||||
Author: Dr. Tilmann Bubeck <t.bubeck@reinform.de>
|
||||
Date: Mon Mar 31 23:21:12 2014 +0200
|
||||
|
||||
version bump to 1.0.9
|
||||
|
||||
Prepare for a new version 1.0.9 of xauth.
|
||||
|
||||
Signed-off-by: Dr. Tilmann Bubeck <t.bubeck@reinform.de>
|
||||
|
||||
commit ccf30deb585297823ea03fc68805a1c825e335fe
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Fri Dec 27 11:01:35 2013 -0800
|
||||
|
||||
Add AC_USE_SYSTEM_EXTENSIONS to expose non-standard extensions
|
||||
|
||||
Required on Solaris to expose definitions in system headers that
|
||||
are not defined in the XPG standards now that xtrans 1.3 defines
|
||||
_XOPEN_SOURCE to 600 on Solaris.
|
||||
|
||||
Fixes build failures:
|
||||
gethost.c: In function ‘get_hostname’:
|
||||
gethost.c:97:21: error: ‘INET6_ADDRSTRLEN’ undeclared (first use in this function)
|
||||
gethost.c:97:21: note: each undeclared identifier is reported only once for each function it appears in
|
||||
gethost.c:97:16: warning: unused variable ‘addr’ [-Wunused-variable]
|
||||
gethost.c: In function ‘get_address_info’:
|
||||
gethost.c:196:9: error: implicit declaration of function ‘strlcpy’ [-Werror=implicit-function-declaration]
|
||||
gethost.c:196:9: warning: nested extern declaration of ‘strlcpy’ [-Wnested-externs]
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
|
||||
|
||||
commit afeb2c22ba1f7193acf814954e66f40cfd699c17
|
||||
Author: Dr. Tilmann Bubeck <t.bubeck@reinform.de>
|
||||
Date: Sun Oct 13 21:38:10 2013 +0200
|
||||
|
||||
Fix warning about warn_unused_result triggered by WRITES.
|
||||
|
||||
commit 2eb4ef59d7c27ac7972954d406ad9c2fa8123672
|
||||
Author: Dr. Tilmann Bubeck <t.bubeck@reinform.de>
|
||||
Date: Sun Oct 13 17:57:49 2013 +0200
|
||||
|
||||
* Do not install test_xauth during "make install" as it is
|
||||
only used during "make check".
|
||||
* perror out, if test_xauth does not find "cmdtest".
|
||||
|
||||
commit 4de4a231f3a718d2af0d2b00443c803f8bddfbc5
|
||||
Author: Dr. Tilmann Bubeck <t.bubeck@reinform.de>
|
||||
Date: Wed Oct 9 23:45:15 2013 +0200
|
||||
|
||||
@ -38,3 +38,37 @@ For more information on the git code manager, see:
|
||||
|
||||
http://wiki.x.org/wiki/GitPage
|
||||
|
||||
|
||||
IV. RELEASING
|
||||
|
||||
This section describes how to release a new version of xauth to the
|
||||
public. A detailed description of this process can be found at
|
||||
http://www.x.org/wiki/Development/Documentation/ReleaseHOWTO with a
|
||||
few clarification below.
|
||||
|
||||
For releasing under Fedora make sure, that INSTALL in
|
||||
/usr/share/util-macros/ exists. If not, then please create that
|
||||
file.
|
||||
|
||||
To release a new version of xauth, please follow this steps:
|
||||
|
||||
* git clone git://anongit.freedesktop.org/git/xorg/app/xauth
|
||||
* cd xauth ; ./autogen.sh ; make ; make check
|
||||
* follow ReleaseHowto inside this directory.
|
||||
|
||||
Ignore these errors shown during release.sh:
|
||||
|
||||
/bin/sh: ../.changelog.tmp: Permission denied
|
||||
git directory not found: installing possibly empty changelog.
|
||||
|
||||
cp: cannot create regular file '../.INSTALL.tmp': Permission denied
|
||||
util-macros "pkgdatadir" from xorg-macros.pc not found: installing possibly empty INSTALL.
|
||||
|
||||
V. GARBAGE
|
||||
|
||||
Please ignore this paragraph. It is only used to satisfying
|
||||
release.sh, which wants to see the version number to the last version
|
||||
in the diff, which is 1.0.9 in our case. This paragraph can be
|
||||
deleted on the next release of xauth.
|
||||
|
||||
[eof]
|
||||
|
||||
109
app/xauth/aclocal.m4
vendored
109
app/xauth/aclocal.m4
vendored
@ -1279,7 +1279,7 @@ dnl DEALINGS IN THE SOFTWARE.
|
||||
# See the "minimum version" comment for each macro you use to see what
|
||||
# version you require.
|
||||
m4_defun([XORG_MACROS_VERSION],[
|
||||
m4_define([vers_have], [1.17.1])
|
||||
m4_define([vers_have], [1.19.0])
|
||||
m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.])))
|
||||
m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.])))
|
||||
m4_if(m4_cmp(maj_have, maj_needed), 0,,
|
||||
@ -1329,6 +1329,7 @@ if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then
|
||||
AC_MSG_RESULT([no])
|
||||
else
|
||||
if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then
|
||||
TRADITIONALCPPFLAGS="-traditional"
|
||||
RAWCPPFLAGS="${RAWCPPFLAGS} -traditional"
|
||||
AC_MSG_RESULT([yes])
|
||||
else
|
||||
@ -1337,6 +1338,7 @@ else
|
||||
fi
|
||||
rm -f conftest.$ac_ext
|
||||
AC_SUBST(RAWCPPFLAGS)
|
||||
AC_SUBST(TRADITIONALCPPFLAGS)
|
||||
]) # XORG_PROG_RAWCPP
|
||||
|
||||
# XORG_MANPAGE_SECTIONS()
|
||||
@ -1861,9 +1863,10 @@ AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes])
|
||||
]) # XORG_WITH_ASCIIDOC
|
||||
|
||||
# XORG_WITH_DOXYGEN([MIN-VERSION], [DEFAULT])
|
||||
# --------------------------------
|
||||
# -------------------------------------------
|
||||
# Minimum version: 1.5.0
|
||||
# Minimum version for optional DEFAULT argument: 1.11.0
|
||||
# Minimum version for optional DOT checking: 1.18.0
|
||||
#
|
||||
# Documentation tools are not always available on all platforms and sometimes
|
||||
# not at the appropriate level. This macro enables a module to test for the
|
||||
@ -1883,6 +1886,7 @@ AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes])
|
||||
#
|
||||
AC_DEFUN([XORG_WITH_DOXYGEN],[
|
||||
AC_ARG_VAR([DOXYGEN], [Path to doxygen command])
|
||||
AC_ARG_VAR([DOT], [Path to the dot graphics utility])
|
||||
m4_define([_defopt], m4_default([$2], [auto]))
|
||||
AC_ARG_WITH(doxygen,
|
||||
AS_HELP_STRING([--with-doxygen],
|
||||
@ -1926,6 +1930,20 @@ m4_ifval([$1],
|
||||
AC_MSG_ERROR([doxygen version $doxygen_version found, but $1 needed])
|
||||
fi])
|
||||
fi])
|
||||
|
||||
dnl Check for DOT if we have doxygen. The caller decides if it is mandatory
|
||||
dnl HAVE_DOT is a variable that can be used in your doxygen.in config file:
|
||||
dnl HAVE_DOT = @HAVE_DOT@
|
||||
HAVE_DOT=no
|
||||
if test "x$have_doxygen" = "xyes"; then
|
||||
AC_PATH_PROG([DOT], [dot])
|
||||
if test "x$DOT" != "x"; then
|
||||
HAVE_DOT=yes
|
||||
fi
|
||||
fi
|
||||
|
||||
AC_SUBST([HAVE_DOT])
|
||||
AM_CONDITIONAL([HAVE_DOT], [test "$HAVE_DOT" = "yes"])
|
||||
AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes])
|
||||
]) # XORG_WITH_DOXYGEN
|
||||
|
||||
@ -2108,6 +2126,29 @@ fi])
|
||||
AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = yes])
|
||||
]) # XORG_WITH_FOP
|
||||
|
||||
# XORG_WITH_M4([MIN-VERSION])
|
||||
# ---------------------------
|
||||
# Minimum version: 1.19.0
|
||||
#
|
||||
# This macro attempts to locate an m4 macro processor which supports
|
||||
# -I option and is only useful for modules relying on M4 in order to
|
||||
# expand macros in source code files.
|
||||
#
|
||||
# Interface to module:
|
||||
# M4: returns the path of the m4 program found
|
||||
# returns the path set by the user in the environment
|
||||
#
|
||||
AC_DEFUN([XORG_WITH_M4], [
|
||||
AC_CACHE_CHECK([for m4 that supports -I option], [ac_cv_path_M4],
|
||||
[AC_PATH_PROGS_FEATURE_CHECK([M4], [m4 gm4],
|
||||
[[$ac_path_M4 -I. /dev/null > /dev/null 2>&1 && \
|
||||
ac_cv_path_M4=$ac_path_M4 ac_path_M4_found=:]],
|
||||
[AC_MSG_ERROR([could not find m4 that supports -I option])],
|
||||
[$PATH:/usr/gnu/bin])])
|
||||
|
||||
AC_SUBST([M4], [$ac_cv_path_M4])
|
||||
]) # XORG_WITH_M4
|
||||
|
||||
# XORG_WITH_PS2PDF([DEFAULT])
|
||||
# ----------------
|
||||
# Minimum version: 1.6.0
|
||||
@ -2562,7 +2603,8 @@ AC_ARG_ENABLE(malloc0returnsnull,
|
||||
|
||||
AC_MSG_CHECKING([whether malloc(0) returns NULL])
|
||||
if test "x$MALLOC_ZERO_RETURNS_NULL" = xauto; then
|
||||
AC_RUN_IFELSE([AC_LANG_PROGRAM([
|
||||
AC_CACHE_VAL([xorg_cv_malloc0_returns_null],
|
||||
[AC_RUN_IFELSE([AC_LANG_PROGRAM([
|
||||
#include <stdlib.h>
|
||||
],[
|
||||
char *m0, *r0, *c0, *p;
|
||||
@ -2572,9 +2614,9 @@ if test "x$MALLOC_ZERO_RETURNS_NULL" = xauto; then
|
||||
c0 = calloc(0,10);
|
||||
exit((m0 == 0 || r0 == 0 || c0 == 0) ? 0 : 1);
|
||||
])],
|
||||
[MALLOC_ZERO_RETURNS_NULL=yes],
|
||||
[MALLOC_ZERO_RETURNS_NULL=no],
|
||||
[MALLOC_ZERO_RETURNS_NULL=yes])
|
||||
[xorg_cv_malloc0_returns_null=yes],
|
||||
[xorg_cv_malloc0_returns_null=no])])
|
||||
MALLOC_ZERO_RETURNS_NULL=$xorg_cv_malloc0_returns_null
|
||||
fi
|
||||
AC_MSG_RESULT([$MALLOC_ZERO_RETURNS_NULL])
|
||||
|
||||
@ -2863,7 +2905,7 @@ AC_LANG_CASE(
|
||||
XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-prototypes])
|
||||
XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wnested-externs])
|
||||
XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wbad-function-cast])
|
||||
XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wold-style-definition])
|
||||
XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wold-style-definition], [-fd])
|
||||
XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wdeclaration-after-statement])
|
||||
]
|
||||
)
|
||||
@ -2872,16 +2914,17 @@ AC_LANG_CASE(
|
||||
XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wunused])
|
||||
XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wuninitialized])
|
||||
XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wshadow])
|
||||
XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-qual])
|
||||
XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-noreturn])
|
||||
XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-format-attribute])
|
||||
# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wredundant-decls])
|
||||
XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wlogical-op])
|
||||
|
||||
# These are currently disabled because they are noisy. They will be enabled
|
||||
# in the future once the codebase is sufficiently modernized to silence
|
||||
# them. For now, I don't want them to drown out the other warnings.
|
||||
# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wlogical-op])
|
||||
# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wparentheses])
|
||||
# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-align])
|
||||
# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-qual])
|
||||
|
||||
# Turn some warnings into errors, so we don't accidently get successful builds
|
||||
# when there are problems that should be fixed.
|
||||
@ -3123,12 +3166,12 @@ AC_DEFUN([XTRANS_TCP_FLAGS],[
|
||||
AC_SEARCH_LIBS(socket, [socket])
|
||||
AC_SEARCH_LIBS(gethostbyname, [nsl])
|
||||
if test "$ac_cv_search_socket$ac_cv_search_gethostbyname" = "nono"; then
|
||||
AC_HAVE_LIBRARY([ws2_32])
|
||||
AC_CHECK_LIB([ws2_32],[main])
|
||||
fi
|
||||
|
||||
# Needs to come after above checks for libsocket & libnsl for SVR4 systems
|
||||
AC_ARG_ENABLE(ipv6,
|
||||
AC_HELP_STRING([--enable-ipv6],[Enable IPv6 support]),
|
||||
AS_HELP_STRING([--enable-ipv6],[Enable IPv6 support]),
|
||||
[IPV6CONN=$enableval],
|
||||
[AC_CHECK_FUNC(getaddrinfo,[IPV6CONN=yes],[IPV6CONN=no])])
|
||||
AC_MSG_CHECKING([if IPv6 support should be built])
|
||||
@ -3151,6 +3194,41 @@ AC_DEFUN([XTRANS_TCP_FLAGS],[
|
||||
AC_INCLUDES_DEFAULT
|
||||
#include <sys/socket.h>])
|
||||
|
||||
# XPG4v2/UNIX95 added msg_control - check to see if we need to define
|
||||
# _XOPEN_SOURCE to get it (such as on Solaris)
|
||||
AC_CHECK_MEMBER([struct msghdr.msg_control], [], [],
|
||||
[
|
||||
AC_INCLUDES_DEFAULT
|
||||
#include <sys/socket.h>
|
||||
])
|
||||
# First try for Solaris in C99 compliant mode, which requires XPG6/UNIX03
|
||||
if test "x$ac_cv_member_struct_msghdr_msg_control" = xno; then
|
||||
unset ac_cv_member_struct_msghdr_msg_control
|
||||
AC_MSG_NOTICE([trying again with _XOPEN_SOURCE=600])
|
||||
AC_CHECK_MEMBER([struct msghdr.msg_control],
|
||||
[AC_DEFINE([_XOPEN_SOURCE], [600],
|
||||
[Defined if needed to expose struct msghdr.msg_control])
|
||||
], [], [
|
||||
#define _XOPEN_SOURCE 600
|
||||
AC_INCLUDES_DEFAULT
|
||||
#include <sys/socket.h>
|
||||
])
|
||||
fi
|
||||
# If that didn't work, fall back to XPG5/UNIX98 with C89
|
||||
if test "x$ac_cv_member_struct_msghdr_msg_control" = xno; then
|
||||
unset ac_cv_member_struct_msghdr_msg_control
|
||||
AC_MSG_NOTICE([trying again with _XOPEN_SOURCE=500])
|
||||
AC_CHECK_MEMBER([struct msghdr.msg_control],
|
||||
[AC_DEFINE([_XOPEN_SOURCE], [500],
|
||||
[Defined if needed to expose struct msghdr.msg_control])
|
||||
], [], [
|
||||
#define _XOPEN_SOURCE 500
|
||||
AC_INCLUDES_DEFAULT
|
||||
#include <sys/socket.h>
|
||||
])
|
||||
fi
|
||||
|
||||
|
||||
]) # XTRANS_TCP_FLAGS
|
||||
|
||||
# XTRANS_CONNECTION_FLAGS()
|
||||
@ -3159,13 +3237,12 @@ AC_INCLUDES_DEFAULT
|
||||
# that use Xtrans functions
|
||||
AC_DEFUN([XTRANS_CONNECTION_FLAGS],[
|
||||
AC_REQUIRE([AC_CANONICAL_HOST])
|
||||
AC_REQUIRE([AC_TYPE_SIGNAL])
|
||||
[case $host_os in
|
||||
mingw*) unixdef="no" ;;
|
||||
*) unixdef="yes" ;;
|
||||
esac]
|
||||
AC_ARG_ENABLE(unix-transport,
|
||||
AC_HELP_STRING([--enable-unix-transport],[Enable UNIX domain socket transport]),
|
||||
AS_HELP_STRING([--enable-unix-transport],[Enable UNIX domain socket transport]),
|
||||
[UNIXCONN=$enableval], [UNIXCONN=$unixdef])
|
||||
AC_MSG_CHECKING([if Xtrans should support UNIX socket connections])
|
||||
if test "$UNIXCONN" = "yes"; then
|
||||
@ -3173,7 +3250,7 @@ AC_DEFUN([XTRANS_CONNECTION_FLAGS],[
|
||||
fi
|
||||
AC_MSG_RESULT($UNIXCONN)
|
||||
AC_ARG_ENABLE(tcp-transport,
|
||||
AC_HELP_STRING([--enable-tcp-transport],[Enable TCP socket transport]),
|
||||
AS_HELP_STRING([--enable-tcp-transport],[Enable TCP socket transport]),
|
||||
[TCPCONN=$enableval], [TCPCONN=yes])
|
||||
AC_MSG_CHECKING([if Xtrans should support TCP socket connections])
|
||||
AC_MSG_RESULT($TCPCONN)
|
||||
@ -3186,7 +3263,7 @@ AC_DEFUN([XTRANS_CONNECTION_FLAGS],[
|
||||
*) localdef="no" ;;
|
||||
esac]
|
||||
AC_ARG_ENABLE(local-transport,
|
||||
AC_HELP_STRING([--enable-local-transport],[Enable os-specific local transport]),
|
||||
AS_HELP_STRING([--enable-local-transport],[Enable os-specific local transport]),
|
||||
[LOCALCONN=$enableval], [LOCALCONN=$localdef])
|
||||
AC_MSG_CHECKING([if Xtrans should support os-specific local connections])
|
||||
AC_MSG_RESULT($LOCALCONN)
|
||||
@ -3204,7 +3281,7 @@ AC_DEFUN([XTRANS_CONNECTION_FLAGS],[
|
||||
AC_DEFUN([XTRANS_SECURE_RPC_FLAGS],
|
||||
[AC_REQUIRE([XTRANS_TCP_FLAGS])
|
||||
AC_ARG_ENABLE(secure-rpc,
|
||||
AC_HELP_STRING([--enable-secure-rpc],[Enable Secure RPC]),
|
||||
AS_HELP_STRING([--enable-secure-rpc],[Enable Secure RPC]),
|
||||
[SECURE_RPC=$enableval], [SECURE_RPC="try"])
|
||||
|
||||
if test "x$SECURE_RPC" = "xyes" -o "x$SECURE_RPC" = "xtry" ; then
|
||||
|
||||
@ -78,9 +78,6 @@
|
||||
/* Patch version of this package */
|
||||
#undef PACKAGE_VERSION_PATCHLEVEL
|
||||
|
||||
/* Define as the return type of signal handlers (`int' or `void'). */
|
||||
#undef RETSIGTYPE
|
||||
|
||||
/* Define to 1 if you have the ANSI C header files. */
|
||||
#undef STDC_HEADERS
|
||||
|
||||
@ -90,5 +87,40 @@
|
||||
/* Support UNIX socket connections */
|
||||
#undef UNIXCONN
|
||||
|
||||
/* Enable extensions on AIX 3, Interix. */
|
||||
#ifndef _ALL_SOURCE
|
||||
# undef _ALL_SOURCE
|
||||
#endif
|
||||
/* Enable GNU extensions on systems that have them. */
|
||||
#ifndef _GNU_SOURCE
|
||||
# undef _GNU_SOURCE
|
||||
#endif
|
||||
/* Enable threading extensions on Solaris. */
|
||||
#ifndef _POSIX_PTHREAD_SEMANTICS
|
||||
# undef _POSIX_PTHREAD_SEMANTICS
|
||||
#endif
|
||||
/* Enable extensions on HP NonStop. */
|
||||
#ifndef _TANDEM_SOURCE
|
||||
# undef _TANDEM_SOURCE
|
||||
#endif
|
||||
/* Enable general extensions on Solaris. */
|
||||
#ifndef __EXTENSIONS__
|
||||
# undef __EXTENSIONS__
|
||||
#endif
|
||||
|
||||
|
||||
/* Version number of package */
|
||||
#undef VERSION
|
||||
|
||||
/* Define to 1 if on MINIX. */
|
||||
#undef _MINIX
|
||||
|
||||
/* Define to 2 if the system does not provide POSIX.1 features except with
|
||||
this defined. */
|
||||
#undef _POSIX_1_SOURCE
|
||||
|
||||
/* Define to 1 if you need to in order for `stat' and other things to work. */
|
||||
#undef _POSIX_SOURCE
|
||||
|
||||
/* Defined if needed to expose struct msghdr.msg_control */
|
||||
#undef _XOPEN_SOURCE
|
||||
|
||||
1167
app/xauth/configure
vendored
1167
app/xauth/configure
vendored
File diff suppressed because it is too large
Load Diff
@ -22,7 +22,7 @@ dnl Process this file with autoconf to create configure.
|
||||
|
||||
AC_PREREQ([2.60])
|
||||
AC_INIT([xauth],
|
||||
[1.0.8],
|
||||
[1.0.9],
|
||||
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
|
||||
[xauth])
|
||||
AM_INIT_AUTOMAKE([foreign dist-bzip2])
|
||||
@ -30,6 +30,11 @@ AM_MAINTAINER_MODE
|
||||
|
||||
AC_CONFIG_HEADERS([config.h])
|
||||
|
||||
# Set common system defines for POSIX extensions, such as _GNU_SOURCE
|
||||
# Must be called before any macros that run the compiler (like
|
||||
# AC_PROG_LIBTOOL) to avoid autoconf errors.
|
||||
AC_USE_SYSTEM_EXTENSIONS
|
||||
|
||||
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
|
||||
m4_ifndef([XORG_MACROS_VERSION],
|
||||
[m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
|
||||
|
||||
@ -636,8 +636,9 @@ static const char *xauth_filename = NULL;
|
||||
static volatile Bool dieing = False;
|
||||
|
||||
|
||||
/* poor man's puts(), for under signal handlers */
|
||||
#define WRITES(fd, S) (void)write((fd), (S), strlen((S)))
|
||||
/* poor man's puts(), for under signal handlers,
|
||||
extended to ignore warn_unused_result */
|
||||
#define WRITES(fd, S) {if(write((fd), (S), strlen((S))));}
|
||||
|
||||
/* ARGSUSED */
|
||||
_X_NORETURN
|
||||
|
||||
127
app/xauth/test-driver
Normal file
127
app/xauth/test-driver
Normal file
@ -0,0 +1,127 @@
|
||||
#! /bin/sh
|
||||
# test-driver - basic testsuite driver script.
|
||||
|
||||
scriptversion=2012-06-27.10; # UTC
|
||||
|
||||
# Copyright (C) 2011-2013 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
|
||||
# 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, see <http://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
|
||||
# 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>.
|
||||
|
||||
# Make unconditional expansion of undefined variables an error. This
|
||||
# helps a lot in preventing typo-related bugs.
|
||||
set -u
|
||||
|
||||
usage_error ()
|
||||
{
|
||||
echo "$0: $*" >&2
|
||||
print_usage >&2
|
||||
exit 2
|
||||
}
|
||||
|
||||
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-SCRIPT
|
||||
The '--test-name', '--log-file' and '--trs-file' options are mandatory.
|
||||
END
|
||||
}
|
||||
|
||||
# TODO: better error handling in option parsing (in particular, ensure
|
||||
# TODO: $log_file, $trs_file and $test_name are defined).
|
||||
test_name= # Used for reporting.
|
||||
log_file= # Where to save the output of the test script.
|
||||
trs_file= # Where to save the metadata of the test run.
|
||||
expect_failure=no
|
||||
color_tests=no
|
||||
enable_hard_errors=yes
|
||||
while test $# -gt 0; do
|
||||
case $1 in
|
||||
--help) print_usage; exit $?;;
|
||||
--version) echo "test-driver $scriptversion"; exit $?;;
|
||||
--test-name) test_name=$2; shift;;
|
||||
--log-file) log_file=$2; shift;;
|
||||
--trs-file) trs_file=$2; shift;;
|
||||
--color-tests) color_tests=$2; shift;;
|
||||
--expect-failure) expect_failure=$2; shift;;
|
||||
--enable-hard-errors) enable_hard_errors=$2; shift;;
|
||||
--) shift; break;;
|
||||
-*) usage_error "invalid option: '$1'";;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
|
||||
if test $color_tests = yes; then
|
||||
# Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'.
|
||||
red='[0;31m' # Red.
|
||||
grn='[0;32m' # Green.
|
||||
lgn='[1;32m' # Light green.
|
||||
blu='[1;34m' # Blue.
|
||||
mgn='[0;35m' # Magenta.
|
||||
std='[m' # No color.
|
||||
else
|
||||
red= grn= lgn= blu= mgn= std=
|
||||
fi
|
||||
|
||||
do_exit='rm -f $log_file $trs_file; (exit $st); exit $st'
|
||||
trap "st=129; $do_exit" 1
|
||||
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
|
||||
estatus=$?
|
||||
if test $enable_hard_errors = no && test $estatus -eq 99; then
|
||||
estatus=1
|
||||
fi
|
||||
|
||||
case $estatus:$expect_failure in
|
||||
0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
|
||||
0:*) col=$grn res=PASS recheck=no gcopy=no;;
|
||||
77:*) col=$blu res=SKIP recheck=no gcopy=yes;;
|
||||
99:*) col=$mgn res=ERROR recheck=yes gcopy=yes;;
|
||||
*:yes) col=$lgn res=XFAIL recheck=no gcopy=yes;;
|
||||
*:*) col=$red res=FAIL recheck=yes gcopy=yes;;
|
||||
esac
|
||||
|
||||
# Report outcome to console.
|
||||
echo "${col}${res}${std}: $test_name"
|
||||
|
||||
# Register the test result, and other relevant metadata.
|
||||
echo ":test-result: $res" > $trs_file
|
||||
echo ":global-test-result: $res" >> $trs_file
|
||||
echo ":recheck: $recheck" >> $trs_file
|
||||
echo ":copy-in-global-log: $gcopy" >> $trs_file
|
||||
|
||||
# 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-time-zone: "UTC"
|
||||
# time-stamp-end: "; # UTC"
|
||||
# End:
|
||||
20
app/xauth/tests/010-xauth-add-inet.script
Normal file
20
app/xauth/tests/010-xauth-add-inet.script
Normal file
@ -0,0 +1,20 @@
|
||||
#!/bin/bash
|
||||
|
||||
# setup the test ennvironment inside this shell
|
||||
. setup-sourced
|
||||
|
||||
xauth add examplehost1/unix:0 MIT-MAGIC-COOKIE-1 b90b0fd1cf6a0e7a2c74c00000000001
|
||||
xauth add examplehost2/unix:0 . b90b0fd1cf6a0e7a2c74c00000000002
|
||||
xauth add examplehost3/unix:0 . b90b0fd1cf6a0e7a2c74c00000000003
|
||||
|
||||
xauth list
|
||||
xauth nlist
|
||||
xauth list examplehost1/unix:0
|
||||
xauth nlist examplehost2/unix:0
|
||||
|
||||
xauth remove examplehost1/unix:0
|
||||
xauth list
|
||||
xauth remove examplehost2/unix:0
|
||||
xauth remove examplehost3/unix:0
|
||||
xauth list
|
||||
|
||||
34
app/xauth/tests/010-xauth-add-inet.stdout
Normal file
34
app/xauth/tests/010-xauth-add-inet.stdout
Normal file
@ -0,0 +1,34 @@
|
||||
> xauth add examplehost1/unix:0 MIT-MAGIC-COOKIE-1 b90b0fd1cf6a0e7a2c74c00000000001
|
||||
exits with 0
|
||||
> xauth add examplehost2/unix:0 . b90b0fd1cf6a0e7a2c74c00000000002
|
||||
exits with 0
|
||||
> xauth add examplehost3/unix:0 . b90b0fd1cf6a0e7a2c74c00000000003
|
||||
exits with 0
|
||||
> xauth list
|
||||
examplehost1/unix:0 MIT-MAGIC-COOKIE-1 b90b0fd1cf6a0e7a2c74c00000000001
|
||||
examplehost2/unix:0 MIT-MAGIC-COOKIE-1 b90b0fd1cf6a0e7a2c74c00000000002
|
||||
examplehost3/unix:0 MIT-MAGIC-COOKIE-1 b90b0fd1cf6a0e7a2c74c00000000003
|
||||
exits with 0
|
||||
> xauth nlist
|
||||
0100 000c 6578616d706c65686f737431 0001 30 0012 4d49542d4d414749432d434f4f4b49452d31 0010 b90b0fd1cf6a0e7a2c74c00000000001
|
||||
0100 000c 6578616d706c65686f737432 0001 30 0012 4d49542d4d414749432d434f4f4b49452d31 0010 b90b0fd1cf6a0e7a2c74c00000000002
|
||||
0100 000c 6578616d706c65686f737433 0001 30 0012 4d49542d4d414749432d434f4f4b49452d31 0010 b90b0fd1cf6a0e7a2c74c00000000003
|
||||
exits with 0
|
||||
> xauth list examplehost1/unix:0
|
||||
examplehost1/unix:0 MIT-MAGIC-COOKIE-1 b90b0fd1cf6a0e7a2c74c00000000001
|
||||
exits with 0
|
||||
> xauth nlist examplehost2/unix:0
|
||||
0100 000c 6578616d706c65686f737432 0001 30 0012 4d49542d4d414749432d434f4f4b49452d31 0010 b90b0fd1cf6a0e7a2c74c00000000002
|
||||
exits with 0
|
||||
> xauth remove examplehost1/unix:0
|
||||
exits with 0
|
||||
> xauth list
|
||||
examplehost2/unix:0 MIT-MAGIC-COOKIE-1 b90b0fd1cf6a0e7a2c74c00000000002
|
||||
examplehost3/unix:0 MIT-MAGIC-COOKIE-1 b90b0fd1cf6a0e7a2c74c00000000003
|
||||
exits with 0
|
||||
> xauth remove examplehost2/unix:0
|
||||
exits with 0
|
||||
> xauth remove examplehost3/unix:0
|
||||
exits with 0
|
||||
> xauth list
|
||||
exits with 0
|
||||
22
app/xauth/tests/020-xauth-add-local.script
Normal file
22
app/xauth/tests/020-xauth-add-local.script
Normal file
@ -0,0 +1,22 @@
|
||||
#!/bin/bash
|
||||
|
||||
# setup the test ennvironment inside this shell
|
||||
. setup-sourced
|
||||
|
||||
# Execute the test
|
||||
xauth add unix:0 . b90b0fd1cf6a0e7a2c74c00000000004
|
||||
xauth add 127.0.0.1:1 . b90b0fd1cf6a0e7a2c74c00000000005
|
||||
xauth add :2 . b90b0fd1cf6a0e7a2c74c00000000006
|
||||
xauth add :3.5 . b90b0fd1cf6a0e7a2c74c00000000007
|
||||
xauth add :4 . b90b0fd1cf6a0e7a2c74c00000000004
|
||||
|
||||
# List the number of entries added
|
||||
xauth list | wc -l
|
||||
|
||||
# Try to match them and print cookie
|
||||
xauth list unix:0 | awk '{print $3}'
|
||||
xauth list 127.0.0.1:1 | awk '{print $3}'
|
||||
xauth list 127.0.0.1:2 | awk '{print $3}'
|
||||
xauth list 127.0.0.1:3.6 | awk '{print $3}'
|
||||
xauth list :4 | awk '{print $3}'
|
||||
|
||||
26
app/xauth/tests/020-xauth-add-local.stdout
Normal file
26
app/xauth/tests/020-xauth-add-local.stdout
Normal file
@ -0,0 +1,26 @@
|
||||
> xauth add unix:0 . b90b0fd1cf6a0e7a2c74c00000000004
|
||||
exits with 0
|
||||
> xauth add 127.0.0.1:1 . b90b0fd1cf6a0e7a2c74c00000000005
|
||||
exits with 0
|
||||
> xauth add :2 . b90b0fd1cf6a0e7a2c74c00000000006
|
||||
exits with 0
|
||||
> xauth add :3.5 . b90b0fd1cf6a0e7a2c74c00000000007
|
||||
exits with 0
|
||||
> xauth add :4 . b90b0fd1cf6a0e7a2c74c00000000004
|
||||
exits with 0
|
||||
7
|
||||
list
|
||||
b90b0fd1cf6a0e7a2c74c00000000004
|
||||
0
|
||||
list
|
||||
b90b0fd1cf6a0e7a2c74c00000000005
|
||||
0
|
||||
list
|
||||
b90b0fd1cf6a0e7a2c74c00000000006
|
||||
0
|
||||
list
|
||||
b90b0fd1cf6a0e7a2c74c00000000007
|
||||
0
|
||||
list
|
||||
b90b0fd1cf6a0e7a2c74c00000000004
|
||||
0
|
||||
26
app/xauth/tests/030-xauth-extract.script
Normal file
26
app/xauth/tests/030-xauth-extract.script
Normal file
@ -0,0 +1,26 @@
|
||||
#!/bin/bash
|
||||
|
||||
# setup the test ennvironment inside this shell
|
||||
. setup-sourced
|
||||
|
||||
# Execute the test
|
||||
xauth add examplehost1/unix:0 . b90b0fd1cf6a0e7a2c74c00000000001
|
||||
xauth add examplehost2/unix:0 . b90b0fd1cf6a0e7a2c74c00000000002
|
||||
xauth add examplehost3/unix:0 . b90b0fd1cf6a0e7a2c74c00000000003
|
||||
|
||||
# Use xauth_silent because otherwise the system dependant pathes are printed
|
||||
XAUTHORITY2=$DATADIR/.Xauthority2
|
||||
xauth_silent extract $XAUTHORITY2 examplehost2/unix:0
|
||||
xauth_silent -f $XAUTHORITY2 list
|
||||
|
||||
XAUTHORITY3=$DATADIR/.Xauthority3
|
||||
xauth_silent extract $XAUTHORITY3 examplehost3/unix:0
|
||||
xauth_silent -f $XAUTHORITY3 list
|
||||
|
||||
rm $XAUTHORITY ; touch $XAUTHORITY
|
||||
xauth_silent merge $XAUTHORITY2 $XAUTHORITY3
|
||||
xauth list
|
||||
|
||||
|
||||
|
||||
|
||||
22
app/xauth/tests/030-xauth-extract.stdout
Normal file
22
app/xauth/tests/030-xauth-extract.stdout
Normal file
@ -0,0 +1,22 @@
|
||||
> xauth add examplehost1/unix:0 . b90b0fd1cf6a0e7a2c74c00000000001
|
||||
exits with 0
|
||||
> xauth add examplehost2/unix:0 . b90b0fd1cf6a0e7a2c74c00000000002
|
||||
exits with 0
|
||||
> xauth add examplehost3/unix:0 . b90b0fd1cf6a0e7a2c74c00000000003
|
||||
exits with 0
|
||||
> xauth some silent commands which should not be logged...
|
||||
exits with 0
|
||||
> xauth some silent commands which should not be logged...
|
||||
examplehost2/unix:0 MIT-MAGIC-COOKIE-1 b90b0fd1cf6a0e7a2c74c00000000002
|
||||
exits with 0
|
||||
> xauth some silent commands which should not be logged...
|
||||
exits with 0
|
||||
> xauth some silent commands which should not be logged...
|
||||
examplehost3/unix:0 MIT-MAGIC-COOKIE-1 b90b0fd1cf6a0e7a2c74c00000000003
|
||||
exits with 0
|
||||
> xauth some silent commands which should not be logged...
|
||||
exits with 0
|
||||
> xauth list
|
||||
examplehost2/unix:0 MIT-MAGIC-COOKIE-1 b90b0fd1cf6a0e7a2c74c00000000002
|
||||
examplehost3/unix:0 MIT-MAGIC-COOKIE-1 b90b0fd1cf6a0e7a2c74c00000000003
|
||||
exits with 0
|
||||
10
app/xauth/tests/040-xauth-source.script
Normal file
10
app/xauth/tests/040-xauth-source.script
Normal file
@ -0,0 +1,10 @@
|
||||
#!/bin/bash
|
||||
|
||||
# setup the test ennvironment inside this shell
|
||||
. setup-sourced
|
||||
|
||||
# Execute the test
|
||||
CMDFILE=$DATADIR/xauth-cmdfile
|
||||
echo add examplehost1/unix:0 . b90b0fd1cf6a0e7a2c74c00000000001 > $CMDFILE
|
||||
xauth_silent source $CMDFILE
|
||||
xauth list
|
||||
5
app/xauth/tests/040-xauth-source.stdout
Normal file
5
app/xauth/tests/040-xauth-source.stdout
Normal file
@ -0,0 +1,5 @@
|
||||
> xauth some silent commands which should not be logged...
|
||||
exits with 0
|
||||
> xauth list
|
||||
examplehost1/unix:0 MIT-MAGIC-COOKIE-1 b90b0fd1cf6a0e7a2c74c00000000001
|
||||
exits with 0
|
||||
17
app/xauth/tests/090-xauth-bad-usage.script
Normal file
17
app/xauth/tests/090-xauth-bad-usage.script
Normal file
@ -0,0 +1,17 @@
|
||||
#!/bin/bash
|
||||
|
||||
# setup the test ennvironment inside this shell
|
||||
. setup-sourced
|
||||
|
||||
# Execute the test
|
||||
|
||||
# The following displays are bad:
|
||||
xauth add bad4/unix:0 . b90b0fd1cf6a0e7a2c74c0000000002
|
||||
xauth add bad4/unix:0 . ThisIsNotHex0e7a2c74c00000000011
|
||||
xauth add bad4/unxi:0 . b90b0fd1cf6a0e7a2c74c00000000021
|
||||
xauth add bad5/unix: . b90b0fd1cf6a0e7a2c74c00000000022
|
||||
xauth add bad6/something/unix:0 . b90b0fd1cf6a0e7a2c74c00000000023
|
||||
xauth add bad7/unix . b90b0fd1cf6a0e7a2c74c00000000024
|
||||
xauth add bad8 . b90b0fd1cf6a0e7a2c74c00000000025
|
||||
xauth add 127.0.0.:0 . b90b0fd1cf6a0e7a2c74c00000000026
|
||||
|
||||
8
app/xauth/tests/090-xauth-bad-usage.stderr
Normal file
8
app/xauth/tests/090-xauth-bad-usage.stderr
Normal file
@ -0,0 +1,8 @@
|
||||
../xauth: (argv):1: key contains odd number of or non-hex characters
|
||||
../xauth: (argv):1: key contains odd number of or non-hex characters
|
||||
../xauth: (argv):1: bad display name "bad4/unxi:0" in "add" command
|
||||
../xauth: (argv):1: bad display name "bad5/unix:" in "add" command
|
||||
../xauth: (argv):1: bad display name "bad6/something/unix:0" in "add" command
|
||||
../xauth: (argv):1: bad display name "bad7/unix" in "add" command
|
||||
../xauth: (argv):1: bad display name "bad8" in "add" command
|
||||
../xauth: (argv):1: bad display name "127.0.0.:0" in "add" command
|
||||
16
app/xauth/tests/090-xauth-bad-usage.stdout
Normal file
16
app/xauth/tests/090-xauth-bad-usage.stdout
Normal file
@ -0,0 +1,16 @@
|
||||
> xauth add bad4/unix:0 . b90b0fd1cf6a0e7a2c74c0000000002
|
||||
exits with 1
|
||||
> xauth add bad4/unix:0 . ThisIsNotHex0e7a2c74c00000000011
|
||||
exits with 1
|
||||
> xauth add bad4/unxi:0 . b90b0fd1cf6a0e7a2c74c00000000021
|
||||
exits with 1
|
||||
> xauth add bad5/unix: . b90b0fd1cf6a0e7a2c74c00000000022
|
||||
exits with 1
|
||||
> xauth add bad6/something/unix:0 . b90b0fd1cf6a0e7a2c74c00000000023
|
||||
exits with 1
|
||||
> xauth add bad7/unix . b90b0fd1cf6a0e7a2c74c00000000024
|
||||
exits with 1
|
||||
> xauth add bad8 . b90b0fd1cf6a0e7a2c74c00000000025
|
||||
exits with 1
|
||||
> xauth add 127.0.0.:0 . b90b0fd1cf6a0e7a2c74c00000000026
|
||||
exits with 1
|
||||
@ -1,7 +1,14 @@
|
||||
## Process this file with automake to produce Makefile.in
|
||||
|
||||
EXTRA_DIST = setup-sourced \
|
||||
010-xauth-add-inet.script 010-xauth-add-inet.stdout \
|
||||
020-xauth-add-local.script 020-xauth-add-local.stdout \
|
||||
030-xauth-extract.script 030-xauth-extract.stdout \
|
||||
040-xauth-source.script 040-xauth-source.stdout \
|
||||
090-xauth-bad-usage.script 090-xauth-bad-usage.stderr 090-xauth-bad-usage.stdout
|
||||
|
||||
TESTS = test_xauth
|
||||
bin_PROGRAMS = test_xauth
|
||||
check_PROGRAMS = test_xauth
|
||||
test_xauth_SOURCES = test_xauth.c
|
||||
|
||||
|
||||
|
||||
@ -13,7 +13,6 @@
|
||||
# PARTICULAR PURPOSE.
|
||||
|
||||
@SET_MAKE@
|
||||
|
||||
VPATH = @srcdir@
|
||||
am__make_dryrun = \
|
||||
{ \
|
||||
@ -51,7 +50,7 @@ POST_UNINSTALL = :
|
||||
build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
TESTS = test_xauth$(EXEEXT)
|
||||
bin_PROGRAMS = test_xauth$(EXEEXT)
|
||||
check_PROGRAMS = test_xauth$(EXEEXT)
|
||||
subdir = tests
|
||||
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
|
||||
$(top_srcdir)/depcomp
|
||||
@ -63,8 +62,6 @@ mkinstalldirs = $(install_sh) -d
|
||||
CONFIG_HEADER = $(top_builddir)/config.h
|
||||
CONFIG_CLEAN_FILES =
|
||||
CONFIG_CLEAN_VPATH_FILES =
|
||||
am__installdirs = "$(DESTDIR)$(bindir)"
|
||||
PROGRAMS = $(bin_PROGRAMS)
|
||||
am_test_xauth_OBJECTS = test_xauth.$(OBJEXT)
|
||||
test_xauth_OBJECTS = $(am_test_xauth_OBJECTS)
|
||||
test_xauth_LDADD = $(LDADD)
|
||||
@ -233,6 +230,13 @@ target_alias = @target_alias@
|
||||
top_build_prefix = @top_build_prefix@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
EXTRA_DIST = setup-sourced \
|
||||
010-xauth-add-inet.script 010-xauth-add-inet.stdout \
|
||||
020-xauth-add-local.script 020-xauth-add-local.stdout \
|
||||
030-xauth-extract.script 030-xauth-extract.stdout \
|
||||
040-xauth-source.script 040-xauth-source.stdout \
|
||||
090-xauth-bad-usage.script 090-xauth-bad-usage.stderr 090-xauth-bad-usage.stdout
|
||||
|
||||
test_xauth_SOURCES = test_xauth.c
|
||||
all: all-am
|
||||
|
||||
@ -268,46 +272,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
|
||||
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
|
||||
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
||||
$(am__aclocal_m4_deps):
|
||||
install-binPROGRAMS: $(bin_PROGRAMS)
|
||||
@$(NORMAL_INSTALL)
|
||||
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
|
||||
if test -n "$$list"; then \
|
||||
echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
|
||||
$(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
|
||||
fi; \
|
||||
for p in $$list; do echo "$$p $$p"; done | \
|
||||
sed 's/$(EXEEXT)$$//' | \
|
||||
while read p p1; do if test -f $$p; \
|
||||
then echo "$$p"; echo "$$p"; else :; fi; \
|
||||
done | \
|
||||
sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
|
||||
-e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
|
||||
sed 'N;N;N;s,\n, ,g' | \
|
||||
$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
|
||||
{ d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
|
||||
if ($$2 == $$4) files[d] = files[d] " " $$1; \
|
||||
else { print "f", $$3 "/" $$4, $$1; } } \
|
||||
END { for (d in files) print "f", d, files[d] }' | \
|
||||
while read type dir files; do \
|
||||
if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
|
||||
test -z "$$files" || { \
|
||||
echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
|
||||
$(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
|
||||
} \
|
||||
; done
|
||||
|
||||
uninstall-binPROGRAMS:
|
||||
@$(NORMAL_UNINSTALL)
|
||||
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
|
||||
files=`for p in $$list; do echo "$$p"; done | \
|
||||
sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
|
||||
-e 's/$$/$(EXEEXT)/' `; \
|
||||
test -n "$$list" || exit 0; \
|
||||
echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
|
||||
cd "$(DESTDIR)$(bindir)" && rm -f $$files
|
||||
|
||||
clean-binPROGRAMS:
|
||||
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
|
||||
clean-checkPROGRAMS:
|
||||
-test -z "$(check_PROGRAMS)" || rm -f $(check_PROGRAMS)
|
||||
test_xauth$(EXEEXT): $(test_xauth_OBJECTS) $(test_xauth_DEPENDENCIES) $(EXTRA_test_xauth_DEPENDENCIES)
|
||||
@rm -f test_xauth$(EXEEXT)
|
||||
$(AM_V_CCLD)$(LINK) $(test_xauth_OBJECTS) $(test_xauth_LDADD) $(LIBS)
|
||||
@ -524,13 +491,11 @@ distdir: $(DISTFILES)
|
||||
fi; \
|
||||
done
|
||||
check-am: all-am
|
||||
$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
|
||||
$(MAKE) $(AM_MAKEFLAGS) check-TESTS
|
||||
check: check-am
|
||||
all-am: Makefile $(PROGRAMS)
|
||||
all-am: Makefile
|
||||
installdirs:
|
||||
for dir in "$(DESTDIR)$(bindir)"; do \
|
||||
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
|
||||
done
|
||||
install: install-am
|
||||
install-exec: install-exec-am
|
||||
install-data: install-data-am
|
||||
@ -563,7 +528,7 @@ maintainer-clean-generic:
|
||||
@echo "it deletes files that may require special tools to rebuild."
|
||||
clean: clean-am
|
||||
|
||||
clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
|
||||
clean-am: clean-checkPROGRAMS clean-generic mostlyclean-am
|
||||
|
||||
distclean: distclean-am
|
||||
-rm -rf ./$(DEPDIR)
|
||||
@ -589,7 +554,7 @@ install-dvi: install-dvi-am
|
||||
|
||||
install-dvi-am:
|
||||
|
||||
install-exec-am: install-binPROGRAMS
|
||||
install-exec-am:
|
||||
|
||||
install-html: install-html-am
|
||||
|
||||
@ -628,22 +593,22 @@ ps: ps-am
|
||||
|
||||
ps-am:
|
||||
|
||||
uninstall-am: uninstall-binPROGRAMS
|
||||
uninstall-am:
|
||||
|
||||
.MAKE: check-am install-am install-strip
|
||||
|
||||
.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
|
||||
clean-binPROGRAMS clean-generic cscopelist ctags distclean \
|
||||
clean-checkPROGRAMS clean-generic cscopelist ctags distclean \
|
||||
distclean-compile distclean-generic distclean-tags distdir dvi \
|
||||
dvi-am html html-am info info-am install install-am \
|
||||
install-binPROGRAMS install-data install-data-am install-dvi \
|
||||
install-dvi-am install-exec install-exec-am install-html \
|
||||
install-html-am install-info install-info-am install-man \
|
||||
install-pdf install-pdf-am install-ps install-ps-am \
|
||||
install-strip installcheck installcheck-am installdirs \
|
||||
maintainer-clean maintainer-clean-generic mostlyclean \
|
||||
mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
|
||||
tags uninstall uninstall-am uninstall-binPROGRAMS
|
||||
install-data install-data-am install-dvi install-dvi-am \
|
||||
install-exec install-exec-am install-html install-html-am \
|
||||
install-info install-info-am install-man install-pdf \
|
||||
install-pdf-am install-ps install-ps-am install-strip \
|
||||
installcheck installcheck-am installdirs maintainer-clean \
|
||||
maintainer-clean-generic mostlyclean mostlyclean-compile \
|
||||
mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
|
||||
uninstall-am
|
||||
|
||||
|
||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||
|
||||
26
app/xauth/tests/setup-sourced
Normal file
26
app/xauth/tests/setup-sourced
Normal file
@ -0,0 +1,26 @@
|
||||
#
|
||||
# This script gets sourced by every test to setup a common environment.
|
||||
#
|
||||
|
||||
# Force all output to be standard english
|
||||
export LANG=C
|
||||
|
||||
# Define the name of the authority file, which we use during test.
|
||||
export XAUTHORITY=${DATADIR:-/tmp}/.Xauthority
|
||||
|
||||
# Start a new authority file
|
||||
rm -f $XAUTHORITY ; touch $XAUTHORITY
|
||||
|
||||
function xauth()
|
||||
{
|
||||
echo "> xauth" "$@"
|
||||
../xauth "$@"
|
||||
echo " exits with $?"
|
||||
}
|
||||
|
||||
function xauth_silent()
|
||||
{
|
||||
echo "> xauth" "some silent commands which should not be logged..."
|
||||
../xauth "$@"
|
||||
echo " exits with $?"
|
||||
}
|
||||
@ -1,6 +1,10 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
execlp("cmdtest", "cmdtest", ".", NULL);
|
||||
perror("Unable to execute 'cmdtest'. Make sure, that it is installed");
|
||||
exit(1);
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user