Thu Nov 7 22:50:50 2013 UTC ()

Upgrade to 1.3.1 with upstream patches (will be in 1.3.2).
Same changes as in the previous try except that the patches fix
the breakage :)


(wiz)

diff -r1.20 -r1.21 pkgsrc/x11/xtrans/Makefile
diff -r1.20 -r1.21 pkgsrc/x11/xtrans/distinfo
diff -r1.9 -r1.10 pkgsrc/x11/xtrans/PLIST
diff -r0 -r1.1 pkgsrc/x11/xtrans/patches/patch-Xtransint.h
diff -r0 -r1.1 pkgsrc/x11/xtrans/patches/patch-Xtranssock.c
diff -r1.1 -r1.2 pkgsrc/x11/xtrans/patches/patch-ab

--- pkgsrc/x11/xtrans/Makefile 2013/11/07 10:48:15 1.20
+++ pkgsrc/x11/xtrans/Makefile 2013/11/07 22:50:50 1.21

 @@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.20 2013/11/07 10:48:15 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2013/11/07 22:50:50 wiz Exp $
-DISTNAME=		xtrans-1.2.7
+DISTNAME=		xtrans-1.3.1
 CATEGORIES=		x11 net
 MASTER_SITES=		${MASTER_SITE_XORG:=lib/}
 EXTRACT_SUFX=		.tar.bz2
 MAINTAINER=		joerg@NetBSD.org
 HOMEPAGE=		http://xorg.freedesktop.org/
 COMMENT=		Network API translation layer to insulate X
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 GNU_CONFIGURE=		yes
 PKGCONFIG_OVERRIDE+=	xtrans.pc.in

--- pkgsrc/x11/xtrans/distinfo 2013/11/07 10:48:15 1.20
+++ pkgsrc/x11/xtrans/distinfo 2013/11/07 22:50:50 1.21

 @@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.20 2013/11/07 10:48:15 wiz Exp $
+$NetBSD: distinfo,v 1.21 2013/11/07 22:50:50 wiz Exp $
-SHA1 (xtrans-1.2.7.tar.bz2) = b6ed421edf577816f6e641e1846dc0bff337676c
+SHA1 (xtrans-1.3.1.tar.bz2) = 0905e47fe1d185b918a15651632a8ca822be4385
-RMD160 (xtrans-1.2.7.tar.bz2) = 9b0fd9dfb477a1ab6f46ab15599f69a31deaa09f
+RMD160 (xtrans-1.3.1.tar.bz2) = 25df07259934c5daf6458faac627e2429f25b6db
-Size (xtrans-1.2.7.tar.bz2) = 173025 bytes
+Size (xtrans-1.3.1.tar.bz2) = 178597 bytes
-SHA1 (patch-ab) = d2a7af633ab880ec71975b70f521c0e32cd07a5e
+SHA1 (patch-Xtransint.h) = ad8046c33b02b178af5bb4f88fc7c5c12186bc77
 SHA1 (patch-Xtranssock.c) = 9965e72fbe9da4d6b5db9bb56ef7e0d9f31efdb9
 SHA1 (patch-ab) = 4d87d72f6ef3e06a95a9deaee978802bbb3a985a

--- pkgsrc/x11/xtrans/PLIST 2013/11/07 10:48:15 1.9
+++ pkgsrc/x11/xtrans/PLIST 2013/11/07 22:50:50 1.10

 @@ -1,12 +1,11 @@
-@comment $NetBSD: PLIST,v 1.9 2013/11/07 10:48:15 wiz Exp $
+@comment $NetBSD: PLIST,v 1.10 2013/11/07 22:50:50 wiz Exp $
 include/X11/Xtrans/Xtrans.c
 include/X11/Xtrans/Xtrans.h
 include/X11/Xtrans/Xtransint.h
 include/X11/Xtrans/Xtranslcl.c
 include/X11/Xtrans/Xtranssock.c
 include/X11/Xtrans/Xtranstli.c
 include/X11/Xtrans/Xtransutil.c
 include/X11/Xtrans/transport.c
 share/aclocal/xtrans.m4
 share/doc/xtrans/xtrans.xml
 share/pkgconfig/xtrans.pc

$NetBSD: patch-Xtransint.h,v 1.1 2013/11/07 22:50:50 wiz Exp $

--- Xtransint.h.orig	2013-11-07 06:58:43.000000000 +0000
+++ Xtransint.h
@@ -291,6 +291,7 @@ typedef struct _Xtransport {
 	int			/* size */
     );
 
+#if XTRANS_SEND_FDS
     int (*SendFd)(
 	XtransConnInfo,		/* connection */
         int,                    /* fd */
@@ -300,6 +301,7 @@ typedef struct _Xtransport {
     int (*RecvFd)(
 	XtransConnInfo		/* connection */
     );
+#endif
 
     int	(*Disconnect)(
 	XtransConnInfo		/* connection */

$NetBSD: patch-Xtranssock.c,v 1.1 2013/11/07 22:50:50 wiz Exp $

--- Xtranssock.c.orig	2013-11-03 02:12:32.000000000 +0000
+++ Xtranssock.c
@@ -2506,8 +2506,10 @@ Xtransport	TRANS(SocketTCPFuncs) = {
 	TRANS(SocketWrite),
 	TRANS(SocketReadv),
 	TRANS(SocketWritev),
+#if XTRANS_SEND_FDS
         TRANS(SocketSendFdInvalid),
         TRANS(SocketRecvFdInvalid),
+#endif
 	TRANS(SocketDisconnect),
 	TRANS(SocketINETClose),
 	TRANS(SocketINETClose),
@@ -2548,8 +2550,10 @@ Xtransport	TRANS(SocketINETFuncs) = {
 	TRANS(SocketWrite),
 	TRANS(SocketReadv),
 	TRANS(SocketWritev),
+#if XTRANS_SEND_FDS
         TRANS(SocketSendFdInvalid),
         TRANS(SocketRecvFdInvalid),
+#endif
 	TRANS(SocketDisconnect),
 	TRANS(SocketINETClose),
 	TRANS(SocketINETClose),
@@ -2591,8 +2595,10 @@ Xtransport     TRANS(SocketINET6Funcs) =
 	TRANS(SocketWrite),
 	TRANS(SocketReadv),
 	TRANS(SocketWritev),
+#if XTRANS_SEND_FDS
         TRANS(SocketSendFdInvalid),
         TRANS(SocketRecvFdInvalid),
+#endif
 	TRANS(SocketDisconnect),
 	TRANS(SocketINETClose),
 	TRANS(SocketINETClose),
@@ -2641,8 +2647,10 @@ Xtransport	TRANS(SocketLocalFuncs) = {
 	TRANS(SocketWrite),
 	TRANS(SocketReadv),
 	TRANS(SocketWritev),
+#if XTRANS_SEND_FDS
         TRANS(SocketSendFd),
         TRANS(SocketRecvFd),
+#endif
 	TRANS(SocketDisconnect),
 	TRANS(SocketUNIXClose),
 	TRANS(SocketUNIXCloseForCloning),
@@ -2697,8 +2705,10 @@ Xtransport	TRANS(SocketUNIXFuncs) = {
 	TRANS(SocketWrite),
 	TRANS(SocketReadv),
 	TRANS(SocketWritev),
+#if XTRANS_SEND_FDS
         TRANS(SocketSendFd),
         TRANS(SocketRecvFd),
+#endif
 	TRANS(SocketDisconnect),
 	TRANS(SocketUNIXClose),
 	TRANS(SocketUNIXCloseForCloning),

--- pkgsrc/x11/xtrans/patches/Attic/patch-ab 2007/01/14 10:30:56 1.1
+++ pkgsrc/x11/xtrans/patches/Attic/patch-ab 2013/11/07 22:50:50 1.2

 @@ -1,15 +1,31 @@
-$NetBSD: patch-ab,v 1.1 2007/01/14 10:30:56 joerg Exp $
+$NetBSD: patch-ab,v 1.2 2013/11/07 22:50:50 wiz Exp $
---- Xtrans.c.orig	2007-01-14 11:28:47.000000000 +0100
+--- Xtrans.c.orig	2013-11-03 02:10:11.000000000 +0000
 +++ Xtrans.c
-@@ -180,8 +180,8 @@ TRANS(SelectTransport) (char *protocol)
+@@ -162,8 +162,8 @@ TRANS(SelectTransport) (const char *prot
      protobuf[PROTOBUFSIZE-1] = '\0';
      for (i = 0; i < PROTOBUFSIZE && protobuf[i] != '\0'; i++)
 -	if (isupper (protobuf[i]))
 -	    protobuf[i] = tolower (protobuf[i]);
 +	if (isupper ((unsigned char)protobuf[i]))
 +	    protobuf[i] = tolower ((unsigned char)protobuf[i]);
      /* Look at all of the configured protocols */
@@ -879,6 +879,7 @@ TRANS(Writev) (XtransConnInfo ciptr, str
      return ciptr->transptr->Writev (ciptr, buf, size);
+ }
 +#if XTRANS_SEND_FDS
  int
  TRANS(SendFd) (XtransConnInfo ciptr, int fd, int do_close)
+ {
@@ -890,6 +891,7 @@ TRANS(RecvFd) (XtransConnInfo ciptr)
+ {
      return ciptr->transptr->RecvFd(ciptr);
+ }
 +#endif
  int
  TRANS(Disconnect) (XtransConnInfo ciptr)