Updated gnutls to 3.5.17.

diff --git a/Makefile.am b/Makefile.am
index 4ca0cee55cf642c50e11cd949a08a2009ad18d7d..feee9f713d33542d2df6e3faa0b17a5d353d1fb8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -66,7 +66,6 @@ EXTRA_DIST = autogen.sh \
                                patches/glib-2.54.2/02-folder-icons.patch \
                                patches/glib-2.54.2/03-wchar64.patch \
                                patches/glib-networking-2.50.0/01-giomoduledir.patch \
-                               patches/gnutls-3.5.2/01-no-endservent.patch \
                                patches/gtk+-2.24.31/00-fix-private-defs.patch \
                                patches/icu4c-58_2-src/01-libnames.patch \
                                patches/icu4c-58_2-src/02-float128-clang.patch \

diff --git a/packages/packages.current b/packages/packages.current
index 9e609b75b6941289d0eb53045dd92d77ad481d85..6eddb35e9416ad038668d01813b464330b35066a 100644 (file)
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -59,8 +59,8 @@ chk 9dc6981197a7d92f339192eea974f5eca48fcffe
 # gnutls
 server ftp://ftp.gnutls.org/gcrypt
 
-file gnutls/v3.5/gnutls-3.5.9.tar.xz
-chk f3f184a92f128af1c2fb29b29a4d325af65694a5
+file gnutls/v3.5/gnutls-3.5.17.tar.xz
+chk d843a34e386dd82861a9fd64b8d4e2e77fe9d991
 
 #
 # Various libraries, mostly those from sf.net

diff --git a/patches/gnutls-3.5.2/01-no-endservent.patch b/patches/gnutls-3.5.2/01-no-endservent.patch
deleted file mode 100755 (executable)
index 9ac0bc0..0000000
--- a/patches/gnutls-3.5.2/01-no-endservent.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-diff -ruN gnutls-3.5.2-orig/src/socket.c gnutls-3.5.2/src/socket.c
---- gnutls-3.5.2-orig/src/socket.c     2016-07-08 23:18:19.887794943 +0200
-+++ gnutls-3.5.2/src/socket.c  2016-07-08 23:18:45.667205089 +0200
-@@ -281,7 +281,6 @@
-       if (s != NULL) {
-               return s->s_port;
-       }
--      endservent();
- 
-       return 443;
- }
-@@ -296,7 +295,6 @@
-       if (s != NULL) {
-               return s->s_name;
-       }
--      endservent();
- 
-       return "443";
- }