Update to 0.3.12.

6 files changed, 32 insertions, 32 deletions

diff --git a/net-im/telepathy-salut/Makefile b/net-im/telepathy-salut/Makefile
index e5130ce910d3..39a4808b0b26 100644
--- a/net-im/telepathy-salut/Makefile
+++ b/net-im/telepathy-salut/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	telepathy-salut
-PORTVERSION=	0.3.11
+PORTVERSION=	0.3.12
 CATEGORIES=	net-im
 MASTER_SITES=	http://telepathy.freedesktop.org/releases/${PORTNAME}/
 
diff --git a/net-im/telepathy-salut/distinfo b/net-im/telepathy-salut/distinfo
index f03fb0caae39..f4fd2c24e8ab 100644
--- a/net-im/telepathy-salut/distinfo
+++ b/net-im/telepathy-salut/distinfo
@@ -1,3 +1,3 @@
-MD5 (telepathy-salut-0.3.11.tar.gz) = 96caa3a9dbe95ba73cf9623232259a09
-SHA256 (telepathy-salut-0.3.11.tar.gz) = 51dbfad0d57c990dd7378fc7f7f7e4ab5dca60085012a79e0685c25567238df8
-SIZE (telepathy-salut-0.3.11.tar.gz) = 1187612
+MD5 (telepathy-salut-0.3.12.tar.gz) = 95968f871737e7cd75e4df39b521b692
+SHA256 (telepathy-salut-0.3.12.tar.gz) = d2780902940394fd81217042f29998e485b821d3fab484c857546f4376f87d09
+SIZE (telepathy-salut-0.3.12.tar.gz) = 1215907
diff --git a/net-im/telepathy-salut/files/patch-lib_gibber_gibber-bytestream-oob.h b/net-im/telepathy-salut/files/patch-lib_gibber_gibber-bytestream-oob.h
index 2bea200aa4eb..22af230b175d 100644
--- a/net-im/telepathy-salut/files/patch-lib_gibber_gibber-bytestream-oob.h
+++ b/net-im/telepathy-salut/files/patch-lib_gibber_gibber-bytestream-oob.h
@@ -1,10 +1,10 @@
---- lib/gibber/gibber-bytestream-oob.h.orig	2008-01-17 00:55:20.000000000 -0500
-+++ lib/gibber/gibber-bytestream-oob.h	2008-01-17 00:55:54.000000000 -0500
-@@ -22,6 +22,7 @@
- 
- #include <glib-object.h>
+--- lib/gibber/gibber-bytestream-oob.h.orig	2010-05-20 06:10:39.000000000 -0400
++++ lib/gibber/gibber-bytestream-oob.h	2010-07-24 20:41:19.000000000 -0400
+@@ -20,6 +20,7 @@
+ #ifndef __GIBBER_BYTESTREAM_OOB_H__
+ #define __GIBBER_BYTESTREAM_OOB_H__
  
 +#include <netinet/in.h>
- #include <netdb.h>
+ #include <glib-object.h>
  
  #include "gibber-bytestream-iface.h"
diff --git a/net-im/telepathy-salut/files/patch-lib_gibber_gibber-tcp-transport.c b/net-im/telepathy-salut/files/patch-lib_gibber_gibber-tcp-transport.c
index a3b3f8ef41fc..5711d4b293db 100644
--- a/net-im/telepathy-salut/files/patch-lib_gibber_gibber-tcp-transport.c
+++ b/net-im/telepathy-salut/files/patch-lib_gibber_gibber-tcp-transport.c
@@ -1,10 +1,10 @@
---- lib/gibber/gibber-tcp-transport.c.orig	Thu Apr 19 16:54:23 2007
-+++ lib/gibber/gibber-tcp-transport.c	Thu Apr 19 16:54:46 2007
-@@ -18,6 +18,7 @@
-  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-  */
+--- lib/gibber/gibber-tcp-transport.c.orig	2010-05-20 06:10:39.000000000 -0400
++++ lib/gibber/gibber-tcp-transport.c	2010-07-24 20:42:16.000000000 -0400
+@@ -20,6 +20,7 @@
  
-+#include <netinet/in.h>
+ #include <config.h>
  
++#include <netinet/in.h>
  #include <stdio.h>
  #include <stdlib.h>
+ 
diff --git a/net-im/telepathy-salut/files/patch-lib_gibber_gibber-unix-transport.c b/net-im/telepathy-salut/files/patch-lib_gibber_gibber-unix-transport.c
index b65bb8bcd69b..4eb7a48494ea 100644
--- a/net-im/telepathy-salut/files/patch-lib_gibber_gibber-unix-transport.c
+++ b/net-im/telepathy-salut/files/patch-lib_gibber_gibber-unix-transport.c
@@ -1,6 +1,6 @@
---- lib/gibber/gibber-unix-transport.c.orig	2009-09-12 13:43:06.000000000 -0400
-+++ lib/gibber/gibber-unix-transport.c	2009-09-12 13:55:49.000000000 -0400
-@@ -200,11 +200,12 @@ gibber_unix_transport_send_credentials (
+--- lib/gibber/gibber-unix-transport.c.orig	2010-05-20 06:10:39.000000000 -0400
++++ lib/gibber/gibber-unix-transport.c	2010-07-24 20:47:17.000000000 -0400
+@@ -217,11 +217,12 @@ gibber_unix_transport_send_credentials (
      gsize size)
  {
    int fd, ret;
@@ -16,14 +16,15 @@
  
    DEBUG ("send credentials");
    fd = GIBBER_FD_TRANSPORT (transport)->fd;
-@@ -217,19 +218,14 @@ gibber_unix_transport_send_credentials (
-   memset (&msg, 0, sizeof msg);
+@@ -234,20 +235,14 @@ gibber_unix_transport_send_credentials (
+   memset (&msg, 0, sizeof (msg));
    msg.msg_iov = &iov;
    msg.msg_iovlen = 1;
 -  msg.msg_control = buffer;
 -  msg.msg_controllen = sizeof (buffer);
 +  msg.msg_control = (caddr_t) &buffer;
 +  msg.msg_controllen = CMSG_SPACE (sizeof (struct cmsgcred));
+   memset (buffer, 0, sizeof (buffer));
  
    /* Set the credentials */
 -  ch = CMSG_FIRSTHDR (&msg);
@@ -35,14 +36,13 @@
 -  cred->pid = getpid ();
 -  cred->uid = getuid ();
 -  cred->gid = getgid ();
-+  memset (&buffer, 0, sizeof (buffer));
 +  buffer.hdr.cmsg_len = CMSG_LEN (sizeof (struct cmsgcred));
 +  buffer.hdr.cmsg_level = SOL_SOCKET;
 +  buffer.hdr.cmsg_type = SCM_CREDS;
  
    ret = sendmsg (fd, &msg, 0);
    if (ret == -1)
-@@ -256,10 +252,10 @@ gibber_unix_transport_read (GibberFdTran
+@@ -274,10 +269,10 @@ gibber_unix_transport_read (GibberFdTran
    GibberBuffer buf;
    struct iovec iov;
    struct msghdr msg;
@@ -57,7 +57,7 @@
  
    if (priv->recv_creds_cb == NULL)
      return gibber_fd_transport_read (transport, channel, error);
-@@ -267,10 +263,6 @@ gibber_unix_transport_read (GibberFdTran
+@@ -285,10 +280,6 @@ gibber_unix_transport_read (GibberFdTran
    /* We are waiting for credentials */
    fd = transport->fd;
  
@@ -68,7 +68,7 @@
    memset (buffer, 0, sizeof (buffer));
    memset (&iov, 0, sizeof (iov));
    iov.iov_base = buffer;
-@@ -279,8 +271,9 @@ gibber_unix_transport_read (GibberFdTran
+@@ -297,8 +288,9 @@ gibber_unix_transport_read (GibberFdTran
    memset (&msg, 0, sizeof (msg));
    msg.msg_iov = &iov;
    msg.msg_iovlen = 1;
@@ -80,7 +80,7 @@
  
    bytes_read = recvmsg (fd, &msg, 0);
  
-@@ -299,16 +292,11 @@ gibber_unix_transport_read (GibberFdTran
+@@ -317,16 +309,11 @@ gibber_unix_transport_read (GibberFdTran
        return GIBBER_FD_IO_RESULT_ERROR;
      }
  
@@ -98,7 +98,7 @@
      {
        GError *err = NULL;
  
-@@ -324,11 +312,12 @@ gibber_unix_transport_read (GibberFdTran
+@@ -342,11 +329,12 @@ gibber_unix_transport_read (GibberFdTran
    else
      {
        GibberCredentials credentials;
diff --git a/net-im/telepathy-salut/files/patch-lib_gibber_gibber-xmpp-connection-listener.c b/net-im/telepathy-salut/files/patch-lib_gibber_gibber-xmpp-connection-listener.c
index 7d0cabfe1c73..842337118809 100644
--- a/net-im/telepathy-salut/files/patch-lib_gibber_gibber-xmpp-connection-listener.c
+++ b/net-im/telepathy-salut/files/patch-lib_gibber_gibber-xmpp-connection-listener.c
@@ -1,10 +1,10 @@
---- lib/gibber/gibber-xmpp-connection-listener.c.orig	2008-01-17 00:56:23.000000000 -0500
-+++ lib/gibber/gibber-xmpp-connection-listener.c	2008-01-17 00:56:46.000000000 -0500
-@@ -24,6 +24,7 @@
+--- lib/gibber/gibber-xmpp-connection-listener.c.orig	2010-05-20 06:10:39.000000000 -0400
++++ lib/gibber/gibber-xmpp-connection-listener.c	2010-07-24 20:48:34.000000000 -0400
+@@ -23,6 +23,7 @@
+ #include <string.h>
  #include <time.h>
  #include <sys/types.h>
- #include <sys/socket.h>
 +#include <netinet/in.h>
- #include <netdb.h>
  #include <unistd.h>
  #include <errno.h>
+