3.4.7

3 files changed, 45 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c77bd7bad702..6298586b2bb0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Thu Jan 12 19:37:07 UTC 2017
 pkgbase = mingw-w64-gnutls
 	pkgdesc = A library which provides a secure layer over a reliable transport layer (mingw-w64)
-	pkgver = 3.4.4.1
+	pkgver = 3.4.7
 	pkgrel = 1
 	url = http://www.gnu.org/software/gnutls
 	arch = any
@@ -16,18 +18,20 @@ pkgbase = mingw-w64-gnutls
 	options = staticlibs
 	options = !strip
 	options = !buildflags
-	source = ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/gnutls-3.4.4.1.tar.xz
-	source = ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/gnutls-3.4.4.1.tar.xz.sig
+	source = ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/gnutls-3.4.7.tar.xz
+	source = ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/gnutls-3.4.7.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 = 474efaba6fd6c6c6c0ebac2a3f431946
+	source = fix-undefined-ref-endservent.patch
+	md5sums = e7556cec73c8b34fd2ff0b591e24e44c
 	md5sums = SKIP
 	md5sums = 291612225516234ede7e60f8b367dd8b
 	md5sums = c3a2abfe08f47d9b07f770689b0c1b39
 	md5sums = e0dba6bfe81b965a352f965b1398bcad
 	md5sums = f90a0f01eb0f2a6b7afcc25a836eb67e
+	md5sums = 0841d1955f57ebadd1086ea9a3d9d1aa
 
 pkgname = mingw-w64-gnutls
 
diff --git a/PKGBUILD b/PKGBUILD
index cc6742234938..7d004ba294ad 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mingw-w64-gnutls
-pkgver=3.4.4.1
+pkgver=3.4.7
 pkgrel=1
 pkgdesc="A library which provides a secure layer over a reliable transport layer (mingw-w64)"
 arch=(any)
@@ -13,13 +13,15 @@ source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/gnutls-${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=('474efaba6fd6c6c6c0ebac2a3f431946'
+        'gnutls-fix-external-libtasn1-detection.patch'
+        'fix-undefined-ref-endservent.patch')
+md5sums=('e7556cec73c8b34fd2ff0b591e24e44c'
          'SKIP'
          '291612225516234ede7e60f8b367dd8b'
          'c3a2abfe08f47d9b07f770689b0c1b39'
          'e0dba6bfe81b965a352f965b1398bcad'
-         'f90a0f01eb0f2a6b7afcc25a836eb67e')
+         'f90a0f01eb0f2a6b7afcc25a836eb67e'
+         '0841d1955f57ebadd1086ea9a3d9d1aa')
 validpgpkeys=('1F42418905D8206AA754CCDC29EE58B996865171')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
@@ -30,6 +32,7 @@ prepare() {
   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
+  patch -p1 -i ../fix-undefined-ref-endservent.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
diff --git a/fix-undefined-ref-endservent.patch b/fix-undefined-ref-endservent.patch
new file mode 100644
index 000000000000..fb40347013f4
--- /dev/null
+++ b/fix-undefined-ref-endservent.patch
@@ -0,0 +1,30 @@
+From 62de8ca0b18223cda8b9ad8ecd1ff1e700ad2561 Mon Sep 17 00:00:00 2001
+From: Nikos Mavrogiannopoulos <nmav@redhat.com>
+Date: Tue, 24 Nov 2015 12:54:32 +0100
+Subject: [PATCH] tools: don't call endservent in windows
+
+---
+ src/socket.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/socket.c b/src/socket.c
+index 8991089..be8a4a1 100644
+--- a/src/socket.c
++++ b/src/socket.c
+@@ -33,8 +33,11 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #ifndef _WIN32
+-#include <arpa/inet.h>
+-#include <signal.h>
++# include <arpa/inet.h>
++# include <signal.h>
++#else
++# undef endservent
++# define endservent()
+ #endif
+ #include <socket.h>
+ #include <c-ctype.h>
+--
+libgit2 0.24.0
+