update to 2.32.1

This switches to the gnome-2.32 release branch.

7 files changed, 107 insertions, 77 deletions

diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index 1d659b0351c..f9b3f1ed541 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.59 2011/01/13 13:36:39 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2011/04/13 16:39:14 drochner Exp $
 
-DISTNAME=	gnome-keyring-2.30.3
-PKGREVISION=	3
+DISTNAME=	gnome-keyring-2.32.1
 CATEGORIES=	security gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-keyring/2.30/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-keyring/2.32/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -21,8 +20,6 @@ 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
-
 CFLAGS.HPUX+=		-DMAP_ANON=MAP_ANONYMOUS
 
 # Workaround a bug with NetBSD's openpam
@@ -34,10 +31,10 @@ CFLAGS.NetBSD+=		-DNO_STATIC_MODULES
 
 BUILDLINK_TRANSFORM+=	opt:-ldl:${BUILDLINK_LDADD.dl:M*}
 
-BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.6.0
-BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.6.0
+BUILD_DEPENDS+=	gsed-[0-9]*:../../textproc/gsed
 
-.include "../../devel/GConf/schemas.mk"
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.26.0
+.include "../../devel/glib2/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
diff --git a/security/gnome-keyring/PLIST b/security/gnome-keyring/PLIST
index 41aadb5dff3..83a6629dfb2 100644
--- a/security/gnome-keyring/PLIST
+++ b/security/gnome-keyring/PLIST
@@ -1,64 +1,70 @@
-@comment $NetBSD: PLIST,v 1.24 2010/07/06 16:13:41 drochner Exp $
+@comment $NetBSD: PLIST,v 1.25 2011/04/13 16:39:14 drochner 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-unlock-options-widget.h
-include/gcr/gcr.h
+include/gcr/gcr/gcr-certificate-basics-widget.h
+include/gcr/gcr/gcr-certificate-details-widget.h
+include/gcr/gcr/gcr-certificate.h
+include/gcr/gcr/gcr-importer.h
+include/gcr/gcr/gcr-parser.h
+include/gcr/gcr/gcr-simple-certificate.h
+include/gcr/gcr/gcr-types.h
+include/gcr/gcr/gcr-unlock-options-widget.h
+include/gcr/gcr/gcr-unlock-options.h
+include/gcr/gcr/gcr.h
 include/gp11/gp11.h
 include/gp11/pkcs11.h
 include/gp11/pkcs11g.h
 include/gp11/pkcs11n.h
-lib/gnome-keyring/devel/gck-ssh-store-standalone.la
-lib/gnome-keyring/devel/gck-user-store-standalone.la
+lib/gnome-keyring/devel/gkm-ssh-store-standalone.la
+lib/gnome-keyring/devel/gkm-user-store-standalone.la
 lib/gnome-keyring/gnome-keyring-pkcs11.la
-lib/gnome-keyring/standalone/gck-roots-store-standalone.la
-lib/gnome-keyring/standalone/gck-secret-store-standalone.la
+lib/gnome-keyring/standalone/gkm-roots-store-standalone.la
+lib/gnome-keyring/standalone/gkm-secret-store-standalone.la
 lib/libgcr.la
 lib/libgp11.la
 lib/pkgconfig/gcr-0.pc
 lib/pkgconfig/gp11-0.pc
 lib/security/pam_gnome_keyring.la
 libexec/gnome-keyring-prompt
+share/GConf/gsettings/org.gnome.crypto.cache.convert
+share/GConf/gsettings/org.gnome.crypto.pgp.convert
 share/dbus-1/services/org.freedesktop.secrets.service
 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/gcr/ui/gcr-unlock-options-widget.ui
+share/glib-2.0/schemas/org.gnome.crypto.cache.gschema.xml
+share/glib-2.0/schemas/org.gnome.crypto.pgp.gschema.xml
 share/gnome-keyring/introspect/introspect-collection.xml
 share/gnome-keyring/introspect/introspect-item.xml
 share/gnome-keyring/introspect/introspect-prompt.xml
 share/gnome-keyring/introspect/introspect-service.xml
 share/gnome-keyring/introspect/introspect-session.xml
-share/gnome-keyring/ui/gkd-prompt.ui
+share/gnome-keyring/ui/gku-prompt.ui
+share/gnome/autostart/gnome-keyring-gpg.desktop
 share/gnome/autostart/gnome-keyring-pkcs11.desktop
 share/gnome/autostart/gnome-keyring-secrets.desktop
 share/gnome/autostart/gnome-keyring-ssh.desktop
-share/gtk-doc/html/gcr/ch01.html
-share/gtk-doc/html/gcr/gcr-GcrCertificate.html
-share/gtk-doc/html/gcr/gcr-gcr-certificate-basics-widget.html
-share/gtk-doc/html/gcr/gcr-gcr-certificate-details-widget.html
-share/gtk-doc/html/gcr/gcr-gcr-import-dialog.html
-share/gtk-doc/html/gcr/gcr-gcr-importer.html
-share/gtk-doc/html/gcr/gcr-gcr-initializer.html
-share/gtk-doc/html/gcr/gcr-gcr-parser.html
-share/gtk-doc/html/gcr/gcr-gcr-simple-certificate.html
-share/gtk-doc/html/gcr/gcr-gcr-types.html
-share/gtk-doc/html/gcr/gcr-gcr-xxx.html
-share/gtk-doc/html/gcr/gcr.devhelp
-share/gtk-doc/html/gcr/gcr.devhelp2
-share/gtk-doc/html/gcr/home.png
-share/gtk-doc/html/gcr/index.html
-share/gtk-doc/html/gcr/index.sgml
-share/gtk-doc/html/gcr/left.png
-share/gtk-doc/html/gcr/right.png
-share/gtk-doc/html/gcr/style.css
-share/gtk-doc/html/gcr/up.png
+share/gtk-doc/html/gcr-0/ch01.html
+share/gtk-doc/html/gcr-0/gcr-0.devhelp
+share/gtk-doc/html/gcr-0/gcr-0.devhelp2
+share/gtk-doc/html/gcr-0/gcr-GcrCertificate.html
+share/gtk-doc/html/gcr-0/gcr-gcr-certificate-basics-widget.html
+share/gtk-doc/html/gcr-0/gcr-gcr-certificate-details-widget.html
+share/gtk-doc/html/gcr-0/gcr-gcr-import-dialog.html
+share/gtk-doc/html/gcr-0/gcr-gcr-importer.html
+share/gtk-doc/html/gcr-0/gcr-gcr-initializer.html
+share/gtk-doc/html/gcr-0/gcr-gcr-parser.html
+share/gtk-doc/html/gcr-0/gcr-gcr-simple-certificate.html
+share/gtk-doc/html/gcr-0/gcr-gcr-types.html
+share/gtk-doc/html/gcr-0/gcr-gcr-xxx.html
+share/gtk-doc/html/gcr-0/home.png
+share/gtk-doc/html/gcr-0/index.html
+share/gtk-doc/html/gcr-0/index.sgml
+share/gtk-doc/html/gcr-0/left.png
+share/gtk-doc/html/gcr-0/right.png
+share/gtk-doc/html/gcr-0/style.css
+share/gtk-doc/html/gcr-0/up.png
 share/gtk-doc/html/gp11/GP11Module.html
 share/gtk-doc/html/gp11/GP11Object.html
 share/gtk-doc/html/gp11/GP11Session.html
diff --git a/security/gnome-keyring/distinfo b/security/gnome-keyring/distinfo
index ea5184d29be..7ed24871036 100644
--- a/security/gnome-keyring/distinfo
+++ b/security/gnome-keyring/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.38 2010/07/06 16:13:42 drochner Exp $
+$NetBSD: distinfo,v 1.39 2011/04/13 16:39:14 drochner Exp $
 
-SHA1 (gnome-keyring-2.30.3.tar.bz2) = 0e0a2a1f4127dc6a01583fb3e81386370d9335f0
-RMD160 (gnome-keyring-2.30.3.tar.bz2) = 9bd3cea25e10e1dcd93cfbc75a6a448e8ab338ca
-Size (gnome-keyring-2.30.3.tar.bz2) = 1592573 bytes
+SHA1 (gnome-keyring-2.32.1.tar.bz2) = 3d0ecc3e29f426ecfcaa488ea17d3e330fe34eb6
+RMD160 (gnome-keyring-2.32.1.tar.bz2) = cb72f171f5918ff26f40feb7bba90dc7e2e120ec
+Size (gnome-keyring-2.32.1.tar.bz2) = 1619245 bytes
 SHA1 (patch-ad) = d49bc78227646b3de3c357cd0f1e90cd38862ee4
-SHA1 (patch-ae) = f2c75eb299cd9cd6f1f4ba32da73df0ad546c4ec
-SHA1 (patch-af) = 03f4ff07a7b9830dbc5c228efb4d971adfe85d89
-SHA1 (patch-ag) = 4b6f5510124c58613c5b8ce8782f913cca43a570
+SHA1 (patch-ae) = a4e6fabd0534a56b974ec799539ce93df6580ff1
+SHA1 (patch-af) = f89bc8980fd966f330c67907b4534ba01f2591f9
+SHA1 (patch-ag) = 1d51cad93c511d2fe0132b1a24e554611d4e18e2
+SHA1 (patch-ah) = 59f37786e06e197a726a32e8fc76b0b064259e1d
diff --git a/security/gnome-keyring/patches/patch-ae b/security/gnome-keyring/patches/patch-ae
index 93705aa2bcf..15963d3b24a 100644
--- a/security/gnome-keyring/patches/patch-ae
+++ b/security/gnome-keyring/patches/patch-ae
@@ -1,10 +1,10 @@
-$NetBSD: patch-ae,v 1.4 2010/07/06 16:13:42 drochner Exp $
+$NetBSD: patch-ae,v 1.5 2011/04/13 16:39:14 drochner Exp $
 
---- daemon/Makefile.in.orig	2010-06-20 23:35:30.000000000 +0000
+--- daemon/Makefile.in.orig	2010-10-25 22:47:41.000000000 +0000
 +++ daemon/Makefile.in
-@@ -416,7 +416,7 @@ desktop_in_files = \
- 	gnome-keyring-secrets.desktop.in \
- 	gnome-keyring-ssh.desktop.in
+@@ -428,7 +428,7 @@ desktop_in_files = \
+ 	gnome-keyring-ssh.desktop.in \
+ 	gnome-keyring-gpg.desktop.in
  
 -desktopdir = $(sysconfdir)/xdg/autostart
 +desktopdir = $(PREFIX)/share/gnome/autostart
diff --git a/security/gnome-keyring/patches/patch-af b/security/gnome-keyring/patches/patch-af
index bbaaea12e48..4649703ee78 100644
--- a/security/gnome-keyring/patches/patch-af
+++ b/security/gnome-keyring/patches/patch-af
@@ -1,16 +1,17 @@
-$NetBSD: patch-af,v 1.2 2009/10/21 16:37:19 drochner Exp $
+$NetBSD: patch-af,v 1.3 2011/04/13 16:39:14 drochner Exp $
 
---- egg/egg-asn1.h.orig	2009-08-15 02:01:31.000000000 +0200
-+++ egg/egg-asn1.h
-@@ -75,9 +75,9 @@ gchar*             egg_asn1_read_dn     
- gchar*             egg_asn1_read_dn_part                  (ASN1_TYPE asn, const gchar *part, const gchar *match);
+--- egg/egg-asn1x.h.orig	2010-10-19 02:11:38.000000000 +0000
++++ egg/egg-asn1x.h
+@@ -167,10 +167,10 @@ gboolean            egg_asn1x_set_oid_as
  
+ void                egg_asn1x_destroy                (gpointer asn);
  
--glong              egg_asn1_time_parse_utc                (const gchar* value, gssize n_value);
-+time_t              egg_asn1_time_parse_utc                (const gchar* value, gssize n_value);
+-glong               egg_asn1x_parse_time_general     (const gchar *time,
++time_t               egg_asn1x_parse_time_general     (const gchar *time,
+                                                       gssize n_time);
  
--glong              egg_asn1_time_parse_general            (const gchar* value, gssize n_value);
-+time_t              egg_asn1_time_parse_general            (const gchar* value, gssize n_value);
+-glong               egg_asn1x_parse_time_utc         (const gchar *time,
++time_t               egg_asn1x_parse_time_utc         (const gchar *time,
+                                                       gssize n_time);
  
- 
- typedef void       (*EggAsn1DnCallback)                   (guint index, GQuark oid, const guchar *value,
+ gssize              egg_asn1x_element_length         (gconstpointer data,
diff --git a/security/gnome-keyring/patches/patch-ag b/security/gnome-keyring/patches/patch-ag
index d3d47a51d72..b705daed2c5 100644
--- a/security/gnome-keyring/patches/patch-ag
+++ b/security/gnome-keyring/patches/patch-ag
@@ -1,22 +1,32 @@
-$NetBSD: patch-ag,v 1.2 2009/10/21 16:37:19 drochner Exp $
+$NetBSD: patch-ag,v 1.3 2011/04/13 16:39:14 drochner Exp $
 
---- egg/egg-asn1.c.orig	2009-08-15 02:01:31.000000000 +0200
-+++ egg/egg-asn1.c
-@@ -601,7 +601,7 @@ when_to_time (struct tm *when, gint offs
- 	return result;
- }
+--- egg/egg-asn1x.c.orig	2010-10-19 02:11:38.000000000 +0000
++++ egg/egg-asn1x.c
+@@ -3746,11 +3746,11 @@ egg_asn1x_destroy (gpointer data)
+  * TIME PARSING
+  */
  
 -glong
 +time_t
- egg_asn1_time_parse_utc (const gchar *time, gssize n_time)
+ egg_asn1x_parse_time_general (const gchar *time, gssize n_time)
  {
+ 	gboolean ret;
+-	glong value;
++	time_t value;
  	struct tm when;
-@@ -723,7 +723,7 @@ parse_general_time (const gchar *time, g
- 	return TRUE;
+ 	gint offset = 0;
+ 
+@@ -3777,11 +3777,11 @@ egg_asn1x_parse_time_general (const gcha
+ 	return value;
  }
  
 -glong
 +time_t
- egg_asn1_time_parse_general (const gchar *time, gssize n_time)
+ egg_asn1x_parse_time_utc (const gchar *time, gssize n_time)
  {
+ 	gboolean ret;
+-	glong value;
++	time_t value;
  	struct tm when;
+ 	gint offset = 0;
+ 
diff --git a/security/gnome-keyring/patches/patch-ah b/security/gnome-keyring/patches/patch-ah
new file mode 100644
index 00000000000..419615c777c
--- /dev/null
+++ b/security/gnome-keyring/patches/patch-ah
@@ -0,0 +1,15 @@
+$NetBSD: patch-ah,v 1.1 2011/04/13 16:39:14 drochner Exp $
+
+--- configure.orig	2010-10-25 22:47:44.000000000 +0000
++++ configure
+@@ -14454,8 +14454,8 @@ install-data-am: install-gsettings-schem
+ .SECONDARY: $(gsettings_SCHEMAS)
+ 
+ gsettings__base_list = \
+-  sed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \
+-  sed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g"
++  gsed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \
++  gsed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g"
+ 
+ install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
+ 	@$(NORMAL_INSTALL)