X Strike Force X.Org X11 SVN commit: r1392 - in branches/modular/lib/xtrans-X11R7.0-1.0.0/debian: . patches
Author: dnusinow
Date: 2006-03-05 20:52:19 -0500 (Sun, 05 Mar 2006)
New Revision: 1392
Added:
branches/modular/lib/xtrans-X11R7.0-1.0.0/debian/patches/02_gnu-kbsd_sock_un.diff
Modified:
branches/modular/lib/xtrans-X11R7.0-1.0.0/debian/changelog
branches/modular/lib/xtrans-X11R7.0-1.0.0/debian/patches/series
Log:
* Port patches from trunk
+ freebsd/003_gnu-kbsd_sock_un.diff
Modified: branches/modular/lib/xtrans-X11R7.0-1.0.0/debian/changelog
===================================================================
--- branches/modular/lib/xtrans-X11R7.0-1.0.0/debian/changelog 2006-03-06 01:49:06 UTC (rev 1391)
+++ branches/modular/lib/xtrans-X11R7.0-1.0.0/debian/changelog 2006-03-06 01:52:19 UTC (rev 1392)
@@ -2,8 +2,9 @@
* Port patches from trunk
+ hurd/804_maxhostnamelen.diff
+ + freebsd/003_gnu-kbsd_sock_un.diff
- -- David Nusinow <dnusinow@debian.org> Sat, 4 Mar 2006 19:56:24 -0500
+ -- David Nusinow <dnusinow@debian.org> Sun, 5 Mar 2006 20:51:47 -0500
xtrans (1.0.0-1) experimental; urgency=low
Added: branches/modular/lib/xtrans-X11R7.0-1.0.0/debian/patches/02_gnu-kbsd_sock_un.diff
===================================================================
--- branches/modular/lib/xtrans-X11R7.0-1.0.0/debian/patches/02_gnu-kbsd_sock_un.diff 2006-03-06 01:49:06 UTC (rev 1391)
+++ branches/modular/lib/xtrans-X11R7.0-1.0.0/debian/patches/02_gnu-kbsd_sock_un.diff 2006-03-06 01:52:19 UTC (rev 1392)
@@ -0,0 +1,33 @@
+$Id: 003_gnu-kbsd_sock_un.diff 1054 2006-01-10 23:42:01Z ender $
+
+Index: Xtranssock.c
+===================================================================
+--- Xtranssock.c.orig 2006-01-11 00:29:04.000000000 +0100
++++ Xtranssock.c 2006-01-11 00:29:22.000000000 +0100
+@@ -1111,7 +1111,7 @@
+ sockname.sun_len = strlen(sockname.sun_path);
+ namelen = SUN_LEN(&sockname);
+ #else
+- namelen = strlen(sockname.sun_path) + sizeof(sockname.sun_family);
++ namelen = strlen(sockname.sun_path) + offsetof(struct sockaddr_un, sun_path);
+ #endif
+
+ unlink (sockname.sun_path);
+@@ -2001,7 +2001,7 @@
+ sockname.sun_len = strlen (sockname.sun_path);
+ namelen = SUN_LEN (&sockname);
+ #else
+- namelen = strlen (sockname.sun_path) + sizeof (sockname.sun_family);
++ namelen = strlen (sockname.sun_path) + offsetof(struct sockaddr_un, sun_path);
+ #endif
+
+
+@@ -2015,7 +2015,7 @@
+ return TRANS_CONNECT_FAILED;
+ }
+ old_namelen = strlen (old_sockname.sun_path) +
+- sizeof (old_sockname.sun_family);
++ offsetof(struct sockaddr_un, sun_path);
+ #endif
+
+
Modified: branches/modular/lib/xtrans-X11R7.0-1.0.0/debian/patches/series
===================================================================
--- branches/modular/lib/xtrans-X11R7.0-1.0.0/debian/patches/series 2006-03-06 01:49:06 UTC (rev 1391)
+++ branches/modular/lib/xtrans-X11R7.0-1.0.0/debian/patches/series 2006-03-06 01:52:19 UTC (rev 1392)
@@ -1 +1,2 @@
01_hurd_maxhostnamelen.diff -p3
+02_gnu-kbsd_sock_un.diff -p0
Reply to: