From c78066a30e92521d6edd98461c5777cfa871f37d Mon Sep 17 00:00:00 2001 From: Boram Park Date: Tue, 21 Aug 2012 18:03:32 +0900 Subject: [PATCH] upload tizen2.0 source --- AuDispose.c | 3 - AuFileName.c | 3 - AuGetAddr.c | 3 - AuGetBest.c | 3 - AuLock.c | 7 +- AuRead.c | 3 - AuUnlock.c | 3 - AuWrite.c | 3 - Autest.c | 2 - ChangeLog | 134 ++++++++++++++++++++ INSTALL | 291 +++++++++++++++++++++++++++++++++++++++++++ Makefile.am | 35 +----- README | 6 +- autogen.sh | 12 ++ configure.ac | 84 +++++++------ include/X11/Xauth.h | 4 - man/Makefile.am | 47 +++++++ Xau.man => man/Xau.man | 53 ++++---- man/XauDisposeAuth.man | 1 + man/XauFileName.man | 1 + man/XauGetAuthByAddr.man | 1 + man/XauGetBestAuthByAddr.man | 1 + man/XauLockAuth.man | 1 + man/XauReadAuth.man | 1 + man/XauUnlockAuth.man | 1 + man/XauWriteAuth.man | 1 + packaging/libXau.spec | 72 +++++++++++ packaging/libxau.spec | 70 ----------- 28 files changed, 640 insertions(+), 206 deletions(-) create mode 100644 INSTALL create mode 100755 autogen.sh create mode 100644 man/Makefile.am rename Xau.man => man/Xau.man (87%) create mode 100644 man/XauDisposeAuth.man create mode 100644 man/XauFileName.man create mode 100644 man/XauGetAuthByAddr.man create mode 100644 man/XauGetBestAuthByAddr.man create mode 100644 man/XauLockAuth.man create mode 100644 man/XauReadAuth.man create mode 100644 man/XauUnlockAuth.man create mode 100644 man/XauWriteAuth.man create mode 100644 packaging/libXau.spec delete mode 100644 packaging/libxau.spec diff --git a/AuDispose.c b/AuDispose.c index cb6f85c..2a9b2f1 100644 --- a/AuDispose.c +++ b/AuDispose.c @@ -1,5 +1,3 @@ -/* $Xorg: AuDispose.c,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xau/AuDispose.c,v 1.4 2001/07/25 15:04:48 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include diff --git a/AuFileName.c b/AuFileName.c index b21b048..f384f75 100644 --- a/AuFileName.c +++ b/AuFileName.c @@ -1,5 +1,3 @@ -/* $Xorg: AuFileName.c,v 1.5 2001/02/09 02:03:42 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xau/AuFileName.c,v 3.6 2001/07/25 15:04:48 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include diff --git a/AuGetAddr.c b/AuGetAddr.c index 6275531..897d8b5 100644 --- a/AuGetAddr.c +++ b/AuGetAddr.c @@ -1,5 +1,3 @@ -/* $Xorg: AuGetAddr.c,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xau/AuGetAddr.c,v 1.5 2001/12/14 19:54:36 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include diff --git a/AuGetBest.c b/AuGetBest.c index ae2b748..673ee40 100644 --- a/AuGetBest.c +++ b/AuGetBest.c @@ -1,5 +1,3 @@ -/* $Xorg: AuGetBest.c,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xau/AuGetBest.c,v 1.7 2001/12/14 19:54:36 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include diff --git a/AuLock.c b/AuLock.c index 69b1fd6..a816b24 100644 --- a/AuLock.c +++ b/AuLock.c @@ -1,5 +1,3 @@ -/* $Xorg: AuLock.c,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xau/AuLock.c,v 3.6 2002/05/31 18:45:43 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include @@ -79,12 +76,12 @@ long dead) (void) unlink (link_name); } } - + while (retries > 0) { if (creat_fd == -1) { creat_fd = open (creat_name, O_WRONLY | O_CREAT | O_EXCL, 0600); if (creat_fd == -1) { - if (errno != EACCES) + if (errno != EACCES && errno != EEXIST) return LOCK_ERROR; } else (void) close (creat_fd); diff --git a/AuRead.c b/AuRead.c index 9979c1d..3c59632 100644 --- a/AuRead.c +++ b/AuRead.c @@ -1,5 +1,3 @@ -/* $Xorg: AuRead.c,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xau/AuRead.c,v 1.5 2001/07/25 15:04:48 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include diff --git a/AuUnlock.c b/AuUnlock.c index 460effe..ddbe7db 100644 --- a/AuUnlock.c +++ b/AuUnlock.c @@ -1,5 +1,3 @@ -/* $Xorg: AuUnlock.c,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xau/AuUnlock.c,v 1.4 2001/12/14 19:54:36 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include diff --git a/AuWrite.c b/AuWrite.c index 5852759..0924f8d 100644 --- a/AuWrite.c +++ b/AuWrite.c @@ -1,5 +1,3 @@ -/* $Xorg: AuWrite.c,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xau/AuWrite.c,v 1.3 2001/01/17 19:42:24 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include diff --git a/Autest.c b/Autest.c index 12b8cbf..efb3da8 100644 --- a/Autest.c +++ b/Autest.c @@ -1,5 +1,3 @@ -/* $Xorg: Autest.c,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group diff --git a/ChangeLog b/ChangeLog index 855aa72..2d3c243 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,137 @@ +commit 0e3061495f5da8a323db02e612c4f09688b7ade0 +Author: Alan Coopersmith +Date: Tue Mar 6 22:16:57 2012 -0800 + + libXau 1.0.7 + + Signed-off-by: Alan Coopersmith + +commit 5c01ef69eee7dfe925c97558153fcd5e116252c6 +Author: Matthew D. Fuller +Date: Mon Sep 5 10:31:14 2011 -0500 + + Improve the handling of "normal" locking collisions. + + EEXIST is a perfectly normal and expected errno for open(O_CREAT | + O_EXCL), and is a signal to loop around and retry, not return with an + error. + + Signed-off-by: Matthew D. Fuller + Reviewed-by: Alan Coopersmith + Signed-off-by: Alan Coopersmith + +commit 8fd15eb0149cec75d69a27b1f8ec3ce092465b80 +Author: Alan Coopersmith +Date: Fri Sep 16 22:04:41 2011 -0700 + + Strip trailing whitespace + + Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}' + git diff -w & git diff -b show no diffs from this change + + Signed-off-by: Alan Coopersmith + +commit 063bfa679adc2c00a6b55e5c9ee97f2aa0638788 +Author: Gaetan Nadon +Date: Wed Feb 2 11:43:40 2011 -0500 + + config: comment, minor upgrade, quote and layout configure.ac + + Group statements per section as per Autoconf standard layout + Quote statements where appropriate. + Autoconf recommends not using dnl instead of # for comments + + Use AC_CONFIG_FILES to replace the deprecated AC_OUTPUT with parameters. + Use AC_PROG_LIBTOOL to replace the deprecated AM_PROG_LIBTOOL + Add AC_CONFIG_SRCDIR([Makefile.am]) where missing + No functional configuration changes + + This helps automated maintenance and release activities. + Details can be found in http://wiki.x.org/wiki/NewModuleGuidelines + + Signed-off-by: Gaetan Nadon + +commit c492cf2f90db79e75bf3fa8a8215f8139237c5c5 +Author: Gaetan Nadon +Date: Fri Jan 28 19:41:37 2011 -0500 + + config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS + + Signed-off-by: Gaetan Nadon + +commit 7de07642d62440a90942a8a071624ac09f48a2b3 +Author: Gaetan Nadon +Date: Fri Jan 28 16:07:07 2011 -0500 + + config: replace deprecated AC_HELP_STRING with AS_HELP_STRING + + This silences an Automake warning. + + Signed-off-by: Gaetan Nadon + +commit 98f08b9c8414e7d759d08af4711b9519ca8fd37f +Author: Gaetan Nadon +Date: Fri Jan 28 11:56:13 2011 -0500 + + config: remove already included statements + + AC_PROG_INSTALL and AC_PROG_SED are included in XORG_DEFAULT_OPTIONS. + AC_PROG_MAKE_SET is included by AM_INIT_AUTOMAKE + + Signed-off-by: Gaetan Nadon + +commit b910d657d7b857fcd2564304205c853fa8148667 +Author: Gaetan Nadon +Date: Thu Jan 27 18:50:14 2011 -0500 + + config: remove AC_PROG_CC as it overrides AC_PROG_C_C99 + + XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls + AC_PROG_C_C99. This sets gcc with -std=gnu99. + If AC_PROG_CC macro is called afterwards, it resets CC to gcc. + + Signed-off-by: Gaetan Nadon + +commit 2085fbfa8347620890ed844057a42c9a4dba606b +Author: Jesse Adkins +Date: Tue Sep 28 13:30:02 2010 -0700 + + Purge cvs tags. + + Signed-off-by: Jesse Adkins + Signed-off-by: Alan Coopersmith + +commit 240d2475aa627774dad9e4f02594c5ce8c8048a4 +Author: Gaetan Nadon +Date: Wed Aug 11 09:41:00 2010 -0400 + + Xau.man: replace hard-coded 3 with __libmansuffix__ + + Signed-off-by: Gaetan Nadon + +commit afcd0ff9109b3478a473772c9d4e14d57951aab8 +Author: Gaetan Nadon +Date: Wed Aug 11 09:31:50 2010 -0400 + + Xau.man: remove whitespace as reported by git diff check + + Signed-off-by: Gaetan Nadon + +commit f666268d1f328f76cbbef367560eb9ea4da30808 +Author: Gaetan Nadon +Date: Wed Aug 11 09:11:55 2010 -0400 + + config: simplify building of shadow man pages + + Store the shadow files in git as any other man page. + Move man pages to man dir and use the common makefile + + Local fix in CVS for bug 5628 + is not required as the problem has been fixed in + util-macros d9062e4077ebfd0985baf8418f3d0f111b9ddbba + + Signed-off-by: Gaetan Nadon + commit a01b74fad039e68cf296bd5e83c6f538181e529a Author: Julien Cristau Date: Mon Jul 19 17:17:54 2010 +0100 diff --git a/INSTALL b/INSTALL new file mode 100644 index 0000000..8b82ade --- /dev/null +++ b/INSTALL @@ -0,0 +1,291 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007, 2008 Free Software Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +================== + + Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + + 6. Often, you can also type `make uninstall' to remove the installed + files again. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + +Installation Names +================== + + By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + +Specifying the System Type +========================== + + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`--prefix=DIR' + Use DIR as the installation prefix. *Note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + diff --git a/Makefile.am b/Makefile.am index 2a76275..9e8d95b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,5 @@ +SUBDIRS=man + lib_LTLIBRARIES = libXau.la AM_CFLAGS = $(XAU_CFLAGS) $(CWARNFLAGS) @@ -48,39 +50,8 @@ $(LINTLIB): $(libXau_la_SOURCES) $(LINT) -y -oXau -x $(ALL_LINT_FLAGS) $(libXau_la_SOURCES) endif MAKE_LINT_LIB -LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%) - -libmandir = $(LIB_MAN_DIR) -libman_PRE = Xau.man -BUILT_SOURCES = $(Xau_shadows:=.@LIB_MAN_SUFFIX@) -CLEANFILES = $(libman_DATA) $(BUILT_SOURCES) $(lintlib_DATA) -libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \ - $(Xau_shadows:=.@LIB_MAN_SUFFIX@) - +CLEANFILES = $(lintlib_DATA) MAINTAINERCLEANFILES = ChangeLog INSTALL -EXTRA_DIST = $(libman_PRE) - -Xau_shadows = \ - XauFileName \ - XauReadAuth \ - XauLockAuth \ - XauUnlockAuth \ - XauWriteAuth \ - XauDisposeAuth \ - XauGetAuthByAddr \ - XauGetBestAuthByAddr - -Xau_shadows_man = $(Xau_shadows:=.@LIB_MAN_SUFFIX@) -$(Xau_shadows_man): - $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/Xau.$(LIB_MAN_SUFFIX) > $@ - -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -Xau.$(LIB_MAN_SUFFIX): $(srcdir)/Xau.man - $(AM_V_GEN)$(SED) \ - -e 's/__xorgversion__/"$(XORGRELSTRING)" "$(XORGMANNAME)"/' \ - < $(srcdir)/Xau.man > Xau.$(LIB_MAN_SUFFIX) .PHONY: ChangeLog INSTALL diff --git a/README b/README index 9ee12e7..249a1a7 100644 --- a/README +++ b/README @@ -38,7 +38,7 @@ This scheme involves changes to the following parts of the sample release: - add entries to user's auth file - remove entries from user's auth file -This mechanism assumes that the superuser and the transport layer between +This mechanism assumes that the superuser and the transport layer between the client and the server is secure. @@ -46,7 +46,7 @@ Description The sample implementation will use the xdm Display Manager to set up and control the server's authorization file. Sites that do not run xdm will -need to build their own mechanisms. +need to build their own mechanisms. Xdm uses a random key (seeded by the system time and check sum of /dev/kmem) to generate a unique sequence of characters at 16 bytes long. This sequence @@ -130,7 +130,7 @@ There are three types of input: name non-NULL, data NULL - use the named authorization; get data from that mechanism's default. name non-NULL, data non-NULL - use the given authorization and data. - + This interface is used by xdm and might also be used by any other applications that wish to explicitly set the authorization information. diff --git a/autogen.sh b/autogen.sh new file mode 100755 index 0000000..904cd67 --- /dev/null +++ b/autogen.sh @@ -0,0 +1,12 @@ +#! /bin/sh + +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +ORIGDIR=`pwd` +cd $srcdir + +autoreconf -v --install || exit 1 +cd $ORIGDIR || exit $? + +$srcdir/configure --enable-maintainer-mode "$@" diff --git a/configure.ac b/configure.ac index 18771a6..92ad113 100644 --- a/configure.ac +++ b/configure.ac @@ -1,51 +1,54 @@ -dnl -dnl Copyright © 2003 Keith Packard, Noah Levitt -dnl -dnl Permission to use, copy, modify, distribute, and sell this software and its -dnl documentation for any purpose is hereby granted without fee, provided that -dnl the above copyright notice appear in all copies and that both that -dnl copyright notice and this permission notice appear in supporting -dnl documentation, and that the name of Keith Packard not be used in -dnl advertising or publicity pertaining to distribution of the software without -dnl specific, written prior permission. Keith Packard makes no -dnl representations about the suitability of this software for any purpose. It -dnl is provided "as is" without express or implied warranty. -dnl -dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR -dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -dnl PERFORMANCE OF THIS SOFTWARE. -dnl -dnl Process this file with autoconf to create configure. +# +# Copyright © 2003 Keith Packard, Noah Levitt +# +# 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, and that the name of Keith Packard not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. Keith Packard makes no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT(libXau, 1.0.6, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],libXau) +AC_INIT([libXau], [1.0.7], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXau]) +AC_CONFIG_SRCDIR([Makefile.am]) +AC_CONFIG_HEADERS([config.h]) + +# Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -AM_CONFIG_HEADER(config.h) +# Initialize libtool +AC_LIBTOOL_WIN32_DLL +AC_PROG_LIBTOOL -# Require xorg-macros: XORG_DEFAULT_OPTIONS +# 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.4 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.4) + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS -AC_PROG_CC -AC_PROG_INSTALL +# Checks for programs. AC_PROG_LN_S -AC_LIBTOOL_WIN32_DLL -AM_PROG_LIBTOOL -AC_PROG_MAKE_SET -AC_PROG_SED +# Obtain compiler/linker options for depedencies PKG_CHECK_MODULES(XAU, xproto) AC_ARG_ENABLE(xthreads, - AC_HELP_STRING([--disable-xthreads], + AS_HELP_STRING([--disable-xthreads], [Disable libXau support for Multithreading]), [xthreads=$enableval],[xthreads=yes]) @@ -56,11 +59,11 @@ if test "x$xthreads" = "xyes" ; then AC_CHECK_LIB(nsl, gethostbyname_r, [mtsafe=yes]) fi if test "x$mtsafe" = "xyes" ; then - AC_DEFINE(XUSE_MTSAFE_API, 1, + AC_DEFINE(XUSE_MTSAFE_API, 1, [Whether libXau needs to use MT safe API's]) fi -dnl XXX incomplete, please fill this in +# XXX incomplete, please fill this in case $host_os in solaris*) XTHREAD_CFLAGS="-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS" ;; @@ -68,11 +71,12 @@ dnl XXX incomplete, please fill this in XAU_CFLAGS="$XAU_CFLAGS $XTHREAD_CFLAGS" fi -dnl Allow checking code with lint, sparse, etc. +# Allow checking code with lint, sparse, etc. XORG_WITH_LINT XORG_LINT_LIBRARY([Xau]) LINT_FLAGS="${LINT_FLAGS} ${XAU_CFLAGS}" - -AC_OUTPUT([Makefile - xau.pc]) +AC_CONFIG_FILES([Makefile + man/Makefile + xau.pc]) +AC_OUTPUT diff --git a/include/X11/Xauth.h b/include/X11/Xauth.h index ace975d..f57a1b3 100644 --- a/include/X11/Xauth.h +++ b/include/X11/Xauth.h @@ -1,5 +1,3 @@ -/* $Xorg: Xauth.h,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -26,8 +24,6 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xau/Xauth.h,v 1.5 2001/12/14 19:54:36 dawes Exp $ */ - #ifndef _Xauth_h #define _Xauth_h diff --git a/man/Makefile.am b/man/Makefile.am new file mode 100644 index 0000000..4becb8a --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,47 @@ +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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. +# + +libmandir = $(LIB_MAN_DIR) + +libman_PRE = \ + Xau.man \ + XauDisposeAuth.man \ + XauFileName.man \ + XauGetAuthByAddr.man \ + XauGetBestAuthByAddr.man \ + XauLockAuth.man \ + XauReadAuth.man \ + XauUnlockAuth.man \ + XauWriteAuth.man + +libman_DATA = $(libman_PRE:man=$(LIB_MAN_SUFFIX)) + +EXTRA_DIST = $(libman_PRE) + +CLEANFILES = $(libman_DATA) + +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure +SUFFIXES = .$(LIB_MAN_SUFFIX) .man + +.man.$(LIB_MAN_SUFFIX): + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ diff --git a/Xau.man b/man/Xau.man similarity index 87% rename from Xau.man rename to man/Xau.man index cc82bc7..46d4a19 100644 --- a/Xau.man +++ b/man/Xau.man @@ -1,34 +1,29 @@ -.\" $Xorg: Xau.man,v 1.3 2000/08/17 19:41:54 cpqbld Exp $ -.\" $XdotOrg$ -.\" .\" Copyright (c) 1994 X Consortium -.\" +.\" .\" Permission is hereby granted, free of charge, to any person obtaining a -.\" copy of this software and associated documentation files (the "Software"), -.\" to deal in the Software without restriction, including without limitation -.\" the rights to use, copy, modify, merge, publish, distribute, sublicense, -.\" and/or sell copies of the Software, and to permit persons to whom the +.\" copy of this software and associated documentation files (the "Software"), +.\" to deal in the Software without restriction, including without limitation +.\" the rights to use, copy, modify, merge, publish, distribute, sublicense, +.\" and/or sell copies of the Software, and to permit persons to whom the .\" Software furnished to do so, subject to the following conditions: -.\" +.\" .\" 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 X CONSORTIUM 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 +.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +.\" THE X CONSORTIUM 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 X Consortium shall not -.\" be used in advertising or otherwise to promote the sale, use or other -.\" dealing in this Software without prior written authorization from the -.\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xau/Xau.man,v 1.2 2001/01/27 18:20:19 dawes Exp $ +.\" Except as contained in this notice, the name of the X Consortium shall not +.\" be used in advertising or otherwise to promote the sale, use or other +.\" dealing in this Software without prior written authorization from the +.\" X Consortium. .\" -.TH Xau 3 __xorgversion__ +.TH Xau __libmansuffix__ __xorgversion__ .SH NAME Xau library: XauFileName, XauReadAuth, XauLockAuth, XauUnlockAuth, XauWriteAuth, XauDisposeAuth, @@ -51,11 +46,11 @@ typedef struct xauth { } Xauth; .HP -char *XauFileName (void); +char *XauFileName (void); .HP -Xauth *XauReadAuth (FILE *\fIauth_file\fP\^); +Xauth *XauReadAuth (FILE *\fIauth_file\fP\^); .HP -int XauWriteAuth (FILE *\fIauth_file\fP, Xauth *\fIauth\fP\^); +int XauWriteAuth (FILE *\fIauth_file\fP, Xauth *\fIauth\fP\^); .HP Xauth *XauGetAuthByAddr (unsigned short \fIfamily\fP\^, unsigned short \fIaddress_length\fP\^, const char *\fIaddress\fP\^, unsigned short @@ -65,14 +60,14 @@ Xauth *XauGetAuthByAddr (unsigned short \fIfamily\fP\^, unsigned short Xauth *XauGetBestAuthByAddr (unsigned short \fIfamily\fP\^, unsigned short \fIaddress_length\fP\^, const char *\fIaddress\fP\^, unsigned short \fInumber_length\fP\^, const char *\fInumber\fP\^, int \fItypes_length\fP\^, -char **\fItypes\fR\^, const int *\fItype_lengths\fR\^); +char **\fItypes\fR\^, const int *\fItype_lengths\fR\^); .HP int XauLockAuth (const char *\fIfile_name\fP\^, int \fIretries\fP\^, int -\fItimeout\fP\^, long \fIdead\fP\^); +\fItimeout\fP\^, long \fIdead\fP\^); .HP -int XauUnlockAuth (const char *\fIfile_name\fP\^); +int XauUnlockAuth (const char *\fIfile_name\fP\^); .HP -int XauDisposeAuth (Xauth *\fIauth\fP\^); +int XauDisposeAuth (Xauth *\fIauth\fP\^); .ft R .SH DESCRIPTION .PP @@ -124,7 +119,7 @@ results: .fi .PP -\fBXauUnlockAuth\fP undoes the work of \fIXauLockAuth\fP by unlinking both +\fBXauUnlockAuth\fP undoes the work of \fIXauLockAuth\fP by unlinking both the ``-c'' and ``-l'' file names. .PP \fBXauDisposeAuth\fP frees storage allocated to hold an authorization entry. diff --git a/man/XauDisposeAuth.man b/man/XauDisposeAuth.man new file mode 100644 index 0000000..df111d6 --- /dev/null +++ b/man/XauDisposeAuth.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xau.__libmansuffix__ diff --git a/man/XauFileName.man b/man/XauFileName.man new file mode 100644 index 0000000..df111d6 --- /dev/null +++ b/man/XauFileName.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xau.__libmansuffix__ diff --git a/man/XauGetAuthByAddr.man b/man/XauGetAuthByAddr.man new file mode 100644 index 0000000..df111d6 --- /dev/null +++ b/man/XauGetAuthByAddr.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xau.__libmansuffix__ diff --git a/man/XauGetBestAuthByAddr.man b/man/XauGetBestAuthByAddr.man new file mode 100644 index 0000000..df111d6 --- /dev/null +++ b/man/XauGetBestAuthByAddr.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xau.__libmansuffix__ diff --git a/man/XauLockAuth.man b/man/XauLockAuth.man new file mode 100644 index 0000000..df111d6 --- /dev/null +++ b/man/XauLockAuth.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xau.__libmansuffix__ diff --git a/man/XauReadAuth.man b/man/XauReadAuth.man new file mode 100644 index 0000000..df111d6 --- /dev/null +++ b/man/XauReadAuth.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xau.__libmansuffix__ diff --git a/man/XauUnlockAuth.man b/man/XauUnlockAuth.man new file mode 100644 index 0000000..df111d6 --- /dev/null +++ b/man/XauUnlockAuth.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xau.__libmansuffix__ diff --git a/man/XauWriteAuth.man b/man/XauWriteAuth.man new file mode 100644 index 0000000..df111d6 --- /dev/null +++ b/man/XauWriteAuth.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xau.__libmansuffix__ diff --git a/packaging/libXau.spec b/packaging/libXau.spec new file mode 100644 index 0000000..ad7c337 --- /dev/null +++ b/packaging/libXau.spec @@ -0,0 +1,72 @@ +Name: libXau +Summary: X.Org X11 libXau runtime library +Version: 1.0.7 +Release: 1 +Group: System/Libraries +License: MIT +URL: http://www.x.org/ +Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.gz + +BuildRequires: pkgconfig(xproto) +BuildRequires: pkgconfig(xorg-macros) + +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig + +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%description +Description: %{summary} +This is a very simple mechanism for providing individual access to an X Window +System display.It uses existing core protocol and library hooks for specifying +authorization data in the connection setup block to restrict use of the display +to only those clients that show that they know a server-specific key +called a "magic cookie". + +%package devel +Summary: Development components for the libXau library +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Provides: libxau-devel + +%description devel +Description: %{summary} + + +%prep +%setup -q + + +%build + +./autogen.sh +%reconfigure --disable-static + +# Call make instruction with smp support +make %{?jobs:-j%jobs} + +%install +rm -rf %{buildroot} +%make_install + +# remove *.la files +rm -f %{buildroot}%{_libdir}/*.la + +%remove_docs + +%clean +rm -rf %{buildroot} + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +%{_libdir}/*.so.* + +%files devel +%defattr(-,root,root,-) +%dir %{_includedir}/X11 +%{_includedir}/X11/*.h +%{_libdir}/*.so +%{_libdir}/pkgconfig/*.pc diff --git a/packaging/libxau.spec b/packaging/libxau.spec deleted file mode 100644 index e9a1cbd..0000000 --- a/packaging/libxau.spec +++ /dev/null @@ -1,70 +0,0 @@ -Name: libxau -Summary: X.Org X11 libXau runtime library -Version: 1.0.6 -Release: 2.24 -Group: System/Libraries -License: MIT -URL: http://www.x.org/ -Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.gz -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig -BuildRequires: pkgconfig(xproto) -BuildRequires: pkgconfig(xorg-macros) - -BuildRoot: %{_tmppath}/%{name}-%{version}-build - -%description -Description: %{summary} - - -%package devel -Summary: Development components for the libXau library -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} - -%description devel -Description: %{summary} - - -%prep -%setup -q -n %{name}-%{version} - - -%build - -%reconfigure -# Call make instruction with smp support -make %{?jobs:-j%jobs} - -%install -rm -rf %{buildroot} -%make_install - - -%clean -rm -rf %{buildroot} - - - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - - - -%files -%defattr(-,root,root,-) -%doc AUTHORS COPYING README ChangeLog -%{_libdir}/libXau.so.6 -%{_libdir}/libXau.so.6.0.0 - - -%files devel -%defattr(-,root,root,-) -%dir %{_includedir}/X11 -%{_includedir}/X11/Xauth.h -%{_libdir}/libXau.so -%{_libdir}/pkgconfig/xau.pc -#%dir %{_mandir}/man3x -%doc %{_mandir}/man3/*.3* - -- 2.7.4