[Gpa-commits] r736 - in trunk: . po src
scm-commit at wald.intevation.org
scm-commit at wald.intevation.org
Fri Jan 13 09:41:52 CET 2006
Author: werner
Date: 2006-01-13 09:41:52 +0100 (Fri, 13 Jan 2006)
New Revision: 736
Modified:
trunk/configure.ac
trunk/po/ChangeLog
trunk/po/de.po
trunk/src/ChangeLog
trunk/src/gpa.c
trunk/src/keyserver.c
trunk/src/server_access.c
Log:
Fixes for keyserver access
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2006-01-11 09:44:34 UTC (rev 735)
+++ trunk/configure.ac 2006-01-13 08:41:52 UTC (rev 736)
@@ -228,10 +228,12 @@
cat >gpadefs.tmp <<GPAEOF
/* Generated automatically by configure */
#ifdef HAVE_DRIVE_LETTERS
+ /* These W32 locations are fallbacks
+ and not used with current gpg installations. */
#define GPA_LOCALEDIR "c:/lib/gnupg/locale"
#define GPA_DATADIR "c:/lib/gnupg"
#define GPG_PROGRAM "c:/gnupg/gpg"
- #define KEYSERVER_DIR "c:/gnupg"
+ #define GPA_KEYSERVER_HELPERS_DIR "c:/gnupg"
#else
#define GPA_LOCALEDIR "${prefix}/${DATADIRNAME}/locale"
#define GPA_DATADIR "${datadir}/gpa"
Modified: trunk/po/ChangeLog
===================================================================
--- trunk/po/ChangeLog 2006-01-11 09:44:34 UTC (rev 735)
+++ trunk/po/ChangeLog 2006-01-13 08:41:52 UTC (rev 736)
@@ -1,3 +1,7 @@
+2006-01-13 Werner Koch <wk at g10code.com>
+
+ * de.po: Updated.
+
2006-01-11 Werner Koch <wk at g10code.com>
* de.po: Updated.
Modified: trunk/po/de.po
===================================================================
--- trunk/po/de.po 2006-01-11 09:44:34 UTC (rev 735)
+++ trunk/po/de.po 2006-01-13 08:41:52 UTC (rev 736)
@@ -7,7 +7,7 @@
"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-01-11 10:08+0100\n"
-"PO-Revision-Date: 2006-01-11 10:41+0100\n"
+"PO-Revision-Date: 2006-01-13 09:37+0100\n"
"Last-Translator: Steffen Michalek <steffen at michalek.de>\n"
"Language-Team: deutsch <de at li.org>\n"
"MIME-Version: 1.0\n"
@@ -1189,6 +1189,13 @@
"\n"
"The affected key is:"
msgstr ""
+"Einer Ihrer Schlüssel hat einen ElGamal Signaturschlüssel. Durch\n"
+"einen Fehler in GnuPG sind alle diese Schlüssel - sofern jemals mit\n"
+"GnuPG ab 1.0.2 verwendet - als kompromitiert zu betrachten.\n"
+"\n"
+"Bitte widerrufen Sie diesen Schlüssel sobald wie möglich.\n"
+"\n"
+"Der betroffene Schlüssel ist:"
#: src/keyring.c:437
msgid "No keys selected for signing."
@@ -1766,7 +1773,7 @@
#: src/settingsdlg.c:136
msgid "_Yes"
-msgstr "/_Ja"
+msgstr "_Ja"
#: src/settingsdlg.c:139
msgid "_No"
Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog 2006-01-11 09:44:34 UTC (rev 735)
+++ trunk/src/ChangeLog 2006-01-13 08:41:52 UTC (rev 736)
@@ -1,7 +1,14 @@
+2006-01-12 Werner Koch <wk at g10code.com>
+
+ * server_access.c (helper_path): Add special version for W32.
+ (do_spawn) [W32]: Don't pass ERROR by value.
+
+ * gpa.c (get_locale_dir): Fixed.
+
2006-01-11 Werner Koch <wk at g10code.com>
* gpawizard.c (gpa_wizard_new): Replace stock button labels by our
- own for consistent labeling bewteen gpg4win installer and GPA.
+ own for consistent labeling between gpg4win installer and GPA.
2006-01-05 Werner Koch <wk at g10code.com>
Modified: trunk/src/gpa.c
===================================================================
--- trunk/src/gpa.c 2006-01-11 09:44:34 UTC (rev 735)
+++ trunk/src/gpa.c 2006-01-13 08:41:52 UTC (rev 736)
@@ -233,7 +233,7 @@
p = name;
}
p++;
- strcpy (p, "\\share\\locale");
+ strcpy (p, "share\\locale");
return strdup (name);
#else
return strdup (GPA_LOCALEDIR);
Modified: trunk/src/keyserver.c
===================================================================
--- trunk/src/keyserver.c 2006-01-11 09:44:34 UTC (rev 735)
+++ trunk/src/keyserver.c 2006-01-13 08:41:52 UTC (rev 736)
@@ -166,7 +166,18 @@
if (!serverlist)
{ /* no entries in list - use default values */
- add_server (&serverlist, "hkp://keyserver.kjsl.com");
+ add_server (&serverlist, "hkp://random.sks.keyserver.penguin.de");
+ add_server (&serverlist, "hkp://blackhole.pca.dfn.de");
+ add_server (&serverlist, "hkp://pks.gpg.cz");
+ add_server (&serverlist, "hpk://pgp.cns.ualberta.ca");
+ add_server (&serverlist, "hkp://minsky.surfnet.nl");
+ add_server (&serverlist, "hkp://keyserver.ubuntu.com");
+ add_server (&serverlist, "hkp://keyserver.pramberger.at");
+
+ add_server (&serverlist, "http://gpg-keyserver.de");
+ add_server (&serverlist, "http://keyserver.pramberger.at");
+
+ add_server (&serverlist, "hkp://subkeys.pgp.net");
add_server (&serverlist, "ldap://keyserver.pgp.com");
}
Modified: trunk/src/server_access.c
===================================================================
--- trunk/src/server_access.c 2006-01-11 09:44:34 UTC (rev 735)
+++ trunk/src/server_access.c 2006-01-13 08:41:52 UTC (rev 736)
@@ -34,6 +34,7 @@
#include <sys/types.h>
#include <sys/wait.h>
#else
+#include <windows.h>
#include <io.h>
#endif
@@ -202,11 +203,26 @@
{
gchar *helper;
gchar *path;
-
+#ifdef G_OS_WIN32
+ char name[530];
+
+ if ( !GetModuleFileNameA (0, name, sizeof (name)-30) )
+ helper = GPA_KEYSERVER_HELPERS_DIR;
+ else
+ {
+ char *p = strrchr (name, '\\');
+ if (p)
+ *p = 0;
+ else
+ *name = 0;
+ helper = name;
+ }
+ path = g_strdup_printf ("%s\\gpgkeys_%s.exe", helper, scheme);
+#else
helper = g_strdup_printf ("gpgkeys_%s", scheme);
path = g_build_filename (GPA_KEYSERVER_HELPERS_DIR, helper, NULL);
g_free (helper);
-
+#endif
return path;
}
@@ -217,7 +233,7 @@
gchar *helper[] = {helper_path (scheme), "-V", NULL};
gchar *output = NULL;
gint version;
-
+ less ~/hage
g_spawn_sync (NULL, helper, NULL, G_SPAWN_STDERR_TO_DEV_NULL, NULL, NULL,
&output, NULL, NULL, NULL);
if (output && *output)
@@ -428,7 +444,7 @@
/* On Windows, use syncronous spawn */
g_spawn_sync (NULL, helper_argv, NULL,
G_SPAWN_STDOUT_TO_DEV_NULL, NULL, NULL,
- NULL, error_output, exit_status, error);
+ NULL, error_output, exit_status, &error);
#endif
/* Free the helper's filename */
@@ -497,8 +513,9 @@
/* Public functions */
-gboolean server_send_keys (const gchar *server, const gchar *keyid,
- gpgme_data_t data, GtkWidget *parent)
+gboolean
+server_send_keys (const gchar *server, const gchar *keyid,
+ gpgme_data_t data, GtkWidget *parent)
{
gchar *keyserver = g_strdup (server);
gchar *command_filename, *output_filename;
@@ -535,8 +552,9 @@
return success;
}
-gboolean server_get_key (const gchar *server, const gchar *keyid,
- gpgme_data_t *data, GtkWidget *parent)
+gboolean
+server_get_key (const gchar *server, const gchar *keyid,
+ gpgme_data_t *data, GtkWidget *parent)
{
gchar *keyserver = g_strdup (server);
gchar *command_filename, *output_filename;
More information about the Gpa-commits
mailing list