summaryrefslogtreecommitdiff
path: root/security/gnome-keyring/patches/patch-ad
diff options
context:
space:
mode:
authordrochner <drochner@pkgsrc.org>2010-06-11 13:45:50 +0000
committerdrochner <drochner@pkgsrc.org>2010-06-11 13:45:50 +0000
commit65c53682aafe9d7736d5890bf318ea7a4a1b29c8 (patch)
tree68891e31f64db27c14f30366f792b37be7a732d9 /security/gnome-keyring/patches/patch-ad
parente2f69b7266ad6e632fc90cfddf1874487a4b61c3 (diff)
downloadpkgsrc-65c53682aafe9d7736d5890bf318ea7a4a1b29c8.tar.gz
update to 2.30.1
This switches to the gnome-2.30 release branch pkgsrc note: temporarily add a dependency on libgnome-keyring which was split out of the old gnome-keyring pkg, so that client pkgs get the same as before
Diffstat (limited to 'security/gnome-keyring/patches/patch-ad')
-rw-r--r--security/gnome-keyring/patches/patch-ad15
1 files changed, 12 insertions, 3 deletions
diff --git a/security/gnome-keyring/patches/patch-ad b/security/gnome-keyring/patches/patch-ad
index 08c282c5d81..6f05e0bcf37 100644
--- a/security/gnome-keyring/patches/patch-ad
+++ b/security/gnome-keyring/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.6 2009/03/15 18:14:24 jmcneill Exp $
+$NetBSD: patch-ad,v 1.7 2010/06/11 13:45:50 drochner Exp $
---- egg/egg-unix-credentials.c.orig 2009-01-17 18:08:46.000000000 -0500
+--- egg/egg-unix-credentials.c.orig 2009-12-15 04:00:09.000000000 +0000
+++ egg/egg-unix-credentials.c
-@@ -130,7 +130,6 @@ egg_unix_credentials_read (int sock, pid
+@@ -127,7 +127,6 @@ egg_unix_credentials_read (int sock, pid
cred = (struct sockcred *) CMSG_DATA (&cmsg.hdr);
*pid = 0;
*uid = cred->sc_euid;
@@ -10,3 +10,12 @@ $NetBSD: patch-ad,v 1.6 2009/03/15 18:14:24 jmcneill Exp $
#elif defined(HAVE_GETPEEREID) /* OpenBSD */
uid_t euid;
gid_t egid;
+@@ -215,7 +214,7 @@ egg_unix_credentials_setup (int sock)
+ #if defined(LOCAL_CREDS) && !defined(HAVE_CMSGCRED)
+ int val = 1;
+ if (setsockopt (sock, 0, LOCAL_CREDS, &val, sizeof (val)) < 0) {
+- fprintf (stderr, "unable to set LOCAL_CREDS socket option on fd %d\n", fd);
++ fprintf (stderr, "unable to set LOCAL_CREDS socket option on fd %d\n", sock);
+ retval = -1;
+ }
+ #endif