[SCM] GNU gnutls branch, master, updated. gnutls_3_0_3-20-g3fc1df4

[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=3fc1df4a398be9cabc805ac99f11ce373e12a042

The branch, master has been updated
       via  3fc1df4a398be9cabc805ac99f11ce373e12a042 (commit)
       via  911b7885be5e8869437dac88ce6133bada362f02 (commit)
       via  da740dc1a25d220f75048485afd9f6bf5a6461ed (commit)
       via  85901c4eb97e01d7519cbda80267ab9af2b7f2d2 (commit)
      from  12c4b5136c9bcd7c7855cd910a2b9a9790a81e98 (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 3fc1df4a398be9cabc805ac99f11ce373e12a042
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Fri Sep 23 00:00:16 2011 +0200

    more files to ignore

commit 911b7885be5e8869437dac88ce6133bada362f02
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Sep 22 23:59:38 2011 +0200

    Added epub version of manual

commit da740dc1a25d220f75048485afd9f6bf5a6461ed
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Sep 22 23:24:53 2011 +0200

    corrected typos

commit 85901c4eb97e01d7519cbda80267ab9af2b7f2d2
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Sep 22 22:49:58 2011 +0200

    pdf is the image format for latex.

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

Summary of changes:
 .gitignore                                 |    8 +++++
 configure.ac                               |    1 -
 doc/latex/Makefile.am                      |   44 ++++++++++++++++++++++-----
 doc/latex/{cover.tex.in => cover-epub.tex} |   31 ++++++++++++-------
 doc/latex/{gnutls.tex => epub.tex}         |   42 +++++++-------------------
 doc/latex/gnutls.bib                       |    6 ++--
 doc/latex/gnutls.tex                       |    2 +
 doc/latex/{macros.tex => macros-epub.tex}  |   30 +++++++++----------
 doc/scripts/mytexi2latex                   |    5 ++-
 9 files changed, 99 insertions(+), 70 deletions(-)
 rename doc/latex/{cover.tex.in => cover-epub.tex} (76%)
 copy doc/latex/{gnutls.tex => epub.tex} (61%)
 copy doc/latex/{macros.tex => macros-epub.tex} (93%)

diff --git a/.gitignore b/.gitignore
index 1d31f67..61c3951 100644
--- a/.gitignore
+++ b/.gitignore
@@ -518,3 +518,11 @@ tests/x509cert-tl
 doc/enums.texi
 doc/enums/
 tests/infoaccess
+gl/tests/test-fdopen
+gl/tests/test-fgetc
+gl/tests/test-fseeko4
+gl/tests/test-fstat
+gl/tests/test-ftello4
+gl/tests/test-pathmax
+gl/tests/test-sys_types
+tests/mini-deflate
diff --git a/configure.ac b/configure.ac
index 16bbe33..e5797f5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -429,7 +429,6 @@ AC_CONFIG_FILES([
   doc/credentials/x509/Makefile
   doc/cyclo/Makefile
   doc/latex/Makefile
-  doc/latex/cover.tex
   doc/doxygen/Doxyfile
   doc/examples/Makefile
   doc/manpages/Makefile
diff --git a/doc/latex/Makefile.am b/doc/latex/Makefile.am
index 841def2..3a030d1 100644
--- a/doc/latex/Makefile.am
+++ b/doc/latex/Makefile.am
@@ -1,4 +1,5 @@
-TEX_OBJECTS = gnutls.tex macros.tex fdl.tex cover.tex gnutls.bib
+TEX_OBJECTS = gnutls.tex macros.tex macros-epub.tex fdl.tex cover.tex 
gnutls.bib \
+       cover-epub.tex
 
 GEN_TEX_OBJECTS = cha-preface.tex cha-library.tex cha-intro-tls.tex 
cha-auth.tex \
   cha-cert-auth.tex cha-gtls-app.tex cha-tls-app.tex cha-programs.tex 
cha-support.tex \
@@ -119,14 +120,41 @@ extra-api.tex: $(srcdir)/../../libextra/gnutls_extra.c
 
 SOURCE_GEN_FILES =  extra-api.tex pgp-api.tex x509-api.tex gnutls-api.tex 
gnutls-enums.tex
 
+PDF_FILES = gnutls-client-server-use-case.pdf gnutls-crypto-layers.pdf \
+       gnutls-handshake-sequence.pdf gnutls-handshake-state.pdf \
+       gnutls-internals.pdf gnutls-layers.pdf gnutls-logo.pdf \
+       gnutls-modauth.pdf gnutls-pgp.pdf gnutls-x509.pdf pkcs11-vision.pdf
+
 gnutls.pdf: $(SOURCE_GEN_FILES) $(TEX_OBJECTS) $(GEN_TEX_OBJECTS)
        $(MAKE) -C .. errcodes printlist alert-printlist
-       -pdflatex gnutls.tex
-       -bibtex gnutls
-       -makeindex gnutls.idx
-       -pdflatex gnutls.tex && pdflatex gnutls.tex
+#      for i in $(PDF_FILES);do cp ../$$i .;done
+       pdflatex gnutls.tex
+       bibtex gnutls
+       makeindex gnutls.idx
+       pdflatex gnutls.tex && pdflatex gnutls.tex
+#      for i in $(PDF_FILES);do rm -f $$i;done
+
+PNG_FILES = gnutls-client-server-use-case.png gnutls-crypto-layers.png \
+       gnutls-handshake-sequence.png gnutls-handshake-state.png \
+       gnutls-internals.png gnutls-layers.png gnutls-logo.png \
+       gnutls-modauth.png gnutls-pgp.png gnutls-x509.png pkcs11-vision.png
+
+epub.html: $(SOURCE_GEN_FILES) $(TEX_OBJECTS) $(GEN_TEX_OBJECTS)
+       $(MAKE) -C .. errcodes printlist alert-printlist
+       mkdir -p epub
+       for i in $(PNG_FILES);do cp ../$$i epub;done
+       htlatex epub.tex "xhtml,pmathml" " -cunihtf -utf8 -cvalidate'"
+       bibtex epub
+       makeindex epub.idx
+       htlatex epub.tex "xhtml,pmathml" " -cunihtf -utf8 -cvalidate'"
+       cp epub*.html epub
+       sed -i 's/\.\.\//\.\//g' epub/epub.html
+       cd epub && zip gnutls-epub.zip *
+#      for i in $(PNG_FILES);do rm -f $$i;done
 
 clean-am:
-       rm -f $(GEN_TEX_OBJECTS) $(SOURCE_GEN_FILES) gnutls.aux gnutls.bbl 
gnutls.blg gnutls.idx gnutls.ilg gnutls.ind gnutls.log gnutls.out gnutls.toc
-       rm -rf functions enums
-
+       rm -f $(GEN_TEX_OBJECTS) $(SOURCE_GEN_FILES) gnutls.aux gnutls.bbl 
gnutls.blg gnutls.idx \
+       gnutls.ilg gnutls.ind gnutls.log gnutls.out gnutls.toc epub.4ct 
epub.4tc epub.aux epub.bbl \
+       epub.blg epub.css epub.dvi epub*.html epub.idv epub.idx epub.ilg 
epub.ind epub.lg epub.lof \
+       epub.log epub.lot epub.out epub.xref epub.toc epub.tmp
+       rm -rf functions enums epub $(PNG_FILES) $(PDF_FILES)
diff --git a/doc/latex/cover.tex.in b/doc/latex/cover-epub.tex
similarity index 76%
rename from doc/latex/cover.tex.in
rename to doc/latex/cover-epub.tex
index b0d6d84..43a9efb 100644
--- a/doc/latex/cover.tex.in
+++ b/doc/latex/cover-epub.tex
@@ -1,10 +1,28 @@
 \thispagestyle{empty}
+
+\vspace*{\stretch{2}}
+\begin{center}
+\huge{The GnuTLS manual}
+\vspace*{\stretch{2}}
+\end{center}
+
+%\newpage
+%\vspace*{\stretch{2}}
+%\begin{center}
+%\includegraphics[width=6cm]{../gnutls-logo}
+%\end{center}
+
+%\vspace*{\stretch{2}}
+
+\newpage
+
+\thispagestyle{empty}
 \vspace*{\stretch{2}}
 
 
-\begin{quotation}
+\begin{flushleft}
 Copyright \copyright{} 2011 Free Software Foundation, Inc.
-\end{quotation}
+\end{flushleft}
 
 \begin{flushleft}
 Permission is granted to copy, distribute and/or modify this document
@@ -15,12 +33,3 @@ copy of the license is included in the section entitled 
``GNU Free
 Documentation License''.
 \end{flushleft}
 
-\newpage
-\thispagestyle{empty}
-
-\vspace*{\stretch{2}}
-\begin{center}
-\includegraphics[width=6cm]{../gnutls-logo.pdf}
-\end{center}
-
-\vspace*{\stretch{2}}
diff --git a/doc/latex/gnutls.tex b/doc/latex/epub.tex
similarity index 61%
copy from doc/latex/gnutls.tex
copy to doc/latex/epub.tex
index 664a1b4..20c6297 100644
--- a/doc/latex/gnutls.tex
+++ b/doc/latex/epub.tex
@@ -1,38 +1,26 @@
-\documentclass[fontsize=10pt,twoside,openright]{scrbook}
+\documentclass[]{book}
 \bibliographystyle{plain}
-
-\usepackage[paperwidth=18.91cm,paperheight=24.589cm,twoside,bindingoffset=11mm,outer=2.2cm,inner=1.2cm,top=2.6cm,bottom=2.5cm]{geometry}
-\usepackage{fancyhdr}
 \usepackage{graphicx}
 \usepackage{makeidx}
 \usepackage{supertabular}
 \usepackage{color}
-\usepackage{fancyvrb}
-\usepackage{eurosans}
-\usepackage{parskip}
 \usepackage{hyperref}
-\usepackage{framed}
-\usepackage{verbatim}
 \usepackage{listings}
-\usepackage{xcolor}
-\usepackage{afterpage}
-\usepackage{float}
-\usepackage{morefloats}
+\usepackage{verbatim}
 \usepackage[greek,english]{babel}%for euro sign
+\usepackage{float}
+\usepackage{fancyvrb}
+\usepackage{framed}
 
+\DeclareGraphicsExtensions{.png}
+
+%\newcommand{\euro}[0]{euro}
 \renewcommand{\textfraction}{0.00}
 \renewcommand{\floatpagefraction}{0.8}
 \renewcommand{\dblfloatpagefraction}{0.8}
 
-\hypersetup{
-    colorlinks,%
-    citecolor=blue,%
-    filecolor=blue,%
-    linkcolor=blue,%
-    urlcolor=blue
-}
 
-\input{macros}
+\input{macros-epub}
 
 \makeindex
 
@@ -40,24 +28,20 @@
 
 \frontmatter
 
-\input{cover}
+\input{cover-epub}
 
 \setcounter{tocdepth}{1}
 \tableofcontents
 \listoftables
 \listoffigures
 
-\pagestyle{fancy}
-\fancyhead[RE]{\slshape \rightmark}
-\fancyhead[LO]{\slshape \leftmark}
-\fancyhead[RO,LE]{\empty}
-\fancyfoot[C]{\thepage}
-
 \input{cha-preface}
 
 \mainmatter
+
 \input{cha-library}
 
+
 \input{cha-intro-tls}
 
 \input{cha-auth}
@@ -80,8 +64,6 @@
 
 \input{cha-errors}
 
-%\input{cha-functions}
-
 \input{fdl}
 
 \backmatter
diff --git a/doc/latex/gnutls.bib b/doc/latex/gnutls.bib
index d5ccfdf..a0c9f63 100644
--- a/doc/latex/gnutls.bib
+++ b/doc/latex/gnutls.bib
@@ -28,8 +28,8 @@
 @Misc{TLSTKT,
   author = "Joseph Salowey and Hao Zhou and Pasi Eronen and Hannes Tschofenig",
   title = "Transport Layer Security {(TLS)} Session Resumption without 
Server-Side State",
-  month="January"
-  year="2008"
+  month="January",
+  year="2008",
   note = "Available from \url{http://www.ietf.org/rfc/rfc5077}";,
   url = "http://www.ietf.org/rfc/rfc5077";
 }
@@ -45,7 +45,7 @@
 @Misc{ECRYPT,
  publisher = "European Network of Excellence in Cryptology II",
  title = "{ECRYPT II Yearly Report on Algorithms and Keysizes (2009-2010)}",
- url = "http://www.ecrypt.eu.org/documents/D.SPA.13.pdf";.
+ url = "http://www.ecrypt.eu.org/documents/D.SPA.13.pdf";,
  year=2010
 }
 
diff --git a/doc/latex/gnutls.tex b/doc/latex/gnutls.tex
index 664a1b4..89b92e5 100644
--- a/doc/latex/gnutls.tex
+++ b/doc/latex/gnutls.tex
@@ -20,6 +20,8 @@
 \usepackage{morefloats}
 \usepackage[greek,english]{babel}%for euro sign
 
+\DeclareGraphicsExtensions{.pdf}
+
 \renewcommand{\textfraction}{0.00}
 \renewcommand{\floatpagefraction}{0.8}
 \renewcommand{\dblfloatpagefraction}{0.8}
diff --git a/doc/latex/macros.tex b/doc/latex/macros-epub.tex
similarity index 93%
copy from doc/latex/macros.tex
copy to doc/latex/macros-epub.tex
index fbfb687..3f0b6d5 100644
--- a/doc/latex/macros.tex
+++ b/doc/latex/macros-epub.tex
@@ -65,11 +65,11 @@
 \newcommand{\showfuncdesc}[1]{%
  \begin{figure}[htbp]
  \begin{minipage}[l]{\linewidth}
- \begin{framed}
+% \begin{framed}
   \texttt{
    \input{functions/#1}
   }
- \end{framed}
+% \end{framed}
  \end{minipage}
  \end{figure}
 }
@@ -77,11 +77,11 @@
 \newcommand{\showenumdesc}[2]{%
  \begin{table}[h]
  \begin{minipage}[l]{\linewidth}
- \begin{framed}
+% \begin{framed}
   \texttt{
    \input{enums/#1}
   }
- \end{framed}
+% \end{framed}
  \vspace{0.15cm}
  \end{minipage}
  \caption{#2}
@@ -92,9 +92,9 @@
 \newcommand{\showfuncA}[1]{%
  \begin{figure}[H]
  \begin{samepage}
- \begin{framed}
+% \begin{framed}
    \showfunc{#1}
- \end{framed}
+% \end{framed}
  \end{samepage}
  \end{figure}
 }
@@ -102,11 +102,11 @@
 \newcommand{\showfuncB}[2]{%
  \begin{figure}[H]
  \begin{samepage}
- \begin{framed}
+% \begin{framed}
     \showfunc{#1}
  \vspace{0.2cm}
     \showfunc{#2}
- \end{framed}
+% \end{framed}
  \end{samepage}
  \end{figure}
 }
@@ -114,13 +114,13 @@
 \newcommand{\showfuncC}[3]{%
  \begin{figure}[H]
  \begin{samepage}
- \begin{framed}
+% \begin{framed}
   \showfunc{#1}
  \vspace{0.2cm}
   \showfunc{#2}
  \vspace{0.2cm}
   \showfunc{#3}
- \end{framed}
+% \end{framed}
  \end{samepage}
  \end{figure}
 }
@@ -128,7 +128,7 @@
 \newcommand{\showfuncD}[4]{%
  \begin{figure}[H]
  \begin{samepage}
- \begin{framed}
+% \begin{framed}
   \showfunc{#1}
  \vspace{0.2cm}
   \showfunc{#2}
@@ -136,7 +136,7 @@
   \showfunc{#3}
  \vspace{0.2cm}
   \showfunc{#4}
- \end{framed}
+% \end{framed}
  \end{samepage}
  \end{figure}
 }
@@ -144,7 +144,7 @@
 \newcommand{\showfuncE}[5]{%
  \begin{figure}[H]
  \begin{samepage}
- \begin{framed}
+% \begin{framed}
   \showfunc{#1}
  \vspace{0.2cm}
   \showfunc{#2}
@@ -154,7 +154,7 @@
   \showfunc{#4}
  \vspace{0.2cm}
   \showfunc{#5}
- \end{framed}
+% \end{framed}
  \end{samepage}
  \end{figure}
 }
@@ -162,7 +162,6 @@
 \newcommand{\showfuncF}[6]{%
  \begin{figure}[H]
  \begin{samepage}
- \begin{framed}
   \showfunc{#1}
  \vspace{0.2cm}
   \showfunc{#2}
@@ -174,7 +173,6 @@
   \showfunc{#5}
  \vspace{0.2cm}
   \showfunc{#6}
- \end{framed}
  \end{samepage}
  \end{figure}
 }
diff --git a/doc/scripts/mytexi2latex b/doc/scripts/mytexi2latex
index a057726..1ddce5d 100755
--- a/doc/scripts/mytexi2latex
+++ b/doc/scripts/mytexi2latex
@@ -28,6 +28,7 @@ my $prefix = $_[0];
 my $suffix=$_[0];
        $suffix =~ s/\\//g;
        $prefix =~ s/\\_/\\_\\-/g;
+
        return "\\funcref\{$prefix\}\{$suffix\}";
 }
 
@@ -37,6 +38,7 @@ my $prefix = $_[0];
 my $suffix = $_[1];
        $suffix =~ s/\\//g;
        $suffix =~ s/\,/\}\{/g;
+
        return "\\showfunc$prefix\{$suffix\}";
 }
 
@@ -44,6 +46,7 @@ sub showfuncdesc()
 {
 my $suffix = $_[0];
        $suffix =~ s/\\//g;
+
        return "\\showfuncdesc\{$suffix\}";
 }
 
@@ -312,7 +315,7 @@ multitable:
                $line =~ s/\#/\\\#/g;
                $line =~ s/address@hidden/\\-/g;
                 $line =~ s/address@hidden (.*)/\\examplefile{\.\.\/$1}/g;
-               $line =~ 
s/address@hidden($match+)\,($match+)\}/\\includegraphics\[width\=$2\]\{\.\.\/$1\.pdf\}/g;
+               $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 (.*)/\% $1/g;


hooks/post-receive
-- 
GNU gnutls