[SCM] GNU gnutls branch, gnutls_2_12_x, updated. gnutls_2_12_7_a-9-g7544a58

[Nikos Mavrogiannopoulos]

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 "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=7544a585429668e0b5b4eccc463a9cd3ac247bad

The branch, gnutls_2_12_x has been updated
       via  7544a585429668e0b5b4eccc463a9cd3ac247bad (commit)
       via  15d9a783a560b1fe99604ca56ca238e485a524e5 (commit)
      from  1b90f50b49fdd2ffb95fc6a793a6819d75f15b3e (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 7544a585429668e0b5b4eccc463a9cd3ac247bad
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Jul 28 19:39:46 2011 +0200

    corrected typo

commit 15d9a783a560b1fe99604ca56ca238e485a524e5
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed Jul 27 22:11:02 2011 +0200

    documented updates.

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

Summary of changes:
 NEWS               |    9 ++++++++-
 src/certtool-gaa.c |    2 +-
 src/certtool.gaa   |    2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index e22877e..b5850db 100644
--- a/NEWS
+++ b/NEWS
@@ -8,7 +8,14 @@ See the end for copying conditions.
 ** libgnutls: gcrypt: replaced occurences of gcry_sexp_nth_mpi (..., 0)
 with gcry_sexp_nth_mpi (..., GCRYMPI_FMT_USG) to fix errors with 1.5.0.
 
-** libgnutls: writev_emu: stop on the first incomplete write
+** libgnutls: writev_emu: stop on the first incomplete write. Patch by
+Sjoerd Simons.
+
+** libgnutls: Fix zlib handling in gnutls.pc. Patch by Andreas
+Metzler.
+
+** certtool: bug fixes in certificate request generation. Patch
+by Petr Písař.
 
 ** API and ABI modifications:
 No changes since last version.
diff --git a/src/certtool-gaa.c b/src/certtool-gaa.c
index a741a64..232d923 100644
--- a/src/certtool-gaa.c
+++ b/src/certtool-gaa.c
@@ -141,7 +141,7 @@ void gaa_help(void)
        __gaa_helpsingle(0, "generate-dh-params", "", "Generate PKCS #3 encoded 
Diffie-Hellman parameters.");
        __gaa_helpsingle(0, "get-dh-params", "", "Get the included PKCS #3 
encoded Diffie-Hellman parameters.");
        __gaa_helpsingle(0, "load-privkey", "FILE ", "Private key file to 
use.");
-       __gaa_helpsingle(0, "load-pubkey", "FILE ", "Private key file to use.");
+       __gaa_helpsingle(0, "load-pubkey", "FILE ", "Public key file to use.");
        __gaa_helpsingle(0, "load-request", "FILE ", "Certificate request file 
to use.");
        __gaa_helpsingle(0, "load-certificate", "FILE ", "Certificate file to 
use.");
        __gaa_helpsingle(0, "load-ca-privkey", "FILE ", "Certificate 
authority's private key file to use.");
diff --git a/src/certtool.gaa b/src/certtool.gaa
index 7c67af3..a066bdf 100644
--- a/src/certtool.gaa
+++ b/src/certtool.gaa
@@ -40,7 +40,7 @@ option (get-dh-params) { $action=ACTION_GET_DH; } "Get the 
included PKCS #3 enco
 option (load-privkey) STR "FILE" { $privkey = $1 } "Private key file to use."
 
 #char *pubkey;
-option (load-pubkey) STR "FILE" { $pubkey = $1 } "Private key file to use."
+option (load-pubkey) STR "FILE" { $pubkey = $1 } "Public key file to use."
 
 #char *request;
 option (load-request) STR "FILE" { $request = $1 } "Certificate request file 
to use."


hooks/post-receive
-- 
GNU gnutls