libxau: Changes to 'debian-unstable'
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 +++++++++++++++++++++++++++++++++++++++++++
Makefile.am | 35 -----------
README | 6 -
Xau.man | 134 -------------------------------------------
configure.ac | 84 ++++++++++++++------------
debian/changelog | 8 ++
debian/control | 2
debian/rules | 3
include/X11/Xauth.h | 4 -
man/Makefile.am | 47 +++++++++++++++
man/Xau.man | 129 +++++++++++++++++++++++++++++++++++++++++
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
28 files changed, 379 insertions(+), 245 deletions(-)
New commits:
commit ef45539720860b826a16804e3c2290e604a3b676
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Apr 9 18:53:26 2012 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 9a969e4..497bc14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libxau (1:1.0.7-1) UNRELEASED; urgency=low
+libxau (1:1.0.7-1) unstable; urgency=low
* New upstream release.
* Don't require (fake)root for debian/rules clean.
* Bump xutils-dev build-dep to 1:7.5+4 for newer macros.
- -- Julien Cristau <jcristau@debian.org> Mon, 09 Apr 2012 18:43:10 +0200
+ -- Julien Cristau <jcristau@debian.org> Mon, 09 Apr 2012 18:50:40 +0200
libxau (1:1.0.6-4) unstable; urgency=low
commit 4aa3e8bd21d9646dbab51f5ae008bd260032a483
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Apr 9 18:50:39 2012 +0200
Bump xutils-dev build-dep to 1:7.5+4 for newer macros.
diff --git a/debian/changelog b/debian/changelog
index 39fcee6..9a969e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libxau (1:1.0.7-1) UNRELEASED; urgency=low
* New upstream release.
* Don't require (fake)root for debian/rules clean.
+ * Bump xutils-dev build-dep to 1:7.5+4 for newer macros.
-- Julien Cristau <jcristau@debian.org> Mon, 09 Apr 2012 18:43:10 +0200
diff --git a/debian/control b/debian/control
index 3a9ca27..a2752b6 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends:
autoconf,
automake,
libtool,
- xutils-dev (>= 1:7.5+1),
+ xutils-dev (>= 1:7.5+4),
Standards-Version: 3.9.2
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxau
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxau.git
commit 874196a83728386abbab991ca8d56dd68c765bae
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Apr 9 18:48:58 2012 +0200
Don't require (fake)root for debian/rules clean.
diff --git a/debian/changelog b/debian/changelog
index 22bbf15..39fcee6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
libxau (1:1.0.7-1) UNRELEASED; urgency=low
* New upstream release.
+ * Don't require (fake)root for debian/rules clean.
-- Julien Cristau <jcristau@debian.org> Mon, 09 Apr 2012 18:43:10 +0200
diff --git a/debian/rules b/debian/rules
index a2960eb..aa4c25b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -61,9 +61,7 @@ build-stamp: build/config.status
clean: xsfclean
dh_testdir
- dh_testroot
rm -f build-stamp
-
rm -f config.cache config.log config.status
rm -f */config.cache */config.log */config.status
rm -f conftest* */conftest*
@@ -72,7 +70,6 @@ clean: xsfclean
rm -f $$(find -name Makefile.in)
rm -f compile config.guess config.sub configure depcomp install-sh
rm -f ltmain.sh missing INSTALL aclocal.m4 mkinstalldirs config.h.in
-
dh_clean
install: build
commit 4c4d4a2ebb0684351e3c75bd9167bf2926442a0b
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Apr 9 18:45:59 2012 +0200
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index 855aa72..2d3c243 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,137 @@
+commit 0e3061495f5da8a323db02e612c4f09688b7ade0
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Tue Mar 6 22:16:57 2012 -0800
+
+ libXau 1.0.7
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 5c01ef69eee7dfe925c97558153fcd5e116252c6
+Author: Matthew D. Fuller <fullermd@over-yonder.net>
+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 <fullermd@over-yonder.net>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 8fd15eb0149cec75d69a27b1f8ec3ce092465b80
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+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 <alan.coopersmith@oracle.com>
+
+commit 063bfa679adc2c00a6b55e5c9ee97f2aa0638788
+Author: Gaetan Nadon <memsize@videotron.ca>
+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 <memsize@videotron.ca>
+
+commit c492cf2f90db79e75bf3fa8a8215f8139237c5c5
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Fri Jan 28 19:41:37 2011 -0500
+
+ config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 7de07642d62440a90942a8a071624ac09f48a2b3
+Author: Gaetan Nadon <memsize@videotron.ca>
+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 <memsize@videotron.ca>
+
+commit 98f08b9c8414e7d759d08af4711b9519ca8fd37f
+Author: Gaetan Nadon <memsize@videotron.ca>
+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 <memsize@videotron.ca>
+
+commit b910d657d7b857fcd2564304205c853fa8148667
+Author: Gaetan Nadon <memsize@videotron.ca>
+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 <memsize@videotron.ca>
+
+commit 2085fbfa8347620890ed844057a42c9a4dba606b
+Author: Jesse Adkins <jesserayadkins@gmail.com>
+Date: Tue Sep 28 13:30:02 2010 -0700
+
+ Purge cvs tags.
+
+ Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 240d2475aa627774dad9e4f02594c5ce8c8048a4
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Aug 11 09:41:00 2010 -0400
+
+ Xau.man: replace hard-coded 3 with __libmansuffix__
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit afcd0ff9109b3478a473772c9d4e14d57951aab8
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Aug 11 09:31:50 2010 -0400
+
+ Xau.man: remove whitespace as reported by git diff check
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit f666268d1f328f76cbbef367560eb9ea4da30808
+Author: Gaetan Nadon <memsize@videotron.ca>
+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 <memsize@videotron.ca>
+
commit a01b74fad039e68cf296bd5e83c6f538181e529a
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Jul 19 17:17:54 2010 +0100
diff --git a/debian/changelog b/debian/changelog
index 008bb48..22bbf15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxau (1:1.0.7-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Julien Cristau <jcristau@debian.org> Mon, 09 Apr 2012 18:43:10 +0200
+
libxau (1:1.0.6-4) unstable; urgency=low
* Mark libxau-dev Multi-Arch: same, after confirming the contents are
commit 0e3061495f5da8a323db02e612c4f09688b7ade0
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Mar 6 22:16:57 2012 -0800
libXau 1.0.7
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index c21fbcd..92ad113 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([libXau], [1.0.6],
+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])
commit 5c01ef69eee7dfe925c97558153fcd5e116252c6
Author: Matthew D. Fuller <fullermd@over-yonder.net>
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 <fullermd@over-yonder.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/AuLock.c b/AuLock.c
index 1eab79a..a816b24 100644
--- a/AuLock.c
+++ b/AuLock.c
@@ -81,7 +81,7 @@ long dead)
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);
commit 8fd15eb0149cec75d69a27b1f8ec3ce092465b80
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
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 <alan.coopersmith@oracle.com>
diff --git a/AuLock.c b/AuLock.c
index c236027..1eab79a 100644
--- a/AuLock.c
+++ b/AuLock.c
@@ -76,7 +76,7 @@ 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);
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/configure.ac b/configure.ac
index 09a872e..c21fbcd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,7 +59,7 @@ 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
commit 063bfa679adc2c00a6b55e5c9ee97f2aa0638788
Author: Gaetan Nadon <memsize@videotron.ca>
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 <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 4fce292..09a872e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,32 +1,39 @@
-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.6],
+ [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
-AC_CONFIG_HEADERS(config.h)
+# Initialize libtool
+AC_LIBTOOL_WIN32_DLL
+AC_PROG_LIBTOOL
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
@@ -34,10 +41,10 @@ m4_ifndef([XORG_MACROS_VERSION],
XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
+# Checks for programs.
AC_PROG_LN_S
-AC_LIBTOOL_WIN32_DLL
-AM_PROG_LIBTOOL
+# Obtain compiler/linker options for depedencies
PKG_CHECK_MODULES(XAU, xproto)
AC_ARG_ENABLE(xthreads,
@@ -56,7 +63,7 @@ if test "x$xthreads" = "xyes" ; then
[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" ;;
@@ -64,12 +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
- man/Makefile
- xau.pc])
+AC_CONFIG_FILES([Makefile
+ man/Makefile
+ xau.pc])
+AC_OUTPUT
commit c492cf2f90db79e75bf3fa8a8215f8139237c5c5
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Jan 28 19:41:37 2011 -0500
config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 7fab497..4fce292 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ AC_INIT(libXau, 1.0.6, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
commit 7de07642d62440a90942a8a071624ac09f48a2b3
Author: Gaetan Nadon <memsize@videotron.ca>
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 <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 52a7f05..7fab497 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,7 +41,7 @@ AM_PROG_LIBTOOL
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])
commit 98f08b9c8414e7d759d08af4711b9519ca8fd37f
Author: Gaetan Nadon <memsize@videotron.ca>
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 <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 6760b3d..52a7f05 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,12 +34,9 @@ m4_ifndef([XORG_MACROS_VERSION],
XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
-AC_PROG_INSTALL
AC_PROG_LN_S
AC_LIBTOOL_WIN32_DLL
AM_PROG_LIBTOOL
-AC_PROG_MAKE_SET
-AC_PROG_SED
PKG_CHECK_MODULES(XAU, xproto)
commit b910d657d7b857fcd2564304205c853fa8148667
Author: Gaetan Nadon <memsize@videotron.ca>
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 <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index f08800b..6760b3d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,7 +34,6 @@ m4_ifndef([XORG_MACROS_VERSION],
XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
-AC_PROG_CC
AC_PROG_INSTALL
AC_PROG_LN_S
AC_LIBTOOL_WIN32_DLL
commit 2085fbfa8347620890ed844057a42c9a4dba606b
Author: Jesse Adkins <jesserayadkins@gmail.com>
Date: Tue Sep 28 13:30:02 2010 -0700
Purge cvs tags.
Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
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 <config.h>
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 <config.h>
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 <config.h>
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 <config.h>
diff --git a/AuLock.c b/AuLock.c
index 69b1fd6..c236027 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 <config.h>
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 <config.h>
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 <config.h>
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 <config.h>
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/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/Xau.man b/man/Xau.man
index 7fb64d7..46d4a19 100644
--- a/man/Xau.man
+++ b/man/Xau.man
@@ -1,6 +1,3 @@
-.\" $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
@@ -26,8 +23,6 @@
.\" 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 $
-.\"
.TH Xau __libmansuffix__ __xorgversion__
.SH NAME
Xau library: XauFileName, XauReadAuth, XauLockAuth, XauUnlockAuth,
commit 240d2475aa627774dad9e4f02594c5ce8c8048a4
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Aug 11 09:41:00 2010 -0400
Xau.man: replace hard-coded 3 with __libmansuffix__
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/man/Xau.man b/man/Xau.man
index 88bafac..7fb64d7 100644
--- a/man/Xau.man
+++ b/man/Xau.man
@@ -28,7 +28,7 @@
.\"
.\" $XFree86: xc/doc/man/Xau/Xau.man,v 1.2 2001/01/27 18:20:19 dawes Exp $
.\"
-.TH Xau 3 __xorgversion__
+.TH Xau __libmansuffix__ __xorgversion__
.SH NAME
Xau library: XauFileName, XauReadAuth, XauLockAuth, XauUnlockAuth,
XauWriteAuth, XauDisposeAuth,
commit afcd0ff9109b3478a473772c9d4e14d57951aab8
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Aug 11 09:31:50 2010 -0400
Xau.man: remove whitespace as reported by git diff check
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/man/Xau.man b/man/Xau.man
index cc82bc7..88bafac 100644
--- a/man/Xau.man
+++ b/man/Xau.man
@@ -2,28 +2,28 @@
.\" $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
+.\"
+.\" 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 $
@@ -51,11 +51,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 +65,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 +124,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.
commit f666268d1f328f76cbbef367560eb9ea4da30808
Author: Gaetan Nadon <memsize@videotron.ca>
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 <memsize@videotron.ca>
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@) \
Reply to: