[git] GnuPG - branch, master, updated. gnupg-2.1.15-312-g60ad1a7

by Justus Winter cvs at cvs.gnupg.org
Wed Nov 2 13:12:16 CET 2016


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  60ad1a7f37ffc10e601e69a3e2d2bb14af510257 (commit)
       via  5e693ddfbe44d149ce0d9393d699c613ad5ea706 (commit)
       via  68b59bbc42ba9ec69496758743924d54a95742f0 (commit)
       via  5d4f1408d0dd055d412ae44bb4a0f28f74617f05 (commit)
      from  ad491ceec6145b3781a05dc7b4a36052abeeb4b4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 60ad1a7f37ffc10e601e69a3e2d2bb14af510257
Author: Justus Winter <justus at g10code.com>
Date:   Wed Nov 2 13:06:06 2016 +0100

    gpgscm: Fix inclusion of readline header.
    
    * tests/gpgscm/ffi.c: Define magic macro to prevent the completion
    function from redefined.
    
    GnuPG-bug-id: 2824
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/tests/gpgscm/ffi.c b/tests/gpgscm/ffi.c
index 8e21ba6..305b7a1 100644
--- a/tests/gpgscm/ffi.c
+++ b/tests/gpgscm/ffi.c
@@ -35,6 +35,7 @@
 #include <unistd.h>
 
 #if HAVE_LIBREADLINE
+#define GNUPG_LIBREADLINE_H_INCLUDED
 #include <readline/readline.h>
 #include <readline/history.h>
 #endif

commit 5e693ddfbe44d149ce0d9393d699c613ad5ea706
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Mon Oct 31 20:24:33 2016 -0400

    build: Fix misspelled dirmngr.
    
    Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>

diff --git a/configure.ac b/configure.ac
index c211979..47de5f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -200,7 +200,7 @@ test -n "$GNUPG_PROTECT_TOOL_PGM" \
       && show_gnupg_protect_tool_pgm="$GNUPG_PROTECT_TOOL_PGM"
 
 AC_ARG_WITH(dirmngr-ldap-pgm,
-    [  --with-dirmngr-ldap-pgm=PATH  Use PATH as the default for the dirmnge ldap wrapper)],
+    [  --with-dirmngr-ldap-pgm=PATH  Use PATH as the default for the dirmngr ldap wrapper)],
           GNUPG_DIRMNGR_LDAP_PGM="$withval", GNUPG_DIRMNGR_LDAP_PGM="" )
 AC_SUBST(GNUPG_DIRMNGR_LDAP_PGM)
 AM_CONDITIONAL(GNUPG_DIRMNGR_LDAP_PGM, test -n "$GNUPG_DIRMNGR_LDAP_PGM")

commit 68b59bbc42ba9ec69496758743924d54a95742f0
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Fri Oct 28 15:06:11 2016 -0400

    Spelling: correct spelling of "passphrase".
    
    There were several different variant spellings of "passphrase".  This
    should fix them all for all English text.
    
    I did notice that po/it.po contains multiple instances of
    "passhprase", which also looks suspect to me, but i do not know
    Italian, so i did not try to correct it.
    
    Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>

diff --git a/NEWS b/NEWS
index 1a780f8..395eca9 100644
--- a/NEWS
+++ b/NEWS
@@ -343,7 +343,7 @@ Noteworthy changes in version 2.1.9 (2015-10-09)
 
  * agent: Fix ssh fingerprint computation for nistp384 and EdDSA.
 
- * agent: Fix crash during passprase entry on some platforms.
+ * agent: Fix crash during passphrase entry on some platforms.
 
  * scd: Change timeout to fix problems with some 2.1 cards.
 
diff --git a/agent/agent.h b/agent/agent.h
index a3ec457..1d40386 100644
--- a/agent/agent.h
+++ b/agent/agent.h
@@ -122,7 +122,7 @@ struct
 
   /* If set, a passphrase history will be written and checked at each
      passphrase change.  */
-  int enable_passhrase_history;
+  int enable_passphrase_history;
 
   int running_detached; /* We are running detached from the tty. */
 
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index 7294c69..67ef321 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -789,7 +789,7 @@ parse_rereadable_options (ARGPARSE_ARGS *pargs, int reread)
       opt.min_passphrase_nonalpha = MIN_PASSPHRASE_NONALPHA;
       opt.check_passphrase_pattern = NULL;
       opt.max_passphrase_days = MAX_PASSPHRASE_DAYS;
-      opt.enable_passhrase_history = 0;
+      opt.enable_passphrase_history = 0;
       opt.ignore_cache_for_signing = 0;
       opt.allow_mark_trusted = 1;
       opt.allow_external_cache = 1;
@@ -856,7 +856,7 @@ parse_rereadable_options (ARGPARSE_ARGS *pargs, int reread)
       opt.max_passphrase_days = pargs->r.ret_ulong;
       break;
     case oEnablePassphraseHistory:
-      opt.enable_passhrase_history = 1;
+      opt.enable_passphrase_history = 1;
       break;
 
     case oIgnoreCacheForSigning: opt.ignore_cache_for_signing = 1; break;
diff --git a/doc/help.be.txt b/doc/help.be.txt
index 36c9ffb..d6d07e8 100644
--- a/doc/help.be.txt
+++ b/doc/help.be.txt
@@ -228,7 +228,7 @@ self-signatures will be advanced by one second.
 
 .#gpg.passphrase.enter
 # fixme: Please translate and remove the hash mark from the key line.
-Please enter the passhrase; this is a secret sentence 
+Please enter the passphrase; this is a secret sentence
 
 .
 
diff --git a/doc/help.ca.txt b/doc/help.ca.txt
index 36c9ffb..d6d07e8 100644
--- a/doc/help.ca.txt
+++ b/doc/help.ca.txt
@@ -228,7 +228,7 @@ self-signatures will be advanced by one second.
 
 .#gpg.passphrase.enter
 # fixme: Please translate and remove the hash mark from the key line.
-Please enter the passhrase; this is a secret sentence 
+Please enter the passphrase; this is a secret sentence
 
 .
 
diff --git a/doc/help.cs.txt b/doc/help.cs.txt
index 36c9ffb..d6d07e8 100644
--- a/doc/help.cs.txt
+++ b/doc/help.cs.txt
@@ -228,7 +228,7 @@ self-signatures will be advanced by one second.
 
 .#gpg.passphrase.enter
 # fixme: Please translate and remove the hash mark from the key line.
-Please enter the passhrase; this is a secret sentence 
+Please enter the passphrase; this is a secret sentence
 
 .
 
diff --git a/doc/help.da.txt b/doc/help.da.txt
index 36c9ffb..d6d07e8 100644
--- a/doc/help.da.txt
+++ b/doc/help.da.txt
@@ -228,7 +228,7 @@ self-signatures will be advanced by one second.
 
 .#gpg.passphrase.enter
 # fixme: Please translate and remove the hash mark from the key line.
-Please enter the passhrase; this is a secret sentence 
+Please enter the passphrase; this is a secret sentence
 
 .
 
diff --git a/doc/help.el.txt b/doc/help.el.txt
index 36c9ffb..d6d07e8 100644
--- a/doc/help.el.txt
+++ b/doc/help.el.txt
@@ -228,7 +228,7 @@ self-signatures will be advanced by one second.
 
 .#gpg.passphrase.enter
 # fixme: Please translate and remove the hash mark from the key line.
-Please enter the passhrase; this is a secret sentence 
+Please enter the passphrase; this is a secret sentence
 
 .
 
diff --git a/doc/help.eo.txt b/doc/help.eo.txt
index 36c9ffb..d6d07e8 100644
--- a/doc/help.eo.txt
+++ b/doc/help.eo.txt
@@ -228,7 +228,7 @@ self-signatures will be advanced by one second.
 
 .#gpg.passphrase.enter
 # fixme: Please translate and remove the hash mark from the key line.
-Please enter the passhrase; this is a secret sentence 
+Please enter the passphrase; this is a secret sentence
 
 .
 
diff --git a/doc/help.et.txt b/doc/help.et.txt
index 36c9ffb..d6d07e8 100644
--- a/doc/help.et.txt
+++ b/doc/help.et.txt
@@ -228,7 +228,7 @@ self-signatures will be advanced by one second.
 
 .#gpg.passphrase.enter
 # fixme: Please translate and remove the hash mark from the key line.
-Please enter the passhrase; this is a secret sentence 
+Please enter the passphrase; this is a secret sentence
 
 .
 
diff --git a/doc/help.gl.txt b/doc/help.gl.txt
index 36c9ffb..d6d07e8 100644
--- a/doc/help.gl.txt
+++ b/doc/help.gl.txt
@@ -228,7 +228,7 @@ self-signatures will be advanced by one second.
 
 .#gpg.passphrase.enter
 # fixme: Please translate and remove the hash mark from the key line.
-Please enter the passhrase; this is a secret sentence 
+Please enter the passphrase; this is a secret sentence
 
 .
 
diff --git a/doc/help.nb.txt b/doc/help.nb.txt
index 36c9ffb..d6d07e8 100644
--- a/doc/help.nb.txt
+++ b/doc/help.nb.txt
@@ -228,7 +228,7 @@ self-signatures will be advanced by one second.
 
 .#gpg.passphrase.enter
 # fixme: Please translate and remove the hash mark from the key line.
-Please enter the passhrase; this is a secret sentence 
+Please enter the passphrase; this is a secret sentence
 
 .
 
diff --git a/doc/help.sv.txt b/doc/help.sv.txt
index 36c9ffb..d6d07e8 100644
--- a/doc/help.sv.txt
+++ b/doc/help.sv.txt
@@ -228,7 +228,7 @@ self-signatures will be advanced by one second.
 
 .#gpg.passphrase.enter
 # fixme: Please translate and remove the hash mark from the key line.
-Please enter the passhrase; this is a secret sentence 
+Please enter the passphrase; this is a secret sentence
 
 .
 
diff --git a/doc/help.txt b/doc/help.txt
index 4c6df7c..e64656e 100644
--- a/doc/help.txt
+++ b/doc/help.txt
@@ -312,7 +312,7 @@ self-signatures will be advanced by one second.
 .gpg.passphrase.enter
 # (keep a leading empty line)
 
-Please enter the passhrase; this is a secret sentence.
+Please enter the passphrase; this is a secret sentence.
 .
 
 
diff --git a/g10/ChangeLog-2011 b/g10/ChangeLog-2011
index 31359d8..37da37b 100644
--- a/g10/ChangeLog-2011
+++ b/g10/ChangeLog-2011
@@ -8210,7 +8210,7 @@
 	to all foo-fd options.
 	* gpgv.c, openfile.c, ringedit.c, tdbio.c: Minor fixes.  Mainly
 	replaced hardcoded path	separators with EXTSEP_S like macros.
-	* passprase.c [__riscos__]: Disabled agent stuff
+	* passphrase.c [__riscos__]: Disabled agent stuff
 	* trustdb.c (check_trust): Changed r_trustlevel to signed int to
 	avoid mismatch problems in pkclist.c
 	* pkclist.c (add_ownertrust): Ditto.
@@ -11583,7 +11583,7 @@ Mon May  4 09:35:53 1998  Werner Koch  (wk at isil.d.shuttle.de)
 	changed all callers.
 
 	* passphrase.c (make_dek_from_passphrase): Removed
-	* (get_passhrase_hash): Changed name to passphrase_to_dek, add arg,
+	* (get_passphrase_hash): Changed name to passphrase_to_dek, add arg,
 	changed all callers.
 
 	* all: Introduced the new ELG identifier and added support for the
diff --git a/po/ca.po b/po/ca.po
index 51f5650..9afadcc 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9798,7 +9798,7 @@ msgstr ""
 #~ "a la llista actual de preferències. Les marques de temps de totes les\n"
 #~ "autosignatures afectades s'avançaran un segon.\n"
 
-#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgid "Please enter the passphrase; this is a secret sentence \n"
 #~ msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
 #~ msgid ""
diff --git a/po/cs.po b/po/cs.po
index d185c57..1ebade0 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -9669,7 +9669,7 @@ msgstr ""
 #~ "na aktuální seznam předvoleb. Časová razítka všech dotčených podpisů\n"
 #~ "klíčů jimi samotnými budou posunuty o jednu vteřinu dopředu.\n"
 
-#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgid "Please enter the passphrase; this is a secret sentence \n"
 #~ msgstr "Prosím, vložte heslo; toto je tajná věta \n"
 
 #~ msgid ""
diff --git a/po/de.po b/po/de.po
index 71e5700..cf01be3 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9616,7 +9616,7 @@ msgstr ""
 #~ "betroffenen\n"
 #~ "Eigenbeglaubigungen werden um eine Sekunde vorgestellt.\n"
 
-#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgid "Please enter the passphrase; this is a secret sentence \n"
 #~ msgstr "Bitte geben Sie die Passphrase ein. Dies ist ein geheimer Satz \n"
 
 #~ msgid ""
diff --git a/po/el.po b/po/el.po
index 77c81a8..5527de9 100644
--- a/po/el.po
+++ b/po/el.po
@@ -9605,7 +9605,7 @@ msgstr ""
 #~ "στην προυπάρχουσα λίστα προεπιλογών.  Η ημερομηνία όλων των επηρεασμένων\n"
 #~ "ιδιο-υπογραφών θα αυξηθεί κατά 1 δευτερόλεπτο.\n"
 
-#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgid "Please enter the passphrase; this is a secret sentence \n"
 #~ msgstr "Πληκτρολογήστε τη φράση κλειδί· αυτή είναι μια μυστική πρόταση \n"
 
 #~ msgid ""
diff --git a/po/eo.po b/po/eo.po
index 63f3882..87331ff 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -9488,7 +9488,7 @@ msgstr ""
 #~ "al la aktuala listo de preferoj. La dato de ĉiuj trafitaj\n"
 #~ "mem-subskriboj estos antaŭenigitaj je unu sekundo.\n"
 
-#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgid "Please enter the passphrase; this is a secret sentence \n"
 #~ msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
 #~ msgid ""
diff --git a/po/es.po b/po/es.po
index 76fae21..f12f9c0 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9955,7 +9955,7 @@ msgstr ""
 #~ "seleccionados) a la lista actual de preferencias. El sello de tiempo\n"
 #~ "de todas las autofirmas afectadas se avanzará en un segundo.\n"
 
-#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgid "Please enter the passphrase; this is a secret sentence \n"
 #~ msgstr "Por favor introduzca la contraseña: una frase secreta \n"
 
 #~ msgid ""
diff --git a/po/et.po b/po/et.po
index 74426d8..75ded06 100644
--- a/po/et.po
+++ b/po/et.po
@@ -9492,7 +9492,7 @@ msgstr ""
 #~ "vastavaks hetkel määratud seadetele. Kõikide asjasse puutuvate\n"
 #~ "ise loodud allkirjade ajatempleid suurendatakse ühe sekundi võrra.\n"
 
-#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgid "Please enter the passphrase; this is a secret sentence \n"
 #~ msgstr "Palun sisestage parool; see on salajane tekst \n"
 
 #~ msgid ""
diff --git a/po/fi.po b/po/fi.po
index 5002410..5063207 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9584,7 +9584,7 @@ msgstr ""
 #~ "nykyiseen luetteloon valinnoista.  Kaikkien muutettujen\n"
 #~ "oma-allekirjoitusten aikaleima siirretään yhdellä sekunnilla eteenpäin.\n"
 
-#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgid "Please enter the passphrase; this is a secret sentence \n"
 #~ msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
 #~ msgid ""
diff --git a/po/gl.po b/po/gl.po
index 833533d..f02986f 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -9605,7 +9605,7 @@ msgstr ""
 #~ "sinaturas\n"
 #~ "afectadas ha avanzar un segundo.\n"
 
-#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgid "Please enter the passphrase; this is a secret sentence \n"
 #~ msgstr "Por favor, introduza o contrasinal; esta é unha frase secreta \n"
 
 #~ msgid ""
diff --git a/po/hu.po b/po/hu.po
index bcfe704..b068e69 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -9548,7 +9548,7 @@ msgstr ""
 #~ "tartozó preferenciákat az aktuális preferenciákra. Minden érintett\n"
 #~ "önaláírás időpontját egy másodperccel növeli.\n"
 
-#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgid "Please enter the passphrase; this is a secret sentence \n"
 #~ msgstr "Kérem, adja meg a jelszót! Ezt egy titkos mondat. \n"
 
 #~ msgid ""
diff --git a/po/id.po b/po/id.po
index 015e419..5ee96c7 100644
--- a/po/id.po
+++ b/po/id.po
@@ -9540,7 +9540,7 @@ msgstr ""
 #~ "ke daftar preferensi saat ini.  Timestamp seluruh self-signature\n"
 #~ "yang terpengaruh akan bertambah satu detik.\n"
 
-#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgid "Please enter the passphrase; this is a secret sentence \n"
 #~ msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
 #~ msgid ""
diff --git a/po/it.po b/po/it.po
index dfc4f45..c109126 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9599,7 +9599,7 @@ msgstr ""
 #~ "coinvolte\n"
 #~ "sarà aumentato di un secondo.\n"
 
-#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgid "Please enter the passphrase; this is a secret sentence \n"
 #~ msgstr "Inserisci la passphrase, cioè una frase segreta \n"
 
 #~ msgid ""
diff --git a/po/pt.po b/po/pt.po
index 1593ff0..40d65f7 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9532,7 +9532,7 @@ msgstr ""
 #~ "O 'timestamp' de todas as auto-assinaturas afectuadas será avançado\n"
 #~ "em um segundo.\n"
 
-#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgid "Please enter the passphrase; this is a secret sentence \n"
 #~ msgstr "Por favor digite a frase secreta \n"
 
 #~ msgid ""
diff --git a/po/ro.po b/po/ro.po
index 460223c..12fd6f6 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -9639,7 +9639,7 @@ msgstr ""
 #~ "cele selectate) conform cu lista curentă de preferinţe.  Timestamp-urile\n"
 #~ "tuturor auto-semnăturilor afectate vor fi avansate cu o secundă.\n"
 
-#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgid "Please enter the passphrase; this is a secret sentence \n"
 #~ msgstr ""
 #~ "Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
 
diff --git a/po/sk.po b/po/sk.po
index 801cfe8..62b220e 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -9564,7 +9564,7 @@ msgstr ""
 #~ "podpisov\n"
 #~ "kľúčov nimi samotnými budú posunuté o jednu sekundu dopredu.\n"
 
-#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgid "Please enter the passphrase; this is a secret sentence \n"
 #~ msgstr "Prosím, vložte heslo; toto je tajná veta \n"
 
 #~ msgid ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 5e16c8a..f153d7e 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9408,7 +9408,7 @@ msgstr ""
 #~ "用现有的首选项更新所有(或选定的)用户标识的首选项。所有受影响的自身签\n"
 #~ "字的时间戳都会增加一秒钟。\n"
 
-#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgid "Please enter the passphrase; this is a secret sentence \n"
 #~ msgstr "请输入密码:这是一个秘密的句子 \n"
 
 #~ msgid ""
diff --git a/scd/app-nks.c b/scd/app-nks.c
index d0b96a9..458516b 100644
--- a/scd/app-nks.c
+++ b/scd/app-nks.c
@@ -1068,7 +1068,7 @@ do_decipher (app_t app, const char *keyidstr,
 
 
 /* Parse a password ID string.  Returns NULL on error or a string
-   suitable as passpahrse prompt on success.  On success stores the
+   suitable as passphrase prompt on success.  On success stores the
    reference value for the password at R_PWID and a flag indicating
    that the SigG application is to be used at R_SIGG.  If NEW_MODE is
    true, the returned description is suitable for a new Password.
diff --git a/tests/openpgp/ecc.scm b/tests/openpgp/ecc.scm
index f2f3b7c..8f38494 100755
--- a/tests/openpgp/ecc.scm
+++ b/tests/openpgp/ecc.scm
@@ -187,7 +187,7 @@ Rg==
 ;;
 ;; Now check that we can encrypt and decrypt our own messages.
 ;;
-;; Note that we don't need to provide a passppharse because we already
+;; Note that we don't need to provide a passphrase because we already
 ;; preset the passphrase into the gpg-agent.
 ;;
 (for-each-p

commit 5d4f1408d0dd055d412ae44bb4a0f28f74617f05
Author: Justus Winter <justus at g10code.com>
Date:   Wed Nov 2 12:45:18 2016 +0100

    g10,w32: Fix build on Windows.
    
    * g10/tofu.c (begin_transaction): Use the new 'gnupg_usleep'.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/g10/tofu.c b/g10/tofu.c
index 8280321..46d9484 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -192,7 +192,6 @@ begin_transaction (ctrl_t ctrl, int only_batch)
       && dbs->batch_update_started != gnupg_get_time ())
     {
       struct stat statbuf;
-      struct timespec ts;
 
       /* If we are in a batch update, then batch updates better have
          been enabled.  */
@@ -209,9 +208,7 @@ begin_transaction (ctrl_t ctrl, int only_batch)
           /* Yield to allow another process a chance to run.  Note:
            * testing suggests that anything less than a 100ms tends to
            * not result in the other process getting the lock.  */
-          memset (&ts, 0, sizeof (ts));
-          ts.tv_nsec = 100 * 1000 * 1000;
-          nanosleep (&ts, &ts);
+          gnupg_usleep (100000);
         }
       else
         dbs->batch_update_started = gnupg_get_time ();

-----------------------------------------------------------------------

Summary of changes:
 NEWS                  | 2 +-
 agent/agent.h         | 2 +-
 agent/gpg-agent.c     | 4 ++--
 configure.ac          | 2 +-
 doc/help.be.txt       | 2 +-
 doc/help.ca.txt       | 2 +-
 doc/help.cs.txt       | 2 +-
 doc/help.da.txt       | 2 +-
 doc/help.el.txt       | 2 +-
 doc/help.eo.txt       | 2 +-
 doc/help.et.txt       | 2 +-
 doc/help.gl.txt       | 2 +-
 doc/help.nb.txt       | 2 +-
 doc/help.sv.txt       | 2 +-
 doc/help.txt          | 2 +-
 g10/ChangeLog-2011    | 4 ++--
 g10/tofu.c            | 5 +----
 po/ca.po              | 2 +-
 po/cs.po              | 2 +-
 po/de.po              | 2 +-
 po/el.po              | 2 +-
 po/eo.po              | 2 +-
 po/es.po              | 2 +-
 po/et.po              | 2 +-
 po/fi.po              | 2 +-
 po/gl.po              | 2 +-
 po/hu.po              | 2 +-
 po/id.po              | 2 +-
 po/it.po              | 2 +-
 po/pt.po              | 2 +-
 po/ro.po              | 2 +-
 po/sk.po              | 2 +-
 po/zh_CN.po           | 2 +-
 scd/app-nks.c         | 2 +-
 tests/gpgscm/ffi.c    | 1 +
 tests/openpgp/ecc.scm | 2 +-
 36 files changed, 38 insertions(+), 40 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org




More information about the Gnupg-commits mailing list