diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-11-08 07:20:22 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-11-08 07:20:22 +0800 |
commit | ecc692c609745ed2590ee410fcf60f8fc5577767 (patch) | |
tree | 804fc05006975ef53fbc334db1f4ffa42ff9359f /security/gnome-keyring/files | |
parent | 3a142666db7f6854784739853cd212ba74b8b6bd (diff) | |
download | marcuscom-ports-ecc692c609745ed2590ee410fcf60f8fc5577767.tar.gz marcuscom-ports-ecc692c609745ed2590ee410fcf60f8fc5577767.tar.zst marcuscom-ports-ecc692c609745ed2590ee410fcf60f8fc5577767.zip |
Remove these ports now that they have been merged into the ports tree.
Next stop, GNOME 2.9!
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3045 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'security/gnome-keyring/files')
-rw-r--r-- | security/gnome-keyring/files/patch-gnome-keyring-daemon.c | 34 | ||||
-rw-r--r-- | security/gnome-keyring/files/patch-gnome-keyring.c | 88 |
2 files changed, 0 insertions, 122 deletions
diff --git a/security/gnome-keyring/files/patch-gnome-keyring-daemon.c b/security/gnome-keyring/files/patch-gnome-keyring-daemon.c deleted file mode 100644 index 293df59b9..000000000 --- a/security/gnome-keyring/files/patch-gnome-keyring-daemon.c +++ /dev/null @@ -1,34 +0,0 @@ ---- gnome-keyring-daemon.c.orig Tue Jul 20 22:41:27 2004 -+++ gnome-keyring-daemon.c Tue Jul 20 22:43:03 2004 -@@ -121,7 +121,7 @@ - int i; - - got_random = FALSE; --#ifdef __linux__ -+#if defined(__linux__) || defined(__FreeBSD__) - { - int fd; - -@@ -352,6 +352,22 @@ - app_ref->pathname[len] = 0; - } - -+ } -+#elif defined(__FreeBSD__) -+ { -+ char buffer[1024]; -+ int len; -+ char *path; -+ -+ path = g_strdup_printf ("/proc/%d/file", pid); -+ len = readlink (path, buffer, sizeof (buffer)); -+ g_free (path); -+ -+ if (len > 0) { -+ app_ref->pathname = g_malloc (len + 1); -+ memcpy (app_ref->pathname, buffer, len); -+ app_ref->pathname[len] = 0; -+ } - } - #endif - diff --git a/security/gnome-keyring/files/patch-gnome-keyring.c b/security/gnome-keyring/files/patch-gnome-keyring.c deleted file mode 100644 index c1abd3a28..000000000 --- a/security/gnome-keyring/files/patch-gnome-keyring.c +++ /dev/null @@ -1,88 +0,0 @@ ---- gnome-keyring.c.orig Mon Jan 12 04:37:31 2004 -+++ gnome-keyring.c Tue May 11 20:59:40 2004 -@@ -35,6 +35,7 @@ - #include <stdio.h> - #include <sys/types.h> - #include <sys/socket.h> -+#include <sys/uio.h> - #include <sys/un.h> - #include <stdarg.h> - -@@ -248,11 +249,37 @@ - { - char buf; - int bytes_written; -+#if defined(HAVE_CMSGCRED) && !defined(LOCAL_CREDS) -+ char cmsgmem[CMSG_SPACE (sizeof (struct cmsgcred))]; -+ struct cmsghdr *cmsg = (struct cmsghdr *) cmsgmem; -+ struct iovec iov; -+ struct msghdr msg; -+#endif -+ -+ buf = 0; -+#if defined(HAVE_CMSGCRED) && !defined(LOCAL_CREDS) -+ iov.iov_base = &buf; -+ iov.iov_len = 1; -+ -+ memset (&msg, 0, sizeof (msg)); -+ msg.msg_iov = &iov; -+ msg.msg_iovlen = 1; -+ -+ msg.msg_control = cmsg; -+ msg.msg_controllen = sizeof (cmsgmem); -+ memset (cmsg, 0, sizeof (cmsgmem)); -+ cmsg->cmsg_len = sizeof (cmsgmem); -+ cmsg->cmsg_level = SOL_SOCKET; -+ cmsg->cmsg_type = SCM_CREDS; -+#endif - - again: - -- buf = 0; -+#if defined(HAVE_CMSGCRED) && !defined(LOCAL_CREDS) -+ bytes_written = sendmsg (socket, &msg, 0); -+#else - bytes_written = write (socket, &buf, 1); -+#endif - - if (bytes_written < 0 && errno == EINTR) - goto again; -@@ -270,11 +297,37 @@ - { - char buf; - int bytes_written; -+#if defined(HAVE_CMSGCRED) && !defined(LOCAL_CREDS) -+ char cmsgmem[CMSG_SPACE (sizeof (struct cmsgcred))]; -+ struct cmsghdr *cmsg = (struct cmsghdr *) cmsgmem; -+ struct iovec iov; -+ struct msghdr msg; -+#endif -+ -+ buf = 0; -+#if defined(HAVE_CMSGCRED) && !defined(LOCAL_CREDS) -+ iov.iov_base = &buf; -+ iov.iov_len = 1; -+ -+ memset (&msg, 0, sizeof (msg)); -+ msg.msg_iov = &iov; -+ msg.msg_iovlen = 1; -+ -+ msg.msg_control = cmsg; -+ msg.msg_controllen = sizeof (cmsgmem); -+ memset (cmsg, 0, sizeof (cmsgmem)); -+ cmsg->cmsg_len = sizeof (cmsgmem); -+ cmsg->cmsg_level = SOL_SOCKET; -+ cmsg->cmsg_type = SCM_CREDS; -+#endif - - again: - -- buf = 0; -+#if defined(HAVE_CMSGCRED) && !defined(LOCAL_CREDS) -+ bytes_written = sendmsg (op->socket, &msg, 0); -+#else - bytes_written = write (op->socket, &buf, 1); -+#endif - - if (bytes_written < 0 && errno == EINTR) - goto again; |