[SCM] GNU gnutls branch, gnutls_3_0_x-2, updated. gnutls_3_0_25-11-g62cdafc

[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=62cdafc6a172bc667ff11d488b95611ce3d0b650

The branch, gnutls_3_0_x-2 has been updated
       via  62cdafc6a172bc667ff11d488b95611ce3d0b650 (commit)
       via  5234a2508186f9f447db0333e8e2f7ec7e680419 (commit)
       via  463639790319560b4859db01b56db8950891e322 (commit)
       via  e9d4c690116f9beda63cea0badb0c19177da6d64 (commit)
      from  4563a0c7b60d493961b12bfa6f81a8a033e9094e (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 62cdafc6a172bc667ff11d488b95611ce3d0b650
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Fri Nov 9 00:40:30 2012 +0100

    updated

commit 5234a2508186f9f447db0333e8e2f7ec7e680419
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Fri Nov 9 00:24:48 2012 +0100

    updated

commit 463639790319560b4859db01b56db8950891e322
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Fri Nov 9 00:17:12 2012 +0100

    updated scripts

commit e9d4c690116f9beda63cea0badb0c19177da6d64
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Fri Nov 9 00:07:51 2012 +0100

    bumped version

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

Summary of changes:
 NEWS                           |    4 ++--
 configure.ac                   |    2 +-
 doc/scripts/cleanup-autogen.pl |    6 ++++++
 doc/scripts/gdoc               |    2 +-
 doc/scripts/getfuncs.pl        |    2 +-
 doc/scripts/mytexi2latex       |    5 +++--
 m4/hooks.m4                    |    2 +-
 7 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/NEWS b/NEWS
index f9225a9..d2f052d 100644
--- a/NEWS
+++ b/NEWS
@@ -2,12 +2,12 @@ GnuTLS NEWS -- History of user-visible changes.               
 -*- outline -*-
 Copyright (C) 2000-2012 Free Software Foundation, Inc.
 See the end for copying conditions.
 
-* Version 3.0.26 (unreleased)
+* Version 3.0.26 (released 2012-11-09)
 
 ** libgnutls: Always tolerate key usage violation errors from the side
 of the peer, but also notify via an audit message.
 
-** libgnutls: gnutls_x509_crl_verify() includes the time checks.
+** libgnutls: gnutls_x509_crl_verify() includes time checks.
 
 ** libgnutls: Increased maximum password length in the PKCS #12
 functions.
diff --git a/configure.ac b/configure.ac
index a1a8c5b..f02631b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ dnl Process this file with autoconf to produce a configure 
script.
 # USA
 
 AC_PREREQ(2.61)
-AC_INIT([GnuTLS], [3.0.25], address@hidden)
+AC_INIT([GnuTLS], [3.0.26], address@hidden)
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/doc/scripts/cleanup-autogen.pl b/doc/scripts/cleanup-autogen.pl
index fdc9ecd..6f38f5e 100755
--- a/doc/scripts/cleanup-autogen.pl
+++ b/doc/scripts/cleanup-autogen.pl
@@ -51,6 +51,12 @@ while ($line = <>) {
     $line = "address@hidden $1\n";
   }
 
+  if ($line =~ /address@hidden(.*)/) {
+    if ($line !~ /help/) {
+      next;
+    }
+  }
+
   print $line;
   $i++;
 }
diff --git a/doc/scripts/gdoc b/doc/scripts/gdoc
index ac5dea4..953cd57 100755
--- a/doc/scripts/gdoc
+++ b/doc/scripts/gdoc
@@ -857,7 +857,7 @@ sub dump_function {
 sub dump_enum {
     my $prototype = shift @_;
 
-    if (($prototype =~ 
m/^\s*typedef\s+enum\s*[a-zA-Z0-9_~:]*\s*\{([a-zA-Z0-9_~=,:\s]+)\s*\}\s*([a-zA-Z0-9_]+);.*/))
 {
+    if (($prototype =~ 
m/^\s*typedef\s+enum\s*[a-zA-Z0-9_~:]*\s*\{([\-a-zA-Z0-9_~=,:\s\(\)\<]+)\s*\}\s*([a-zA-Z0-9_]+);.*/))
 {
 #        || $prototype =~ m/^\s*enum\s+([a-zA-Z0-9_~:]+).*/) {
         $args = $1;
        $name = $2;
diff --git a/doc/scripts/getfuncs.pl b/doc/scripts/getfuncs.pl
index 3839240..9e76805 100755
--- a/doc/scripts/getfuncs.pl
+++ b/doc/scripts/getfuncs.pl
@@ -42,7 +42,7 @@ while ($line=<STDIN>) {
         $func = $1;
     }
     
-    if ($func ne '' && $func =~ m/gnutls_.*/) {
+    if ($func ne '' && ($func =~ m/gnutls_.*/ || $func =~ m/dane_.*/)) {
       print $func . "\n";
     }
   }
diff --git a/doc/scripts/mytexi2latex b/doc/scripts/mytexi2latex
index 775f186..fe9176c 100755
--- a/doc/scripts/mytexi2latex
+++ b/doc/scripts/mytexi2latex
@@ -341,6 +341,8 @@ multitable:
         }
 
        if ($verbatim == 0) {
+               $line =~ s/\</\$<\$/g;
+               $line =~ s/\>/\$>\$/g;
                $line =~ s/\_/\\_/g;
                $line =~ s/\~/\\~/g;
                $line =~ s/\%(?!c)/\\%/g;
@@ -366,8 +368,7 @@ multitable:
                $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/\~\\textgreek\{\\euro\}/g;
                $line =~ s/address@hidden/\\newpage/g;
                $line =~ s/address@hidden($spacematch+)\}/\\file{$1}/g;
                $line =~ s/address@hidden/\\code{/g;
diff --git a/m4/hooks.m4 b/m4/hooks.m4
index 42140e3..d986fb4 100644
--- a/m4/hooks.m4
+++ b/m4/hooks.m4
@@ -40,7 +40,7 @@ AC_DEFUN([LIBGNUTLS_HOOKS],
   # Interfaces added:                             AGE++
   # Interfaces removed:                           AGE=0
   AC_SUBST(LT_CURRENT, 39)
-  AC_SUBST(LT_REVISION, 0)
+  AC_SUBST(LT_REVISION, 1)
   AC_SUBST(LT_AGE, 11)
 
   AC_SUBST(LT_SSL_CURRENT, 27)


hooks/post-receive
-- 
GNU gnutls