Update to libXau 1.0.5
This commit is contained in:
matthieu
parent
731fd0ecd0
commit
a9500da24b
@ -90,14 +90,28 @@ long dead)
|
||||
(void) close (creat_fd);
|
||||
}
|
||||
if (creat_fd != -1) {
|
||||
if (link (creat_name, link_name) != -1)
|
||||
return LOCK_SUCCESS;
|
||||
if (errno == ENOENT) {
|
||||
creat_fd = -1; /* force re-creat next time around */
|
||||
continue;
|
||||
}
|
||||
if (errno != EEXIST)
|
||||
return LOCK_ERROR;
|
||||
#ifndef X_NOT_POSIX
|
||||
/* The file system may not support hard links, and pathconf should tell us that. */
|
||||
if (1 == pathconf(creat_name, _PC_LINK_MAX)) {
|
||||
if (-1 == rename(creat_name, link_name)) {
|
||||
/* Is this good enough? Perhaps we should retry. TEST */
|
||||
return LOCK_ERROR;
|
||||
} else {
|
||||
return LOCK_SUCCESS;
|
||||
}
|
||||
} else {
|
||||
#endif
|
||||
if (link (creat_name, link_name) != -1)
|
||||
return LOCK_SUCCESS;
|
||||
if (errno == ENOENT) {
|
||||
creat_fd = -1; /* force re-creat next time around */
|
||||
continue;
|
||||
}
|
||||
if (errno != EEXIST)
|
||||
return LOCK_ERROR;
|
||||
#ifndef X_NOT_POSIX
|
||||
}
|
||||
#endif
|
||||
}
|
||||
(void) sleep ((unsigned) timeout);
|
||||
--retries;
|
||||
|
||||
@ -1,3 +1,48 @@
|
||||
commit 825435514bd91d0d903247c46249a87d6fe8ae09
|
||||
Author: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Date: Fri Aug 28 14:34:32 2009 +1000
|
||||
|
||||
libXau 1.0.5
|
||||
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
|
||||
commit fc54a4f03b926dfdb590b112c7128516ffc25539
|
||||
Author: Jeremy Huddleston <jeremy@yuffie.local>
|
||||
Date: Sun Feb 22 11:14:04 2009 -0800
|
||||
|
||||
Make file locking more robust for network shares like AFP
|
||||
|
||||
commit 742ff03dcad4d16ca8901ed47be91b303523a385
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Fri Feb 6 11:35:40 2009 -0800
|
||||
|
||||
Restore FamilyKrb5Principal definition
|
||||
|
||||
Even if Kerberos5 support is currently unimplemented in the X server &
|
||||
libXau, the Family id for the X11 protocol is still defined and reserved
|
||||
for Kerberos5, and should be recorded here for interoperability with
|
||||
other implementations and to avoid reuse if someone adds a new
|
||||
authentication family in the future.
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
|
||||
commit c147fb417582e7384b5464bb53cfd492f9d7c69d
|
||||
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
|
||||
Date: Mon Feb 2 16:54:20 2009 -0200
|
||||
|
||||
Remove old api kerberos.
|
||||
|
||||
LibXau uses a 1993 kerberos api, but the X Server side support has
|
||||
been already removed for quite some time.
|
||||
This corrects bug report
|
||||
https://bugs.freedesktop.org/show_bug.cgi?id=14684
|
||||
|
||||
commit 11fbe620625520668f5e88e4f5a8fe149a7cfa3f
|
||||
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
|
||||
Date: Thu Jan 29 15:08:23 2009 -0200
|
||||
|
||||
Janitor: Correct make distcheck and remove extra .gitignore file.
|
||||
|
||||
commit 7f6275300243fd15ce974d1b5e478b47f7758485
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Tue Aug 26 14:19:19 2008 -0700
|
||||
|
||||
@ -18,10 +18,6 @@ libXau_la_SOURCES = \
|
||||
AuUnlock.c \
|
||||
AuWrite.c
|
||||
|
||||
if KERBEROS
|
||||
libXau_la_SOURCES +=k5encode.c
|
||||
endif KERBEROS
|
||||
|
||||
xauincludedir=$(includedir)/X11
|
||||
|
||||
xauinclude_HEADERS = include/X11/Xauth.h
|
||||
@ -87,6 +83,6 @@ Xau.$(LIB_MAN_SUFFIX): $(srcdir)/Xau.man
|
||||
.PHONY: ChangeLog
|
||||
|
||||
ChangeLog:
|
||||
(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
|
||||
$(CHANGELOG_CMD)
|
||||
|
||||
dist-hook: ChangeLog
|
||||
|
||||
@ -38,7 +38,6 @@ PRE_UNINSTALL = :
|
||||
POST_UNINSTALL = :
|
||||
build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
@KERBEROS_TRUE@am__append_1 = k5encode.c
|
||||
check_PROGRAMS = Autest$(EXEEXT)
|
||||
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
|
||||
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
|
||||
@ -68,12 +67,8 @@ libLTLIBRARIES_INSTALL = $(INSTALL)
|
||||
LTLIBRARIES = $(lib_LTLIBRARIES)
|
||||
am__DEPENDENCIES_1 =
|
||||
libXau_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
|
||||
am__libXau_la_SOURCES_DIST = AuDispose.c AuFileName.c AuGetAddr.c \
|
||||
AuGetBest.c AuLock.c AuRead.c AuUnlock.c AuWrite.c k5encode.c
|
||||
@KERBEROS_TRUE@am__objects_1 = k5encode.lo
|
||||
am_libXau_la_OBJECTS = AuDispose.lo AuFileName.lo AuGetAddr.lo \
|
||||
AuGetBest.lo AuLock.lo AuRead.lo AuUnlock.lo AuWrite.lo \
|
||||
$(am__objects_1)
|
||||
AuGetBest.lo AuLock.lo AuRead.lo AuUnlock.lo AuWrite.lo
|
||||
libXau_la_OBJECTS = $(am_libXau_la_OBJECTS)
|
||||
am_Autest_OBJECTS = Autest.$(OBJEXT)
|
||||
Autest_OBJECTS = $(am_Autest_OBJECTS)
|
||||
@ -90,7 +85,7 @@ CCLD = $(CC)
|
||||
LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
|
||||
$(AM_LDFLAGS) $(LDFLAGS) -o $@
|
||||
SOURCES = $(libXau_la_SOURCES) $(Autest_SOURCES)
|
||||
DIST_SOURCES = $(am__libXau_la_SOURCES_DIST) $(Autest_SOURCES)
|
||||
DIST_SOURCES = $(libXau_la_SOURCES) $(Autest_SOURCES)
|
||||
libmanDATA_INSTALL = $(INSTALL_DATA)
|
||||
lintlibDATA_INSTALL = $(INSTALL_DATA)
|
||||
pkgconfigDATA_INSTALL = $(INSTALL_DATA)
|
||||
@ -109,7 +104,6 @@ am__remove_distdir = \
|
||||
DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
|
||||
GZIP_ENV = --best
|
||||
distuninstallcheck_listfiles = find . -type f -print
|
||||
distcleancheck_listfiles = find . -type f -print
|
||||
ACLOCAL = @ACLOCAL@
|
||||
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
|
||||
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
|
||||
@ -127,8 +121,10 @@ AWK = @AWK@
|
||||
CC = @CC@
|
||||
CCDEPMODE = @CCDEPMODE@
|
||||
CFLAGS = @CFLAGS@
|
||||
CHANGELOG_CMD = @CHANGELOG_CMD@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CWARNFLAGS = @CWARNFLAGS@
|
||||
CXX = @CXX@
|
||||
CXXCPP = @CXXCPP@
|
||||
CXXDEPMODE = @CXXDEPMODE@
|
||||
@ -150,12 +146,11 @@ F77 = @F77@
|
||||
FFLAGS = @FFLAGS@
|
||||
FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||
GREP = @GREP@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
||||
KERBEROS_FALSE = @KERBEROS_FALSE@
|
||||
KERBEROS_TRUE = @KERBEROS_TRUE@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
LIBOBJS = @LIBOBJS@
|
||||
LIBS = @LIBS@
|
||||
@ -196,18 +191,9 @@ STRIP = @STRIP@
|
||||
VERSION = @VERSION@
|
||||
XAU_CFLAGS = @XAU_CFLAGS@
|
||||
XAU_LIBS = @XAU_LIBS@
|
||||
ac_ct_AR = @ac_ct_AR@
|
||||
ac_ct_AS = @ac_ct_AS@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
ac_ct_CXX = @ac_ct_CXX@
|
||||
ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
|
||||
ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
|
||||
ac_ct_F77 = @ac_ct_F77@
|
||||
ac_ct_NMEDIT = @ac_ct_NMEDIT@
|
||||
ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
|
||||
ac_ct_RANLIB = @ac_ct_RANLIB@
|
||||
ac_ct_STRIP = @ac_ct_STRIP@
|
||||
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
|
||||
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
|
||||
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
|
||||
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
|
||||
@ -224,23 +210,31 @@ build_cpu = @build_cpu@
|
||||
build_os = @build_os@
|
||||
build_vendor = @build_vendor@
|
||||
datadir = @datadir@
|
||||
datarootdir = @datarootdir@
|
||||
distcleancheck_listfiles = @distcleancheck_listfiles@
|
||||
docdir = @docdir@
|
||||
dvidir = @dvidir@
|
||||
exec_prefix = @exec_prefix@
|
||||
host = @host@
|
||||
host_alias = @host_alias@
|
||||
host_cpu = @host_cpu@
|
||||
host_os = @host_os@
|
||||
host_vendor = @host_vendor@
|
||||
htmldir = @htmldir@
|
||||
includedir = @includedir@
|
||||
infodir = @infodir@
|
||||
install_sh = @install_sh@
|
||||
libdir = @libdir@
|
||||
libexecdir = @libexecdir@
|
||||
localedir = @localedir@
|
||||
localstatedir = @localstatedir@
|
||||
mandir = @mandir@
|
||||
mkdir_p = @mkdir_p@
|
||||
oldincludedir = @oldincludedir@
|
||||
pdfdir = @pdfdir@
|
||||
prefix = @prefix@
|
||||
program_transform_name = @program_transform_name@
|
||||
psdir = @psdir@
|
||||
sbindir = @sbindir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
sysconfdir = @sysconfdir@
|
||||
@ -250,8 +244,16 @@ AM_CFLAGS = $(XAU_CFLAGS)
|
||||
INCLUDES = -I${top_srcdir}/include
|
||||
libXau_la_LDFLAGS = -version-number 6:0:0 -no-undefined
|
||||
libXau_la_LIBADD = $(XAU_LIBS)
|
||||
libXau_la_SOURCES = AuDispose.c AuFileName.c AuGetAddr.c AuGetBest.c \
|
||||
AuLock.c AuRead.c AuUnlock.c AuWrite.c $(am__append_1)
|
||||
libXau_la_SOURCES = \
|
||||
AuDispose.c \
|
||||
AuFileName.c \
|
||||
AuGetAddr.c \
|
||||
AuGetBest.c \
|
||||
AuLock.c \
|
||||
AuRead.c \
|
||||
AuUnlock.c \
|
||||
AuWrite.c
|
||||
|
||||
xauincludedir = $(includedir)/X11
|
||||
xauinclude_HEADERS = include/X11/Xauth.h
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
@ -398,7 +400,6 @@ distclean-compile:
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AuUnlock.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AuWrite.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Autest.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/k5encode.Plo@am__quote@
|
||||
|
||||
.c.o:
|
||||
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
|
||||
@ -879,7 +880,7 @@ Xau.$(LIB_MAN_SUFFIX): $(srcdir)/Xau.man
|
||||
.PHONY: ChangeLog
|
||||
|
||||
ChangeLog:
|
||||
(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
|
||||
$(CHANGELOG_CMD)
|
||||
|
||||
dist-hook: ChangeLog
|
||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||
|
||||
@ -39,9 +39,7 @@ This scheme involves changes to the following parts of the sample release:
|
||||
- remove entries from user's auth file
|
||||
|
||||
This mechanism assumes that the superuser and the transport layer between
|
||||
the client and the server is secure. Organizations that desire stricter
|
||||
security are encouraged to look at systems such as Kerberos (at Project
|
||||
Athena).
|
||||
the client and the server is secure.
|
||||
|
||||
|
||||
Description
|
||||
|
||||
138
lib/libXau/aclocal.m4
vendored
138
lib/libXau/aclocal.m4
vendored
@ -7631,6 +7631,7 @@ AC_SUBST([am__tar])
|
||||
AC_SUBST([am__untar])
|
||||
]) # _AM_PROG_TAR
|
||||
|
||||
dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure.
|
||||
dnl
|
||||
dnl Copyright 2005-2006 Sun Microsystems, Inc. All rights reserved.
|
||||
dnl
|
||||
@ -7667,27 +7668,24 @@ dnl of the copyright holder.
|
||||
# your configure.ac with the minimum required version, such as:
|
||||
# XORG_MACROS_VERSION(1.1)
|
||||
#
|
||||
# To force at least a version with this macro defined, also add:
|
||||
# m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])])
|
||||
# To ensure that this macro is defined, also add:
|
||||
# m4_ifndef([XORG_MACROS_VERSION],
|
||||
# [m4_fatal([must install xorg-macros 1.1 or later before running autoconf/autogen])])
|
||||
#
|
||||
#
|
||||
# See the "minimum version" comment for each macro you use to see what
|
||||
# version you require.
|
||||
AC_DEFUN([XORG_MACROS_VERSION],[
|
||||
[XORG_MACROS_needed_version=$1
|
||||
XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
|
||||
XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
|
||||
AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
|
||||
[XORG_MACROS_version=1.1.6
|
||||
XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
|
||||
XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
|
||||
if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
|
||||
AC_MSG_ERROR([configure built with incompatible version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.x])
|
||||
fi
|
||||
if test $XORG_MACROS_minor -lt $XORG_MACROS_needed_minor ; then
|
||||
AC_MSG_ERROR([configure built with too old of a version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.${XORG_MACROS_minor}.0 or newer])
|
||||
fi
|
||||
AC_MSG_RESULT([yes, $XORG_MACROS_version])
|
||||
m4_defun([XORG_MACROS_VERSION],[
|
||||
m4_define([vers_have], [1.3.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,,
|
||||
[m4_fatal([xorg-macros major version ]maj_needed[ is required but ]vers_have[ found])])
|
||||
m4_if(m4_version_compare(vers_have, [$1]), -1,
|
||||
[m4_fatal([xorg-macros version $1 or higher is required but ]vers_have[ found])])
|
||||
m4_undefine([vers_have])
|
||||
m4_undefine([maj_have])
|
||||
m4_undefine([maj_needed])
|
||||
]) # XORG_MACROS_VERSION
|
||||
|
||||
# XORG_PROG_RAWCPP()
|
||||
@ -7712,6 +7710,10 @@ else
|
||||
if test `${RAWCPP} -undef < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
|
||||
RAWCPPFLAGS=-undef
|
||||
AC_MSG_RESULT([yes])
|
||||
# under Cygwin unix is still defined even with -undef
|
||||
elif test `${RAWCPP} -undef -ansi < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
|
||||
RAWCPPFLAGS="-undef -ansi"
|
||||
AC_MSG_RESULT([yes, with -ansi])
|
||||
else
|
||||
AC_MSG_ERROR([${RAWCPP} defines unix with or without -undef. I don't know what to do.])
|
||||
fi
|
||||
@ -7824,7 +7826,9 @@ AC_SUBST([ADMIN_MAN_DIR])
|
||||
# Whether or not the necessary tools and files are found can be checked
|
||||
# with the AM_CONDITIONAL "BUILD_LINUXDOC"
|
||||
AC_DEFUN([XORG_CHECK_LINUXDOC],[
|
||||
XORG_SGML_PATH=$prefix/share/sgml
|
||||
if test x$XORG_SGML_PATH = x ; then
|
||||
XORG_SGML_PATH=$prefix/share/sgml
|
||||
fi
|
||||
HAVE_DEFS_ENT=
|
||||
|
||||
if test x"$cross_compiling" = x"yes" ; then
|
||||
@ -7880,7 +7884,9 @@ AC_SUBST(MAKE_HTML)
|
||||
# indicates whether the necessary tools and files are found and, if set,
|
||||
# $(MAKE_XXX) blah.sgml will produce blah.xxx.
|
||||
AC_DEFUN([XORG_CHECK_DOCBOOK],[
|
||||
XORG_SGML_PATH=$prefix/share/sgml
|
||||
if test x$XORG_SGML_PATH = x ; then
|
||||
XORG_SGML_PATH=$prefix/share/sgml
|
||||
fi
|
||||
HAVE_DEFS_ENT=
|
||||
BUILDTXTDOC=no
|
||||
BUILDPDFDOC=no
|
||||
@ -7946,7 +7952,7 @@ AC_SUBST(MAKE_HTML)
|
||||
# their AM_CFLAGS (or other appropriate *_CFLAGS) to use them.
|
||||
AC_DEFUN([XORG_CHECK_MALLOC_ZERO],[
|
||||
AC_ARG_ENABLE(malloc0returnsnull,
|
||||
AC_HELP_STRING([--enable-malloc0returnsnull],
|
||||
AS_HELP_STRING([--enable-malloc0returnsnull],
|
||||
[malloc(0) returns NULL (default: auto)]),
|
||||
[MALLOC_ZERO_RETURNS_NULL=$enableval],
|
||||
[MALLOC_ZERO_RETURNS_NULL=auto])
|
||||
@ -7998,7 +8004,7 @@ AC_SUBST([XTMALLOC_ZERO_CFLAGS])
|
||||
AC_DEFUN([XORG_WITH_LINT],[
|
||||
|
||||
# Allow checking code with lint, sparse, etc.
|
||||
AC_ARG_WITH(lint, [AC_HELP_STRING([--with-lint],
|
||||
AC_ARG_WITH(lint, [AS_HELP_STRING([--with-lint],
|
||||
[Use a lint-style source code checker (default: disabled)])],
|
||||
[use_lint=$withval], [use_lint=no])
|
||||
if test "x$use_lint" = "xyes" ; then
|
||||
@ -8039,7 +8045,7 @@ AM_CONDITIONAL(LINT, [test x$LINT != xno])
|
||||
AC_DEFUN([XORG_LINT_LIBRARY],[
|
||||
AC_REQUIRE([XORG_WITH_LINT])
|
||||
# Build lint "library" for more indepth checks of programs calling this library
|
||||
AC_ARG_ENABLE(lint-library, [AC_HELP_STRING([--enable-lint-library],
|
||||
AC_ARG_ENABLE(lint-library, [AS_HELP_STRING([--enable-lint-library],
|
||||
[Create lint library (default: disabled)])],
|
||||
[make_lint_lib=$enableval], [make_lint_lib=no])
|
||||
if test "x$make_lint_lib" != "xno" ; then
|
||||
@ -8057,6 +8063,75 @@ AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno])
|
||||
|
||||
]) # XORG_LINT_LIBRARY
|
||||
|
||||
# XORG_CWARNFLAGS
|
||||
# ---------------
|
||||
# Minimum version: 1.2.0
|
||||
#
|
||||
# Defines CWARNFLAGS to enable C compiler warnings.
|
||||
#
|
||||
AC_DEFUN([XORG_CWARNFLAGS], [
|
||||
AC_REQUIRE([AC_PROG_CC])
|
||||
if test "x$GCC" = xyes ; then
|
||||
CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \
|
||||
-Wmissing-declarations -Wnested-externs -fno-strict-aliasing \
|
||||
-Wbad-function-cast"
|
||||
case `$CC -dumpversion` in
|
||||
3.4.* | 4.*)
|
||||
CWARNFLAGS="$CWARNFLAGS -Wold-style-definition -Wdeclaration-after-statement"
|
||||
;;
|
||||
esac
|
||||
else
|
||||
AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
|
||||
if test "x$SUNCC" = "xyes"; then
|
||||
CWARNFLAGS="-v"
|
||||
fi
|
||||
fi
|
||||
AC_SUBST(CWARNFLAGS)
|
||||
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
|
||||
]) # XORG_CWARNFLAGS
|
||||
|
||||
# XORG_STRICT_OPTION
|
||||
# -----------------------
|
||||
# Minimum version: 1.3.0
|
||||
#
|
||||
# Add configure option to enable strict compilation
|
||||
AC_DEFUN([XORG_STRICT_OPTION], [
|
||||
AC_REQUIRE([AC_PROG_CC])
|
||||
AC_REQUIRE([AC_PROG_CC_C99])
|
||||
AC_REQUIRE([XORG_CWARNFLAGS])
|
||||
|
||||
AC_ARG_ENABLE(strict-compilation,
|
||||
AS_HELP_STRING([--enable-strict-compilation],
|
||||
[Enable all warnings from compiler and make them errors (default: disabled)]),
|
||||
[STRICT_COMPILE=$enableval], [STRICT_COMPILE=no])
|
||||
if test "x$STRICT_COMPILE" = "xyes"; then
|
||||
AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
|
||||
AC_CHECK_DECL([__INTEL_COMPILER], [INTELCC="yes"], [INTELCC="no"])
|
||||
if test "x$GCC" = xyes ; then
|
||||
STRICT_CFLAGS="-pedantic -Werror"
|
||||
elif test "x$SUNCC" = "xyes"; then
|
||||
STRICT_CFLAGS="-errwarn"
|
||||
elif test "x$INTELCC" = "xyes"; then
|
||||
STRICT_CFLAGS="-Werror"
|
||||
fi
|
||||
fi
|
||||
CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS"
|
||||
AC_SUBST([CWARNFLAGS])
|
||||
]) # XORG_STRICT_OPTION
|
||||
|
||||
# XORG_DEFAULT_OPTIONS
|
||||
# --------------------
|
||||
# Minimum version: 1.3.0
|
||||
#
|
||||
# Defines default options for X.Org modules.
|
||||
#
|
||||
AC_DEFUN([XORG_DEFAULT_OPTIONS], [
|
||||
XORG_CWARNFLAGS
|
||||
XORG_STRICT_OPTION
|
||||
XORG_RELEASE_VERSION
|
||||
XORG_CHANGELOG
|
||||
XORG_MANPAGE_SECTIONS
|
||||
]) # XORG_DEFAULT_OPTIONS
|
||||
dnl Copyright 2005 Red Hat, Inc
|
||||
dnl
|
||||
dnl Permission to use, copy, modify, distribute, and sell this software and its
|
||||
@ -8091,7 +8166,7 @@ dnl
|
||||
|
||||
AC_DEFUN([XORG_RELEASE_VERSION],[
|
||||
AC_ARG_WITH(release-version,
|
||||
AC_HELP_STRING([--with-release-version=STRING],
|
||||
AS_HELP_STRING([--with-release-version=STRING],
|
||||
[Use release version string in package name]),
|
||||
[RELEASE_VERSION="$withval"],
|
||||
[RELEASE_VERSION=""])
|
||||
@ -8119,3 +8194,20 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
|
||||
[Patch version of this package])
|
||||
])
|
||||
|
||||
# XORG_CHANGELOG()
|
||||
# ----------------
|
||||
# Minimum version: 1.2.0
|
||||
#
|
||||
# Defines the variable CHANGELOG_CMD as the command to generate
|
||||
# ChangeLog from git.
|
||||
#
|
||||
# Arrange that distcleancheck ignores ChangeLog left over by distclean.
|
||||
#
|
||||
AC_DEFUN([XORG_CHANGELOG], [
|
||||
CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > .changelog.tmp && \
|
||||
mv .changelog.tmp ChangeLog) || (rm -f .changelog.tmp; touch ChangeLog; \
|
||||
echo 'git directory not found: installing possibly empty changelog.' >&2)"
|
||||
AC_SUBST([CHANGELOG_CMD])
|
||||
AC_SUBST([distcleancheck_listfiles], ['find . -type f ! -name ChangeLog -print'])
|
||||
]) # XORG_CHANGELOG
|
||||
|
||||
|
||||
8760
lib/libXau/configure
vendored
8760
lib/libXau/configure
vendored
File diff suppressed because it is too large
Load Diff
@ -1,5 +1,5 @@
|
||||
dnl
|
||||
dnl $Id: configure.ac,v 1.2 2008/08/27 19:42:20 matthieu Exp $
|
||||
dnl $Id: configure.ac,v 1.3 2009/10/31 17:44:36 matthieu Exp $
|
||||
dnl
|
||||
dnl Copyright © 2003 Keith Packard, Noah Levitt
|
||||
dnl
|
||||
@ -24,15 +24,15 @@ dnl
|
||||
dnl Process this file with autoconf to create configure.
|
||||
|
||||
AC_PREREQ([2.57])
|
||||
AC_INIT(libXau, 1.0.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],libXau)
|
||||
AC_INIT(libXau, 1.0.5, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],libXau)
|
||||
AM_INIT_AUTOMAKE([dist-bzip2])
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
AM_CONFIG_HEADER(config.h)
|
||||
|
||||
# Require xorg-macros version 1.1.0 or newer for XORG_WITH_LINT macro
|
||||
m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])])
|
||||
XORG_MACROS_VERSION(1.1)
|
||||
# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG, XORG_WITH_LINT
|
||||
m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
|
||||
XORG_MACROS_VERSION(1.2)
|
||||
|
||||
AC_PROG_CC
|
||||
AC_PROG_INSTALL
|
||||
@ -40,14 +40,13 @@ AC_PROG_LN_S
|
||||
AC_LIBTOOL_WIN32_DLL
|
||||
AM_PROG_LIBTOOL
|
||||
AC_PROG_MAKE_SET
|
||||
XORG_CWARNFLAGS
|
||||
|
||||
PKG_CHECK_MODULES(XAU, xproto)
|
||||
XAU_CFLAGS="$CWARNFLAGS $XAU_CFLAGS"
|
||||
AC_SUBST(XAU_CFLAGS)
|
||||
AC_SUBST(XAU_LIBS)
|
||||
|
||||
kerberos=false
|
||||
AM_CONDITIONAL(KERBEROS, test x$kerberos = xtrue)
|
||||
|
||||
AC_ARG_ENABLE(xthreads,
|
||||
AC_HELP_STRING([--disable-xthreads],
|
||||
[Disable libXau support for Multithreading]),
|
||||
@ -77,15 +76,9 @@ XORG_WITH_LINT
|
||||
XORG_LINT_LIBRARY([Xau])
|
||||
LINT_FLAGS="${LINT_FLAGS} ${XAU_CFLAGS}"
|
||||
|
||||
if test "x$GCC" = "xyes"; then
|
||||
GCC_WARNINGS="-Wall -Wpointer-arith -Wstrict-prototypes \
|
||||
-Wmissing-prototypes -Wmissing-declarations \
|
||||
-Wnested-externs -fno-strict-aliasing"
|
||||
XAU_CFLAGS="$GCC_WARNINGS $XAU_CFLAGS"
|
||||
fi
|
||||
|
||||
XORG_MANPAGE_SECTIONS
|
||||
XORG_RELEASE_VERSION
|
||||
XORG_CHANGELOG
|
||||
|
||||
AC_OUTPUT([Makefile
|
||||
xau.pc])
|
||||
|
||||
@ -128,23 +128,6 @@ void XauDisposeAuth(
|
||||
Xauth* /* auth */
|
||||
);
|
||||
|
||||
#ifdef K5AUTH
|
||||
#include <krb5/krb5.h>
|
||||
/* 9/93: krb5.h leaks some symbols */
|
||||
#undef BITS32
|
||||
#undef xfree
|
||||
|
||||
int XauKrb5Encode(
|
||||
krb5_principal /* princ */,
|
||||
krb5_data * /* outbuf */
|
||||
);
|
||||
|
||||
int XauKrb5Decode(
|
||||
krb5_data /* inbuf */,
|
||||
krb5_principal * /* princ */
|
||||
);
|
||||
#endif /* K5AUTH */
|
||||
|
||||
_XFUNCPROTOEND
|
||||
|
||||
/* Return values from XauLockAuth */
|
||||
|
||||
@ -1,186 +0,0 @@
|
||||
/* $Xorg: k5encode.c,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */
|
||||
|
||||
/*
|
||||
|
||||
Copyright 1993, 1994, 1998 The Open Group
|
||||
|
||||
Permission to use, copy, modify, distribute, and sell this software and its
|
||||
documentation for any purpose is hereby granted without fee, provided that
|
||||
the above copyright notice appear in all copies and that both that
|
||||
copyright notice and this permission notice appear in supporting
|
||||
documentation.
|
||||
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
|
||||
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
Except as contained in this notice, the name of The Open Group shall not be
|
||||
used in advertising or otherwise to promote the sale, use or other dealings
|
||||
in this Software without prior written authorization from The Open Group.
|
||||
|
||||
*/
|
||||
|
||||
/*
|
||||
* functions to encode/decode Kerberos V5 principals
|
||||
* into something that can be reasonable spewed over
|
||||
* the wire
|
||||
*
|
||||
* Author: Tom Yu <tlyu@MIT.EDU>
|
||||
*
|
||||
* Still needs to be fixed up wrt signed/unsigned lengths, but we'll worry
|
||||
* about that later.
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
#include <krb5/krb5.h>
|
||||
/* 9/93: krb5.h leaks some symbols */
|
||||
#undef BITS32
|
||||
#undef xfree
|
||||
|
||||
#include <X11/X.h>
|
||||
#include <X11/Xos.h>
|
||||
#include <X11/Xmd.h>
|
||||
#include <X11/Xfuncs.h>
|
||||
|
||||
/*
|
||||
* XauKrb5Encode
|
||||
*
|
||||
* this function encodes the principal passed to it in a format that can
|
||||
* easily be dealt with by stuffing it into an X packet. Encoding is as
|
||||
* follows:
|
||||
* length count of the realm name
|
||||
* realm
|
||||
* component count
|
||||
* length of component
|
||||
* actual principal component
|
||||
* etc....
|
||||
*
|
||||
* Note that this function allocates a hunk of memory, which must be
|
||||
* freed to avoid nasty memory leak type things. All counts are
|
||||
* byte-swapped if needed. (except for the total length returned)
|
||||
*
|
||||
* nevermind.... stuffing the encoded packet in net byte order just to
|
||||
* always do the right thing. Don't have to frob with alignment that way.
|
||||
*/
|
||||
int
|
||||
XauKrb5Encode(princ, outbuf)
|
||||
krb5_principal princ; /* principal to encode */
|
||||
krb5_data *outbuf; /* output buffer */
|
||||
{
|
||||
CARD16 i, numparts, totlen = 0, plen, rlen;
|
||||
char *cp, *pdata;
|
||||
|
||||
rlen = krb5_princ_realm(princ)->length;
|
||||
numparts = krb5_princ_size(princ);
|
||||
totlen = 2 + rlen + 2; /* include room for realm length
|
||||
and component count */
|
||||
for (i = 0; i < numparts; i++)
|
||||
totlen += krb5_princ_component(princ, i)->length + 2;
|
||||
/* add 2 bytes each time for length */
|
||||
if ((outbuf->data = (char *)malloc(totlen)) == NULL)
|
||||
return -1;
|
||||
cp = outbuf->data;
|
||||
*cp++ = (char)((int)(0xff00 & rlen) >> 8);
|
||||
*cp++ = (char)(0x00ff & rlen);
|
||||
memcpy(cp, krb5_princ_realm(princ)->data, rlen);
|
||||
cp += rlen;
|
||||
*cp++ = (char)((int)(0xff00 & numparts) >> 8);
|
||||
*cp++ = (char)(0x00ff & numparts);
|
||||
for (i = 0; i < numparts; i++)
|
||||
{
|
||||
plen = krb5_princ_component(princ, i)->length;
|
||||
pdata = krb5_princ_component(princ, i)->data;
|
||||
*cp++ = (char)((int)(0xff00 & plen) >> 8);
|
||||
*cp++ = (char)(0x00ff & plen);
|
||||
memcpy(cp, pdata, plen);
|
||||
cp += plen;
|
||||
}
|
||||
outbuf->length = totlen;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* XauKrb5Decode
|
||||
*
|
||||
* This function essentially reverses what XauKrb5Encode does.
|
||||
* return value: 0 if okay, -1 if malloc fails, -2 if inbuf format bad
|
||||
*/
|
||||
int
|
||||
XauKrb5Decode(inbuf, princ)
|
||||
krb5_data inbuf;
|
||||
krb5_principal *princ;
|
||||
{
|
||||
CARD16 i, numparts, plen, rlen;
|
||||
CARD8 *cp, *pdata;
|
||||
|
||||
if (inbuf.length < 4)
|
||||
{
|
||||
return -2;
|
||||
}
|
||||
*princ = (krb5_principal)malloc(sizeof (krb5_principal_data));
|
||||
if (*princ == NULL)
|
||||
return -1;
|
||||
bzero(*princ, sizeof (krb5_principal_data));
|
||||
cp = (CARD8 *)inbuf.data;
|
||||
rlen = *cp++ << 8;
|
||||
rlen |= *cp++;
|
||||
if (inbuf.length < 4 + (int)rlen + 2)
|
||||
{
|
||||
krb5_free_principal(*princ);
|
||||
return -2;
|
||||
}
|
||||
krb5_princ_realm(*princ)->data = (char *)malloc(rlen);
|
||||
if (krb5_princ_realm(*princ)->data == NULL)
|
||||
{
|
||||
krb5_free_principal(*princ);
|
||||
return -1;
|
||||
}
|
||||
krb5_princ_realm(*princ)->length = rlen;
|
||||
memcpy(krb5_princ_realm(*princ)->data, cp, rlen);
|
||||
cp += rlen;
|
||||
numparts = *cp++ << 8;
|
||||
numparts |= *cp++;
|
||||
krb5_princ_name(*princ) =
|
||||
(krb5_data *)malloc(numparts * sizeof (krb5_data));
|
||||
if (krb5_princ_name(*princ) == NULL)
|
||||
{
|
||||
krb5_free_principal(*princ);
|
||||
return -1;
|
||||
}
|
||||
krb5_princ_size(*princ) = 0;
|
||||
for (i = 0; i < numparts; i++)
|
||||
{
|
||||
if (cp + 2 > (CARD8 *)inbuf.data + inbuf.length)
|
||||
{
|
||||
krb5_free_principal(*princ);
|
||||
return -2;
|
||||
}
|
||||
plen = *cp++ << 8;
|
||||
plen |= *cp++;
|
||||
if (cp + plen > (CARD8 *)inbuf.data + inbuf.length)
|
||||
{
|
||||
krb5_free_principal(*princ);
|
||||
return -2;
|
||||
}
|
||||
pdata = (CARD8 *)malloc(plen);
|
||||
if (pdata == NULL)
|
||||
{
|
||||
krb5_free_principal(*princ);
|
||||
return -1;
|
||||
}
|
||||
krb5_princ_component(*princ, i)->data = (char *)pdata;
|
||||
krb5_princ_component(*princ, i)->length = plen;
|
||||
memcpy(pdata, cp, plen);
|
||||
cp += plen;
|
||||
krb5_princ_size(*princ)++;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@ -2127,17 +2127,6 @@ EOF
|
||||
;;
|
||||
esac
|
||||
for pass in $passes; do
|
||||
# The preopen pass in lib mode reverses $deplibs; put it back here
|
||||
# so that -L comes before libs that need it for instance...
|
||||
if test "$linkmode,$pass" = "lib,link"; then
|
||||
## FIXME: Find the place where the list is rebuilt in the wrong
|
||||
## order, and fix it there properly
|
||||
tmp_deplibs=
|
||||
for deplib in $deplibs; do
|
||||
tmp_deplibs="$deplib $tmp_deplibs"
|
||||
done
|
||||
deplibs="$tmp_deplibs"
|
||||
fi
|
||||
if test "$linkmode,$pass" = "lib,link" ||
|
||||
test "$linkmode,$pass" = "prog,scan"; then
|
||||
libs="$deplibs"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user