Update to 0.7.6.

PR:		78697
Submitted by:	maintainer


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3921 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 40 insertions, 26 deletions

diff --git a/security/seahorse/files/patch-agent_seahorse-agent.c b/security/seahorse/files/patch-agent_seahorse-agent.c
index 577649bbf..f82bae9d1 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 2eca53c2d..000000000
--- 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 000000000..d7422de5e
--- /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 ee8063fb0..000000000
--- 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);
- }