xauth: Changes to 'upstream-unstable'
Makefile.am | 2 -
README | 17 ++++++---------
autogen.sh | 12 +++++++----
configure.ac | 3 --
gethost.c | 63 ++++++++++++++++++++++++++++++++++++++++++-----------------
parsedpy.c | 31 +++++++++++++++++++++++++++--
process.c | 5 +++-
xauth.c | 1
8 files changed, 96 insertions(+), 38 deletions(-)
New commits:
commit 536d1003a5c4d5ac24cd3b8afd10492e4e6242df
Author: Matt Turner <mattst88@gmail.com>
Date: Sun Jan 29 13:09:12 2017 -0800
xauth 1.0.10
Signed-off-by: Matt Turner <mattst88@gmail.com>
diff --git a/configure.ac b/configure.ac
index def3cd5..4bc43e2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ dnl Process this file with autoconf to create configure.
AC_PREREQ([2.60])
AC_INIT([xauth],
- [1.0.9],
+ [1.0.10],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xauth])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
commit 72717ccee0b6bdbf161cc9d44abe3dc1d824fe46
Author: Matt Turner <mattst88@gmail.com>
Date: Sun Jan 29 13:09:39 2017 -0800
Build xauth before running tests.
Otherwise make check fails if make hasn't previously been run.
Signed-off-by: Matt Turner <mattst88@gmail.com>
diff --git a/Makefile.am b/Makefile.am
index 87360a5..9fec077 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,7 @@
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
-SUBDIRS = man tests
+SUBDIRS = . man tests
bin_PROGRAMS = xauth
AM_CFLAGS = $(CWARNFLAGS) $(XAUTH_CFLAGS)
commit 4dee6a980fdc0174d3825389f95ac1f27c2427db
Author: Mihail Konev <k.mvc@ya.ru>
Date: Thu Jan 26 14:00:20 2017 +1000
autogen: add default patch prefix
Signed-off-by: Mihail Konev <k.mvc@ya.ru>
diff --git a/autogen.sh b/autogen.sh
index 0006de8..8c0766c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -9,6 +9,9 @@ cd "$srcdir"
autoreconf -v --install || exit 1
cd "$ORIGDIR" || exit $?
+git config --local --get format.subjectPrefix >/dev/null 2>&1 ||
+ git config --local format.subjectPrefix "PATCH app/xauth"
+
if test -z "$NOCONFIGURE"; then
exec "$srcdir"/configure "$@"
fi
commit 4933bc594087c25dfbc9b1f6db46440f19d0b360
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Mon Mar 9 12:00:52 2015 +0000
autogen.sh: use quoted string variables
Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent
fall-outs, when they contain space.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/autogen.sh b/autogen.sh
index fd9c59a..0006de8 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,14 +1,14 @@
#! /bin/sh
-srcdir=`dirname $0`
+srcdir=`dirname "$0"`
test -z "$srcdir" && srcdir=.
ORIGDIR=`pwd`
-cd $srcdir
+cd "$srcdir"
autoreconf -v --install || exit 1
-cd $ORIGDIR || exit $?
+cd "$ORIGDIR" || exit $?
if test -z "$NOCONFIGURE"; then
- exec $srcdir/configure "$@"
+ exec "$srcdir"/configure "$@"
fi
commit eaeb306e67c23657f713b3ca48765d1c6ed99986
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jan 24 10:32:07 2017 +1000
autogen.sh: use exec instead of waiting for configure to finish
Syncs the invocation of configure with the one from the server.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
diff --git a/autogen.sh b/autogen.sh
index fc34bd5..fd9c59a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -10,5 +10,5 @@ autoreconf -v --install || exit 1
cd $ORIGDIR || exit $?
if test -z "$NOCONFIGURE"; then
- $srcdir/configure "$@"
+ exec $srcdir/configure "$@"
fi
commit 179459471e83a0cd235a0c8ead99b3156390e00c
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Jun 1 21:03:14 2014 -0700
autogen.sh: Honor NOCONFIGURE=1
See http://people.gnome.org/~walters/docs/build-api.txt
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/autogen.sh b/autogen.sh
index 80ae530..fc34bd5 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -9,5 +9,6 @@ cd $srcdir
autoreconf -v --install || exit 1
cd $ORIGDIR || exit $?
-$srcdir/configure "$@"
-
+if test -z "$NOCONFIGURE"; then
+ $srcdir/configure "$@"
+fi
commit 0e4c17c6d6980f07896f0631cffeb82a0e9705f7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jan 26 10:26:30 2017 +1000
autogen.sh: stop using maintainer mode
See xserver commit 4bf3eac5fe20f
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/autogen.sh b/autogen.sh
index e81f989..80ae530 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -9,5 +9,5 @@ cd $srcdir
autoreconf -v --install || exit 1
cd $ORIGDIR || exit $?
-$srcdir/configure --enable-maintainer-mode "$@"
+$srcdir/configure "$@"
diff --git a/configure.ac b/configure.ac
index 2d36ed5..def3cd5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,6 @@ AC_INIT([xauth],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xauth])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
-AM_MAINTAINER_MODE
AC_CONFIG_HEADERS([config.h])
commit a64ca3aafcde516658d699047382ab294e3e974f
Author: Søren Sandmann Pedersen <ssp@redhat.com>
Date: Thu Sep 26 12:30:03 2013 -0400
usage(): Print summary for the -n option
This option is mentioned in the man page, but not in the help text
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/xauth.c b/xauth.c
index 85fcaf4..d9efda0 100644
--- a/xauth.c
+++ b/xauth.c
@@ -68,6 +68,7 @@ usage(void)
" -q turn off extra messages",
" -i ignore locks on authority file",
" -b break locks on authority file",
+" -n do not resolve host names in authority file",
" -V show version number of xauth",
"",
"and commands have the following syntax:",
commit ad26f2137f6414c8cadc070f96a4476d435e994b
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Jan 2 09:49:52 2015 -0800
include POSIX-standard limits.h for PATH_MAX instead of sys/syslimits.h
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
diff --git a/gethost.c b/gethost.c
index e0dc8cb..8cb58c5 100644
--- a/gethost.c
+++ b/gethost.c
@@ -58,7 +58,7 @@ in this Software without prior written authorization from The Open Group.
#include "xauth.h"
#include <sys/stat.h>
-#include <sys/syslimits.h>
+#include <limits.h>
#ifndef WIN32
#include <arpa/inet.h>
diff --git a/parsedpy.c b/parsedpy.c
index c638b26..97988d3 100644
--- a/parsedpy.c
+++ b/parsedpy.c
@@ -43,7 +43,7 @@ in this Software without prior written authorization from The Open Group.
#include <X11/Xmu/SysUtil.h>
#include <sys/stat.h>
-#include <sys/syslimits.h>
+#include <limits.h>
#if defined(UNIXCONN) || defined(LOCALCONN)
#define UNIX_CONNECTION "unix"
commit a58c9d74c8f9c4292d367c6e23d15c4cba03dfde
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Jan 2 16:18:52 2015 +0000
Fix !HAVE_STRLCPY case
Fix error in the !HAVE_STRLCPY case, introduced in commit
f990dd936b5fd1a40290bb88cde517a0ac38f823
It seems that "path[sizeof(path) - 1]" rather than "buf[sizeof(path) - 1]" must
be meant here, especially as the second instance doesn't even compile...
parsedpy.c: In function ‘parse_displayname’:
parsedpy.c:176:9: error: ‘buf’ undeclared (first use in this function)
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
diff --git a/gethost.c b/gethost.c
index c75ae02..e0dc8cb 100644
--- a/gethost.c
+++ b/gethost.c
@@ -200,7 +200,7 @@ struct addrlist *get_address_info (
strlcpy(path, fulldpyname, sizeof(path));
#else
strncpy(path, fulldpyname, sizeof(path));
- buf[sizeof(path) - 1] = '\0';
+ path[sizeof(path) - 1] = '\0';
#endif
if (0 == stat(path, &sbuf)) {
is_path_to_socket = 1;
diff --git a/parsedpy.c b/parsedpy.c
index 7365224..c638b26 100644
--- a/parsedpy.c
+++ b/parsedpy.c
@@ -173,7 +173,7 @@ parse_displayname (const char *displayname,
strlcpy(path, displayname, sizeof(path));
#else
strncpy(path, displayname, sizeof(path));
- buf[sizeof(path) - 1] = '\0';
+ path[sizeof(path) - 1] = '\0';
#endif
if (0 == stat(path, &sbuf)) {
family = FamilyLocal;
commit f990dd936b5fd1a40290bb88cde517a0ac38f823
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Wed Dec 31 02:42:17 2014 -0800
Update DISPLAY parsing to work with new launchd paths in Yosemite
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
diff --git a/gethost.c b/gethost.c
index 0a5aff5..c75ae02 100644
--- a/gethost.c
+++ b/gethost.c
@@ -57,6 +57,8 @@ in this Software without prior written authorization from The Open Group.
#include <errno.h>
#include "xauth.h"
+#include <sys/stat.h>
+#include <sys/syslimits.h>
#ifndef WIN32
#include <arpa/inet.h>
@@ -189,30 +191,55 @@ struct addrlist *get_address_info (
src = buf;
len = strlen (buf);
}
- } else if(prefix == 0 && (strncmp (fulldpyname, "/tmp/launch", 11) == 0)) {
- /* Use the bundle id (part preceding : in the basename) as our src id */
- char *c;
+ } else {
+ char path[PATH_MAX];
+ struct stat sbuf;
+ int is_path_to_socket = 0;
+
+#ifdef HAVE_STRLCPY
+ strlcpy(path, fulldpyname, sizeof(path));
+#else
+ strncpy(path, fulldpyname, sizeof(path));
+ buf[sizeof(path) - 1] = '\0';
+#endif
+ if (0 == stat(path, &sbuf)) {
+ is_path_to_socket = 1;
+ } else {
+ char *dot = strrchr(path, '.');
+ if (dot) {
+ *dot = '\0';
+ /* screen = atoi(dot + 1); */
+ if (0 == stat(path, &sbuf)) {
+ is_path_to_socket = 1;
+ }
+ }
+ }
+
+ if (is_path_to_socket) {
+ /* Use the bundle id (part preceding : in the basename) as our src id */
+ char *c;
#ifdef HAVE_STRLCPY
- strlcpy(buf, strrchr(fulldpyname, '/') + 1, sizeof(buf));
+ strlcpy(buf, strrchr(fulldpyname, '/') + 1, sizeof(buf));
#else
- strncpy(buf, strrchr(fulldpyname, '/') + 1, sizeof(buf));
- buf[sizeof(buf) - 1] = '\0';
+ strncpy(buf, strrchr(fulldpyname, '/') + 1, sizeof(buf));
+ buf[sizeof(buf) - 1] = '\0';
#endif
- c = strchr(buf, ':');
+ c = strchr(buf, ':');
- /* In the legacy case with no bundle id, use the full path */
- if(c == buf) {
- src = fulldpyname;
- } else {
- *c = '\0';
- src = buf;
- }
+ /* In the legacy case with no bundle id, use the full path */
+ if(c == buf) {
+ src = fulldpyname;
+ } else {
+ *c = '\0';
+ src = buf;
+ }
- len = strlen(src);
- } else {
- src = fulldpyname;
- len = prefix;
+ len = strlen(src);
+ } else {
+ src = fulldpyname;
+ len = prefix;
+ }
}
break;
case FamilyInternet: /* host:0 */
diff --git a/parsedpy.c b/parsedpy.c
index c591b77..7365224 100644
--- a/parsedpy.c
+++ b/parsedpy.c
@@ -42,6 +42,9 @@ in this Software without prior written authorization from The Open Group.
#include <X11/Xauth.h> /* for FamilyLocal */
#include <X11/Xmu/SysUtil.h>
+#include <sys/stat.h>
+#include <sys/syslimits.h>
+
#if defined(UNIXCONN) || defined(LOCALCONN)
#define UNIX_CONNECTION "unix"
#define UNIX_CONNECTION_LENGTH 4
@@ -158,8 +161,32 @@ parse_displayname (const char *displayname,
if (!host) return False;
- if(strncmp (host, "/tmp/launch", 11) == 0) {
- family = FamilyLocal;
+ {
+ /*
+ * If using launchd socket, remove the screen number from the end
+ * of $DISPLAY and check if it is a path to a socket.
+ */
+ char path[PATH_MAX];
+ struct stat sbuf;
+
+#ifdef HAVE_STRLCPY
+ strlcpy(path, displayname, sizeof(path));
+#else
+ strncpy(path, displayname, sizeof(path));
+ buf[sizeof(path) - 1] = '\0';
+#endif
+ if (0 == stat(path, &sbuf)) {
+ family = FamilyLocal;
+ } else {
+ char *dot = strrchr(path, '.');
+ if (dot) {
+ *dot = '\0';
+ /* screen = atoi(dot + 1); */
+ if (0 == stat(path, &sbuf)) {
+ family = FamilyLocal;
+ }
+ }
+ }
}
/*
commit 047f92a85796fca563d9345d6c4798b64be77cff
Author: Dr. Tilmann Bubeck <tilmann@bubecks.de>
Date: Tue Jun 24 00:22:54 2014 +0200
Fix for xauth failing on ENOSPC (= disk full)
If xauth must store its XAUTHORITY file on a file system which is
full, it will be unable to write the changes. This condition was
not detected and therefore often the whole XAUTHORITY file was
cleared. Here is the fix.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=21260
Signed-off-by: Dr. Tilmann Bubeck <tilmann@bubecks.de>
diff --git a/process.c b/process.c
index b44858a..5b12c92 100644
--- a/process.c
+++ b/process.c
@@ -844,7 +844,10 @@ write_auth_file(char *tmp_nam)
}
}
- (void) fclose (fp);
+ if (fclose(fp)) {
+ return -1;
+ }
+
return 0;
}
commit 12e63de4e0b3a45fad15863a66723609b068e668
Author: Dr. Tilmann Bubeck <tilmann@bubecks.de>
Date: Wed Apr 2 22:13:48 2014 +0200
Clarified RELEASING in README
Changed clone URL and improved text. Removed section GARBAGE.
Signed-off-by: Dr. Tilmann Bubeck <tilmann@bubecks.de>
diff --git a/README b/README
index 2795b79..1f5e867 100644
--- a/README
+++ b/README
@@ -46,13 +46,17 @@ public. A detailed description of this process can be found at
http://www.x.org/wiki/Development/Documentation/ReleaseHOWTO with a
few clarification below.
-For releasing under Fedora make sure, that INSTALL in
-/usr/share/util-macros/ exists. If not, then please create that
+Remember, that the last commit _must_ include the version string in
+its diff (not the commit message). This is typically done by
+incrementing the version string in configure.ac.
+
+For releasing under Fedora make sure, that
+/usr/share/util-macros/INSTALL exists. If not, then please create that
file.
To release a new version of xauth, please follow this steps:
- * git clone git://anongit.freedesktop.org/git/xorg/app/xauth
+ * git clone ssh://git.freedesktop.org/git/xorg/app/xauth
* cd xauth ; ./autogen.sh ; make ; make check
* follow ReleaseHowto inside this directory.
@@ -64,11 +68,4 @@ Ignore these errors shown during release.sh:
cp: cannot create regular file '../.INSTALL.tmp': Permission denied
util-macros "pkgdatadir" from xorg-macros.pc not found: installing possibly empty INSTALL.
- V. GARBAGE
-
-Please ignore this paragraph. It is only used to satisfying
-release.sh, which wants to see the version number to the last version
-in the diff, which is 1.0.9 in our case. This paragraph can be
-deleted on the next release of xauth.
-
[eof]
Reply to: