X Strike Force X.Org X11 SVN commit: r3830 - in trunk/lib/xtrans/debian: . patches
Author: dparsons
Date: 2006-10-16 08:39:58 -0400 (Mon, 16 Oct 2006)
New Revision: 3830
Added:
trunk/lib/xtrans/debian/patches/02_sunlen_nonbsd_sock.patch
Modified:
trunk/lib/xtrans/debian/changelog
trunk/lib/xtrans/debian/patches/series
Log:
Include patch 02_sunlen_nonbsd_sock.patch from upstream (see
upstream bug #4982). Follows on from 02_gnu-kbsd_sock_un.diff.
Closes: #338290.
Modified: trunk/lib/xtrans/debian/changelog
===================================================================
--- trunk/lib/xtrans/debian/changelog 2006-10-16 11:53:06 UTC (rev 3829)
+++ trunk/lib/xtrans/debian/changelog 2006-10-16 12:39:58 UTC (rev 3830)
@@ -1,3 +1,11 @@
+xtrans (1.0.1-3) unstable; urgency=low
+
+ * Include patch 02_sunlen_nonbsd_sock.patch from upstream (see
+ upstream bug #4982). Follows on from 02_gnu-kbsd_sock_un.diff.
+ Closes: #338290.
+
+ -- Drew Parsons <dparsons@debian.org> Mon, 16 Oct 2006 22:39:05 +1000
+
xtrans (1.0.1-2) unstable; urgency=low
[ Andres Salomon ]
Added: trunk/lib/xtrans/debian/patches/02_sunlen_nonbsd_sock.patch
===================================================================
--- trunk/lib/xtrans/debian/patches/02_sunlen_nonbsd_sock.patch (rev 0)
+++ trunk/lib/xtrans/debian/patches/02_sunlen_nonbsd_sock.patch 2006-10-16 12:39:58 UTC (rev 3830)
@@ -0,0 +1,30 @@
+From: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Fri, 25 Aug 2006 00:40:24 +0000 (-0700)
+Subject: Use SUN_LEN if it is defined on non-BSD44SOCKETS systems
+X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/lib/libxtrans.git;a=commitdiff;h=5d006baadf213e91f131ffedc53c88a973fb1cba
+
+Use SUN_LEN if it is defined on non-BSD44SOCKETS systems
+---
+
+--- a/Xtranssock.c
++++ b/Xtranssock.c
+@@ -1106,6 +1106,9 @@ TRANS(SocketUNIXCreateListener) (XtransC
+
+ #if (defined(BSD44SOCKETS) || defined(__UNIXWARE__)) && !defined(Lynx)
+ sockname.sun_len = strlen(sockname.sun_path);
++#endif
++
++#if defined(BSD44SOCKETS) || defined(SUN_LEN)
+ namelen = SUN_LEN(&sockname);
+ #else
+ namelen = strlen(sockname.sun_path) + offsetof(struct sockaddr_un, sun_path);
+@@ -1996,6 +1999,9 @@ TRANS(SocketUNIXConnect) (XtransConnInfo
+
+ #if (defined(BSD44SOCKETS) || defined(__UNIXWARE__)) && !defined(Lynx)
+ sockname.sun_len = strlen (sockname.sun_path);
++#endif
++
++#if defined(BSD44SOCKETS) || defined(SUN_LEN)
+ namelen = SUN_LEN (&sockname);
+ #else
+ namelen = strlen (sockname.sun_path) + offsetof(struct sockaddr_un, sun_path);
Modified: trunk/lib/xtrans/debian/patches/series
===================================================================
--- trunk/lib/xtrans/debian/patches/series 2006-10-16 11:53:06 UTC (rev 3829)
+++ trunk/lib/xtrans/debian/patches/series 2006-10-16 12:39:58 UTC (rev 3830)
@@ -1,2 +1,3 @@
01_hurd_maxhostnamelen.diff -p3
02_gnu-kbsd_sock_un.diff -p0
+02_sunlen_nonbsd_sock.patch
Reply to: