updated

8 files changed, 36 insertions, 204 deletions

diff --git a/.AURINFO b/.AURINFO
deleted file mode 100644
index 99bd7e41d41a..000000000000
--- a/.AURINFO
+++ /dev/null
@@ -1,31 +0,0 @@
-pkgbase = libcurl-gnutls
-	pkgdesc = An URL retrieval utility and library
-	pkgver = 7.38.0
-	pkgrel = 1
-	url = http://curl.haxx.se
-	arch = i686
-	arch = x86_64
-	license = MIT
-	depends = ca-certificates
-	depends = libssh2
-	depends = zlib
-	depends = gnutls
-	source = http://curl.haxx.se/download/curl-7.38.0.tar.gz
-	source = http://curl.haxx.se/download/curl-7.38.0.tar.gz.asc
-	source = curlbuild.h
-	source = 01_runtests_gdb.patch
-	source = 02_art_http_scripting.patch
-	source = 03_keep_symbols_compat.patch
-	source = 04_workaround_as_needed_bug.patch
-	source = 06_always-disable-valgrind.patch
-	source = 07_do-not-disable-debug-symbols.patch
-	source = 08_fix-spelling.patch
-	source = 09_libtoolize_check.patch
-	source = 10_fix-resolver.patch
-	source = 90_gnutls.patch
-	source = 99_nss.patch
-	options = !libtool
-	options = !strip
-
-pkgname = libcurl-gnutls
-
diff --git a/.SRCINFO b/.SRCINFO
index fed1ee75024b..eee598b581f8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = libcurl-gnutls
 	pkgdesc = An URL retrieval utility and library
-	pkgver = 7.38.0
+	pkgver = 7.45.0
 	pkgrel = 1
 	url = http://curl.haxx.se
 	arch = i686
@@ -12,8 +12,7 @@ pkgbase = libcurl-gnutls
 	depends = gnutls
 	options = !libtool
 	options = !strip
-	source = http://curl.haxx.se/download/curl-7.38.0.tar.gz
-	source = http://curl.haxx.se/download/curl-7.38.0.tar.gz.asc
+	source = http://curl.haxx.se/download/curl-7.45.0.tar.gz
 	source = curlbuild.h
 	source = 01_runtests_gdb.patch
 	source = 02_art_http_scripting.patch
@@ -21,13 +20,9 @@ pkgbase = libcurl-gnutls
 	source = 04_workaround_as_needed_bug.patch
 	source = 06_always-disable-valgrind.patch
 	source = 07_do-not-disable-debug-symbols.patch
-	source = 08_fix-spelling.patch
-	source = 09_libtoolize_check.patch
-	source = 10_fix-resolver.patch
 	source = 90_gnutls.patch
 	source = 99_nss.patch
-	md5sums = b6e3ea55bb718f2270489581efa50a8a
-	md5sums = SKIP
+	md5sums = be21c6a190d65cfd3eeb749a3dce3947
 	md5sums = 751bd433ede935c8fae727377625a8ae
 	md5sums = e6b1f326a81f4a21e829f0a7ce43619f
 	md5sums = 5cadcf82367cef12738fc3b0ef27483f
@@ -35,11 +30,8 @@ pkgbase = libcurl-gnutls
 	md5sums = fd110c854e055d0375798c2857bd260e
 	md5sums = 2cc79bcb4c64e131f4be9f86a5d7f2cb
 	md5sums = eb393f4dcd524916372c6bdd66c78c0b
-	md5sums = fc565eca2ca9b5996ef8f4168497b2f4
-	md5sums = 19a2255c096bb829b2d9fb5082dd1842
-	md5sums = 26723d41149031db8c282d5cb42f2bd2
-	md5sums = 011864a7f8332d7785939016af5f98c3
-	md5sums = 7d13d3b00286735dbed1161809546f61
+	md5sums = 8647154bd1e6943b072afad746e8fc9b
+	md5sums = 92089fe6b6e4f57fe109db89c6a643ce
 
 pkgname = libcurl-gnutls
 
diff --git a/08_fix-spelling.patch b/08_fix-spelling.patch
deleted file mode 100644
index f52e511647c2..000000000000
--- a/08_fix-spelling.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fix spelling error in manpage
-Origin: vendor
-Forwarded: no
-Author: Alessandro Ghedini <ghedo@debian.org>
-Last-Update: 2014-09-10
-
---- a/docs/curl.1
-+++ b/docs/curl.1
-@@ -1637,7 +1637,7 @@
- still.
- 
- When using Kerberos V5 with a Windows based server you should include the
--Windows domain name in the user name, in order for the server to succesfully
-+Windows domain name in the user name, in order for the server to successfully
- obtain a Kerberos Ticket. If you don't then the initial authentication
- handshake may fail.
- 
diff --git a/09_libtoolize_check.patch b/09_libtoolize_check.patch
deleted file mode 100644
index 6600c86dd7b3..000000000000
--- a/09_libtoolize_check.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From: Helmut Grohne <helmut@subdivi.de>
-Subject: check for libtoolize rather than libtool
-Last-Modified: 2014-09-19
-
-libtool is now in package libtool-bin, but curl really only uses libtoolize.
-
---- a/buildconf
-+++ b/buildconf
-@@ -190,31 +190,35 @@
- fi
- 
- #--------------------------------------------------------------------------
--# GNU libtool preliminary check
-+# GNU libtoolize check
- #
- want_lt_major=1
- want_lt_minor=4
- want_lt_patch=2
- want_lt_version=1.4.2
- 
--# This approach that tries 'glibtool' first is intended for systems that
--# have GNU libtool named as 'glibtool' and libtool not being GNU's.
-+# This approach that tries 'glibtoolize' first is intended for systems that
-+# have GNU libtool named as 'glibtoolize' and libtoolize not being GNU's.
- 
--libtool=`findtool glibtool 2>/dev/null`
--if test ! -x "$libtool"; then
--  libtool=`findtool ${LIBTOOL:-libtool}`
-+if test -z "$LIBTOOLIZE"; then
-+  libtoolize=`findtool glibtoolize 2>/dev/null`
-+  if test ! -x "$libtoolize"; then
-+    libtoolize=`findtool libtoolize 2>/dev/null`
-+  fi
-+else
-+  libtoolize=`findtool $LIBTOOLIZE`
- fi
--if test -z "$libtool"; then
--  echo "buildconf: libtool not found."
--  echo "            You need GNU libtool $want_lt_version or newer installed."
-+if test ! -f "$libtoolize"; then
-+  echo "buildconf: libtoolize not found."
-+  echo "            You need GNU libtoolize $want_lt_version or newer installed."
-   exit 1
- fi
- 
--lt_pver=`$libtool --version 2>/dev/null|head -n 1`
-+lt_pver=`$libtoolize --version 2>/dev/null|head -n 1`
- lt_qver=`echo $lt_pver|sed -e "s/([^)]*)//g" -e "s/^[^0-9]*//g"`
- lt_version=`echo $lt_qver|sed -e "s/[- ].*//" -e "s/\([a-z]*\)$//"`
- if test -z "$lt_version"; then
--  echo "buildconf: libtool not found."
-+  echo "buildconf: libtoolize not found."
-   echo "            You need GNU libtool $want_lt_version or newer installed."
-   exit 1
- fi
-@@ -253,21 +257,6 @@
- echo "buildconf: libtool version $lt_version (ok)"
- 
- #--------------------------------------------------------------------------
--# GNU libtoolize check
--#
--if test -z "$LIBTOOLIZE"; then
--  # use (g)libtoolize from same location as (g)libtool
--  libtoolize="${libtool}ize"
--else
--  libtoolize=`findtool $LIBTOOLIZE`
--fi
--if test ! -f "$libtoolize"; then
--  echo "buildconf: libtoolize not found."
--  echo "            You need GNU libtoolize $want_lt_version or newer installed."
--  exit 1
--fi
--
--#--------------------------------------------------------------------------
- # m4 check
- #
- m4=`(${M4:-m4} --version || ${M4:-gm4} --version) 2>/dev/null | head -n 1`;
diff --git a/10_fix-resolver.patch b/10_fix-resolver.patch
deleted file mode 100644
index 3cc274a14171..000000000000
--- a/10_fix-resolver.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From d9762a7cdb35e70f8cb0bf1c2f8019e8391616e1 Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Tue, 23 Sep 2014 11:44:03 +0200
-Subject: [PATCH] threaded-resolver: revert Curl_expire_latest() switch
-
-The switch to using Curl_expire_latest() in commit cacdc27f52b was a
-mistake and was against the advice even mentioned in that commit. The
-comparison in asyn-thread.c:Curl_resolver_is_resolved() makes
-Curl_expire() the suitable function to use.
-
-Bug: http://curl.haxx.se/bug/view.cgi?id=1426
-Reported-By: graysky
----
- lib/asyn-thread.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/asyn-thread.c b/lib/asyn-thread.c
-index e4ad32b..6cdc9ad 100644
---- a/lib/asyn-thread.c
-+++ b/lib/asyn-thread.c
-@@ -541,7 +541,7 @@ CURLcode Curl_resolver_is_resolved(struct connectdata *conn,
-       td->poll_interval = 250;
- 
-     td->interval_end = elapsed + td->poll_interval;
--    Curl_expire_latest(conn->data, td->poll_interval);
-+    Curl_expire(conn->data, td->poll_interval);
-   }
- 
-   return CURLE_OK;
diff --git a/90_gnutls.patch b/90_gnutls.patch
index 751c80c798b2..930358b8a262 100644
--- a/90_gnutls.patch
+++ b/90_gnutls.patch
@@ -3,7 +3,7 @@ Origin: vendor
 Forwarded: not-needed
 Author: Ramakrishnan Muthukrishnan <vu3rdd@gmail.com>
 Reviewed-by: Alessandro Ghedini <ghedo@debian.org>
-Last-Update: 2013-04-17
+Last-Update: 2015-08-12
 
 --- a/docs/examples/Makefile.am
 +++ b/docs/examples/Makefile.am
@@ -21,16 +21,16 @@ Last-Update: 2013-04-17
  # Makefile.inc provides the check_PROGRAMS and COMPLICATED_EXAMPLES defines
 --- a/lib/Makefile.am
 +++ b/lib/Makefile.am
-@@ -36,7 +36,7 @@
+@@ -32,7 +32,7 @@
   firefox-db2pem.sh config-vxworks.h Makefile.vxworks checksrc.pl	\
-  objnames-test08.sh objnames-test10.sh objnames.inc
+  objnames-test08.sh objnames-test10.sh objnames.inc checksrc.whitelist
  
 -lib_LTLIBRARIES = libcurl.la
 +lib_LTLIBRARIES = libcurl-gnutls.la
  
  if BUILD_UNITTESTS
  noinst_LTLIBRARIES = libcurlu.la
-@@ -106,38 +106,38 @@
+@@ -102,38 +102,38 @@
  AM_LDFLAGS =
  AM_CFLAGS =
  
@@ -82,7 +82,7 @@ Last-Update: 2013-04-17
  
  libcurlu_la_CPPFLAGS = $(AM_CPPFLAGS) -DCURL_STATICLIB -DUNITTESTS
  libcurlu_la_LDFLAGS = $(AM_LDFLAGS) -static $(LIBCURL_LIBS)
-@@ -146,7 +146,7 @@
+@@ -142,7 +142,7 @@
  # Makefile.inc provides the CSOURCES and HHEADERS defines
  include Makefile.inc
  
@@ -100,8 +100,8 @@ Last-Update: 2013-04-17
 -curl_LDADD = $(top_builddir)/lib/libcurl.la @LIBMETALINK_LIBS@ @LIBCURL_LIBS@
 +curl_LDADD = $(top_builddir)/lib/libcurl-gnutls.la @LIBMETALINK_LIBS@ @LIBCURL_LIBS@
  else
--curl_LDADD = $(top_builddir)/lib/libcurl.la @LIBMETALINK_LIBS@ @NSS_LIBS@ @ZLIB_LIBS@ @CURL_NETWORK_AND_TIME_LIBS@
-+curl_LDADD = $(top_builddir)/lib/libcurl-gnutls.la @LIBMETALINK_LIBS@ @NSS_LIBS@ @ZLIB_LIBS@ @CURL_NETWORK_AND_TIME_LIBS@
+-curl_LDADD = $(top_builddir)/lib/libcurl.la @LIBMETALINK_LIBS@ @NSS_LIBS@ @SSL_LIBS@ @ZLIB_LIBS@ @CURL_NETWORK_AND_TIME_LIBS@
++curl_LDADD = $(top_builddir)/lib/libcurl-gnutls.la @LIBMETALINK_LIBS@ @NSS_LIBS@ @SSL_LIBS@ @ZLIB_LIBS@ @CURL_NETWORK_AND_TIME_LIBS@
  endif
  
  curl_LDFLAGS = @LIBMETALINK_LDFLAGS@
@@ -122,10 +122,10 @@ Last-Update: 2013-04-17
 +SUPPORTFILES_LIBS = $(top_builddir)/lib/libcurl-gnutls.la @LIBCURL_LIBS@
 +TESTUTIL_LIBS = $(top_builddir)/lib/libcurl-gnutls.la @LIBCURL_LIBS@
  else
--SUPPORTFILES_LIBS = $(top_builddir)/lib/libcurl.la @CURL_NETWORK_LIBS@
--TESTUTIL_LIBS = $(top_builddir)/lib/libcurl.la @CURL_NETWORK_AND_TIME_LIBS@
-+SUPPORTFILES_LIBS = $(top_builddir)/lib/libcurl-gnutls.la @CURL_NETWORK_LIBS@
-+TESTUTIL_LIBS = $(top_builddir)/lib/libcurl-gnutls.la @CURL_NETWORK_AND_TIME_LIBS@
+-SUPPORTFILES_LIBS = $(top_builddir)/lib/libcurl.la @CURL_NETWORK_LIBS@ @NSS_LIBS@
+-TESTUTIL_LIBS = $(top_builddir)/lib/libcurl.la @CURL_NETWORK_AND_TIME_LIBS@ @NSS_LIBS@
++SUPPORTFILES_LIBS = $(top_builddir)/lib/libcurl-gnutls.la @CURL_NETWORK_LIBS@ @NSS_LIBS@
++TESTUTIL_LIBS = $(top_builddir)/lib/libcurl-gnutls.la @CURL_NETWORK_AND_TIME_LIBS@ @NSS_LIBS@
  endif
  
  # Dependencies (may need to be overriden)
diff --git a/99_nss.patch b/99_nss.patch
index ade5c8e16d1c..b82d2eaef312 100644
--- a/99_nss.patch
+++ b/99_nss.patch
@@ -3,7 +3,7 @@ Origin: vendor
 Forwarded: not-needed
 Author: Ramakrishnan Muthukrishnan <vu3rdd@gmail.com>
 Reviewed-by: Alessandro Ghedini <ghedo@debian.org>
-Last-Update: 2013-04-17
+Last-Update: 2015-08-12
 
 --- a/docs/examples/Makefile.am
 +++ b/docs/examples/Makefile.am
@@ -21,16 +21,16 @@ Last-Update: 2013-04-17
  # Makefile.inc provides the check_PROGRAMS and COMPLICATED_EXAMPLES defines
 --- a/lib/Makefile.am
 +++ b/lib/Makefile.am
-@@ -36,7 +36,7 @@
+@@ -32,7 +32,7 @@
   firefox-db2pem.sh config-vxworks.h Makefile.vxworks checksrc.pl	\
-  objnames-test08.sh objnames-test10.sh objnames.inc
+  objnames-test08.sh objnames-test10.sh objnames.inc checksrc.whitelist
  
 -lib_LTLIBRARIES = libcurl-gnutls.la
 +lib_LTLIBRARIES = libcurl-nss.la
  
  if BUILD_UNITTESTS
  noinst_LTLIBRARIES = libcurlu.la
-@@ -106,38 +106,38 @@
+@@ -102,38 +102,38 @@
  AM_LDFLAGS =
  AM_CFLAGS =
  
@@ -82,7 +82,7 @@ Last-Update: 2013-04-17
  
  libcurlu_la_CPPFLAGS = $(AM_CPPFLAGS) -DCURL_STATICLIB -DUNITTESTS
  libcurlu_la_LDFLAGS = $(AM_LDFLAGS) -static $(LIBCURL_LIBS)
-@@ -146,7 +146,7 @@
+@@ -142,7 +142,7 @@
  # Makefile.inc provides the CSOURCES and HHEADERS defines
  include Makefile.inc
  
@@ -100,8 +100,8 @@ Last-Update: 2013-04-17
 -curl_LDADD = $(top_builddir)/lib/libcurl-gnutls.la @LIBMETALINK_LIBS@ @LIBCURL_LIBS@
 +curl_LDADD = $(top_builddir)/lib/libcurl-nss.la @LIBMETALINK_LIBS@ @LIBCURL_LIBS@
  else
--curl_LDADD = $(top_builddir)/lib/libcurl-gnutls.la @LIBMETALINK_LIBS@ @NSS_LIBS@ @ZLIB_LIBS@ @CURL_NETWORK_AND_TIME_LIBS@
-+curl_LDADD = $(top_builddir)/lib/libcurl-nss.la @LIBMETALINK_LIBS@ @NSS_LIBS@ @ZLIB_LIBS@ @CURL_NETWORK_AND_TIME_LIBS@
+-curl_LDADD = $(top_builddir)/lib/libcurl-gnutls.la @LIBMETALINK_LIBS@ @NSS_LIBS@ @SSL_LIBS@ @ZLIB_LIBS@ @CURL_NETWORK_AND_TIME_LIBS@
++curl_LDADD = $(top_builddir)/lib/libcurl-nss.la @LIBMETALINK_LIBS@ @NSS_LIBS@ @SSL_LIBS@ @ZLIB_LIBS@ @CURL_NETWORK_AND_TIME_LIBS@
  endif
  
  curl_LDFLAGS = @LIBMETALINK_LDFLAGS@
@@ -122,10 +122,10 @@ Last-Update: 2013-04-17
 +SUPPORTFILES_LIBS = $(top_builddir)/lib/libcurl-nss.la @LIBCURL_LIBS@
 +TESTUTIL_LIBS = $(top_builddir)/lib/libcurl-nss.la @LIBCURL_LIBS@
  else
--SUPPORTFILES_LIBS = $(top_builddir)/lib/libcurl-gnutls.la @CURL_NETWORK_LIBS@
--TESTUTIL_LIBS = $(top_builddir)/lib/libcurl-gnutls.la @CURL_NETWORK_AND_TIME_LIBS@
-+SUPPORTFILES_LIBS = $(top_builddir)/lib/libcurl-nss.la @CURL_NETWORK_LIBS@
-+TESTUTIL_LIBS = $(top_builddir)/lib/libcurl-nss.la @CURL_NETWORK_AND_TIME_LIBS@
+-SUPPORTFILES_LIBS = $(top_builddir)/lib/libcurl-gnutls.la @CURL_NETWORK_LIBS@ @NSS_LIBS@
+-TESTUTIL_LIBS = $(top_builddir)/lib/libcurl-gnutls.la @CURL_NETWORK_AND_TIME_LIBS@ @NSS_LIBS@
++SUPPORTFILES_LIBS = $(top_builddir)/lib/libcurl-nss.la @CURL_NETWORK_LIBS@ @NSS_LIBS@
++TESTUTIL_LIBS = $(top_builddir)/lib/libcurl-nss.la @CURL_NETWORK_AND_TIME_LIBS@ @NSS_LIBS@
  endif
  
  # Dependencies (may need to be overriden)
diff --git a/PKGBUILD b/PKGBUILD
index 5b23793d9946..9a812f5f5aad 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=libcurl-gnutls
 _pkgname=curl
-pkgver=7.38.0
+pkgver=7.45.0
 pkgrel=1
 pkgdesc="An URL retrieval utility and library"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ url="http://curl.haxx.se"
 license=('MIT')
 depends=('ca-certificates' 'libssh2' 'zlib' 'gnutls')
 options=('!libtool' '!strip')
-source=("http://curl.haxx.se/download/$_pkgname-$pkgver.tar.gz"{,.asc}
+source=("http://curl.haxx.se/download/$_pkgname-$pkgver.tar.gz"
         curlbuild.h
         01_runtests_gdb.patch
         02_art_http_scripting.patch
@@ -19,14 +19,10 @@ source=("http://curl.haxx.se/download/$_pkgname-$pkgver.tar.gz"{,.asc}
         04_workaround_as_needed_bug.patch
         06_always-disable-valgrind.patch
         07_do-not-disable-debug-symbols.patch
-	08_fix-spelling.patch
-	09_libtoolize_check.patch
-	10_fix-resolver.patch
         90_gnutls.patch
         99_nss.patch)
 
-md5sums=('b6e3ea55bb718f2270489581efa50a8a'
-         'SKIP'
+md5sums=('be21c6a190d65cfd3eeb749a3dce3947'
          '751bd433ede935c8fae727377625a8ae'
          'e6b1f326a81f4a21e829f0a7ce43619f'
          '5cadcf82367cef12738fc3b0ef27483f'
@@ -34,11 +30,8 @@ md5sums=('b6e3ea55bb718f2270489581efa50a8a'
          'fd110c854e055d0375798c2857bd260e'
          '2cc79bcb4c64e131f4be9f86a5d7f2cb'
          'eb393f4dcd524916372c6bdd66c78c0b'
-         'fc565eca2ca9b5996ef8f4168497b2f4'
-         '19a2255c096bb829b2d9fb5082dd1842'
-         '26723d41149031db8c282d5cb42f2bd2'
-         '011864a7f8332d7785939016af5f98c3'
-         '7d13d3b00286735dbed1161809546f61')
+         '8647154bd1e6943b072afad746e8fc9b'
+         '92089fe6b6e4f57fe109db89c6a643ce')
 
 ptrsize=$(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d')
 case $ptrsize in
@@ -54,6 +47,7 @@ build() {
   # apply debian patches
   for i in ../*patch
 	do
+	echo "using $i"
 	patch -p1 < "$i"
 	done
 
@@ -78,7 +72,7 @@ build() {
 }
 
 package() {
-  install -Dm644 $srcdir/$_pkgname-$pkgver/lib/.libs/libcurl.so.4.3.0 $pkgdir/usr/lib/libcurl-gnutls.so.4.3.0
-  ln -s libcurl-gnutls.so.4.3.0 $pkgdir/usr/lib/libcurl-gnutls.so.4
-  ln -s libcurl-gnutls.so.4.3.0 $pkgdir/usr/lib/libcurl-gnutls.so.3
+  install -Dm644 $srcdir/$_pkgname-$pkgver/lib/.libs/libcurl.so.4.4.0 $pkgdir/usr/lib/libcurl-gnutls.so.4.4.0
+  ln -s libcurl-gnutls.so.4.4.0 $pkgdir/usr/lib/libcurl-gnutls.so.4
+  ln -s libcurl-gnutls.so.4.4.0 $pkgdir/usr/lib/libcurl-gnutls.so.3
 }