7 files changed, 62 insertions, 34 deletions

diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 30b3d25a8e06..bba75d834ce0 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	seahorse
-PORTVERSION=	0.7.5
-PORTREVISION=	1
+PORTVERSION=	0.7.6
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=sources/${PORTNAME}/0.7
@@ -41,9 +40,16 @@ OPTIONS=	GEDIT "Enable the gedit plug-in" on
 BUILD_DEPENDS+=	gedit:${PORTSDIR}/editors/gedit
 RUN_DEPENDS+=	gedit:${PORTSDIR}/editors/gedit
 PLIST_SUB+=	GEDIT=""
+GCONF_SCHEMAS+=	seahorse-gedit.schemas
+post-patch:
+	@${REINPLACE_CMD} -e "s|gedit-2.8|gedit-2.10|g" \
+		${WRKSRC}/configure
 .else
 PLIST_SUB+=	GEDIT="@comment "
 CONFIGURE_ARGS+=--disable-gedit
 .endif
 
+post-install:
+	-@update-desktop-database
+
 .include <bsd.port.post.mk>
diff --git a/security/seahorse/distinfo b/security/seahorse/distinfo
index 3659cf102060..ef9568b16bc4 100644
--- a/security/seahorse/distinfo
+++ b/security/seahorse/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/seahorse-0.7.5.tar.bz2) = aa113297dbc5525a4853e73bedb9af45
-SIZE (gnome2/seahorse-0.7.5.tar.bz2) = 937238
+MD5 (gnome2/seahorse-0.7.6.tar.bz2) = b0a0942faabc1dd9367b4bea9cdd9c4a
+SIZE (gnome2/seahorse-0.7.6.tar.bz2) = 1088531
diff --git a/security/seahorse/files/patch-agent_seahorse-agent.c b/security/seahorse/files/patch-agent_seahorse-agent.c
index 577649bbf7a2..f82bae9d1634 100644
--- a/security/seahorse/files/patch-agent_seahorse-agent.c
+++ b/security/seahorse/files/patch-agent_seahorse-agent.c
@@ -1,6 +1,27 @@
---- agent/seahorse-agent.c.orig	Mon Jan 31 11:14:02 2005
-+++ agent/seahorse-agent.c	Mon Jan 31 11:14:48 2005
-@@ -309,7 +309,6 @@
+--- agent/seahorse-agent.c.orig	Sun Feb 13 19:43:53 2005
++++ agent/seahorse-agent.c	Fri Mar 11 22:20:26 2005
+@@ -265,7 +265,6 @@
+     int ch = 0;
+     const char *sockname;
+ 
+-    secmem_init (65536);
+ 
+     /* We need to drop privileges completely for security */
+ #if defined(HAVE_SETRESUID) && defined(HAVE_SETRESGID)
+@@ -273,10 +272,12 @@
+     /* Not in header files for all OSs, even where present */
+     int setresuid(uid_t ruid, uid_t euid, uid_t suid);
+     int setresgid(gid_t rgid, gid_t egid, gid_t sgid);
++    secmem_init (65536);
+   
+     if (setresuid (getuid (), getuid (), getuid ()) == -1 ||
+         setresgid (getgid (), getgid (), getgid ()) == -1)
+ #else
++    secmem_init (65536);
+     if (setuid (getuid ()) == -1 || setgid (getgid ()) == -1)
+ #endif
+         err (1, _("couldn't drop privileges properly"));
+@@ -320,7 +321,6 @@
       * All functions after this point have to print messages 
       * nicely and not just called exit() 
       */
@@ -8,7 +29,7 @@
  
      /* Handle some signals */
      signal (SIGINT, on_quit);
-@@ -322,6 +321,8 @@
+@@ -333,6 +333,8 @@
      /* Initialize our sub systems */
      seahorse_agent_actions_init ();
      seahorse_agent_cache_init ();
diff --git a/security/seahorse/files/patch-libseahorse_seahorse-gpg-options.c b/security/seahorse/files/patch-libseahorse_seahorse-gpg-options.c
deleted file mode 100644
index 2eca53c2d888..000000000000
--- a/security/seahorse/files/patch-libseahorse_seahorse-gpg-options.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libseahorse/seahorse-gpg-options.c.orig	Wed Jan 26 12:11:42 2005
-+++ libseahorse/seahorse-gpg-options.c	Wed Jan 26 12:11:57 2005
-@@ -31,7 +31,7 @@
- #include "seahorse-gpg-options.h"
- 
- #define  GPG_CONF_HEADER    "# FILE CREATED BY SEAHORSE\n\n"
--#define  GPG_VERSION_PREFIX   "1.2."
-+#define  GPG_VERSION_PREFIX   "1.4."
- 
- static gchar gpg_homedir[MAXPATHLEN];
- static gboolean gpg_options_inited = FALSE;
diff --git a/security/seahorse/files/patch-libseahorse_seahorse-server-source.c b/security/seahorse/files/patch-libseahorse_seahorse-server-source.c
new file mode 100644
index 000000000000..d7422de5ea50
--- /dev/null
+++ b/security/seahorse/files/patch-libseahorse_seahorse-server-source.c
@@ -0,0 +1,15 @@
+--- libseahorse/seahorse-server-source.c.orig	Fri Mar 11 22:17:43 2005
++++ libseahorse/seahorse-server-source.c	Fri Mar 11 22:17:55 2005
+@@ -518,11 +518,11 @@
+ seahorse_server_source_get_state (SeahorseKeySource *src)
+ {
+     SeahorseServerSource *ssrc;
++    guint state = SEAHORSE_KEY_SOURCE_REMOTE;
+     
+     g_return_val_if_fail (SEAHORSE_IS_SERVER_SOURCE (src), 0);
+     ssrc = SEAHORSE_SERVER_SOURCE (src);
+     
+-    guint state = SEAHORSE_KEY_SOURCE_REMOTE;
+     if (!seahorse_operation_is_done (ssrc->priv->operation))
+         state |= SEAHORSE_KEY_SOURCE_LOADING;
+     return state;
diff --git a/security/seahorse/files/patch-libseahorse_seahorse-widget.c b/security/seahorse/files/patch-libseahorse_seahorse-widget.c
deleted file mode 100644
index ee8063fb02aa..000000000000
--- a/security/seahorse/files/patch-libseahorse_seahorse-widget.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libseahorse/seahorse-widget.c.orig	Mon Dec 13 23:49:49 2004
-+++ libseahorse/seahorse-widget.c	Mon Dec 13 23:49:57 2004
-@@ -197,7 +197,7 @@
- {
- 	//error check help
- 	if (g_str_equal (swidget->name, "key-manager"))
--		gnome_help_display (PACKAGE, "toc", NULL);
-+		gnome_help_display (PACKAGE, NULL, NULL);
- 	else
- 		gnome_help_display (PACKAGE, swidget->name, NULL);
- }
diff --git a/security/seahorse/pkg-plist b/security/seahorse/pkg-plist
index 9d09f8ba299d..7d7410e04bc9 100644
--- a/security/seahorse/pkg-plist
+++ b/security/seahorse/pkg-plist
@@ -10,6 +10,9 @@ lib/libseahorse-internal.so.0
 libdata/bonobo/servers/Seahorse_PGP_File_Listener.server
 share/gnome/applications/seahorse.desktop
 share/gnome/control-center-2.0/capplets/seahorse-pgp-preferences.desktop
+share/gnome/applications/seahorse-pgp-encrypted.desktop
+share/gnome/applications/seahorse-pgp-signature.desktop
+@exec update-desktop-database > /dev/null || /usr/bin/true
 share/gnome/help/seahorse/C/figures/export.png
 share/gnome/help/seahorse/C/figures/file-manager.png
 share/gnome/help/seahorse/C/figures/generate.png
@@ -26,6 +29,8 @@ share/gnome/help/seahorse/C/seahorse.xml
 share/gnome/mime-info/seahorse.keys
 share/gnome/mime-info/seahorse.mime
 share/gnome/omf/seahorse/seahorse-C.omf
+share/gnome/pixmaps/seahorse-key.png
+share/gnome/pixmaps/seahorse-secret.png
 share/gnome/pixmaps/seahorse.png
 share/gnome/seahorse/glade/seahorse-add-subkey.glade
 share/gnome/seahorse/glade/seahorse-add-uid.glade
@@ -36,19 +41,20 @@ share/gnome/seahorse/glade/seahorse-generate-druid.glade
 share/gnome/seahorse/glade/seahorse-generate-select.glade
 share/gnome/seahorse/glade/seahorse-key-manager.glade
 share/gnome/seahorse/glade/seahorse-key-properties.glade
+share/gnome/seahorse/glade/seahorse-keyserver-results.glade
+share/gnome/seahorse/glade/seahorse-keyserver-search.glade
 share/gnome/seahorse/glade/seahorse-multi-encrypt.glade
 share/gnome/seahorse/glade/seahorse-passphrase.glade
-share/gnome/seahorse/glade/seahorse-pgp-preferences.glade
+share/gnome/seahorse/glade/seahorse-prefs.glade
 share/gnome/seahorse/glade/seahorse-preferences.glade
 share/gnome/seahorse/glade/seahorse-recipients.glade
 share/gnome/seahorse/glade/seahorse-revoke.glade
 share/gnome/seahorse/glade/seahorse-sign.glade
 share/gnome/seahorse/glade/seahorse-signatures.glade
-share/mime/application/pgp-encrypted.xml
-share/mime/application/pgp-keys.xml
-share/mime/application/pgp-signature.xml
+share/gnome/seahorse/glade/seahorse-signer.glade
 share/mime/packages/seahorse.xml
 share/locale/az/LC_MESSAGES/seahorse.mo
+share/locale/bg/LC_MESSAGES/seahorse.mo
 share/locale/ca/LC_MESSAGES/seahorse.mo
 share/locale/cs/LC_MESSAGES/seahorse.mo
 share/locale/da/LC_MESSAGES/seahorse.mo
@@ -65,6 +71,7 @@ share/locale/it/LC_MESSAGES/seahorse.mo
 share/locale/ja/LC_MESSAGES/seahorse.mo
 share/locale/ml/LC_MESSAGES/seahorse.mo
 share/locale/ms/LC_MESSAGES/seahorse.mo
+share/locale/nb/LC_MESSAGES/seahorse.mo
 share/locale/nl/LC_MESSAGES/seahorse.mo
 share/locale/no/LC_MESSAGES/seahorse.mo
 share/locale/pa/LC_MESSAGES/seahorse.mo
@@ -89,3 +96,4 @@ share/locale/zh_CN/LC_MESSAGES/seahorse.mo
 @dirrm share/gnome/seahorse
 @exec update-mime-database %D/share/mime
 @unexec update-mime-database %D/share/mime
+@unexec update-desktop-database > /dev/null || /usr/bin/true