[pkgsrc/trunk]: pkgsrc/x11/xtrans Re-enable abstract socket support under Lin...

[dsainty <dsainty%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d2bab5ee16d7
branches:  trunk
changeset: 546925:d2bab5ee16d7
user:      dsainty <dsainty%pkgsrc.org@localhost>
date:      Tue Sep 09 13:59:13 2008 +0000

description:
Re-enable abstract socket support under Linux (remove comment and first hunk
of patch-aa).

Abstract socket support was previously patched disabled because it was broken
( see http://bugs.freedesktop.org/show_bug.cgi?id=15884 ).  The fix is in two
parts.

The first part is corrected in xtrans 1.2.1: Connection failure for abstract
socket is ECONNREFUSED, not ENOENT.

The second part is in an upcoming release of libX11, but the upstream changes
have been pulled into Pkgsrc as the patches libX11/patches/patch-a[ik].

Tested on the same Linux system that prompted Bug#15884.

Bump PKGREVISION.

diffstat:

 x11/xtrans/Makefile         |   3 ++-
 x11/xtrans/distinfo         |   4 ++--
 x11/xtrans/patches/patch-aa |  15 +--------------
 3 files changed, 5 insertions(+), 17 deletions(-)

diffs (51 lines):

diff -r 2cbcd3767d38 -r d2bab5ee16d7 x11/xtrans/Makefile
--- a/x11/xtrans/Makefile       Tue Sep 09 12:49:32 2008 +0000
+++ b/x11/xtrans/Makefile       Tue Sep 09 13:59:13 2008 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2008/09/07 14:15:02 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2008/09/09 13:59:13 dsainty Exp $
 #
 
 DISTNAME=              xtrans-1.2.1
+PKGREVISION=           1
 CATEGORIES=            x11 net
 MASTER_SITES=          ${MASTER_SITE_XORG:=lib/}
 EXTRACT_SUFX=          .tar.bz2
diff -r 2cbcd3767d38 -r d2bab5ee16d7 x11/xtrans/distinfo
--- a/x11/xtrans/distinfo       Tue Sep 09 12:49:32 2008 +0000
+++ b/x11/xtrans/distinfo       Tue Sep 09 13:59:13 2008 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.12 2008/09/07 14:15:02 wiz Exp $
+$NetBSD: distinfo,v 1.13 2008/09/09 13:59:13 dsainty Exp $
 
 SHA1 (xtrans-1.2.1.tar.bz2) = 66d7916e5386d2e0485af04a3b2314fbccc2d23a
 RMD160 (xtrans-1.2.1.tar.bz2) = 1998ba12f64cfc9563dcb20f9337e448a9e6a882
 Size (xtrans-1.2.1.tar.bz2) = 107174 bytes
-SHA1 (patch-aa) = 8efb33c59ea37504273c226584d4c3ad5871524e
+SHA1 (patch-aa) = f4faf481fdbd0f7fe1d984a3a4632dba46eb7eb0
 SHA1 (patch-ab) = d2a7af633ab880ec71975b70f521c0e32cd07a5e
diff -r 2cbcd3767d38 -r d2bab5ee16d7 x11/xtrans/patches/patch-aa
--- a/x11/xtrans/patches/patch-aa       Tue Sep 09 12:49:32 2008 +0000
+++ b/x11/xtrans/patches/patch-aa       Tue Sep 09 13:59:13 2008 +0000
@@ -1,20 +1,7 @@
-$NetBSD: patch-aa,v 1.6 2008/05/09 22:53:21 dsainty Exp $
-
-Disable HAVE_ABSTRACT_SOCKETS as a workaround for bugs in the abstract socket
-implementation, see:
-  http://bugs.freedesktop.org/show_bug.cgi?id=15884
+$NetBSD: patch-aa,v 1.7 2008/09/09 13:59:13 dsainty Exp $
 
 --- Xtranssock.c.orig  2008-05-09 02:23:07.000000000 +1200
 +++ Xtranssock.c       2008-05-10 09:41:28.000000000 +1200
-@@ -159,7 +159,7 @@
- #endif
- 
- #ifdef linux
--#define HAVE_ABSTRACT_SOCKETS
-+/*#define HAVE_ABSTRACT_SOCKETS*/
- #endif
- 
- #define MIN_BACKLOG 128
 @@ -294,11 +294,6 @@
   * that don't have IPv6 support.
   */