Update gnome-keyring to 2.26.0.

Changes between 2.24.0 and 2.26.0:
==================================

    * Refactor PKI code to make it modular, loosely coupled and easier
      to hack and test.
    * Add standard widgets for display of certificates.
    * If login keyring doesn't exist when changing a PAM password,
      don't create it automatically.
    * Overhaul the secure memory allocator to have memory guards,
      be valgrind compatible, and also be sparing with secure memory.
    * When importing keys, prompt to initialize new PKCS#11 tokens.
    * Fix export of RSA keys to be more interoperable.
    * Make the gp11 library multi-thread safe.
    * Rework initialization of daemon, and the way that it
      integrates with the new session manager.
    * Close open file descriptors before starting daemon from PAM.
    * Don't leave keyring daemon running if PAM just started it
      for a password change.
    * Register environment variables with session properly.
    * Remove usage of deprecated glib/gtk stuff.
    * Hundreds of other smaller changes and fixes.

7 files changed, 96 insertions, 50 deletions

diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index 519ff982bc2..16de6c9605e 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2009/01/11 20:32:18 ahoka Exp $
+# $NetBSD: Makefile,v 1.43 2009/03/15 18:14:24 jmcneill Exp $
 
-DISTNAME=	gnome-keyring-2.24.1
-PKGREVISION=	2
+DISTNAME=	gnome-keyring-2.26.0
 CATEGORIES=	security gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-keyring/2.24/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-keyring/2.26/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -25,7 +24,9 @@ GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
 
+PKGCONFIG_OVERRIDE=	${WRKSRC}/gcr/gcr.pc.in
 PKGCONFIG_OVERRIDE=	${WRKSRC}/library/gnome-keyring-1.pc.in
+PKGCONFIG_OVERRIDE=	${WRKSRC}/gp11/gp11.pc.in
 
 GCONF_SCHEMAS+=		gnome-keyring.schemas
 
@@ -36,6 +37,12 @@ CFLAGS.HPUX+=		-DMAP_ANON=MAP_ANONYMOUS
 #
 CFLAGS.NetBSD+=		-DNO_STATIC_MODULES
 
+.include "../../mk/dlopen.buildlink3.mk"
+
+.if !defined(BUILDLINK_LDADD.dl)
+BUILDLINK_TRANSFORM+=	rm:-ldl
+.endif
+
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.6.0
 BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.6.0
 
diff --git a/security/gnome-keyring/PLIST b/security/gnome-keyring/PLIST
index 8b1bb6997f8..55e7f5d53cc 100644
--- a/security/gnome-keyring/PLIST
+++ b/security/gnome-keyring/PLIST
@@ -1,6 +1,13 @@
-@comment $NetBSD: PLIST,v 1.15 2008/10/25 00:49:32 wiz Exp $
+@comment $NetBSD: PLIST,v 1.16 2009/03/15 18:14:24 jmcneill Exp $
 bin/gnome-keyring
 bin/gnome-keyring-daemon
+include/gcr/gcr-certificate-basics-widget.h
+include/gcr/gcr-certificate-details-widget.h
+include/gcr/gcr-certificate.h
+include/gcr/gcr-importer.h
+include/gcr/gcr-parser.h
+include/gcr/gcr-types.h
+include/gcr/gcr.h
 include/gnome-keyring-1/gnome-keyring-memory.h
 include/gnome-keyring-1/gnome-keyring-result.h
 include/gnome-keyring-1/gnome-keyring.h
@@ -9,14 +16,22 @@ include/gp11/pkcs11.h
 include/gp11/pkcs11g.h
 include/gp11/pkcs11n.h
 lib/gnome-keyring/gnome-keyring-pkcs11.la
+lib/gnome-keyring/devel/gck-ssh-store-standalone.la
+lib/gnome-keyring/devel/gck-user-store-standalone.la
+lib/gnome-keyring/standalone/gck-roots-store-standalone.la
+lib/libgcr.la
 lib/libgnome-keyring.la
 lib/libgp11.la
+lib/pkgconfig/gcr-0.pc
 lib/pkgconfig/gnome-keyring-1.pc
 lib/pkgconfig/gp11-0.pc
 lib/security/pam_gnome_keyring.la
 libexec/gnome-keyring-ask
 share/dbus-1/services/org.gnome.keyring.service
 share/gconf/schemas/gnome-keyring.schemas
+share/gcr/ui/gcr-certificate-basics-widget.ui
+share/gcr/ui/gcr-import-dialog.ui
+share/gnome/autostart/gnome-keyring-daemon.desktop
 share/gtk-doc/html/gnome-keyring/ch01.html
 share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-acl.html
 share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-attributes.html
@@ -56,6 +71,7 @@ share/gtk-doc/html/gp11/right.png
 share/gtk-doc/html/gp11/style.css
 share/gtk-doc/html/gp11/up.png
 share/locale/ar/LC_MESSAGES/gnome-keyring.mo
+share/locale/ast/LC_MESSAGES/gnome-keyring.mo
 share/locale/az/LC_MESSAGES/gnome-keyring.mo
 share/locale/be/LC_MESSAGES/gnome-keyring.mo
 share/locale/be@latin/LC_MESSAGES/gnome-keyring.mo
diff --git a/security/gnome-keyring/distinfo b/security/gnome-keyring/distinfo
index 9dc5e5d3681..dd1be11f04a 100644
--- a/security/gnome-keyring/distinfo
+++ b/security/gnome-keyring/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.30 2008/10/25 00:49:32 wiz Exp $
+$NetBSD: distinfo,v 1.31 2009/03/15 18:14:24 jmcneill Exp $
 
-SHA1 (gnome-keyring-2.24.1.tar.bz2) = 93e92e01daecd85b1c0ae9dda09d5cc808989642
-RMD160 (gnome-keyring-2.24.1.tar.bz2) = 17c6701ef7b35902780b6c72b79a3f0eaafe2378
-Size (gnome-keyring-2.24.1.tar.bz2) = 1125993 bytes
-SHA1 (patch-aa) = 0538fdbe4b6d45e38daeefbe26b287972b208034
-SHA1 (patch-ab) = c6fc864a34ae6ccb0fdf891082146f451203494c
+SHA1 (gnome-keyring-2.26.0.tar.bz2) = dcbc2f06bca8f8d6d310064a85f5ab97a6af8889
+RMD160 (gnome-keyring-2.26.0.tar.bz2) = 0cbf6208864f39a9437faadd9fb348eaccef65ba
+Size (gnome-keyring-2.26.0.tar.bz2) = 1211953 bytes
+SHA1 (patch-aa) = 7f7c15099b1abedf24493c4a14d6a71941ed09bd
 SHA1 (patch-ac) = 550b4ebfdf9ae7653d0174e6857e32c8453f2ca7
-SHA1 (patch-ad) = b251bb0479a527f18822de67a0cb0af267f5ee60
+SHA1 (patch-ad) = df4a9a69ca9262066daf2272869ce63471c15bd3
+SHA1 (patch-ae) = c727e8e6fa07daf2c40cf2a2de4322eb4f683b96
diff --git a/security/gnome-keyring/patches/patch-aa b/security/gnome-keyring/patches/patch-aa
index 548fabdd258..24faad78866 100644
--- a/security/gnome-keyring/patches/patch-aa
+++ b/security/gnome-keyring/patches/patch-aa
@@ -1,26 +1,17 @@
-$NetBSD: patch-aa,v 1.8 2008/10/16 13:45:38 drochner Exp $
+$NetBSD: patch-aa,v 1.9 2009/03/15 18:14:24 jmcneill Exp $
 
---- configure.orig	2008-09-21 00:18:31.000000000 +0200
+--- configure.orig	2009-03-14 14:57:51.000000000 -0400
 +++ configure
-@@ -17119,7 +17119,7 @@ fi
- 
- 	dbus_status=$DBUS_VERSION
- fi
-- if test "$enable_dbus" == "yes"; then
-+ if test "$enable_dbus" = "yes"; then
-   WITH_DBUS_TRUE=
-   WITH_DBUS_FALSE='#'
- else
-@@ -18160,7 +18160,7 @@ if test "${enable_tests+set}" = set; the
- fi
- 
+@@ -18124,7 +18124,7 @@ fi
  
+ { echo "$as_me:$LINENO: checking build test tools, unit tests, and -Werror" >&5
+ echo $ECHO_N "checking build test tools, unit tests, and -Werror... $ECHO_C" >&6; }
 -if test "$enable_tests" == "yes"; then
 +if test "$enable_tests" = "yes"; then
- 	echo "building tests and unit tests"
  
  cat >>confdefs.h <<_ACEOF
-@@ -18173,7 +18173,7 @@ else
+ #define WITH_TESTS 1
+@@ -18140,7 +18140,7 @@ echo "${ECHO_T}no" >&6; }
    	tests_status="no"
  fi
  
@@ -29,7 +20,7 @@ $NetBSD: patch-aa,v 1.8 2008/10/16 13:45:38 drochner Exp $
    WITH_TESTS_TRUE=
    WITH_TESTS_FALSE='#'
  else
-@@ -18188,7 +18188,7 @@ if test "${enable_coverage+set}" = set; 
+@@ -18155,7 +18155,7 @@ if test "${enable_coverage+set}" = set; 
  fi
  
  
@@ -38,3 +29,39 @@ $NetBSD: patch-aa,v 1.8 2008/10/16 13:45:38 drochner Exp $
  	CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage"
  	LDFLAGS="$LDFLAGS -fprofile-arcs -ftest-coverage"
  fi
+@@ -18173,7 +18173,7 @@ fi
+ echo $ECHO_N "checking valgrind... $ECHO_C" >&6; }
+ valgrind_status="yes"
+ 
+- if test "$enable_valgrind" == "run"; then
++ if test "$enable_valgrind" = "run"; then
+   WITH_VALGRIND_TRUE=
+   WITH_VALGRIND_FALSE='#'
+ else
+@@ -18183,7 +18183,7 @@ fi
+ 
+ 
+ # Run gnome-keyring-daemon under valgrind as default
+-if test "$enable_valgrind" == "run"; then
++if test "$enable_valgrind" = "run"; then
+ 	# Extract the first word of "valgrind", so it can be a program name with args.
+ set dummy valgrind; ac_word=$2
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
+@@ -18254,7 +18254,7 @@ fi
+ 
+ 
+ # Build valgrind support into code
+-if test "$enable_valgrind" == "yes"; then
++if test "$enable_valgrind" = "yes"; then
+ 	if test "${ac_cv_header_valgrind_valgrind_h+set}" = set; then
+   { echo "$as_me:$LINENO: checking for valgrind/valgrind.h" >&5
+ echo $ECHO_N "checking for valgrind/valgrind.h... $ECHO_C" >&6; }
+@@ -18387,7 +18387,7 @@ else
+ fi
+ 
+ 
+-	if test "$have_valgrind" == "no"; then
++	if test "$have_valgrind" = "no"; then
+ 		{ { echo "$as_me:$LINENO: error: The valgrind headers are missing" >&5
+ echo "$as_me: error: The valgrind headers are missing" >&2;}
+    { (exit 1); exit 1; }; }
diff --git a/security/gnome-keyring/patches/patch-ab b/security/gnome-keyring/patches/patch-ab
deleted file mode 100644
index 36b0b3d7daf..00000000000
--- a/security/gnome-keyring/patches/patch-ab
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2007/11/13 12:04:24 rillig Exp $
-
-The native Solaris PAM library doesn't define PAM_EXTERN.
-
---- pam/gkr-pam-module.c.orig	2007-10-09 17:35:32.000000000 +0200
-+++ pam/gkr-pam-module.c	2007-11-13 12:43:16.119765000 +0100
-@@ -77,6 +77,10 @@ enum {
- #define PAM_AUTHTOK_RECOVER_ERR PAM_AUTHTOK_RECOVERY_ERR
- #endif
- 
-+#ifndef PAM_EXTERN
-+#define PAM_EXTERN /* extern */
-+#endif
-+
- /* -----------------------------------------------------------------------------
-  * HELPERS 
-  */
diff --git a/security/gnome-keyring/patches/patch-ad b/security/gnome-keyring/patches/patch-ad
index 61da377ffdc..08c282c5d81 100644
--- a/security/gnome-keyring/patches/patch-ad
+++ b/security/gnome-keyring/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.5 2008/07/14 17:20:35 drochner Exp $
+$NetBSD: patch-ad,v 1.6 2009/03/15 18:14:24 jmcneill Exp $
 
---- common/gkr-unix-credentials.c.orig	2008-06-30 17:27:42.000000000 +0200
-+++ common/gkr-unix-credentials.c
-@@ -126,7 +126,6 @@ gkr_unix_credentials_read (int sock, pid
+--- egg/egg-unix-credentials.c.orig	2009-01-17 18:08:46.000000000 -0500
++++ egg/egg-unix-credentials.c
+@@ -130,7 +130,6 @@ egg_unix_credentials_read (int sock, pid
  		cred = (struct sockcred *) CMSG_DATA (&cmsg.hdr);
  		*pid = 0;
  		*uid = cred->sc_euid;
diff --git a/security/gnome-keyring/patches/patch-ae b/security/gnome-keyring/patches/patch-ae
new file mode 100644
index 00000000000..77066512534
--- /dev/null
+++ b/security/gnome-keyring/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2009/03/15 18:14:24 jmcneill Exp $
+
+--- daemon/Makefile.in.orig	2009-03-14 14:57:47.000000000 -0400
++++ daemon/Makefile.in
+@@ -364,7 +364,7 @@ servicedir = $(DBUS_SERVICES_DIR)
+ service_in_files = org.gnome.keyring.service.in
+ service_DATA = $(service_in_files:.service.in=.service)
+ desktop_in_files = gnome-keyring-daemon.desktop.in
+-desktopdir = $(sysconfdir)/xdg/autostart
++desktopdir = $(PREFIX)/share/gnome/autostart
+ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+ all: all-recursive
+