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

[Sjoerd Simons]

Author: sjoerd
Date: 2006-03-15 18:02:13 +0000 (Wed, 15 Mar 2006)
New Revision: 747

Modified:
   packages/unstable/avahi/debian/changelog
   packages/unstable/avahi/debian/patches/03_cmsg_too_large.patch
Log:
* debian/patches/03_cmsg_too_large.patch
  + Updated. The previous version undid a fix for alignment on ia64.

Modified: packages/unstable/avahi/debian/changelog
===================================================================
--- packages/unstable/avahi/debian/changelog	2006-03-14 16:53:52 UTC (rev 746)
+++ packages/unstable/avahi/debian/changelog	2006-03-15 18:02:13 UTC (rev 747)
@@ -1,3 +1,10 @@
+avahi (0.6.9-5) unstable; urgency=low
+
+  * debian/patches/03_cmsg_too_large.patch
+    + Updated. The previous version undid a fix for alignment on ia64.
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Wed, 15 Mar 2006 19:01:15 +0100
+
 avahi (0.6.9-4) unstable; urgency=low
 
   * debian/patches/03_cmsg_too_large.patch 

Modified: packages/unstable/avahi/debian/patches/03_cmsg_too_large.patch
===================================================================
--- packages/unstable/avahi/debian/patches/03_cmsg_too_large.patch	2006-03-14 16:53:52 UTC (rev 746)
+++ packages/unstable/avahi/debian/patches/03_cmsg_too_large.patch	2006-03-15 18:02:13 UTC (rev 747)
@@ -2,25 +2,30 @@
 ===================================================================
 --- 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))];
+@@ -513,7 +513,7 @@
+             pkti->ipi_spec_dst.s_addr = src_address->address;
+ 
+         msg.msg_control = cmsg_data;
+-        msg.msg_controllen = sizeof(cmsg_data);
++        msg.msg_controllen = CMSG_SPACE(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);
+     if (src_address) {
+@@ -529,7 +529,7 @@
+ 	addr->s_addr =  src_address->address;
+ 	
+ 	msg.msg_control = cmsg_data;
+-	msg.msg_controllen = sizeof(cmsg_data);
++	msg.msg_controllen = CMSG_SPACE(struct in_addr);
+     }
+ #elif defined(IP_MULTICAST_IF)
+     {
+@@ -592,7 +592,7 @@
+             memcpy(&pkti->ipi6_addr, src_address->address, sizeof(src_address->address));
+         
+         msg.msg_control = cmsg_data;
+-        msg.msg_controllen = sizeof(cmsg_data);
++        msg.msg_controllen = CMSG_SPACE(struct in6_pktinfo);
+     } else {
+         msg.msg_control = NULL;
+         msg.msg_controllen = 0;