r22465 - in /desktop/unstable/gnome-keyring/debian: changelog patches/03_kfreebsd.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Sat Nov 28 22:02:22 2009
New Revision: 22465

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22465
Log:
03_kfreebsd.patch: patch from Emmanuel Bouthenot to add kFreeBSD 
support. Closes: #558406.

Added:
    desktop/unstable/gnome-keyring/debian/patches/03_kfreebsd.patch
Modified:
    desktop/unstable/gnome-keyring/debian/changelog

Modified: desktop/unstable/gnome-keyring/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/changelog?rev=22465&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/changelog [utf-8] Sat Nov 28 22:02:22 2009
@@ -1,3 +1,10 @@
+gnome-keyring (2.28.1-3) UNRELEASED; urgency=low
+
+  * 03_kfreebsd.patch: patch from Emmanuel Bouthenot to add kFreeBSD 
+    support. Closes: #558406.
+
+ -- Josselin Mouette <joss at debian.org>  Sat, 28 Nov 2009 23:00:07 +0100
+
 gnome-keyring (2.28.1-2) unstable; urgency=low
 
   * 10_whitelist_system.patch: new patch. Whitelist some system 

Added: desktop/unstable/gnome-keyring/debian/patches/03_kfreebsd.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/patches/03_kfreebsd.patch?rev=22465&op=file
==============================================================================
--- desktop/unstable/gnome-keyring/debian/patches/03_kfreebsd.patch (added)
+++ desktop/unstable/gnome-keyring/debian/patches/03_kfreebsd.patch [utf-8] Sat Nov 28 22:02:22 2009
@@ -1,0 +1,58 @@
+--- gnome-keyring-2.28.1/egg/egg-unix-credentials.c	2009-11-28 16:35:59.000000000 +0100
++++ gnome-keyring-2.28.1.new/egg/egg-unix-credentials.c	2009-11-28 16:37:59.000000000 +0100
+@@ -45,7 +45,7 @@
+ 	char buf;
+ 	int ret;
+ 	
+-#if defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS)
++#if (defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS)) && (!defined(__FreeBSD__) || !defined(__FreeBSD_kernel__))
+ 	/* Prefer CMSGCRED over LOCAL_CREDS because the former provides the
+ 	 * remote PID. */
+ #if defined(HAVE_CMSGCRED)
+@@ -73,7 +73,7 @@
+ 	msg.msg_iov = &iov;
+ 	msg.msg_iovlen = 1;
+ 	
+-#if defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS)
++#if (defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS)) && (!defined(__FreeBSD__) || !defined(__FreeBSD_kernel__))
+ 	memset (&cmsg, 0, sizeof (cmsg));
+ 	msg.msg_control = (caddr_t) &cmsg;
+ 	msg.msg_controllen = CMSG_SPACE(sizeof *cred);
+@@ -96,8 +96,8 @@
+ 		fprintf (stderr, "credentials byte was not nul\n");
+ 		return -1;
+ 	}
+-
+-#if defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS)
++	
++#if (defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS)) && (!defined(__FreeBSD__) || !defined(__FreeBSD_kernel__))
+ 	if (cmsg.hdr.cmsg_len < CMSG_LEN (sizeof *cred) ||
+ 	    cmsg.hdr.cmsg_type != SCM_CREDS) {
+ 		fprintf (stderr, "message from recvmsg() was not SCM_CREDS\n");
+@@ -164,7 +164,7 @@
+ {
+ 	char buf;
+ 	int bytes_written;
+-#if defined(HAVE_CMSGCRED) && (!defined(LOCAL_CREDS) || defined(__FreeBSD__))
++#if defined(HAVE_CMSGCRED) && (!defined(LOCAL_CREDS) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__))
+ 	union {
+ 		struct cmsghdr hdr;
+ 		char cred[CMSG_SPACE (sizeof (struct cmsgcred))];
+@@ -175,7 +175,7 @@
+ 
+ 	buf = 0;
+ 
+-#if defined(HAVE_CMSGCRED) && (!defined(LOCAL_CREDS) || defined(__FreeBSD__))
++#if defined(HAVE_CMSGCRED) && (!defined(LOCAL_CREDS) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__))
+ 	iov.iov_base = &buf;
+ 	iov.iov_len = 1;
+ 
+@@ -193,7 +193,7 @@
+ 
+ again:
+ 
+-#if defined(HAVE_CMSGCRED) && (!defined(LOCAL_CREDS) || defined(__FreeBSD__))
++#if defined(HAVE_CMSGCRED) && (!defined(LOCAL_CREDS) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__))
+ 	bytes_written = sendmsg (socket, &msg, 0);
+ #else
+ 	bytes_written = write (socket, &buf, 1);