kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to 1.3.2:

Browse source 
Another round of fixes for the fd sending API's: improves portability,
fixes build failures on BSD & Solaris when building with the new API
disabled, and enables the new API for Solaris.
This commit is contained in:
wiz 2013-11-08 13:10:16 +00:00
parent 54a0da9db7
commit 86a8ea1503
5 changed files with 8 additions and 105 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
x11/xtrans/Makefile
View file

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.21 2013/11/07 22:50:50 wiz Exp $
# $NetBSD: Makefile,v 1.22 2013/11/08 13:10:16 wiz Exp $
DISTNAME= xtrans-1.3.1
DISTNAME= xtrans-1.3.2
CATEGORIES= x11 net
MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2

12
x11/xtrans/distinfo
View file

@ -1,8 +1,6 @@
$NetBSD: distinfo,v 1.21 2013/11/07 22:50:50 wiz Exp $
$NetBSD: distinfo,v 1.22 2013/11/08 13:10:16 wiz Exp $
SHA1 (xtrans-1.3.1.tar.bz2) = 0905e47fe1d185b918a15651632a8ca822be4385
RMD160 (xtrans-1.3.1.tar.bz2) = 25df07259934c5daf6458faac627e2429f25b6db
Size (xtrans-1.3.1.tar.bz2) = 178597 bytes
SHA1 (patch-Xtransint.h) = ad8046c33b02b178af5bb4f88fc7c5c12186bc77
SHA1 (patch-Xtranssock.c) = 9965e72fbe9da4d6b5db9bb56ef7e0d9f31efdb9
SHA1 (patch-ab) = 4d87d72f6ef3e06a95a9deaee978802bbb3a985a
SHA1 (xtrans-1.3.2.tar.bz2) = 720928c80323827c9a88bda6990a298489570474
RMD160 (xtrans-1.3.2.tar.bz2) = de2a6add9944f7cbc3f22b090cb13eb38f84cdfe
Size (xtrans-1.3.2.tar.bz2) = 177812 bytes
SHA1 (patch-ab) = dd2cf693831270fc15ff89eb81cdf43d3916d721

20
x11/xtrans/patches/patch-Xtransint.h
View file

@ -1,20 +0,0 @@
$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 */

59
x11/xtrans/patches/patch-Xtranssock.c
View file

@ -1,59 +0,0 @@
$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),

18
x11/xtrans/patches/patch-ab
View file

@ -1,4 +1,4 @@
$NetBSD: patch-ab,v 1.2 2013/11/07 22:50:50 wiz Exp $
$NetBSD: patch-ab,v 1.3 2013/11/08 13:10:16 wiz Exp $
--- Xtrans.c.orig 2013-11-03 02:10:11.000000000 +0000
+++ Xtrans.c
@ -13,19 +13,3 @@ $NetBSD: patch-ab,v 1.2 2013/11/07 22:50:50 wiz Exp $
/* 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)