Update to 3.5.12

4 files changed, 27 insertions, 74 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 305dcb1ad9c9..2be8d08af289 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,13 @@
 # Generated by mksrcinfo v8
-# Sat Jan 14 10:14:49 UTC 2017
+# Tue May 23 17:35:54 UTC 2017
 pkgbase = mingw-w64-gnutls
 	pkgdesc = A library which provides a secure layer over a reliable transport layer (mingw-w64)
-	pkgver = 3.4.17
+	pkgver = 3.5.12
 	pkgrel = 1
 	url = http://www.gnu.org/software/gnutls
 	arch = any
-	license = GPL3, LGPL2.1
+	license = GPL3,
+	license = LGPL2.1
 	makedepends = mingw-w64-configure
 	depends = mingw-w64-crt
 	depends = mingw-w64-libtasn1
@@ -14,22 +15,19 @@ pkgbase = mingw-w64-gnutls
 	depends = mingw-w64-zlib
 	depends = mingw-w64-nettle
 	depends = mingw-w64-p11-kit
+	depends = mingw-w64-libunistring
 	optdepends = mingw-w64-openssl: libgnutls-openssl
 	options = staticlibs
 	options = !strip
 	options = !buildflags
-	source = ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/gnutls-3.4.17.tar.xz
-	source = ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/gnutls-3.4.17.tar.xz.sig
+	source = https://www.gnupg.org/ftp/gcrypt/gnutls/v3.5/gnutls-3.5.12.tar.xz
+	source = https://www.gnupg.org/ftp/gcrypt/gnutls/v3.5/gnutls-3.5.12.tar.xz.sig
 	source = gnutls-3.2.7-rpath.patch
-	source = gnutls-3.1.11-nosrp.patch
-	source = gnutls-3.3.6-default-policy.patch
 	source = gnutls-fix-external-libtasn1-detection.patch
-	md5sums = 03ea7575a43f58964635a5064cce4dc0
-	md5sums = SKIP
-	md5sums = 291612225516234ede7e60f8b367dd8b
-	md5sums = c3a2abfe08f47d9b07f770689b0c1b39
-	md5sums = e0dba6bfe81b965a352f965b1398bcad
-	md5sums = f90a0f01eb0f2a6b7afcc25a836eb67e
+	sha256sums = 63cb39a5eaa029381df2e49a74cfb7be89fc4a592445191818ffe1e66bde57cb
+	sha256sums = SKIP
+	sha256sums = 9e18e03c8f736f49a46b911920e87ea52e3bb2b35044b1fc5ac0e45fd528935a
+	sha256sums = 8525da75852a516be0cb05df0a770daf19ce0583033260d6cac03a1e40fd2072
 
 pkgname = mingw-w64-gnutls
 
diff --git a/PKGBUILD b/PKGBUILD
index 9c66459e2a00..eb8ad16892a5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,34 @@
+# Maintainer: Martchus <martchus@gmx.net>
+
 pkgname=mingw-w64-gnutls
-pkgver=3.4.17
+pkgver=3.5.12
 pkgrel=1
 pkgdesc="A library which provides a secure layer over a reliable transport layer (mingw-w64)"
 arch=(any)
 url="http://www.gnu.org/software/gnutls"
-license=("GPL3, LGPL2.1")
+license=('GPL3', 'LGPL2.1')
 makedepends=(mingw-w64-configure)
-depends=(mingw-w64-crt mingw-w64-libtasn1 mingw-w64-readline mingw-w64-zlib mingw-w64-nettle mingw-w64-p11-kit)
+depends=(mingw-w64-crt mingw-w64-libtasn1 mingw-w64-readline mingw-w64-zlib mingw-w64-nettle mingw-w64-p11-kit mingw-w64-libunistring)
 options=(staticlibs !strip !buildflags)
 optdepends=("mingw-w64-openssl: libgnutls-openssl")
-source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/gnutls-${pkgver}.tar.xz{,.sig}
+source=(https://www.gnupg.org/ftp/gcrypt/gnutls/v3.5/${pkgname#mingw-w64-}-${pkgver}.tar.xz{,.sig}
         'gnutls-3.2.7-rpath.patch'
-        'gnutls-3.1.11-nosrp.patch'
-        'gnutls-3.3.6-default-policy.patch'
         'gnutls-fix-external-libtasn1-detection.patch')
-md5sums=('03ea7575a43f58964635a5064cce4dc0'
-         'SKIP'
-         '291612225516234ede7e60f8b367dd8b'
-         'c3a2abfe08f47d9b07f770689b0c1b39'
-         'e0dba6bfe81b965a352f965b1398bcad'
-         'f90a0f01eb0f2a6b7afcc25a836eb67e')
-validpgpkeys=('1F42418905D8206AA754CCDC29EE58B996865171')
+sha256sums=('63cb39a5eaa029381df2e49a74cfb7be89fc4a592445191818ffe1e66bde57cb'
+            'SKIP'
+            '9e18e03c8f736f49a46b911920e87ea52e3bb2b35044b1fc5ac0e45fd528935a'
+            '8525da75852a516be0cb05df0a770daf19ce0583033260d6cac03a1e40fd2072')
+validpgpkeys=('0424D4EE81A0E3D119C6F835EDA21E94B565716F'
+              '1F42418905D8206AA754CCDC29EE58B996865171')
+               # "Simon Josefsson <simon@josefsson.org>"
+               # "Nikos Mavrogiannopoulos <nmav@gnutls.org>
 
-_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
 prepare() {
   cd "${srcdir}/gnutls-${pkgver}"
   patch -p0 -i ../gnutls-fix-external-libtasn1-detection.patch
   patch -p1 -i ../gnutls-3.2.7-rpath.patch
-  patch -p1 -i ../gnutls-3.1.11-nosrp.patch
-  #patch -p1 -i ../gnutls-3.3.6-default-policy.patch
   sed 's/gnutls_srp.c//g' -i lib/Makefile.in
   sed 's/gnutls_srp.lo//g' -i lib/Makefile.in
   rm -f lib/minitasn1/*.c lib/minitasn1/*.h
@@ -57,8 +56,7 @@ package() {
   for _arch in ${_architectures}; do
     cd "${srcdir}/gnutls-${pkgver}/build-${_arch}"
     make DESTDIR="$pkgdir" install
-    rm "$pkgdir"/usr/${_arch}/bin/*.exe
-    rm "$pkgdir"/usr/${_arch}/bin/*.def
+    ${_arch}-strip --strip-all "$pkgdir"/usr/${_arch}/bin/*.exe
     ${_arch}-strip --strip-unneeded "$pkgdir"/usr/${_arch}/bin/*.dll
     ${_arch}-strip -g "$pkgdir"/usr/${_arch}/lib/*.a
   done
diff --git a/gnutls-3.1.11-nosrp.patch b/gnutls-3.1.11-nosrp.patch
deleted file mode 100644
index 29227c08ce20..000000000000
--- a/gnutls-3.1.11-nosrp.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up gnutls-3.1.10/tests/srp/mini-srp.c.noecc gnutls-3.1.10/tests/srp/mini-srp.c
---- gnutls-3.1.10/tests/srp/mini-srp.c.noecc	2013-03-21 21:42:28.000000000 +0100
-+++ gnutls-3.1.10/tests/srp/mini-srp.c	2013-03-25 13:42:20.753422209 +0100
-@@ -27,7 +27,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- 
--#if defined(_WIN32)
-+#if defined(_WIN32) || !defined(ENABLE_SRP)
- 
- int main()
- {
diff --git a/gnutls-3.3.6-default-policy.patch b/gnutls-3.3.6-default-policy.patch
deleted file mode 100644
index 94185e8904c6..000000000000
--- a/gnutls-3.3.6-default-policy.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -ur gnutls-3.3.6.orig/lib/gnutls_priority.c gnutls-3.3.6/lib/gnutls_priority.c
---- gnutls-3.3.6.orig/lib/gnutls_priority.c	2014-07-22 23:43:41.000000000 +0200
-+++ gnutls-3.3.6/lib/gnutls_priority.c	2014-07-23 10:13:30.456310043 +0200
-@@ -1110,6 +1110,7 @@
- 	int algo;
- 	rmadd_func *fn;
- 	bulk_rmadd_func *bulk_fn;
-+	unsigned dset = 0;
- 
- 	if (err_pos)
- 		*err_pos = priorities;
-@@ -1129,10 +1130,16 @@
- 
- 	(*priority_cache)->max_empty_records = DEFAULT_MAX_EMPTY_RECORDS;
- 
--	if (priorities == NULL)
--		priorities = "NORMAL";
-+	if (priorities == NULL) {
-+		priorities = "@SYSTEM";
-+		dset = 1;
-+	}
- 
- 	darg = resolve_priorities(priorities);
-+	if (darg == NULL && dset == 1) {
-+		priorities = "NORMAL";
-+		darg = resolve_priorities(priorities);
-+	}
- 	if (darg == NULL) {
- 		gnutls_assert();
- 		goto error;
-Only in gnutls-3.3.6/lib: gnutls_priority.c.orig