summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authortron <tron>2008-05-30 13:55:48 +0000
committertron <tron>2008-05-30 13:55:48 +0000
commitb2774740ef8aabedfd2a22b75fc679aab043ded1 (patch)
treedcf11b31809b0102f5fa86e763a0c6c881821efe /security
parentf6d805931383738f97f8bd2fe6927a838e95d58a (diff)
downloadpkgsrc-b2774740ef8aabedfd2a22b75fc679aab043ded1.tar.gz
Restore NetBSD specific part of the patch which got lost in the
last commit.
Diffstat (limited to 'security')
-rw-r--r--security/gnome-keyring/distinfo4
-rw-r--r--security/gnome-keyring/patches/patch-ad16
2 files changed, 14 insertions, 6 deletions
diff --git a/security/gnome-keyring/distinfo b/security/gnome-keyring/distinfo
index c6f46d8f408..86e6c9baf74 100644
--- a/security/gnome-keyring/distinfo
+++ b/security/gnome-keyring/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2008/05/30 12:30:07 tron Exp $
+$NetBSD: distinfo,v 1.27 2008/05/30 13:55:48 tron Exp $
SHA1 (gnome-keyring-2.22.2.tar.bz2) = b3276e2c349b761d167df9bdbb9c19268af2bd4b
RMD160 (gnome-keyring-2.22.2.tar.bz2) = 9fcf9bee654050ca7f762b5d50e98ef690e8409e
@@ -6,4 +6,4 @@ Size (gnome-keyring-2.22.2.tar.bz2) = 904890 bytes
SHA1 (patch-aa) = fff624c298f901bb1a81ac7ad4d781cae5a4cff2
SHA1 (patch-ab) = c6fc864a34ae6ccb0fdf891082146f451203494c
SHA1 (patch-ac) = 550b4ebfdf9ae7653d0174e6857e32c8453f2ca7
-SHA1 (patch-ad) = 7012f00f1279cb3ed8f1a52aba3df79579f3a339
+SHA1 (patch-ad) = 469c84aa349e015675848e8dff6bb3b0e4a888b6
diff --git a/security/gnome-keyring/patches/patch-ad b/security/gnome-keyring/patches/patch-ad
index f59f269533e..98e5339a08d 100644
--- a/security/gnome-keyring/patches/patch-ad
+++ b/security/gnome-keyring/patches/patch-ad
@@ -1,8 +1,16 @@
-$NetBSD: patch-ad,v 1.3 2008/05/30 12:30:07 tron Exp $
+$NetBSD: patch-ad,v 1.4 2008/05/30 13:55:48 tron Exp $
---- common/gkr-unix-credentials.c.orig 2008-05-30 13:10:12.000000000 +0100
-+++ common/gkr-unix-credentials.c 2008-05-30 13:16:17.000000000 +0100
-@@ -134,8 +134,8 @@
+--- common/gkr-unix-credentials.c.orig 2008-05-26 17:03:16.000000000 +0100
++++ common/gkr-unix-credentials.c 2008-05-30 14:38:01.000000000 +0100
+@@ -126,7 +126,6 @@
+ cred = (struct sockcred *) CMSG_DATA (&cmsg.hdr);
+ *pid = 0;
+ *uid = cred->sc_euid;
+- set_local_creds(sock, FALSE);
+ #elif defined(HAVE_GETPEEREID) /* OpenBSD */
+ uid_t euid;
+ gid_t egid;
+@@ -135,8 +134,8 @@
if (getpeereid (sock, &euid, &egid) == 0) {
*uid = euid;
} else {