update to 2.22.2
changes: -minor UI improvements -bugfixes -portability improvements, in particular for credential passing on local sockets -- unfortunately a bit of the patch I submitted upstream got lost
This commit is contained in:
parent
a73d8ffc1d
commit
532e197c84
3 changed files with 15 additions and 26 deletions
|
@ -1,6 +1,6 @@
|
||||||
# $NetBSD: Makefile,v 1.36 2008/04/30 13:38:16 jmmv Exp $
|
# $NetBSD: Makefile,v 1.37 2008/05/29 10:47:52 drochner Exp $
|
||||||
|
|
||||||
DISTNAME= gnome-keyring-2.22.1
|
DISTNAME= gnome-keyring-2.22.2
|
||||||
CATEGORIES= security gnome
|
CATEGORIES= security gnome
|
||||||
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-keyring/2.22/}
|
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-keyring/2.22/}
|
||||||
EXTRACT_SUFX= .tar.bz2
|
EXTRACT_SUFX= .tar.bz2
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
$NetBSD: distinfo,v 1.24 2008/04/10 16:53:44 drochner Exp $
|
$NetBSD: distinfo,v 1.25 2008/05/29 10:47:52 drochner Exp $
|
||||||
|
|
||||||
SHA1 (gnome-keyring-2.22.1.tar.bz2) = 59956194b110a4e4576db0791e2d2371b39ff49c
|
SHA1 (gnome-keyring-2.22.2.tar.bz2) = b3276e2c349b761d167df9bdbb9c19268af2bd4b
|
||||||
RMD160 (gnome-keyring-2.22.1.tar.bz2) = 83dddadb1c133931151de302e8f33ff1d99ed496
|
RMD160 (gnome-keyring-2.22.2.tar.bz2) = 9fcf9bee654050ca7f762b5d50e98ef690e8409e
|
||||||
Size (gnome-keyring-2.22.1.tar.bz2) = 960392 bytes
|
Size (gnome-keyring-2.22.2.tar.bz2) = 904890 bytes
|
||||||
SHA1 (patch-aa) = fff624c298f901bb1a81ac7ad4d781cae5a4cff2
|
SHA1 (patch-aa) = fff624c298f901bb1a81ac7ad4d781cae5a4cff2
|
||||||
SHA1 (patch-ab) = c6fc864a34ae6ccb0fdf891082146f451203494c
|
SHA1 (patch-ab) = c6fc864a34ae6ccb0fdf891082146f451203494c
|
||||||
SHA1 (patch-ac) = 550b4ebfdf9ae7653d0174e6857e32c8453f2ca7
|
SHA1 (patch-ac) = 550b4ebfdf9ae7653d0174e6857e32c8453f2ca7
|
||||||
SHA1 (patch-ad) = b0f1633ed5d3e24faf89c96ac730845d1edae8d6
|
SHA1 (patch-ad) = 2247ee2cc1b2a3328e686e222c17fe08e6fbd964
|
||||||
|
|
|
@ -1,23 +1,12 @@
|
||||||
$NetBSD: patch-ad,v 1.1 2008/04/10 16:53:44 drochner Exp $
|
$NetBSD: patch-ad,v 1.2 2008/05/29 10:47:52 drochner Exp $
|
||||||
|
|
||||||
--- ./common/gkr-unix-credentials.c.orig 2008-02-13 22:07:15.000000000 +0100
|
--- common/gkr-unix-credentials.c.orig 2008-05-26 18:03:16.000000000 +0200
|
||||||
+++ ./common/gkr-unix-credentials.c
|
+++ common/gkr-unix-credentials.c
|
||||||
@@ -36,6 +36,10 @@
|
@@ -126,7 +126,6 @@ gkr_unix_credentials_read (int sock, pid
|
||||||
#include <ucred.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+#ifdef __NetBSD__
|
|
||||||
+#include <sys/un.h> /* for LOCAL_CREDS */
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
int
|
|
||||||
gkr_unix_credentials_read (int sock, pid_t *pid, uid_t *uid)
|
|
||||||
{
|
|
||||||
@@ -125,7 +129,6 @@ gkr_unix_credentials_read (int sock, pid
|
|
||||||
cred = (struct sockcred *) CMSG_DATA (&cmsg.hdr);
|
cred = (struct sockcred *) CMSG_DATA (&cmsg.hdr);
|
||||||
*pid = 0;
|
*pid = 0;
|
||||||
*uid = cred->sc_euid;
|
*uid = cred->sc_euid;
|
||||||
- set_local_creds(fd, FALSE);
|
- set_local_creds(sock, FALSE);
|
||||||
#elif defined(HAVE_GETPEERUCRED)
|
#elif defined(HAVE_GETPEEREID) /* OpenBSD */
|
||||||
ucred_t *uc = NULL;
|
uid_t euid;
|
||||||
|
gid_t egid;
|
||||||
|
|
Loading…
Reference in a new issue