<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f2bc6a26c1e08e4aec570576b7a4d52fed86d5af">https://github.com/macports/macports-ports/commit/f2bc6a26c1e08e4aec570576b7a4d52fed86d5af</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f2bc6a26c1e08e4aec570576b7a4d52fed86d5af
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Tue Apr 16 11:55:59 2019 +0100
<span style='display:block; white-space:pre;color:#404040;'> xauth: update to 1.0.10
</span>---
x11/xauth/Portfile | 19 +--
...Fix-for-xauth-failing-on-ENOSPC-disk-full.patch | 36 -----
...LAY-parsing-to-work-with-new-launchd-path.patch | 151 ---------------------
x11/xauth/files/0003-Fix-HAVE_STRLCPY-case.patch | 54 --------
...IX-standard-limits.h-for-PATH_MAX-instead.patch | 43 ------
5 files changed, 7 insertions(+), 296 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xauth/Portfile b/x11/xauth/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0237fa5..55f028a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xauth/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xauth/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> PortSystem 1.0
name xauth
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.0.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.0.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories x11
license X11
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,20 +15,13 @@ long_description ${description}
</span> homepage https://www.x.org/
master_sites xorg:individual/app/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha1 5d1f9f59aea271af8fc098cedef469f7a9337747 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 f67ba3729fb9b610beaf286b4962e6b10b6050f9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 56ce1523eb48b1f8a4f4244fe1c3d8e6af1a3b7d4b0e6063582421b0b68dc28f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 557852f551556305ccabd7c7547cde73d08eca18 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5afe42ce3cdf4f60520d1658d2b17face45c74050f39af45dccdc95e73fafc4d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 162176
</span>
use_bzip2 yes
use_parallel_build yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0001-Fix-for-xauth-failing-on-ENOSPC-disk-full.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0002-Update-DISPLAY-parsing-to-work-with-new-launchd-path.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0003-Fix-HAVE_STRLCPY-case.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0004-include-POSIX-standard-limits.h-for-PATH_MAX-instead.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_build \
port:pkgconfig
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xauth/files/0001-Fix-for-xauth-failing-on-ENOSPC-disk-full.patch b/x11/xauth/files/0001-Fix-for-xauth-failing-on-ENOSPC-disk-full.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2bdfb4e..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xauth/files/0001-Fix-for-xauth-failing-on-ENOSPC-disk-full.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,36 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 047f92a85796fca563d9345d6c4798b64be77cff Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: "Dr. Tilmann Bubeck" <tilmann@bubecks.de>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Tue, 24 Jun 2014 00:22:54 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1/4] Fix for xauth failing on ENOSPC (= disk full)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-If xauth must store its XAUTHORITY file on a file system which is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-full, it will be unable to write the changes. This condition was
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-not detected and therefore often the whole XAUTHORITY file was
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-cleared. Here is the fix.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=21260
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Dr. Tilmann Bubeck <tilmann@bubecks.de>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- process.c | 5 ++++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 4 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/process.c b/process.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index b44858a..5b12c92 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/process.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/process.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -844,7 +844,10 @@ write_auth_file(char *tmp_nam)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (void) fclose (fp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (fclose(fp)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return -1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.3.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xauth/files/0002-Update-DISPLAY-parsing-to-work-with-new-launchd-path.patch b/x11/xauth/files/0002-Update-DISPLAY-parsing-to-work-with-new-launchd-path.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a4b2f90..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xauth/files/0002-Update-DISPLAY-parsing-to-work-with-new-launchd-path.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,151 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From f990dd936b5fd1a40290bb88cde517a0ac38f823 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 31 Dec 2014 02:42:17 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 2/4] Update DISPLAY parsing to work with new launchd paths in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Yosemite
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gethost.c | 63 ++++++++++++++++++++++++++++++++++++++++++++------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- parsedpy.c | 31 +++++++++++++++++++++++++++++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2 files changed, 74 insertions(+), 20 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/gethost.c b/gethost.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0a5aff5..c75ae02 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/gethost.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/gethost.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -57,6 +57,8 @@ in this Software without prior written authorization from The Open Group.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <errno.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "xauth.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <sys/stat.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <sys/syslimits.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <arpa/inet.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -189,30 +191,55 @@ struct addrlist *get_address_info (
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src = buf;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- len = strlen (buf);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- } else if(prefix == 0 && (strncmp (fulldpyname, "/tmp/launch", 11) == 0)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* Use the bundle id (part preceding : in the basename) as our src id */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- char *c;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ char path[PATH_MAX];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ struct stat sbuf;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int is_path_to_socket = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef HAVE_STRLCPY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ strlcpy(path, fulldpyname, sizeof(path));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ strncpy(path, fulldpyname, sizeof(path));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ buf[sizeof(path) - 1] = '\0';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (0 == stat(path, &sbuf)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ is_path_to_socket = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ char *dot = strrchr(path, '.');
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (dot) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *dot = '\0';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* screen = atoi(dot + 1); */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (0 == stat(path, &sbuf)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ is_path_to_socket = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (is_path_to_socket) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* Use the bundle id (part preceding : in the basename) as our src id */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ char *c;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_STRLCPY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- strlcpy(buf, strrchr(fulldpyname, '/') + 1, sizeof(buf));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ strlcpy(buf, strrchr(fulldpyname, '/') + 1, sizeof(buf));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- strncpy(buf, strrchr(fulldpyname, '/') + 1, sizeof(buf));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- buf[sizeof(buf) - 1] = '\0';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ strncpy(buf, strrchr(fulldpyname, '/') + 1, sizeof(buf));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ buf[sizeof(buf) - 1] = '\0';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- c = strchr(buf, ':');
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ c = strchr(buf, ':');
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* In the legacy case with no bundle id, use the full path */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(c == buf) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- src = fulldpyname;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- *c = '\0';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- src = buf;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* In the legacy case with no bundle id, use the full path */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(c == buf) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ src = fulldpyname;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *c = '\0';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ src = buf;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- len = strlen(src);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- src = fulldpyname;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- len = prefix;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ len = strlen(src);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ src = fulldpyname;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ len = prefix;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case FamilyInternet: /* host:0 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/parsedpy.c b/parsedpy.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index c591b77..7365224 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/parsedpy.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/parsedpy.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -42,6 +42,9 @@ in this Software without prior written authorization from The Open Group.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <X11/Xauth.h> /* for FamilyLocal */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <X11/Xmu/SysUtil.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <sys/stat.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <sys/syslimits.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(UNIXCONN) || defined(LOCALCONN)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define UNIX_CONNECTION "unix"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define UNIX_CONNECTION_LENGTH 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -158,8 +161,32 @@ parse_displayname (const char *displayname,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!host) return False;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(strncmp (host, "/tmp/launch", 11) == 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- family = FamilyLocal;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * If using launchd socket, remove the screen number from the end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * of $DISPLAY and check if it is a path to a socket.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ char path[PATH_MAX];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ struct stat sbuf;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef HAVE_STRLCPY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ strlcpy(path, displayname, sizeof(path));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ strncpy(path, displayname, sizeof(path));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ buf[sizeof(path) - 1] = '\0';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (0 == stat(path, &sbuf)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ family = FamilyLocal;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ char *dot = strrchr(path, '.');
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (dot) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *dot = '\0';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* screen = atoi(dot + 1); */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (0 == stat(path, &sbuf)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ family = FamilyLocal;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.3.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xauth/files/0003-Fix-HAVE_STRLCPY-case.patch b/x11/xauth/files/0003-Fix-HAVE_STRLCPY-case.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0ec25665..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xauth/files/0003-Fix-HAVE_STRLCPY-case.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,54 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From a58c9d74c8f9c4292d367c6e23d15c4cba03dfde Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Jon TURNEY <jon.turney@dronecode.org.uk>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Fri, 2 Jan 2015 16:18:52 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 3/4] Fix !HAVE_STRLCPY case
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-MIME-Version: 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Content-Type: text/plain; charset=UTF-8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Content-Transfer-Encoding: 8bit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix error in the !HAVE_STRLCPY case, introduced in commit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-f990dd936b5fd1a40290bb88cde517a0ac38f823
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-It seems that "path[sizeof(path) - 1]" rather than "buf[sizeof(path) - 1]" must
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-be meant here, especially as the second instance doesn't even compile...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-parsedpy.c: In function ‘parse_displayname’:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-parsedpy.c:176:9: error: ‘buf’ undeclared (first use in this function)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gethost.c | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- parsedpy.c | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2 files changed, 2 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/gethost.c b/gethost.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index c75ae02..e0dc8cb 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/gethost.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/gethost.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -200,7 +200,7 @@ struct addrlist *get_address_info (
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- strlcpy(path, fulldpyname, sizeof(path));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- strncpy(path, fulldpyname, sizeof(path));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- buf[sizeof(path) - 1] = '\0';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ path[sizeof(path) - 1] = '\0';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (0 == stat(path, &sbuf)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- is_path_to_socket = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/parsedpy.c b/parsedpy.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 7365224..c638b26 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/parsedpy.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/parsedpy.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -173,7 +173,7 @@ parse_displayname (const char *displayname,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- strlcpy(path, displayname, sizeof(path));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- strncpy(path, displayname, sizeof(path));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- buf[sizeof(path) - 1] = '\0';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ path[sizeof(path) - 1] = '\0';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (0 == stat(path, &sbuf)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- family = FamilyLocal;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.3.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xauth/files/0004-include-POSIX-standard-limits.h-for-PATH_MAX-instead.patch b/x11/xauth/files/0004-include-POSIX-standard-limits.h-for-PATH_MAX-instead.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2fae1d8..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xauth/files/0004-include-POSIX-standard-limits.h-for-PATH_MAX-instead.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,43 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From ad26f2137f6414c8cadc070f96a4476d435e994b Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Alan Coopersmith <alan.coopersmith@oracle.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Fri, 2 Jan 2015 09:49:52 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 4/4] include POSIX-standard limits.h for PATH_MAX instead of
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sys/syslimits.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gethost.c | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- parsedpy.c | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2 files changed, 2 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/gethost.c b/gethost.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index e0dc8cb..8cb58c5 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/gethost.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/gethost.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -58,7 +58,7 @@ in this Software without prior written authorization from The Open Group.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "xauth.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/stat.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <sys/syslimits.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <limits.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <arpa/inet.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/parsedpy.c b/parsedpy.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index c638b26..97988d3 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/parsedpy.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/parsedpy.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -43,7 +43,7 @@ in this Software without prior written authorization from The Open Group.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <X11/Xmu/SysUtil.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/stat.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <sys/syslimits.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <limits.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(UNIXCONN) || defined(LOCALCONN)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define UNIX_CONNECTION "unix"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.3.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>