diff options
| author | joerg <joerg> | 2006-09-17 14:43:00 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2006-09-17 14:43:00 +0000 |
| commit | 961b370f75e7a86bb96f68a5c0e1e7f708d701d7 (patch) | |
| tree | e9bbdb9cedf0a452ea78dfce0f73829b71575ce7 /security | |
| parent | bb128e113daad485fcd70289f12e43415d359cb9 (diff) | |
| download | pkgsrc-961b370f75e7a86bb96f68a5c0e1e7f708d701d7.tar.gz | |
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 (limited to 'security')
| -rw-r--r-- | security/gnome-keyring/distinfo | 3 | ||||
| -rw-r--r-- | security/gnome-keyring/patches/patch-aa | 32 |
2 files changed, 34 insertions, 1 deletions
diff --git a/security/gnome-keyring/distinfo b/security/gnome-keyring/distinfo index b3195bea0d3..44d3c613c8b 100644 --- a/security/gnome-keyring/distinfo +++ b/security/gnome-keyring/distinfo @@ -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 --git a/security/gnome-keyring/patches/patch-aa b/security/gnome-keyring/patches/patch-aa new file mode 100644 index 00000000000..3f6e72921c1 --- /dev/null +++ b/security/gnome-keyring/patches/patch-aa @@ -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: |