[Pkg-utopia-commits] r744 - in packages/unstable/avahi/debian: . patches

[Sjoerd Simons]

Author: sjoerd
Date: 2006-03-10 09:19:07 +0000 (Fri, 10 Mar 2006)
New Revision: 744

Added:
   packages/unstable/avahi/debian/patches/03_cmsg_too_large.patch
Modified:
   packages/unstable/avahi/debian/changelog
Log:
* debian/patches/03_cmsg_too_large.patch 
  + Added. Don't make the cmsg somewhat oversized. Fixes sendmsg returning
  EINVAL on 64 bit machines with 32 bit user space. 
  

Modified: packages/unstable/avahi/debian/changelog
===================================================================
--- packages/unstable/avahi/debian/changelog	2006-03-10 09:13:51 UTC (rev 743)
+++ packages/unstable/avahi/debian/changelog	2006-03-10 09:19:07 UTC (rev 744)
@@ -1,3 +1,11 @@
+avahi (0.6.9-4) unstable; urgency=low
+
+  * debian/patches/03_cmsg_too_large.patch 
+    + Added. Don't make the cmsg somewhat oversized. Fixes sendmsg returning
+    EINVAL on 64 bit machines with 32 bit user space. 
+    
+ -- Sjoerd Simons <sjoerd at debian.org>  Fri, 10 Mar 2006 10:12:02 +0100
+
 avahi (0.6.9-3) unstable; urgency=low
 
   [ Sebastian Dröge ]

Added: packages/unstable/avahi/debian/patches/03_cmsg_too_large.patch
===================================================================
--- packages/unstable/avahi/debian/patches/03_cmsg_too_large.patch	2006-03-10 09:13:51 UTC (rev 743)
+++ packages/unstable/avahi/debian/patches/03_cmsg_too_large.patch	2006-03-10 09:19:07 UTC (rev 744)
@@ -0,0 +1,26 @@
+Index: avahi-core/socket.c
+===================================================================
+--- avahi-core/socket.c	(revision 1177)
++++ avahi-core/socket.c	(working copy)
+@@ -465,10 +465,10 @@
+     struct iovec io;
+ #ifdef IP_PKTINFO
+     struct cmsghdr *cmsg;
+-    size_t cmsg_data[( CMSG_SPACE(sizeof(struct in_pktinfo)) / sizeof(size_t)) + 1];
++    uint8_t cmsg_data[CMSG_SPACE(sizeof(struct in_pktinfo))];
+ #elif defined(IP_SENDSRCADDR)
+     struct cmsghdr *cmsg;
+-    size_t cmsg_data[( CMSG_SPACE(sizeof(struct in_addr)) / sizeof(size_t)) + 1];
++    uint8_t cmsg_data[CMSG_SPACE(sizeof(struct in_addr))];
+ #endif
+ 
+     assert(fd >= 0);
+@@ -551,7 +551,7 @@
+     struct msghdr msg;
+     struct iovec io;
+     struct cmsghdr *cmsg;
+-    size_t cmsg_data[(CMSG_SPACE(sizeof(struct in6_pktinfo))/sizeof(size_t)) + 1];
++    size_t cmsg_data[CMSG_SPACE(sizeof(struct in6_pktinfo))];
+ 
+     assert(fd >= 0);
+     assert(p);