gnutls: Update to 3.4.1

mingw-w64-gnutls/0002-fix-duplicate-entries.patch

@@ -1,36 +0,0 @@
-From 7e63027a5caafa55dcca65c5b9bff3bf76c5a41c Mon Sep 17 00:00:00 2001
-From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
-Date: Thu, 9 Apr 2015 16:00:43 +0200
-Subject: [PATCH] remove duplicate entries from manpages Makefile
-
----
- doc/manpages/Makefile.am | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
-index 8e793d3..68de757 100644
---- a/doc/manpages/Makefile.am
-+++ b/doc/manpages/Makefile.am
-@@ -134,11 +134,8 @@ APIMANS += gnutls_certificate_get_peers.3
- APIMANS += gnutls_certificate_get_peers_subkey_id.3
- APIMANS += gnutls_certificate_get_trust_list.3
- APIMANS += gnutls_certificate_get_verify_flags.3
--APIMANS += gnutls_certificate_get_verify_flags.3
--APIMANS += gnutls_certificate_get_x509_crt.3
- APIMANS += gnutls_certificate_get_x509_crt.3
- APIMANS += gnutls_certificate_get_x509_key.3
--APIMANS += gnutls_certificate_get_x509_key.3
- APIMANS += gnutls_certificate_send_x509_rdn_sequence.3
- APIMANS += gnutls_certificate_server_set_request.3
- APIMANS += gnutls_certificate_set_dh_params.3
-@@ -1101,7 +1098,7 @@ compare-makefile:
- 	@echo "******************************************************************************"
- 	@echo "If the following step fails copy $(srcdir)/doc/manpages/tmp-compare-makefile to doc/manpages/Makefile.am"
- 	@echo "******************************************************************************"
--	FUNCS=`cat $(top_srcdir)/lib/includes/gnutls/*.h | $(top_srcdir)/doc/scripts/getfuncs.pl|sort -d`; \
-+	FUNCS=`cat $(top_srcdir)/lib/includes/gnutls/*.h | $(top_srcdir)/doc/scripts/getfuncs.pl|sort -d|uniq`; \
- 	MANS=""; \
- 	for i in $$FUNCS; do \
- 		MANS="$$MANS\nAPIMANS += $$i.3"; \
---
-libgit2 0.21.4

mingw-w64-gnutls/0004-fix-gtkdoc.all.patch

@@ -1,11 +0,0 @@
---- gnutls-3.1.5/gtk-doc.make.orig	2013-04-12 15:09:23 +0400
-+++ gnutls-3.1.5/gtk-doc.make	2013-04-16 20:16:02 +0400
-@@ -92,7 +92,7 @@
- 
- #### scan ####
- 
--scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
-+scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) setup-build.stamp
- 	@echo '  DOC   Scanning header files'
- 	@_source_dir='' ; \
- 	for i in $(DOC_SOURCE_DIR) ; do \

mingw-w64-gnutls/0005-fix-strtok-conflict.mingw.patch

@@ -1,20 +0,0 @@
---- gnutls-3.1.5/gl/m4/strtok_r.m4.orig	2013-05-03 03:34:40 +0400
-+++ gnutls-3.1.5/gl/m4/strtok_r.m4	2013-05-03 04:34:01 +0400
-@@ -13,6 +13,7 @@
-   AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
-   AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-   AC_CHECK_FUNCS([strtok_r])
-+  ac_cv_func_strtok_r=yes
-   if test $ac_cv_func_strtok_r = yes; then
-     HAVE_STRTOK_R=1
-     dnl glibc 2.7 has a bug in strtok_r that causes a segmentation fault
---- gnutls-3.1.5/lib/verify-tofu.c.orig	2013-05-03 04:35:09 +0400
-+++ gnutls-3.1.5/lib/verify-tofu.c	2013-05-03 05:21:50 +0400
-@@ -34,6 +34,7 @@
- #include <gnutls/abstract.h>
- #include <system.h>
- #include <locks.h>
-+#include <pthread.h>
- 
- struct gnutls_tdb_int {
-   gnutls_tdb_store_func store;

mingw-w64-gnutls/PKGBUILD

@@ -2,8 +2,8 @@
 
 _realname=gnutls
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=3.4.0
-pkgrel=2
+pkgver=3.4.1
+pkgrel=1
 pkgdesc="A library which provides a secure layer over a reliable transport layer (mingw-w64)"
 arch=('any')
 license=('GPL3' 'LGPL2.1')
@@ -22,24 +22,15 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc")
 # Need remove "autogen" package before building.
 source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v${pkgver%.*}/${_realname}-${pkgver}.tar.xz{,.sig}
-        0001-add-missing-define.patch
-        0002-fix-duplicate-entries.patch
-        0004-fix-gtkdoc.all.patch
-        0005-fix-strtok-conflict.mingw.patch)
-md5sums=('aa015c2666b031044edfb01b01980d84'
+        0001-add-missing-define.patch)
+md5sums=('2d04f34fa25b45f9dcb9104c0394e12e'
          'SKIP'
-         '807a79513358a9f4123f62111f1eed59'
-         '516c3b60e5c2878a0af9f243fd4dac30'
-         '86cfab6e7c2ccfcfd1dad9d5024627e3'
-         '77287dc835afbb8cc4e9c4aa6b7adb7b')
+         '807a79513358a9f4123f62111f1eed59')
 validpgpkeys=('0424D4EE81A0E3D119C6F835EDA21E94B565716F')
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
   patch -p1 -i ${srcdir}/0001-add-missing-define.patch
-  patch -p1 -i ${srcdir}/0002-fix-duplicate-entries.patch
-  #patch -p1 -i ${srcdir}/0004-fix-gtkdoc.all.patch
-  #patch -p1 -i ${srcdir}/0005-fix-strtok-conflict.mingw.patch
 
   WANT_AUTOMAKE=latest autoreconf -fi -I m4
 }