xauth: Changes to 'upstream-unstable'
COPYING | 25 +++++++++++++++++--------
Makefile.am | 2 +-
configure.ac | 3 +--
gethost.c | 10 +++++++++-
process.c | 3 +++
5 files changed, 31 insertions(+), 12 deletions(-)
New commits:
commit 85459f9fee2ad4d5954e8f549df9a269cf3bff76
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Mar 7 18:20:15 2008 +0100
Change xauth_CFLAGS to AM_CFLAGS to make automake-1.10 happier
Makefile.am:27: compiling `gethost.c' with per-target flags requires `AM_PROG_CC_C_O' in `configure.ac'
diff --git a/Makefile.am b/Makefile.am
index 948c2aa..24a12c0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,7 @@
bin_PROGRAMS = xauth
-xauth_CFLAGS = $(XAUTH_CFLAGS)
+AM_CFLAGS = $(XAUTH_CFLAGS)
xauth_LDADD = $(XAUTH_LIBS)
xauth_SOURCES = \
commit a9c0960c94b9299bcf2bb08c05a6f66579d4a862
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Mar 6 16:56:33 2008 -0500
xauth 1.0.3
diff --git a/configure.ac b/configure.ac
index fa1a83e..ffe378c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,3 @@
-
dnl Copyright 2005 Red Hat, Inc.
dnl
dnl Permission to use, copy, modify, distribute, and sell this software and its
@@ -22,7 +21,7 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(xauth,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xauth)
+AC_INIT(xauth,[1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xauth)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
commit 65a0917d4661e370b50beed8f06f5577bfeea59f
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Thu Jan 10 21:15:56 2008 -0800
get_address_info: don't allow duplicate entries to be returned in the list
OS-X's getaddrinfo() can return duplicate entries (and does for localhost with
the default 10.5 /etc/hosts). This caused some annoying crashes which this
patch takes care of.
See http://trac.macosforge.org/projects/xquartz/ticket/44
diff --git a/gethost.c b/gethost.c
index a0f30da..94c1d99 100644
--- a/gethost.c
+++ b/gethost.c
@@ -307,7 +307,15 @@ struct addrlist *get_address_info (
family = FamilyInternet6;
}
- if (len > 0 && src != NULL) {
+ struct addrlist *duplicate;
+ for(duplicate = retval; duplicate != NULL; duplicate = duplicate->next) {
+ if(duplicate->family == family && duplicate->len == len &&
+ memcmp(duplicate->address, src, len) == 0) {
+ break;
+ }
+ }
+
+ if (len > 0 && src != NULL && duplicate == NULL) {
struct addrlist *newrv = malloc (sizeof(struct addrlist));
if (newrv) {
newrv->address = malloc (len);
commit 40e1769f4c631713c32c73a5244f3d65aea89ab7
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Sat Dec 1 20:01:23 2007 -0800
Added support for launchd socket
From Martin Costabel
diff --git a/process.c b/process.c
index 4cb2b56..1e61d49 100644
--- a/process.c
+++ b/process.c
@@ -484,6 +484,9 @@ get_displayname_auth(char *displayname, AuthList **authl)
cp = strchr(displayname, '/');
if (cp && strncmp (cp, "/unix:", 6) == 0)
prelen = (cp - displayname);
+
+ if (strncmp (displayname, "/tmp/launch", 11) == 0)
+ displayname = strrchr(displayname, '/') + 1;
if (!parse_displayname (displayname + ((prelen > 0) ? prelen + 1 : 0),
&family, &host, &dpynum, &scrnum, &rest)) {
commit 60615bc52f685b7ddfd574e10ed8fdcf2b6e43f5
Author: Daniel Drake <ddrake@brontes3d.com>
Date: Wed May 16 14:24:00 2007 -0800
Bug #10971: xauth COPYING file
X.Org Bugzilla #10971 <https://bugs.freedesktop.org/show_bug.cgi?id=10971>
diff --git a/COPYING b/COPYING
index 7f33cbf..0ad0f43 100644
--- a/COPYING
+++ b/COPYING
@@ -1,12 +1,21 @@
-This is a stub file. This package has not yet had its complete licensing
-information compiled. Please see the individual source files for details on
-your rights to use and modify this software.
+Copyright 1989, 1993, 1998 The Open Group
-Please submit updated COPYING files to the Xorg bugzilla:
+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.
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
+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.
-http://lists.freedesktop.org/mailman/listinfo/xorg
+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.
Reply to: