From 5b1c69d57ec0f62e0334e15e70ea146beabeb6a42e06916e7e12f0489f93485e Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Wed, 3 Oct 2012 05:23:38 +0000
Subject: [PATCH] Accepting request 136172 from Base:System

- update to latest stable version 3.0.21:
  libgnutls: fixed bug in gnutls_x509_privkey_import()
  that prevented the loading of EC private keys when DER
  encoded. Reported by David Woodhouse.
  libgnutls: In DTLS larger to mtu records result to
  GNUTLS_E_LARGE_PACKET instead of being truncated.
  libgnutls: gnutls_dtls_get_data_mtu() is more precise. Based
  on patch by David Woodhouse.
  libgnutls: Fixed memory leak in PKCS #8 key import.
  libgnutls: Added support for an old version of the DTLS protocol
  used by openconnect vpn client for compatibility with Cisco's AnyConnect
  SSL VPN. It is marked as GNUTLS_DTLS0_9. Do not use it for newer protocols
  as it has issues.
  libgnutls: Corrected bug that prevented resolving PKCS #11 URLs
  if only the label is specified. Patch by David Woodhouse.
  libgnutls: When EMSGSIZE errno is seen then GNUTLS_E_LARGE_PACKET
  is returned.
  API and ABI modifications:
  gnutls_dtls_set_data_mtu: Added
  gnutls_session_set_premaster: Added

OBS-URL: https://build.opensuse.org/request/show/136172
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnutls?expand=0&rev=52
---
 gnutls-3.0.20.tar.xz |  3 ---
 gnutls-3.0.21.tar.xz |  3 +++
 gnutls.changes       | 31 +++++++++++++++++++++++++++++++
 gnutls.spec          |  6 +++---
 4 files changed, 37 insertions(+), 6 deletions(-)
 delete mode 100644 gnutls-3.0.20.tar.xz
 create mode 100644 gnutls-3.0.21.tar.xz

diff --git a/gnutls-3.0.20.tar.xz b/gnutls-3.0.20.tar.xz
deleted file mode 100644
index da115f0..0000000
--- a/gnutls-3.0.20.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7e3f431a43e5366ff5a9b7646d2a79892a905237ef18cb147b945ec99012686d
-size 4426520
diff --git a/gnutls-3.0.21.tar.xz b/gnutls-3.0.21.tar.xz
new file mode 100644
index 0000000..881aa8b
--- /dev/null
+++ b/gnutls-3.0.21.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6901b0203a613869cf475f18d44acd47b36adf714c67d1f9ad29c26ab7bec410
+size 4664124
diff --git a/gnutls.changes b/gnutls.changes
index d4a1536..b3f6987 100644
--- a/gnutls.changes
+++ b/gnutls.changes
@@ -1,3 +1,34 @@
+-------------------------------------------------------------------
+Mon Jul 16 06:00:52 UTC 2012 - gjhe@suse.com
+
+- update to latest stable version 3.0.21:
+  libgnutls: fixed bug in gnutls_x509_privkey_import()
+  that prevented the loading of EC private keys when DER
+  encoded. Reported by David Woodhouse.
+
+  libgnutls: In DTLS larger to mtu records result to
+  GNUTLS_E_LARGE_PACKET instead of being truncated.
+
+  libgnutls: gnutls_dtls_get_data_mtu() is more precise. Based
+  on patch by David Woodhouse.
+
+  libgnutls: Fixed memory leak in PKCS #8 key import.
+
+  libgnutls: Added support for an old version of the DTLS protocol
+  used by openconnect vpn client for compatibility with Cisco's AnyConnect
+  SSL VPN. It is marked as GNUTLS_DTLS0_9. Do not use it for newer protocols
+  as it has issues.
+
+  libgnutls: Corrected bug that prevented resolving PKCS #11 URLs
+  if only the label is specified. Patch by David Woodhouse.
+
+  libgnutls: When EMSGSIZE errno is seen then GNUTLS_E_LARGE_PACKET
+  is returned.
+
+  API and ABI modifications:
+  gnutls_dtls_set_data_mtu: Added
+  gnutls_session_set_premaster: Added
+
 -------------------------------------------------------------------
 Sun Jul  1 20:00:33 UTC 2012 - coolo@suse.com
 
diff --git a/gnutls.spec b/gnutls.spec
index 887b71c..dff063d 100644
--- a/gnutls.spec
+++ b/gnutls.spec
@@ -21,10 +21,10 @@
 %define gnutls_ossl_sover 27
 
 Name:           gnutls
-Version:        3.0.20
+Version:        3.0.21
 Release:        0
 Summary:        The GNU Transport Layer Security Library
-License:        LGPL-3.0+ ; GPL-3.0+
+License:        LGPL-3.0+ and GPL-3.0+
 Group:          Productivity/Networking/Security
 Url:            http://www.gnutls.org/
 Source0:        http://ftp.gnu.org/gnu/gnutls/%{name}-%{version}.tar.xz
@@ -128,7 +128,7 @@ Files needed for software development using gnutls.
 echo %{_includedir}/%{name}/abstract.h
 
 %build
-autoreconf -i
+autoreconf -if
 %configure \
         --disable-static \
         --with-pic \