[svn] GnuPG - r5084 - in trunk: . agent g10 kbx scd sm tools
svn author wk
cvs at cvs.gnupg.org
Tue Jul 21 16:21:05 CEST 2009
Author: wk
Date: 2009-07-21 16:21:05 +0200 (Tue, 21 Jul 2009)
New Revision: 5084
Modified:
trunk/AUTHORS
trunk/THANKS
trunk/agent/gpg-agent.c
trunk/agent/preset-passphrase.c
trunk/agent/protect-tool.c
trunk/configure.ac
trunk/g10/gpg.c
trunk/g10/gpgv.c
trunk/kbx/kbxutil.c
trunk/scd/ChangeLog
trunk/scd/apdu.c
trunk/scd/ccid-driver.c
trunk/scd/sc-copykeys.c
trunk/scd/scdaemon.c
trunk/sm/gpgsm.c
trunk/tools/gpg-check-pattern.c
trunk/tools/gpg-connect-agent.c
trunk/tools/gpgconf.c
trunk/tools/gpgsplit.c
trunk/tools/symcryptrun.c
Log:
Make bug reporting address easier changeable.
Modified: trunk/scd/ChangeLog
===================================================================
--- trunk/scd/ChangeLog 2009-07-20 11:02:20 UTC (rev 5083)
+++ trunk/scd/ChangeLog 2009-07-21 14:21:05 UTC (rev 5084)
@@ -1,3 +1,13 @@
+2009-07-21 Werner Koch <wk at g10code.com>
+
+ * ccid-driver.c [HAVE_PTH]: Include pth.h.
+ (my_sleep): New.
+ (bulk_in): s/gnupg_sleep/my_sleep/.
+
+2009-07-20 Werner Koch <wk at g10code.com>
+
+ * apdu.c [GNUPG_MAJOR_VERSION==1]: Include dynload.h.
+
2009-07-16 Werner Koch <wk at g10code.com>
* command.c (update_reader_status_file): Test for unplugged reader.
Modified: trunk/AUTHORS
===================================================================
--- trunk/AUTHORS 2009-07-20 11:02:20 UTC (rev 5083)
+++ trunk/AUTHORS 2009-07-21 14:21:05 UTC (rev 5084)
@@ -1,7 +1,7 @@
Program: GnuPG
Homepage: http://www.gnupg.org
Maintainer: Werner Koch <wk at gnupg.org>
-Bug reports: <bug-gnupg at gnu.org>
+Bug reports: http://bugs.gnupg.org
Security related bug reports: <security at gnupg.org>
License: GPLv3+
Modified: trunk/THANKS
===================================================================
--- trunk/THANKS 2009-07-20 11:02:20 UTC (rev 5083)
+++ trunk/THANKS 2009-07-21 14:21:05 UTC (rev 5084)
@@ -118,6 +118,7 @@
Jens Bachem bachem at rrz.uni-koeln.de
Jens Seidel jensseidel at users.sf.net
Jeroen C. van Gelderen jeroen at vangelderen.org
+Jeroen Schot schot at a-eskwadraat nl
J Horacio MG homega at ciberia.es
J. Michael Ashley jashley at acm.org
Jim Bauer jfbauer at home.com
Modified: trunk/agent/gpg-agent.c
===================================================================
--- trunk/agent/gpg-agent.c 2009-07-20 11:02:20 UTC (rev 5083)
+++ trunk/agent/gpg-agent.c 2009-07-21 14:21:05 UTC (rev 5084)
@@ -326,8 +326,11 @@
break;
case 13: p = VERSION; break;
case 17: p = PRINTABLE_OS_NAME; break;
- case 19: p = _("Please report bugs to <" PACKAGE_BUGREPORT ">.\n");
- break;
+ /* TRANSLATORS: @EMAIL@ will get replaced by the actual bug
+ reporting address. This is so that we can change the
+ reporting address without breaking the translations. */
+ case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
+
case 20:
if (!ver_gcry)
ver_gcry = make_libversion ("libgcrypt", gcry_check_version);
Modified: trunk/agent/preset-passphrase.c
===================================================================
--- trunk/agent/preset-passphrase.c 2009-07-20 11:02:20 UTC (rev 5083)
+++ trunk/agent/preset-passphrase.c 2009-07-21 14:21:05 UTC (rev 5084)
@@ -91,8 +91,8 @@
break;
case 13: p = VERSION; break;
case 17: p = PRINTABLE_OS_NAME; break;
- case 19: p = _("Please report bugs to <" PACKAGE_BUGREPORT ">.\n");
- break;
+ case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
+
case 1:
case 40:
p = _("Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n");
Modified: trunk/agent/protect-tool.c
===================================================================
--- trunk/agent/protect-tool.c 2009-07-20 11:02:20 UTC (rev 5083)
+++ trunk/agent/protect-tool.c 2009-07-21 14:21:05 UTC (rev 5084)
@@ -157,8 +157,8 @@
break;
case 13: p = VERSION; break;
case 17: p = PRINTABLE_OS_NAME; break;
- case 19: p = _("Please report bugs to <" PACKAGE_BUGREPORT ">.\n");
- break;
+ case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
+
case 1:
case 40: p = _("Usage: gpg-protect-tool [options] (-h for help)\n");
break;
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2009-07-20 11:02:20 UTC (rev 5083)
+++ trunk/configure.ac 2009-07-21 14:21:05 UTC (rev 5084)
@@ -31,7 +31,7 @@
| sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)]))
AC_INIT([gnupg],
[my_version[]m4_if(my_issvn,[yes],[-svn[]svn_revision])],
- [bug-gnupg at gnupg.org])
+ [http://bugs.gnupg.org])
# Set development_version to yes if the minor number is odd or you
# feel that the default check for a development version is not
# sufficient.
Modified: trunk/g10/gpg.c
===================================================================
--- trunk/g10/gpg.c 2009-07-20 11:02:20 UTC (rev 5083)
+++ trunk/g10/gpg.c 2009-07-21 14:21:05 UTC (rev 5084)
@@ -804,9 +804,7 @@
break;
case 13: p = VERSION; break;
case 17: p = PRINTABLE_OS_NAME; break;
- case 19: p =
- _("Please report bugs to <gnupg-bugs at gnu.org>.\n");
- break;
+ case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
case 20:
if (!ver_gcry)
Modified: trunk/g10/gpgv.c
===================================================================
--- trunk/g10/gpgv.c 2009-07-20 11:02:20 UTC (rev 5083)
+++ trunk/g10/gpgv.c 2009-07-21 14:21:05 UTC (rev 5084)
@@ -111,8 +111,8 @@
break;
case 13: p = VERSION; break;
case 17: p = PRINTABLE_OS_NAME; break;
- case 19: p = _("Please report bugs to <gnupg-bugs at gnu.org>.\n");
- break;
+ case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
+
case 1:
case 40: p = _("Usage: gpgv [options] [files] (-h for help)");
break;
Modified: trunk/kbx/kbxutil.c
===================================================================
--- trunk/kbx/kbxutil.c 2009-07-20 11:02:20 UTC (rev 5083)
+++ trunk/kbx/kbxutil.c 2009-07-21 14:21:05 UTC (rev 5084)
@@ -110,9 +110,8 @@
break;
case 13: p = VERSION; break;
case 17: p = PRINTABLE_OS_NAME; break;
- case 19: p =
- _("Please report bugs to " PACKAGE_BUGREPORT ".\n");
- break;
+ case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
+
case 1:
case 40: p =
_("Usage: kbxutil [options] [files] (-h for help)");
Modified: trunk/scd/apdu.c
===================================================================
--- trunk/scd/apdu.c 2009-07-20 11:02:20 UTC (rev 5083)
+++ trunk/scd/apdu.c 2009-07-21 14:21:05 UTC (rev 5084)
@@ -54,6 +54,7 @@
#include "memory.h"
#include "util.h"
#include "i18n.h"
+#include "dynload.h"
#include "cardglue.h"
#else /* GNUPG_MAJOR_VERSION != 1 */
#include "scdaemon.h"
Modified: trunk/scd/ccid-driver.c
===================================================================
--- trunk/scd/ccid-driver.c 2009-07-20 11:02:20 UTC (rev 5083)
+++ trunk/scd/ccid-driver.c 2009-07-21 14:21:05 UTC (rev 5084)
@@ -85,6 +85,9 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <time.h>
+#ifdef HAVE_PTH
+# include <pth.h>
+#endif /*HAVE_PTH*/
#include <usb.h>
@@ -312,6 +315,30 @@
static void
+my_sleep (int seconds)
+{
+#ifdef HAVE_PTH
+ /* With Pth we also call the standard sleep(0) so that the process
+ may give up its timeslot. */
+ if (!seconds)
+ {
+# ifdef HAVE_W32_SYSTEM
+ Sleep (0);
+# else
+ sleep (0);
+# endif
+ }
+ pth_sleep (seconds);
+#else
+# ifdef HAVE_W32_SYSTEM
+ Sleep (seconds*1000);
+# else
+ sleep (seconds);
+# endif
+#endif
+}
+
+static void
print_progress (ccid_driver_t handle)
{
time_t ct = time (NULL);
@@ -1766,8 +1793,8 @@
{
int rc;
- /* No need to continue and clutter the log withy USB error if we
- ever got an ENODEV. */
+ /* No need to continue and clutter the log with USB write error
+ messages after we got the first ENODEV. */
if (handle->enodev_seen)
return CCID_DRIVER_ERR_NO_READER;
@@ -1900,9 +1927,7 @@
DEBUGOUT_1 ("usb_bulk_read error: %s\n", strerror (rc));
if (rc == EAGAIN && eagain_retries++ < 3)
{
-#ifndef TEST
- gnupg_sleep (1);
-#endif
+ my_sleep (1);
goto retry;
}
return CCID_DRIVER_ERR_CARD_IO_ERROR;
@@ -1919,9 +1944,7 @@
handle->dev_fd, strerror (rc));
if (rc == EAGAIN && eagain_retries++ < 5)
{
-#ifndef TEST
- gnupg_sleep (1);
-#endif
+ my_sleep (1);
goto retry;
}
return CCID_DRIVER_ERR_CARD_IO_ERROR;
Modified: trunk/scd/sc-copykeys.c
===================================================================
--- trunk/scd/sc-copykeys.c 2009-07-20 11:02:20 UTC (rev 5083)
+++ trunk/scd/sc-copykeys.c 2009-07-21 14:21:05 UTC (rev 5084)
@@ -76,8 +76,8 @@
break;
case 13: p = VERSION; break;
case 17: p = PRINTABLE_OS_NAME; break;
- case 19: p = _("Please report bugs to <" PACKAGE_BUGREPORT ">.\n");
- break;
+ case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
+
case 1:
case 40: p = _("Usage: sc-copykeys [options] (-h for help)\n");
break;
Modified: trunk/scd/scdaemon.c
===================================================================
--- trunk/scd/scdaemon.c 2009-07-20 11:02:20 UTC (rev 5083)
+++ trunk/scd/scdaemon.c 2009-07-21 14:21:05 UTC (rev 5084)
@@ -242,8 +242,8 @@
break;
case 13: p = VERSION; break;
case 17: p = PRINTABLE_OS_NAME; break;
- case 19: p = _("Please report bugs to <" PACKAGE_BUGREPORT ">.\n");
- break;
+ case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
+
case 20:
if (!ver_gcry)
ver_gcry = make_libversion ("libgcrypt", gcry_check_version);
Modified: trunk/sm/gpgsm.c
===================================================================
--- trunk/sm/gpgsm.c 2009-07-20 11:02:20 UTC (rev 5083)
+++ trunk/sm/gpgsm.c 2009-07-21 14:21:05 UTC (rev 5084)
@@ -509,8 +509,8 @@
break;
case 13: p = VERSION; break;
case 17: p = PRINTABLE_OS_NAME; break;
- case 19: p = _("Please report bugs to <" PACKAGE_BUGREPORT ">.\n");
- break;
+ case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
+
case 1:
case 40: p = _("Usage: gpgsm [options] [files] (-h for help)");
break;
Modified: trunk/tools/gpg-check-pattern.c
===================================================================
--- trunk/tools/gpg-check-pattern.c 2009-07-20 11:02:20 UTC (rev 5083)
+++ trunk/tools/gpg-check-pattern.c 2009-07-21 14:21:05 UTC (rev 5084)
@@ -138,8 +138,8 @@
break;
case 13: p = VERSION; break;
case 17: p = PRINTABLE_OS_NAME; break;
- case 19: p = _("Please report bugs to <" PACKAGE_BUGREPORT ">.\n");
- break;
+ case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
+
case 1:
case 40:
p = _("Usage: gpg-check-pattern [options] patternfile (-h for help)\n");
Modified: trunk/tools/gpg-connect-agent.c
===================================================================
--- trunk/tools/gpg-connect-agent.c 2009-07-20 11:02:20 UTC (rev 5083)
+++ trunk/tools/gpg-connect-agent.c 2009-07-21 14:21:05 UTC (rev 5084)
@@ -177,8 +177,8 @@
break;
case 13: p = VERSION; break;
case 17: p = PRINTABLE_OS_NAME; break;
- case 19: p = _("Please report bugs to <" PACKAGE_BUGREPORT ">.\n");
- break;
+ case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
+
case 1:
case 40: p = _("Usage: gpg-connect-agent [options] (-h for help)");
break;
Modified: trunk/tools/gpgconf.c
===================================================================
--- trunk/tools/gpgconf.c 2009-07-20 11:02:20 UTC (rev 5083)
+++ trunk/tools/gpgconf.c 2009-07-21 14:21:05 UTC (rev 5084)
@@ -99,8 +99,8 @@
break;
case 13: p = VERSION; break;
case 17: p = PRINTABLE_OS_NAME; break;
- case 19: p = _("Please report bugs to <" PACKAGE_BUGREPORT ">.\n");
- break;
+ case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
+
case 1:
case 40: p = _("Usage: gpgconf [options] (-h for help)");
break;
Modified: trunk/tools/gpgsplit.c
===================================================================
--- trunk/tools/gpgsplit.c 2009-07-20 11:02:20 UTC (rev 5083)
+++ trunk/tools/gpgsplit.c 2009-07-21 14:21:05 UTC (rev 5084)
@@ -85,9 +85,8 @@
break;
case 13: p = VERSION; break;
case 17: p = PRINTABLE_OS_NAME; break;
- case 19: p =
- "Please report bugs to <bug-gnupg at gnu.org>.\n";
- break;
+ case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
+
case 1:
case 40: p =
"Usage: gpgsplit [options] [files] (-h for help)";
Modified: trunk/tools/symcryptrun.c
===================================================================
--- trunk/tools/symcryptrun.c 2009-07-20 11:02:20 UTC (rev 5083)
+++ trunk/tools/symcryptrun.c 2009-07-21 14:21:05 UTC (rev 5084)
@@ -201,8 +201,8 @@
break;
case 13: p = VERSION; break;
case 17: p = PRINTABLE_OS_NAME; break;
- case 19: p = _("Please report bugs to <" PACKAGE_BUGREPORT ">.\n");
- break;
+ case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
+
case 1:
case 40: p = _("Usage: symcryptrun [options] (-h for help)");
break;
More information about the Gnupg-commits
mailing list