Update to 0.7.5. While here, apply a patch from shannonjr@ that avoids the

use of a deprecated gpgme function.

Changes in this version:
* Loading large key rings is now many orders of magnitude faster
* A simple panel with common tasks shows up in the key manager the
  first time a new user starts [Adam Schreiber]
* Gnome HIG (Human Interface Guidelines) compliancy fixes
* gedit plugin compiles with GNOME 2.8
* gedit plugin now works on BSD [Julio M. Merino Vidal]
* seahorse-agent now works properly on BSD [Julio M. Merino Vidal]
* disable password caching prefs when using a different agent
* seahorse-agent restores gpg.conf when exiting
* seahorse-agent icon now shows properly in the notification area
* Properly detect mlock for secure memory usage.
* Fixed crash when changing expiry date on a subkey
* Fixed crash when using 'Encrypt To Self' without a default key
* Default key selection now works properly in edge cases.
* Updated RPM spec file
* A multitude of smaller bug fixes

4 files changed, 45 insertions, 22 deletions

diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index b002dac9b41..9cebddce7a9 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.32 2004/10/20 21:30:13 jmmv Exp $
+# $NetBSD: Makefile,v 1.33 2004/11/07 13:19:24 jmmv Exp $
 
-DISTNAME=	seahorse-0.7.4
+DISTNAME=	seahorse-0.7.5
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/seahorse/0.7/}
 EXTRACT_SUFX=	.tar.bz2
@@ -24,7 +24,7 @@ CONFIGURE_ARGS=		--disable-gedit
 
 GCONF2_SCHEMAS= 	seahorse.schemas
 
-BUILDLINK_DEPENDS.gpgme=	gpgme>=1.0.0
+BUILDLINK_DEPENDS.gpgme+=	gpgme>=1.0.1nb2
 
 .include "../../databases/gnome-mime-data/buildlink3.mk"
 .include "../../databases/shared-mime-info/mimedb.mk"
diff --git a/security/seahorse/PLIST b/security/seahorse/PLIST
index abf62fa85f0..6201127b234 100644
--- a/security/seahorse/PLIST
+++ b/security/seahorse/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.8 2004/10/20 20:45:55 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.9 2004/11/07 13:19:24 jmmv Exp $
 bin/seahorse
 bin/seahorse-agent
 bin/seahorse-pgp-preferences
 lib/bonobo/libseahorse-pgp-file-listener.la
 lib/bonobo/servers/Seahorse_PGP_File_Listener.server
+lib/libseahorse-internal.la
 share/applications/seahorse.desktop
 share/control-center-2.0/capplets/seahorse-pgp-preferences.desktop
 share/gconf/schemas/seahorse.schemas
diff --git a/security/seahorse/distinfo b/security/seahorse/distinfo
index 86a9131ea95..a19de23bdc6 100644
--- a/security/seahorse/distinfo
+++ b/security/seahorse/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2004/10/20 20:45:55 jmmv Exp $
+$NetBSD: distinfo,v 1.8 2004/11/07 13:19:24 jmmv Exp $
 
-SHA1 (seahorse-0.7.4.tar.bz2) = e018607afbf1b9db45454924057403b65c9102f0
-Size (seahorse-0.7.4.tar.bz2) = 891599 bytes
-SHA1 (patch-aa) = c0d8f8acc955f030b1cd57966c8a0fcf30b9f8e7
+SHA1 (seahorse-0.7.5.tar.bz2) = e7535125c524d264594f7d82943d27e4472ae6d3
+Size (seahorse-0.7.5.tar.bz2) = 937238 bytes
+SHA1 (patch-aa) = 5e1448b0de81f36b135d4952ea4d9141d5ff4326
diff --git a/security/seahorse/patches/patch-aa b/security/seahorse/patches/patch-aa
index f03d4907174..8833169eb1f 100644
--- a/security/seahorse/patches/patch-aa
+++ b/security/seahorse/patches/patch-aa
@@ -1,17 +1,39 @@
-$NetBSD: patch-aa,v 1.5 2004/10/20 20:45:55 jmmv Exp $
+$NetBSD: patch-aa,v 1.6 2004/11/07 13:19:24 jmmv Exp $
 
---- agent/seahorse-agent.c.orig	2004-10-15 00:12:08.000000000 +0200
-+++ agent/seahorse-agent.c
-@@ -264,8 +264,12 @@ main (int argc, char *argv[])
-     secmem_init (65536);
+--- libseahorse/seahorse-util.c.orig	2004-10-14 11:40:11.000000000 -0600
++++ libseahorse/seahorse-util.c
+@@ -226,11 +226,12 @@ seahorse_util_write_data_to_file (const 
+ 	gchar *buffer;
+ 	gint nread;
+    
+-    /* 
+-     * TODO: gpgme_data_seek doesn't work for us right now
+-     * probably because of different off_t sizes 
+-     */
+-    gpgme_data_rewind (data);
++    /* Reset the read pointer in data */
++    if (gpgme_data_seek (data, 0, SEEK_SET) == -1)
++    {
++        gpg_err_code_t e = gpg_err_code_from_errno (errno);
++        return GPG_E (e);                
++    }
+ 	
+     file = seahorse_vfs_data_create (path, TRUE, &err);
+     if(file != NULL)
+@@ -270,11 +271,11 @@ seahorse_util_write_data_to_text (gpgme_
+         guint nread = 0;
+ 	GString *string;
  
-     /* We need to drop privileges completely for security */
-+#ifdef _GNU_SOURCE
-     if (setresuid (getuid (), getuid (), getuid ()) == -1 ||
-         setresgid (getgid (), getgid (), getgid ()) == -1)
-+#else
-+    if (setuid (getuid ()) == -1 || setgid (getgid ()) == -1)
-+#endif
-         err (1, _("couldn't drop privileges properly"));
+-    /* 
+-     * TODO: gpgme_data_seek doesn't work for us right now
+-     * probably because of different off_t sizes 
+-     */
+-    gpgme_data_rewind (data);
++        /* Reset the read pointer in data */
++        if (gpgme_data_seek (data, 0, SEEK_SET) == -1)
++        {
++            return NULL;                
++        }
  
-     gtk_init (&argc, &argv);
+ 	string = g_string_new ("");
+ 	buffer = g_new (gchar, size);