[pkgsrc/trunk]: pkgsrc/security/gnome-keyring Fix build on DragonFly and othe...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a8f2f37bd853
branches:  trunk
changeset: 518773:a8f2f37bd853
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Sep 17 14:43:00 2006 +0000

description:
Fix build on DragonFly and other platforms without LOCAL_CREDS.
No idea how this code was ever tested, it can't compile for obvious
reaons.

diffstat:

 security/gnome-keyring/distinfo         |   3 ++-
 security/gnome-keyring/patches/patch-aa |  32 ++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletions(-)

diffs (47 lines):

diff -r 36ea74ad7fe2 -r a8f2f37bd853 security/gnome-keyring/distinfo
--- a/security/gnome-keyring/distinfo   Sun Sep 17 13:42:07 2006 +0000
+++ b/security/gnome-keyring/distinfo   Sun Sep 17 14:43:00 2006 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.16 2006/09/15 15:08:52 jmmv Exp $
+$NetBSD: distinfo,v 1.17 2006/09/17 14:43:00 joerg Exp $
 
 SHA1 (gnome-keyring-0.6.0.tar.bz2) = 53c5df57c068f3904a296e37ca743666eb42c7bb
 RMD160 (gnome-keyring-0.6.0.tar.bz2) = 9114a0457871b7a4f9cfe6b3e979ab11881c9145
 Size (gnome-keyring-0.6.0.tar.bz2) = 476280 bytes
+SHA1 (patch-aa) = 437037544f9204c26a565a8bb28bb3305e2cffb8
diff -r 36ea74ad7fe2 -r a8f2f37bd853 security/gnome-keyring/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/gnome-keyring/patches/patch-aa   Sun Sep 17 14:43:00 2006 +0000
@@ -0,0 +1,32 @@
+$NetBSD: patch-aa,v 1.4 2006/09/17 14:43:00 joerg Exp $
+
+--- gnome-keyring.c.orig       2006-09-17 16:32:22.000000000 +0000
++++ gnome-keyring.c
+@@ -275,9 +275,9 @@ write_credentials_byte_sync (int socket)
+   msg.msg_control = (caddr_t) &cmsg;
+   msg.msg_controllen = CMSG_SPACE (sizeof (struct cmsgcred));
+   memset (&cmsg, 0, sizeof (cmsg));
+-  cmsg->cmsg_len = CMSG_LEN (sizeof (struct cmsgcred));
+-  cmsg->cmsg_level = SOL_SOCKET;
+-  cmsg->cmsg_type = SCM_CREDS;
++  cmsg.hdr.cmsg_len = CMSG_LEN (sizeof (struct cmsgcred));
++  cmsg.hdr.cmsg_level = SOL_SOCKET;
++  cmsg.hdr.cmsg_type = SCM_CREDS;
+ #endif
+ 
+  again:
+@@ -324,10 +324,10 @@ write_credentials_byte (GnomeKeyringOper
+ 
+   msg.msg_control = (caddr_t) &cmsg;
+   msg.msg_controllen = CMSG_SPACE (sizeof (struct cmsgcred));
+-  memset (cmsg, 0, sizeof (cmsg));
+-  cmsg->cmsg_len = CMSG_LEN (sizeof (struct cmsgcred));
+-  cmsg->cmsg_level = SOL_SOCKET;
+-  cmsg->cmsg_type = SCM_CREDS;
++  memset (&cmsg, 0, sizeof (cmsg));
++  cmsg.hdr.cmsg_len = CMSG_LEN (sizeof (struct cmsgcred));
++  cmsg.hdr.cmsg_level = SOL_SOCKET;
++  cmsg.hdr.cmsg_type = SCM_CREDS;
+ #endif
+ 
+  again: