[SCM] GNU gnutls branch, master, updated. gnutls-3_0_12-194-g683e5b1

[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=683e5b1873201584334302243caaa438b706adaf

The branch, master has been updated
       via  683e5b1873201584334302243caaa438b706adaf (commit)
       via  998be30fc041ffb20e4fe10f02ac77efb7c57f77 (commit)
       via  4a39cae1f9107840dd9923692d67dca16d7e318f (commit)
      from  94474c4e8ee2888c1b90acd49132eba50c7d2b27 (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 683e5b1873201584334302243caaa438b706adaf
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Fri Feb 10 15:10:38 2012 +0100

    documentation update

commit 998be30fc041ffb20e4fe10f02ac77efb7c57f77
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Fri Feb 10 15:04:24 2012 +0100

    updated doc generation

commit 4a39cae1f9107840dd9923692d67dca16d7e318f
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Fri Feb 10 14:59:41 2012 +0100

    doc fixes

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

Summary of changes:
 doc/Makefile.am          |   22 +++++++++++-----------
 doc/latex/Makefile.am    |   29 ++++++++++++++++++++++++++++-
 doc/scripts/gdoc         |    1 +
 doc/scripts/mytexi2latex |   14 ++++++++++++--
 lib/verify-ssh.c         |    3 ++-
 src/certtool-args.def    |    8 ++++----
 src/p11tool-args.def     |    2 +-
 src/srptool-args.def     |    2 +-
 8 files changed, 60 insertions(+), 21 deletions(-)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index f62cb1e..ab00d0a 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -30,41 +30,41 @@ endif
 
 invoke-gnutls-cli.texi: ../src/cli-args.def
        -cd ../src/ && autogen -Tagtexi-cmd.tpl $< && \
-       mv ../src/$@ .
+       mv -f ../src/$@ ../doc
 
 invoke-gnutls-cli-debug.texi: ../src/cli-debug-args.def
        -cd ../src/ && autogen -Tagtexi-cmd.tpl $< && \
-       mv ../src/$@ .
+       mv -f ../src/$@ ../doc
 
 invoke-gnutls-serv.texi: ../src/serv-args.def
        -cd ../src/ && autogen -Tagtexi-cmd.tpl $< && \
-       mv ../src/$@ .
+       mv -f ../src/$@ ../doc
 
 invoke-certtool.texi: ../src/certtool-args.def
        -cd ../src/ && autogen -Tagtexi-cmd.tpl $< && \
-       mv ../src/$@ .
+       mv -f ../src/$@ ../doc
 
 invoke-srptool.texi: ../src/srptool-args.def
        -cd ../src/ && autogen -Tagtexi-cmd.tpl $< && \
-       mv ../src/$@ . && \
        sed -i 's/@subsection/@subsubsection/g' $@ && \
-       sed -i 's/@section/@subsection/g' $@
+       sed -i 's/@section/@subsection/g' $@ && \
+       mv -f ../src/$@ ../doc
 
 invoke-ocsptool.texi: ../src/ocsptool-args.def
        -cd ../src/ && autogen -Tagtexi-cmd.tpl $< && \
-       mv ../src/$@ .
+       mv -f ../src/$@ ../doc
 
 invoke-psktool.texi: ../src/psk-args.def
        -cd ../src/ && autogen -Tagtexi-cmd.tpl $< && \
-       mv ../src/$@ . && \
        sed -i 's/@subsection/@subsubsection/g' $@ && \
-       sed -i 's/@section/@subsection/g' $@
+       sed -i 's/@section/@subsection/g' $@ && \
+       mv -f ../src/$@ ../doc
 
 invoke-p11tool.texi: ../src/p11tool-args.def
        -cd ../src/ && autogen -Tagtexi-cmd.tpl $< && \
-       mv ../src/$@ . && \
        sed -i 's/@subsection/@subsubsection/g' $@ && \
-       sed -i 's/@section/@subsection/g' $@
+       sed -i 's/@section/@subsection/g' $@ && \
+       mv -f ../src/$@ ../doc
 
 info_TEXINFOS = gnutls.texi gnutls-guile.texi
 gnutls_TEXINFOS = gnutls.texi fdl-1.3.texi                             \
diff --git a/doc/latex/Makefile.am b/doc/latex/Makefile.am
index 55482ba..f1d6efe 100644
--- a/doc/latex/Makefile.am
+++ b/doc/latex/Makefile.am
@@ -4,7 +4,34 @@ TEX_OBJECTS = gnutls.tex macros.tex macros-epub.tex fdl.tex 
cover.tex gnutls.bib
 GEN_TEX_OBJECTS = cha-preface.tex cha-library.tex cha-intro-tls.tex 
cha-cert-auth2.tex \
   cha-cert-auth.tex cha-gtls-app.tex sec-tls-app.tex cha-programs.tex 
cha-support.tex \
   cha-functions.tex error_codes.tex cha-ciphersuites.tex algorithms.tex 
cha-shared-key.tex \
-  cha-errors.tex alerts.tex cha-internals.tex cha-gtls-examples.tex
+  cha-errors.tex alerts.tex cha-internals.tex cha-gtls-examples.tex \
+  invoke-certtool.tex invoke-gnutls-cli.tex invoke-gnutls-serv.tex \
+  invoke-srptool.tex invoke-psktool.tex invoke-gnutls-cli-debug.tex \
+  invoke-p11tool.tex invoke-ocsptool.tex
+
+invoke-certtool.tex: ../invoke-certtool.texi
+       ../scripts/mytexi2latex $< > $@
+
+invoke-gnutls-cli.tex: ../invoke-gnutls-cli.texi
+       ../scripts/mytexi2latex $< > $@
+
+invoke-gnutls-serv.tex: ../invoke-gnutls-serv.texi
+       ../scripts/mytexi2latex $< > $@
+
+invoke-srptool.tex: ../invoke-srptool.texi
+       ../scripts/mytexi2latex $< > $@
+
+invoke-psktool.tex: ../invoke-psktool.texi
+       ../scripts/mytexi2latex $< > $@
+
+invoke-gnutls-cli-debug.tex: ../invoke-gnutls-cli-debug.texi
+       ../scripts/mytexi2latex $< > $@
+
+invoke-p11tool.tex: ../invoke-p11tool.texi
+       ../scripts/mytexi2latex $< > $@
+
+invoke-ocsptool.tex: ../invoke-ocsptool.texi
+       ../scripts/mytexi2latex $< > $@
 
 cha-preface.tex: ../cha-preface.texi
        ../scripts/mytexi2latex $< > $@
diff --git a/doc/scripts/gdoc b/doc/scripts/gdoc
index 0380bba..a1ab4ab 100755
--- a/doc/scripts/gdoc
+++ b/doc/scripts/gdoc
@@ -510,6 +510,7 @@ sub output_tex {
        $out =~ s/\%([a-zA-Z\_]+)/{\\bf $1}/g;
        $out =~ s/\@([a-zA-Z\_]+)/{\\bf $1}/g;
        $out =~ s/_/\\_/g;
+        $out =~ s/\$/\\\$/g;
        $out =~ s/#/\\#/g;
        $out =~ s/\n\n/\n/g;
        $out =~ s/\\:/:/g;
diff --git a/doc/scripts/mytexi2latex b/doc/scripts/mytexi2latex
index 3638043..688c041 100755
--- a/doc/scripts/mytexi2latex
+++ b/doc/scripts/mytexi2latex
@@ -118,6 +118,7 @@ while ($line = <FILE>) {
                         $mode = pop(@stack);
                 }
                 $line =~ s/address@hidden (.+)/\\item $1/g;
+                $line =~ s/address@hidden/\\item/g;
                $prev_mode = $mode;
         } elsif ($mode == ENUMERATE) {
                 if ($line =~ s/address@hidden itemize/\\end{enumerate}/g) {
@@ -127,6 +128,7 @@ while ($line = <FILE>) {
                         $mode = pop(@stack);
                 }
                 $line =~ s/address@hidden(.*)/\\item $1/g;
+                $line =~ s/address@hidden/\\item/g;
                $prev_mode = $mode;
         } elsif ($mode == FLOAT) {
                 if ($line =~ s/address@hidden 
float/\\label\{$label\}\n\\end{figure}/g) {
@@ -271,6 +273,11 @@ multitable:
                         push(@stack, NORMAL);
                        next;
                 }
+                if ($line =~ s/address@hidden//g) {
+                        $mode = SKIP;
+                        push(@stack, NORMAL);
+                       next;
+                }
                 if ($line =~ s/address@hidden//g) {
                         $mode = SKIP;
                         push(@stack, NORMAL);
@@ -314,7 +321,7 @@ multitable:
                         push(@stack, NORMAL);
                         $mode = MULTITABLE;
                 }
-                if ($line =~ s/address@hidden/\\begin{example}/g) {
+                if ($line =~ s/address@hidden/\\begin{example}/g) {
                         push(@stack, NORMAL);
                         $mode = EXAMPLE;
                 }
@@ -342,6 +349,7 @@ multitable:
                $line =~ 
s/address@hidden($match+)\,($match+)\}/\\includegraphics\[width\=$2\]\{\.\.\/$1\}/g;
                $line =~ s/address@hidden($spacematch+)\}/$1/g;
                $line =~ s/address@hidden/\{\\bf /g;
+               $line =~ s/address@hidden//g;
                $line =~ s/address@hidden (.*)/\% $1/g;
                $line =~ s/address@hidden($mathmatch+)\}/\$$1\$/g;
                $line =~ s/address@hidden($spacematch+)\}/\\acronym{$1}/g;
@@ -354,12 +362,13 @@ multitable:
                        $line =~ 
s/(\\input)\{($underscorematch+)\}/$punescape->($1,$2)/ge;
                }
                $line =~ s/address@hidden (.+)/\\index{$1}/g;
+               $line =~ s/address@hidden (.+)/\\index{$1}/g;
                $line =~ s/address@hidden($underscorematch+)\}/\\url{$1}/g;
                #$line =~ s/address@hidden/\\euro/g;
                $line =~ s/address@hidden/\~\\textgreek\{\\euro\}/g;
                $line =~ s/address@hidden/\\newpage/g;
                $line =~ s/address@hidden($spacematch+)\}/\\file{$1}/g;
-               $line =~ s/address@hidden($codematch+)\}/\\code{$1}/g;
+               $line =~ s/address@hidden/\\code{/g;
                $line =~ s/address@hidden($codematch+)\}/\\command{$1}/g;
                $line =~ s/address@hidden($codematch+)\}/\\command{$1}/g;
                $line =~ s/address@hidden/\\myref\{/g;
@@ -380,6 +389,7 @@ multitable:
                #when a myref{} contains underscores remove them
                $line =~ 
s/(\\myref)\{($underscorematch+)\}/$punescape->($1,$2)/ge;
        }
+       $line =~ s/address@hidden@/\@/g;
 
         print $line;
 }
diff --git a/lib/verify-ssh.c b/lib/verify-ssh.c
index 4d085a1..1f53203 100644
--- a/lib/verify-ssh.c
+++ b/lib/verify-ssh.c
@@ -70,7 +70,8 @@ static const trust_storage_st default_storage =
  *
  * The @tdb variable if non-null specifies a custom back-end for
  * the storage and retrieval of entries. If it is NULL then the
- * default file back-end will be used.
+ * default file back-end will be used. In POSIX-like systems the
+ * file back-end uses the $HOME/.gnutls/known_hosts file.
  *
  * Note that if the custom storage back-end is provided the
  * retrieval function should return %GNUTLS_E_CERTIFICATE_KEY_MISMATCH
diff --git a/src/certtool-args.def b/src/certtool-args.def
index 74a73c3..3db0455 100644
--- a/src/certtool-args.def
+++ b/src/certtool-args.def
@@ -85,8 +85,8 @@ flag = {
 flag = {
     name      = verify-chain;
     value     = e;
-    descrip   = "Verify a PEM encoded certificate chain. The last certificate 
in the chain must be a self signed one";
-    doc = "";
+    descrip   = "Verify a PEM encoded certificate chain.";
+    doc = "The last certificate in the chain must be a self signed one.";
 };
 
 flag = {
@@ -300,8 +300,8 @@ flag = {
 flag = {
     name      = hash;
     arg-type  = string;
-    descrip   = "Hash algorithm to use for signing 
(MD5,SHA1,RMD160,SHA256,SHA384,SHA512).";
-    doc = "";
+    descrip   = "Hash algorithm to use for signing.";
+    doc = "Available hash functions are SHA1, RMD160, SHA256, SHA384, SHA512.";
 };
 
 flag = {
diff --git a/src/p11tool-args.def b/src/p11tool-args.def
index 6a99c27..89b044f 100644
--- a/src/p11tool-args.def
+++ b/src/p11tool-args.def
@@ -73,7 +73,7 @@ flag = {
 
 flag = {
     name      = list-certs;
-    descrip   = "List all certificates that are associated with a private key 
present in the token";
+    descrip   = "List all certificates that have an associated private key";
     doc = "";
 };
 
diff --git a/src/srptool-args.def b/src/srptool-args.def
index 8456a66..cc7957d 100644
--- a/src/srptool-args.def
+++ b/src/srptool-args.def
@@ -67,7 +67,7 @@ flag = {
     name      = salt;
     value     = s;
     arg-type  = number;
-    descrip   = "specify salt size for crypt algorithm.";
+    descrip   = "specify salt size.";
     doc = "";
 };
 


hooks/post-receive
-- 
GNU gnutls