rpms/avahi/devel avahi-0.6.5-bz179448.patch,1.3,1.4

[fedora-cvs-commits at redhat.com]

Author: jvdias

Update of /cvs/dist/rpms/avahi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22759

Modified Files:
	avahi-0.6.5-bz179448.patch 
Log Message:
fix bug 179448: prevent unaligned accesses on ia64

avahi-0.6.5-bz179448.patch:
 socket.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

Index: avahi-0.6.5-bz179448.patch
===================================================================
RCS file: /cvs/dist/rpms/avahi/devel/avahi-0.6.5-bz179448.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- avahi-0.6.5-bz179448.patch	2 Feb 2006 19:01:49 -0000	1.3
+++ avahi-0.6.5-bz179448.patch	2 Feb 2006 19:43:40 -0000	1.4
@@ -1,15 +1,15 @@
 --- avahi-0.6.6/avahi-core/socket.c.bz179448	2005-11-09 13:45:51.000000000 -0500
-+++ avahi-0.6.6/avahi-core/socket.c	2006-02-02 13:48:37.000000000 -0500
++++ avahi-0.6.6/avahi-core/socket.c	2006-02-02 14:40:29.000000000 -0500
 @@ -456,10 +456,10 @@
      struct iovec io;
  #ifdef IP_PKTINFO
      struct cmsghdr *cmsg;
 -    uint8_t cmsg_data[CMSG_SPACE(sizeof(struct in_pktinfo))];
-+    struct cmsghdr cmsg_data[( CMSG_SPACE(sizeof(struct in_pktinfo)) / sizeof(struct cmsghdr)) + 1];
++    size_t cmsg_data[( CMSG_SPACE(sizeof(struct in_pktinfo)) / sizeof(size_t)) + 1];
  #elif defined(IP_SENDSRCADDR)
      struct cmsghdr *cmsg;
 -    uint8_t cmsg_data[CMSG_SPACE(sizeof(struct in_addr))];
-+    struct cmsghdr cmsg_data[( CMSG_SPACE(sizeof(struct in_addr)) / sizeof(struct cmsghdr)) + 1];
++    size_t cmsg_data[( CMSG_SPACE(sizeof(struct in_addr)) / sizeof(size_t)) + 1];
  #endif
  
      assert(fd >= 0);
@@ -18,7 +18,7 @@
      struct iovec io;
      struct cmsghdr *cmsg;
 -    uint8_t cmsg_data[CMSG_SPACE(sizeof(struct in6_pktinfo))];
-+    struct cmsghdr cmsg_data[(CMSG_SPACE(sizeof(struct in6_pktinfo))/sizeof(struct cmsghdr)) + 1];
++    size_t cmsg_data[(CMSG_SPACE(sizeof(struct in6_pktinfo))/sizeof(size_t)) + 1];
  
      assert(fd >= 0);
      assert(p);
@@ -27,7 +27,7 @@
      struct msghdr msg;
      struct iovec io;
 -    uint8_t aux[1024];
-+    struct cmsghdr aux[1024 / sizeof(struct cmsghdr)]; /* for alignment on ia64 ! */
++    size_t aux[1024 / sizeof(size_t)]; /* for alignment on ia64 ! */
      ssize_t l;
      struct cmsghdr *cmsg;
      int found_addr = 0;
@@ -36,7 +36,7 @@
      struct msghdr msg;
      struct iovec io;
 -    uint8_t aux[64];
-+    struct cmsghdr aux[1024 / sizeof(struct cmsghdr)];
++    size_t aux[1024 / sizeof(size_t)];
      ssize_t l;
      int ms;
      struct cmsghdr *cmsg;