summaryrefslogtreecommitdiff
path: root/security/gnome-keyring/files
diff options
context:
space:
mode:
Diffstat (limited to 'security/gnome-keyring/files')
-rw-r--r--security/gnome-keyring/files/patch-daemon_control_gkd-control-client.c11
-rw-r--r--security/gnome-keyring/files/patch-daemon_keyrings_gkr-keyrings.c10
-rw-r--r--security/gnome-keyring/files/patch-daemon_prompt_gkd-prompt.c11
-rw-r--r--security/gnome-keyring/files/patch-egg_egg-unix-credentials.c44
4 files changed, 66 insertions, 10 deletions
diff --git a/security/gnome-keyring/files/patch-daemon_control_gkd-control-client.c b/security/gnome-keyring/files/patch-daemon_control_gkd-control-client.c
new file mode 100644
index 000000000000..6cdb0ca6a213
--- /dev/null
+++ b/security/gnome-keyring/files/patch-daemon_control_gkd-control-client.c
@@ -0,0 +1,11 @@
+--- daemon/control/gkd-control-client.c.orig 2009-12-21 18:43:16.000000000 -0500
++++ daemon/control/gkd-control-client.c 2009-12-21 18:44:17.000000000 -0500
+@@ -31,6 +31,8 @@
+ #include <errno.h>
+ #include <fcntl.h>
+
++#include <string.h>
++#include <sys/stat.h>
+ #include <sys/socket.h>
+ #include <sys/types.h>
+ #include <sys/un.h>
diff --git a/security/gnome-keyring/files/patch-daemon_keyrings_gkr-keyrings.c b/security/gnome-keyring/files/patch-daemon_keyrings_gkr-keyrings.c
deleted file mode 100644
index fd4ca0d28a34..000000000000
--- a/security/gnome-keyring/files/patch-daemon_keyrings_gkr-keyrings.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- daemon/keyrings/gkr-keyrings.c.orig 2009-12-16 23:41:18.000000000 -0500
-+++ daemon/keyrings/gkr-keyrings.c 2009-12-16 23:41:38.000000000 -0500
-@@ -38,6 +38,7 @@
- #include <errno.h>
- #include <stdlib.h>
- #include <stdio.h>
-+#include <string.h>
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/un.h>
diff --git a/security/gnome-keyring/files/patch-daemon_prompt_gkd-prompt.c b/security/gnome-keyring/files/patch-daemon_prompt_gkd-prompt.c
new file mode 100644
index 000000000000..1c4cb9ae4a1b
--- /dev/null
+++ b/security/gnome-keyring/files/patch-daemon_prompt_gkd-prompt.c
@@ -0,0 +1,11 @@
+--- daemon/prompt/gkd-prompt.c.orig 2009-12-21 19:17:13.000000000 -0500
++++ daemon/prompt/gkd-prompt.c 2009-12-21 19:17:23.000000000 -0500
+@@ -21,6 +21,8 @@
+
+ #include "config.h"
+
++#include <sys/wait.h>
++
+ #include "gkd-prompt.h"
+ #include "gkd-prompt-marshal.h"
+ #include "gkd-prompt-util.h"
diff --git a/security/gnome-keyring/files/patch-egg_egg-unix-credentials.c b/security/gnome-keyring/files/patch-egg_egg-unix-credentials.c
new file mode 100644
index 000000000000..5ae53f8b02cc
--- /dev/null
+++ b/security/gnome-keyring/files/patch-egg_egg-unix-credentials.c
@@ -0,0 +1,44 @@
+--- egg/egg-unix-credentials.c.orig 2010-01-13 00:21:23.000000000 -0500
++++ egg/egg-unix-credentials.c 2010-01-13 00:25:46.000000000 -0500
+@@ -27,6 +27,7 @@
+
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#include <sys/param.h>
+ #include <sys/uio.h>
+ #include <sys/un.h>
+ #include <errno.h>
+@@ -37,6 +38,33 @@
+ #include <ucred.h>
+ #endif
+
++#if __FreeBSD_version < 701101
++static char *
++strndup (const char *s, size_t n)
++{
++ size_t nAvail;
++ char *p;
++
++ if (s == NULL)
++ return NULL;
++
++ if (memchr (s, '\0', n) != NULL) {
++ nAvail = strlen(s);
++ if (nAvail > n)
++ nAvail = n;
++ } else{
++ nAvail = n;
++ }
++ p = malloc (nAvail + 1);
++ if (p == NULL)
++ return NULL;
++ memcpy (p, s, nAvail);
++ p[nAvail] = '\0';
++
++ return p;
++}
++#endif
++
+ int
+ egg_unix_credentials_read (int sock, pid_t *pid, uid_t *uid)
+ {