From 9a4f99b569e185982f997aff62c19533c74d51fa Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Apr 07 2017 14:48:56 +0000
Subject: Update to 3.5.11-1


- Update to upstream 3.5.11 release

---

diff --git a/.gitignore b/.gitignore
index b07fe75..fb1c48c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -73,3 +73,4 @@ gnutls-2.10.1-nosrp.tar.bz2
 /gnutls-3.5.8-hobbled.tar.xz
 /gnutls-3.5.9-hobbled.tar.xz
 /gnutls-3.5.10-hobbled.tar.xz
+/gnutls-3.5.11-hobbled.tar.xz
diff --git a/gnutls.spec b/gnutls.spec
index 1f29060..ef33cd5 100644
--- a/gnutls.spec
+++ b/gnutls.spec
@@ -1,5 +1,5 @@
 # This spec file has been automatically updated
-Version:	3.5.10
+Version:	3.5.11
 Release: 1%{?dist}
 Patch1:	gnutls-3.2.7-rpath.patch
 Patch2:	gnutls-3.4.2-no-now-guile.patch
@@ -19,6 +19,8 @@ BuildRequires: trousers-devel >= 0.3.11.2
 BuildRequires: libidn2-devel
 BuildRequires: libunistring-devel
 BuildRequires: gperf, net-tools, datefudge, softhsm
+# for a sanity check on cert loading
+BuildRequires: p11-kit-trust, ca-certificates
 Requires: crypto-policies
 Requires: p11-kit-trust
 Requires: libtasn1 >= 4.3
@@ -138,6 +140,7 @@ This package contains Guile bindings for the library.
 
 sed 's/gnutls_srp.c//g' -i lib/Makefile.in
 sed 's/gnutls_srp.lo//g' -i lib/Makefile.in
+sed 's/global_init/gnutls_global_init/g' -i tests/trust-store.c
 sed -i -e 's|sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/lib /usr/lib %{_libdir}|g' configure
 rm -f lib/minitasn1/*.c lib/minitasn1/*.h
 rm -f src/libopts/*.c src/libopts/*.h src/libopts/compat/*.c src/libopts/compat/*.h 
@@ -151,7 +154,7 @@ echo "SYSTEM=NORMAL" >> tests/system.prio
            --disable-srp-authentication \
            --disable-non-suiteb-curves \
            --with-system-priority-file=%{_sysconfdir}/crypto-policies/back-ends/gnutls.config \
-           --with-default-trust-store-pkcs11="pkcs11:model=p11-kit-trust;manufacturer=PKCS%2311%20Kit" \
+           --with-default-trust-store-pkcs11="pkcs11:" \
            --with-trousers-lib=%{_libdir}/libtspi.so.1 \
            --htmldir=%{_docdir}/manual \
 %if %{with guile}
@@ -270,6 +273,9 @@ fi
 %endif
 
 %changelog
+* Fri Apr 07 2017 Nikos Mavrogiannopoulos <nmav@redhat.com> - 3.5.11-1
+- Update to upstream 3.5.11 release
+
 * Mon Mar 06 2017 Nikos Mavrogiannopoulos <nmav@redhat.com> - 3.5.10-1
 - Update to upstream 3.5.10 release
 
diff --git a/sources b/sources
index 3824406..be18ad8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gnutls-3.5.10-hobbled.tar.xz) = 141901717478fc09e6dbe6abed181e34f084a9aa29a5b9cbb0464f35ea245427d34c99ed0aeee9b90b9facd54e95efd63a40b21f9eca691901c8f1baa39d215c
+SHA512 (gnutls-3.5.11-hobbled.tar.xz) = b47b9c6f270454ba626ca17b81c638993563ae6a9c6444e4e2392ee03c5673b790ab7cba52bab58bc1fa4b88bacc44ff11df26e4fc3c727eeb5624c3af8dcd38