From 65cd0f52fa22c8f4c681f70e830e3aa014a99f63f05efdb7e5c62f2193410aa3 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Mon, 18 Jul 2016 19:19:48 +0000
Subject: [PATCH] Accepting request 407873 from Base:System

1

OBS-URL: https://build.opensuse.org/request/show/407873
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnutls?expand=0&rev=93
---
 ...e-datefudge-in-name-constraints-test.patch |  28 ------------------
 gnutls-3.4.13.tar.xz                          |   3 --
 gnutls-3.4.13.tar.xz.sig                      | Bin 287 -> 0 bytes
 gnutls-3.4.14.tar.xz                          |   3 ++
 gnutls-3.4.14.tar.xz.sig                      | Bin 0 -> 287 bytes
 gnutls.changes                                |  13 ++++++++
 gnutls.spec                                   |   4 +--
 7 files changed, 17 insertions(+), 34 deletions(-)
 delete mode 100644 0001-tests-use-datefudge-in-name-constraints-test.patch
 delete mode 100644 gnutls-3.4.13.tar.xz
 delete mode 100644 gnutls-3.4.13.tar.xz.sig
 create mode 100644 gnutls-3.4.14.tar.xz
 create mode 100644 gnutls-3.4.14.tar.xz.sig

diff --git a/0001-tests-use-datefudge-in-name-constraints-test.patch b/0001-tests-use-datefudge-in-name-constraints-test.patch
deleted file mode 100644
index bd6bc8e..0000000
--- a/0001-tests-use-datefudge-in-name-constraints-test.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From cc22a052f40ba800acde7d81fe0ab91b56e66921 Mon Sep 17 00:00:00 2001
-From: Nikos Mavrogiannopoulos <nmav@redhat.com>
-Date: Wed, 29 Jun 2016 17:25:06 +0200
-Subject: [PATCH] tests: use datefudge in name-constraints test
-
-This avoids the expiration of the used certificate to affect the test.
----
- tests/cert-tests/name-constraints | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-Index: gnutls-3.4.13/tests/cert-tests/name-constraints
-===================================================================
---- gnutls-3.4.13.orig/tests/cert-tests/name-constraints	2016-06-30 11:11:35.920632613 +0200
-+++ gnutls-3.4.13/tests/cert-tests/name-constraints	2016-06-30 11:13:06.633974903 +0200
-@@ -28,7 +28,12 @@ if ! test -z "${VALGRIND}"; then
- fi
- TMPFILE=tmp.$$.pem
- 
--${VALGRIND} "${CERTTOOL}" -e --infile "${srcdir}/name-constraints-ip.pem"
-+. ${srcdir}/../scripts/common.sh
-+
-+check_for_datefudge
-+
-+datefudge -s "2016-04-22" \
-+	${VALGRIND} "${CERTTOOL}" -e --infile "${srcdir}/name-constraints-ip.pem"
- rc=$?
- 
- if test "${rc}" != "0"; then
diff --git a/gnutls-3.4.13.tar.xz b/gnutls-3.4.13.tar.xz
deleted file mode 100644
index 105635b..0000000
--- a/gnutls-3.4.13.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fd3386e8e72725980bcd7f40949aa0121dcb7650b5147c6490e794555ed25859
-size 6670508
diff --git a/gnutls-3.4.13.tar.xz.sig b/gnutls-3.4.13.tar.xz.sig
deleted file mode 100644
index 01c0acb0737a82ec9661761e357891b65ec188a380db92b1f539ad6c5a0a4641..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 287
zcmV+)0pR|L0UQJX0SEvF1p-%9ux9`Y2@suLs`ii*xI$<r2me6Tiueu?Aa=$_J$7W~
zuR58$KdiPOW=`wpaClm3l+c`gUX!r1(y(!rs~1&j?L2f_s#S{k2IZ6>@J@T~oumpM
z8jt-z;eQCf(t!_w_yMNUJ$tl~3PQwEGOwOUF<nlAhVKRYne=`syr<wP=HioZOK@f=
z9E2d;&)`h@+nMsSskFKc<AYfL%_#7y9Kcf|bwBhE_z;>Lipb)1at4>)h2(>k?|s>7
zOj+1lLt;C^C7)fBfb~u)CG`CSj<#RQ#x59k+GQ4|Pij<!S6`)Hn0x2&cZOYOKKG$B
lY}tJAbHqi=BG;N_W2{xqFxdZe6Mf!O8RDnB9w3xFw(SK^jXwYY

diff --git a/gnutls-3.4.14.tar.xz b/gnutls-3.4.14.tar.xz
new file mode 100644
index 0000000..4e0d2e0
--- /dev/null
+++ b/gnutls-3.4.14.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:35deddf2779b76ac11057de38bf380b8066c05de21b94263ad5b6dfa75dfbb23
+size 6673148
diff --git a/gnutls-3.4.14.tar.xz.sig b/gnutls-3.4.14.tar.xz.sig
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..ac68ac14a1b1de5d131a1a8b5310fbacdfeeeb9045fe86ba0f21fcd5aa02c32d
GIT binary patch
literal 287
zcmV+)0pR|L0UQJX0SEvF1p-%msCxhk2@suLs`ii*xI(t62mp!=pFPH5$N9zVI@dOj
ziLtxOMHe!PxS(GvAOU79_7~bk)doqYFc?IR71_;Az{5fp(L5jInPh7BDG_4YNK$;)
zor<ZU0xnUQEUHqV1W%>=5g{Vt67W1G7fzC0T>&@tt&2@Cty4yZp)zO|B(gYIXM?Jl
zzHSRIy5~(cGrFY;Ltj3)AL0Gx*dZuypj;CFO(WYQk$n}exi1T0XZpVg(dhsoD+|Yc
zOrQK8*6r8#H0{;;R5!T1u+2DCKf7a?^BG#_DQ~>8KILmNAqY0yUxtl4kdeAi$e(^t
lg5{k^O_b9K3h?0(`l(!TpyXm9k_4mG;jmzxC}d>;Zi4^ifX4s;

literal 0
HcmV?d00001

diff --git a/gnutls.changes b/gnutls.changes
index 0fb14fd..6d3f7a1 100644
--- a/gnutls.changes
+++ b/gnutls.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Sat Jul  9 21:18:21 UTC 2016 - astieger@suse.com
+
+- GnuTLS 3.4.14:
+  * libgnutls: Address issue when utilizing the p11-kit trust store
+    for certificate verification (GNUTLS-SA-2016-2, boo#988276)
+  * libgnutls: Fixed DTLS handshake packet reconstruction.
+  * libgnutls: Fixed issues with PKCS#11 reading of sensitive
+    objects from SafeNet Network HSM
+  * libgnutls: Corrected the writing of PKCS#11 CKA_SERIAL_NUMBER
+- drop upstreamed
+  0001-tests-use-datefudge-in-name-constraints-test.patch
+
 -------------------------------------------------------------------
 Thu Jun 30 08:38:05 UTC 2016 - vcizek@suse.com
 
diff --git a/gnutls.spec b/gnutls.spec
index 35e42b7..1cbd507 100644
--- a/gnutls.spec
+++ b/gnutls.spec
@@ -30,7 +30,7 @@
 %bcond_without guile
 
 Name:           gnutls
-Version:        3.4.13
+Version:        3.4.14
 Release:        0
 Summary:        The GNU Transport Layer Security Library
 License:        LGPL-2.1+ and GPL-3.0+
@@ -41,7 +41,6 @@ Source0:        ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/%{name}-%{version}.tar.x
 Source1:        ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/%{name}-%{version}.tar.xz.sig
 Source2:        %name.keyring
 Source3:        baselibs.conf
-Patch:          0001-tests-use-datefudge-in-name-constraints-test.patch
 
 BuildRequires:  autogen
 BuildRequires:  automake
@@ -191,7 +190,6 @@ GnuTLS Wrappers for GNU Guile - dialect of scheme.
 
 %prep
 %setup -q
-%patch -p1
 
 %build
 export LDFLAGS="-pie"