[SCM] GNU gnutls branch, gnutls_2_12_x, updated. gnutls_2_12_20-10-gb559819

[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=b559819746b20d782ad3ca7e4161c9b079c760bd

The branch, gnutls_2_12_x has been updated
       via  b559819746b20d782ad3ca7e4161c9b079c760bd (commit)
       via  7e0018b09f872f356d4211ac2938d0c6da1c8db4 (commit)
       via  ea0be9387dbee2fd5aa41dabdbebb739aae33af2 (commit)
      from  dbc72ae47b16c6718cb5e53d4a31205bc45d3742 (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 b559819746b20d782ad3ca7e4161c9b079c760bd
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Nov 8 23:49:08 2012 +0100

    updated doc

commit 7e0018b09f872f356d4211ac2938d0c6da1c8db4
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Nov 8 23:45:23 2012 +0100

    updated

commit ea0be9387dbee2fd5aa41dabdbebb739aae33af2
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Nov 8 23:41:48 2012 +0100

    bumped versions

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

Summary of changes:
 NEWS                  |    4 ++-
 build-aux/compile     |   91 +++++++++++++++++++++++++++++++++---------------
 configure.ac          |    2 +-
 lib/configure.ac      |    2 +-
 lib/m4/hooks.m4       |    2 +-
 libextra/configure.ac |    2 +-
 6 files changed, 69 insertions(+), 34 deletions(-)

diff --git a/NEWS b/NEWS
index 21e6ae7..cf960b0 100644
--- a/NEWS
+++ b/NEWS
@@ -3,7 +3,7 @@ Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
               2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 See the end for copying conditions.
 
-Version 2.12.21 (unreleased)
+Version 2.12.21 (released 2012-11-08)
 
 ** libgnutls: Backported patch to compile with libtasn1 3.0.
 Minimum libtasn1 dependency is now 2.14.
@@ -11,6 +11,8 @@ Minimum libtasn1 dependency is now 2.14.
 ** libgnutls: Always tolerate key usage violation errors from the side
 of the peer, but also notify via an audit message.
 
+** minitasn1: Upgraded to libtasn1 version 3.0.
+
 ** API and ABI modifications:
 No changes since last version.
 
diff --git a/build-aux/compile b/build-aux/compile
index b1f4749..862a14e 100755
--- a/build-aux/compile
+++ b/build-aux/compile
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-01-04.17; # UTC
+scriptversion=2012-03-05.13; # UTC
 
 # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free
 # Software Foundation, Inc.
@@ -79,6 +79,48 @@ func_file_conv ()
   esac
 }
 
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+  func_file_conv "$1"
+  if test -z "$lib_path"; then
+    lib_path=$file
+  else
+    lib_path="$lib_path;$file"
+  fi
+  linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+  lib=$1
+  found=no
+  save_IFS=$IFS
+  IFS=';'
+  for dir in $lib_path $LIB
+  do
+    IFS=$save_IFS
+    if $shared && test -f "$dir/$lib.dll.lib"; then
+      found=yes
+      lib=$dir/$lib.dll.lib
+      break
+    fi
+    if test -f "$dir/$lib.lib"; then
+      found=yes
+      lib=$dir/$lib.lib
+      break
+    fi
+  done
+  IFS=$save_IFS
+
+  if test "$found" != yes; then
+    lib=$lib.lib
+  fi
+}
+
 # func_cl_wrapper cl arg...
 # Adjust compile command to suit cl
 func_cl_wrapper ()
@@ -109,43 +151,34 @@ func_cl_wrapper ()
              ;;
          esac
          ;;
+       -I)
+         eat=1
+         func_file_conv "$2" mingw
+         set x "$@" -I"$file"
+         shift
+         ;;
        -I*)
          func_file_conv "${1#-I}" mingw
          set x "$@" -I"$file"
          shift
          ;;
+       -l)
+         eat=1
+         func_cl_dashl "$2"
+         set x "$@" "$lib"
+         shift
+         ;;
        -l*)
-         lib=${1#-l}
-         found=no
-         save_IFS=$IFS
-         IFS=';'
-         for dir in $lib_path $LIB
-         do
-           IFS=$save_IFS
-           if $shared && test -f "$dir/$lib.dll.lib"; then
-             found=yes
-             set x "$@" "$dir/$lib.dll.lib"
-             break
-           fi
-           if test -f "$dir/$lib.lib"; then
-             found=yes
-             set x "$@" "$dir/$lib.lib"
-             break
-           fi
-         done
-         IFS=$save_IFS
-
-         test "$found" != yes && set x "$@" "$lib.lib"
+         func_cl_dashl "${1#-l}"
+         set x "$@" "$lib"
          shift
          ;;
+       -L)
+         eat=1
+         func_cl_dashL "$2"
+         ;;
        -L*)
-         func_file_conv "${1#-L}"
-         if test -z "$lib_path"; then
-           lib_path=$file
-         else
-           lib_path="$lib_path;$file"
-         fi
-         linker_opts="$linker_opts -LIBPATH:$file"
+         func_cl_dashL "${1#-L}"
          ;;
        -static)
          shared=false
diff --git a/configure.ac b/configure.ac
index 89e04d4..654b516 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ dnl Process this file with autoconf to produce a configure 
script.
 # USA
 
 AC_PREREQ(2.61)
-AC_INIT([GnuTLS], [2.12.20], address@hidden)
+AC_INIT([GnuTLS], [2.12.21], address@hidden)
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/lib/configure.ac b/lib/configure.ac
index 1ecca78..266f7ef 100644
--- a/lib/configure.ac
+++ b/lib/configure.ac
@@ -22,7 +22,7 @@ dnl Process this file with autoconf to produce a configure 
script.
 # MA 02110-1301, USA
 
 AC_PREREQ(2.61)
-AC_INIT([libgnutls], [2.12.20], address@hidden)
+AC_INIT([libgnutls], [2.12.21], address@hidden)
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/lib/m4/hooks.m4 b/lib/m4/hooks.m4
index 30c29c8..ab6cf5e 100644
--- a/lib/m4/hooks.m4
+++ b/lib/m4/hooks.m4
@@ -27,7 +27,7 @@ AC_DEFUN([LIBGNUTLS_HOOKS],
   # Interfaces added:                             AGE++
   # Interfaces removed:                           AGE=0
   AC_SUBST(LT_CURRENT, 48)
-  AC_SUBST(LT_REVISION, 4)
+  AC_SUBST(LT_REVISION, 5)
   AC_SUBST(LT_AGE, 22)
 
   AC_SUBST(LT_SSL_CURRENT, 27)
diff --git a/libextra/configure.ac b/libextra/configure.ac
index da52265..25d9b28 100644
--- a/libextra/configure.ac
+++ b/libextra/configure.ac
@@ -22,7 +22,7 @@ dnl Process this file with autoconf to produce a configure 
script.
 # 02110-1301, USA.
 
 AC_PREREQ(2.61)
-AC_INIT([libgnutls-extra], [2.12.20], address@hidden)
+AC_INIT([libgnutls-extra], [2.12.21], address@hidden)
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 


hooks/post-receive
-- 
GNU gnutls