[SCM] GNU gnutls branch, master, updated. gnutls-3_0_12-123-g23597aa

[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=23597aaf450f0db4e639ed3012c9837661c4a541

The branch, master has been updated
       via  23597aaf450f0db4e639ed3012c9837661c4a541 (commit)
       via  598364ccace2db125d8c8d763edc9112b87c2f8c (commit)
       via  e2e548e7a64bd5f9c2549119e076fb48fe02da13 (commit)
      from  4109f932c076edf907c445a3878f0e84d041ac14 (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 23597aaf450f0db4e639ed3012c9837661c4a541
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Jan 29 21:13:08 2012 +0100

    valgrind with suppressions.

commit 598364ccace2db125d8c8d763edc9112b87c2f8c
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Jan 29 21:12:39 2012 +0100

    until autogen supports subheading tag live with a workaround.

commit e2e548e7a64bd5f9c2549119e076fb48fe02da13
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Jan 29 21:12:16 2012 +0100

    updated manpages

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

Summary of changes:
 doc/manpages/Makefile.am |   38 ++++++++++++++++++++++++++++++--------
 gl/m4/valgrind-tests.m4  |    2 +-
 src/cli-args.def.in      |   14 ++++++++------
 src/psk-args.def.in      |    4 ++--
 4 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
index cb8fbd7..b13af2a 100644
--- a/doc/manpages/Makefile.am
+++ b/doc/manpages/Makefile.am
@@ -26,29 +26,51 @@ if ENABLE_SRP
 dist_man_MANS += srptool.1
 endif
 
+# Note that our .def files depend on autogen
+# supporting the @subheading texi keyword. This
+# is not currently the case so we do remove it
+# before processing. Once the new version of autogen
+# is out, replace the sed and tmp files with a simple
+# autogen -DMAN_SECTION=1 -Tagman-cmd.tpl $<
 certtool.1: ../../src/certtool-args.def
-       autogen -DMAN_SECTION=1 -Tagman-cmd.tpl $<
+       sed 's/@subheading \(.*\)/@address@hidden@*/' $< > "$<".tmp
+       autogen -DMAN_SECTION=1 -Tagman-cmd.tpl "$<".tmp
+       rm -f "$<".tmp
 
 ocsptool.1: ../../src/ocsptool-args.def
-       autogen -DMAN_SECTION=1 -Tagman-cmd.tpl $<
+       sed 's/@subheading \(.*\)/@address@hidden@*/' $< > "$<".tmp
+       autogen -DMAN_SECTION=1 -Tagman-cmd.tpl "$<".tmp
+       rm -f "$<".tmp
 
 gnutls-cli.1: ../../src/cli-args.def
-       autogen -DMAN_SECTION=1 -Tagman-cmd.tpl $<
+       sed 's/@subheading \(.*\)/@address@hidden@*/' $< > "$<".tmp
+       autogen -DMAN_SECTION=1 -Tagman-cmd.tpl "$<".tmp
+       rm -f "$<".tmp
 
 gnutls-serv.1: ../../src/serv-args.def
-       autogen -DMAN_SECTION=1 -Tagman-cmd.tpl $<
+       sed 's/@subheading \(.*\)/@address@hidden@*/' $< > "$<".tmp
+       autogen -DMAN_SECTION=1 -Tagman-cmd.tpl "$<".tmp
+       rm -f "$<".tmp
 
 gnutls-cli-debug.1: ../../src/cli-debug-args.def
-       autogen -DMAN_SECTION=1 -Tagman-cmd.tpl $<
+       sed 's/@subheading \(.*\)/@address@hidden@*/' $< > "$<".tmp
+       autogen -DMAN_SECTION=1 -Tagman-cmd.tpl "$<".tmp
+       rm -f "$<".tmp
 
 srptool.1: ../../src/srptool-args.def
-       autogen -DMAN_SECTION=1 -Tagman-cmd.tpl $<
+       sed 's/@subheading \(.*\)/@address@hidden@*/' $< > "$<".tmp
+       autogen -DMAN_SECTION=1 -Tagman-cmd.tpl "$<".tmp
+       rm -f "$<".tmp
 
 p11tool.1: ../../src/p11tool-args.def
-       autogen -DMAN_SECTION=1 -Tagman-cmd.tpl $<
+       sed 's/@subheading \(.*\)/@address@hidden@*/' $< > "$<".tmp
+       autogen -DMAN_SECTION=1 -Tagman-cmd.tpl "$<".tmp
+       rm -f "$<".tmp
 
 psktool.1: ../../src/psk-args.def
-       autogen -DMAN_SECTION=1 -Tagman-cmd.tpl $<
+       sed 's/@subheading \(.*\)/@address@hidden@*/' $< > "$<".tmp
+       autogen -DMAN_SECTION=1 -Tagman-cmd.tpl "$<".tmp
+       rm -f "$<".tmp
 
 APIMANS =
 APIMANS += gnutls_pubkey_init.3
diff --git a/gl/m4/valgrind-tests.m4 b/gl/m4/valgrind-tests.m4
index 077e025..6afd14d 100644
--- a/gl/m4/valgrind-tests.m4
+++ b/gl/m4/valgrind-tests.m4
@@ -21,7 +21,7 @@ AC_DEFUN([gl_VALGRIND_TESTS],
     AC_CHECK_PROGS(VALGRIND, valgrind)
   fi
 
-  OPTS="-q --error-exitcode=1 --suppressions=suppressions.valgrind"
+  OPTS="-q --error-exitcode=1 --leak-check=full 
--suppressions=suppressions.valgrind"
 
   if test -n "$VALGRIND" \
      && $VALGRIND $OPTS $SHELL -c 'exit 0' > /dev/null 2>&1; then
diff --git a/src/cli-args.def.in b/src/cli-args.def.in
index afe2926..7f18026 100644
--- a/src/cli-args.def.in
+++ b/src/cli-args.def.in
@@ -294,6 +294,7 @@ doc-section = {
   ds-type = 'EXAMPLES';
   ds-format = 'texi';
   ds-text   = <<-_EOF_
address@hidden Connecting using PSK authentication
 To connect to a server using PSK authentication, you need to enable the choice 
of PSK by using a cipher priority parameter such as in the example below. 
 @example
 $ ./gnutls-cli -p 5556 localhost --pskusername psk_identity \
@@ -313,16 +314,17 @@ Connecting to '127.0.0.1:5556'...
 @end example
 By keeping the --pskusername parameter and removing the --pskkey parameter, it 
will query only for the password during the handshake. 
 
address@hidden Listing ciphersuites in a priority string
 To list the ciphersuites in a priority string:
 @example
 $ ./gnutls-cli --priority SECURE192 -l
 Cipher suites for SECURE192
-TLS_ECDHE_ECDSA_AES_256_CBC_SHA384                0xc0, 0x24   TLS1.2
-TLS_ECDHE_ECDSA_AES_256_GCM_SHA384                0xc0, 0x2e   TLS1.2
-TLS_ECDHE_RSA_AES_256_GCM_SHA384                  0xc0, 0x30   TLS1.2
-TLS_DHE_RSA_AES_256_CBC_SHA256                    0x00, 0x6b   TLS1.2
-TLS_DHE_DSS_AES_256_CBC_SHA256                    0x00, 0x6a   TLS1.2
-TLS_RSA_AES_256_CBC_SHA256                        0x00, 0x3d   TLS1.2
+TLS_ECDHE_ECDSA_AES_256_CBC_SHA384         0xc0, 0x24  TLS1.2
+TLS_ECDHE_ECDSA_AES_256_GCM_SHA384         0xc0, 0x2e  TLS1.2
+TLS_ECDHE_RSA_AES_256_GCM_SHA384           0xc0, 0x30  TLS1.2
+TLS_DHE_RSA_AES_256_CBC_SHA256             0x00, 0x6b  TLS1.2
+TLS_DHE_DSS_AES_256_CBC_SHA256             0x00, 0x6a  TLS1.2
+TLS_RSA_AES_256_CBC_SHA256                 0x00, 0x3d  TLS1.2
 
 Certificate types: CTYPE-X.509
 Protocols: VERS-TLS1.2, VERS-TLS1.1, VERS-TLS1.0, VERS-SSL3.0, VERS-DTLS1.0
diff --git a/src/psk-args.def.in b/src/psk-args.def.in
index a448af4..b15915b 100644
--- a/src/psk-args.def.in
+++ b/src/psk-args.def.in
@@ -81,8 +81,8 @@ psk_identity:88f3824b3e5659f52d00e959bacab954b6540344
 $
 @end example
 
-This command will create @file{/etc/passwd.psk} if it does not exist
-and will add user 'test' (you will also be prompted for a password). 
+This command will create @file{passwd.psk} if it does not exist
+and will add user 'psk_identity' (you will also be prompted for a password). 
 _EOT_;
 };
 


hooks/post-receive
-- 
GNU gnutls