[SCM] GNU gnutls branch, master, updated. gnutls_2_99_4-12-g6faa558

[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=6faa558ae8905f78a2dc411a6dbe432eafd9e540

The branch, master has been updated
       via  6faa558ae8905f78a2dc411a6dbe432eafd9e540 (commit)
       via  bdf80d7d42baeee0c42a1eae8f6b61e33bdb17b6 (commit)
       via  71ced482bb76eed846197c234fa0680a7c7ac5cf (commit)
      from  724bc2f719148f097c9d65f216ab6364abf8fb5f (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 6faa558ae8905f78a2dc411a6dbe432eafd9e540
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Jul 28 19:39:10 2011 +0200

    Corrected typo.

commit bdf80d7d42baeee0c42a1eae8f6b61e33bdb17b6
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed Jul 27 22:10:49 2011 +0200

    documented updates.

commit 71ced482bb76eed846197c234fa0680a7c7ac5cf
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed Jul 27 22:10:35 2011 +0200

    Added Petr.

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

Summary of changes:
 NEWS               |   11 +++++++++--
 THANKS             |    1 +
 src/certtool-gaa.c |    2 +-
 src/certtool.gaa   |    2 +-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index f82a53f..97b9ee2 100644
--- a/NEWS
+++ b/NEWS
@@ -5,10 +5,17 @@ See the end for copying conditions.
 
 * Version 3.0.0 (unreleased)
 
-** 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.
+gnutls_pcert_list_import_x509_raw: ADDED
 
 
 * Version 2.99.4 (released 2011-07-23)
diff --git a/THANKS b/THANKS
index fb3c6c4..5d679bf 100644
--- a/THANKS
+++ b/THANKS
@@ -115,6 +115,7 @@ Vitaly Kruglikov            <vitaly.kruglikov [at] palm.com>
 Kalle Olavi Niemitalo          <kon [at] iki.fi>
 Dash Shendy                     <admin [at] dash.za.net>
 Rickard Bellgrim                <rickard [at] opendnssec.org>
+Petr Písař                      <petr.pisar [at] atlas.cz>
 
 ----------------------------------------------------------------------
 Copying and distribution of this file, with or without modification,
diff --git a/src/certtool-gaa.c b/src/certtool-gaa.c
index 5a6f6b2..67ba16b 100644
--- a/src/certtool-gaa.c
+++ b/src/certtool-gaa.c
@@ -142,7 +142,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 f51fc9b..078a5e8 100644
--- a/src/certtool.gaa
+++ b/src/certtool.gaa
@@ -42,7 +42,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