From 226cf67bc3675a1137d110825e21e617908bb2c0 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Mon, 9 Jan 2012 14:03:59 +0000
Subject: [PATCH] Minor update to gnutls-2.12.16. * corrected functionality of
 gnutls_record_get_direction()

---
 security/gnutls/Makefile                    |  6 ++----
 security/gnutls/distinfo                    | 10 +++++-----
 security/gnutls/patches/patch-lib_configure | 16 ++++++++--------
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index 6bd58fa09c5..3dd62bab7ed 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -1,12 +1,10 @@
-# $OpenBSD: Makefile,v 1.45 2011/12/30 11:17:08 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.46 2012/01/09 14:03:59 ajacoutot Exp $
 
 COMMENT=	GNU Transport Layer Security library
 
-DISTNAME=	gnutls-2.12.14
+DISTNAME=	gnutls-2.12.16
 CATEGORIES=	security
 
-REVISION=	0
-
 SHARED_LIBS +=  gnutls               18.1     # 47.4
 SHARED_LIBS +=  gnutlsxx             17.0     # 27.0
 SHARED_LIBS +=  gnutls-extra         18.1     # 47.4
diff --git a/security/gnutls/distinfo b/security/gnutls/distinfo
index 93270dec2c1..59d0267840c 100644
--- a/security/gnutls/distinfo
+++ b/security/gnutls/distinfo
@@ -1,5 +1,5 @@
-MD5 (gnutls-2.12.14.tar.bz2) = VVaHp//vugvZ3h5xy2FALA==
-RMD160 (gnutls-2.12.14.tar.bz2) = hVyJxGiY57k0qPa3Rm0wiQMcn5o=
-SHA1 (gnutls-2.12.14.tar.bz2) = 5WgPeO5R/567l0mzlQTT6YGhkkI=
-SHA256 (gnutls-2.12.14.tar.bz2) = Xucrpt56I88xV5JWGVRFHgItrIcwFJypX5PGHpW+LOM=
-SIZE (gnutls-2.12.14.tar.bz2) = 7166618
+MD5 (gnutls-2.12.16.tar.bz2) = BBS7qXYCAfJ9Znh5l8ut+w==
+RMD160 (gnutls-2.12.16.tar.bz2) = RHISEVtrOabVLMa0Qdw78V5peJo=
+SHA1 (gnutls-2.12.16.tar.bz2) = LQhX94lllxhbGdKGGi6zeOXTEPs=
+SHA256 (gnutls-2.12.16.tar.bz2) = 0EMohX2eQg7KU/f3/WFbx20vXXSYSpuQwPLF97W/W0o=
+SIZE (gnutls-2.12.16.tar.bz2) = 7167795
diff --git a/security/gnutls/patches/patch-lib_configure b/security/gnutls/patches/patch-lib_configure
index 393e0ae4cde..1e10c115644 100644
--- a/security/gnutls/patches/patch-lib_configure
+++ b/security/gnutls/patches/patch-lib_configure
@@ -1,7 +1,7 @@
-$OpenBSD: patch-lib_configure,v 1.7 2011/10/21 15:38:15 ajacoutot Exp $
---- lib/configure.orig	Thu Oct 20 20:59:56 2011
-+++ lib/configure	Fri Oct 21 17:21:51 2011
-@@ -18729,21 +18729,9 @@ else
+$OpenBSD: patch-lib_configure,v 1.8 2012/01/09 14:03:59 ajacoutot Exp $
+--- lib/configure.orig	Fri Jan  6 21:50:21 2012
++++ lib/configure	Mon Jan  9 14:45:45 2012
+@@ -18782,21 +18782,9 @@ else
    ZLIB_HAS_PKGCONFIG=n
  fi
  
@@ -23,7 +23,7 @@ $OpenBSD: patch-lib_configure,v 1.7 2011/10/21 15:38:15 ajacoutot Exp $
  # Check whether --with-p11-kit was given.
  if test "${with_p11_kit+set}" = set; then :
    withval=$with_p11_kit;
-@@ -27784,7 +27772,7 @@ fi
+@@ -27837,7 +27825,7 @@ fi
              done
            fi
            if test "X$found_dir" != "X"; then
@@ -32,7 +32,7 @@ $OpenBSD: patch-lib_configure,v 1.7 2011/10/21 15:38:15 ajacoutot Exp $
              if test "X$found_so" != "X"; then
                                                          if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
                                  LIBPTHREAD="${LIBPTHREAD}${LIBPTHREAD:+ }$found_so"
-@@ -27837,7 +27825,7 @@ fi
+@@ -27890,7 +27878,7 @@ fi
                      if test "$acl_hardcode_minus_L" != no; then
                                                                                          LIBPTHREAD="${LIBPTHREAD}${LIBPTHREAD:+ }$found_so"
                      else
@@ -41,7 +41,7 @@ $OpenBSD: patch-lib_configure,v 1.7 2011/10/21 15:38:15 ajacoutot Exp $
                      fi
                    fi
                  fi
-@@ -27846,7 +27834,7 @@ fi
+@@ -27899,7 +27887,7 @@ fi
                if test "X$found_a" != "X"; then
                                  LIBPTHREAD="${LIBPTHREAD}${LIBPTHREAD:+ }$found_a"
                else
@@ -50,7 +50,7 @@ $OpenBSD: patch-lib_configure,v 1.7 2011/10/21 15:38:15 ajacoutot Exp $
                fi
              fi
                          additional_includedir=
-@@ -27996,8 +27984,8 @@ fi
+@@ -28049,8 +28037,8 @@ fi
                done
              fi
            else