gnutls: Update to 3.2.11
This commit is contained in:
@@ -1,41 +0,0 @@
|
||||
From a83ff2c7ca091af646dd787f426694d889eed46a Mon Sep 17 00:00:00 2001
|
||||
From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
|
||||
Date: Fri, 24 Jan 2014 19:44:58 +0100
|
||||
Subject: [PATCH] corrected push/pull function setting
|
||||
|
||||
---
|
||||
src/common.h | 10 ++++++----
|
||||
1 files changed, 6 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/common.h b/src/common.h
|
||||
index f5d66ff..927c175 100644
|
||||
--- a/src/common.h
|
||||
+++ b/src/common.h
|
||||
@@ -68,7 +68,8 @@ pin_callback(void *user, int attempt, const char *token_url,
|
||||
void pkcs11_common(void);
|
||||
|
||||
#ifdef _WIN32
|
||||
-static int neterrno()
|
||||
+# include <errno.h>
|
||||
+static int neterrno(void)
|
||||
{
|
||||
int err = WSAGetLastError();
|
||||
|
||||
@@ -93,11 +94,12 @@ system_read(gnutls_transport_ptr_t ptr, void *data, size_t data_size)
|
||||
return recv((long)ptr, data, data_size, 0);
|
||||
}
|
||||
|
||||
+static
|
||||
void set_read_funcs(gnutls_session_t session)
|
||||
{
|
||||
- gnutls_transport_set_push_function(vpninfo->https_sess, system_write);
|
||||
- gnutls_transport_set_pull_function(vpninfo->https_sess, system_read);
|
||||
- gnutls_transport_set_errno_function(vpninfo->https_sess, neterrno);
|
||||
+ gnutls_transport_set_push_function(session, system_write);
|
||||
+ gnutls_transport_set_pull_function(session, system_read);
|
||||
+ gnutls_transport_set_errno_function(session, neterrno);
|
||||
|
||||
}
|
||||
#else
|
||||
--
|
||||
1.7.1
|
||||
@@ -3,7 +3,7 @@
|
||||
_realname=gnutls
|
||||
_mingw_suff=mingw-w64-${CARCH}
|
||||
pkgname="${_mingw_suff}-${_realname}"
|
||||
pkgver=3.2.9
|
||||
pkgver=3.2.11
|
||||
pkgrel=1
|
||||
pkgdesc="A library which provides a secure layer over a reliable transport layer"
|
||||
arch=('any')
|
||||
@@ -18,23 +18,21 @@ depends=("${_mingw_suff}-gcc"
|
||||
"${_mingw_suff}-nettle"
|
||||
"${_mingw_suff}-p11-kit"
|
||||
"${_mingw_suff}-libgnurx"
|
||||
"${_mingw_suff}-libgpg-error")
|
||||
"${_mingw_suff}-libgpg-error"
|
||||
"${_mingw_suff}-unbound")
|
||||
makedepends=("${_mingw_suff}-gcc")
|
||||
source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${_realname}-${pkgver}.tar.xz{,.sig}
|
||||
0004-fix-gtkdoc.all.patch
|
||||
0005-fix-strtok-conflict.mingw.patch
|
||||
0007-correct-push-function.patch)
|
||||
md5sums=('9ae2bfa55d4c12dd6005cfb7014977f9'
|
||||
0005-fix-strtok-conflict.mingw.patch)
|
||||
md5sums=('3fce0742dd7e273235a9d376dd895657'
|
||||
'SKIP'
|
||||
'86cfab6e7c2ccfcfd1dad9d5024627e3'
|
||||
'77287dc835afbb8cc4e9c4aa6b7adb7b'
|
||||
'7a385188ca3118bb3ee5cda27e925bf3')
|
||||
'77287dc835afbb8cc4e9c4aa6b7adb7b')
|
||||
|
||||
prepare() {
|
||||
cd "${srcdir}/${_realname}-${pkgver}"
|
||||
patch -p1 -i ${srcdir}/0004-fix-gtkdoc.all.patch
|
||||
patch -p1 -i ${srcdir}/0005-fix-strtok-conflict.mingw.patch
|
||||
patch -p1 -i ${srcdir}/0007-correct-push-function.patch
|
||||
|
||||
autoreconf -fi
|
||||
}
|
||||
@@ -55,8 +53,10 @@ build() {
|
||||
--disable-gtk-doc \
|
||||
--with-libiconv-prefix=${MINGW_PREFIX} \
|
||||
--with-libregex-libs=-lgnurx \
|
||||
--with-unbound-root-key-file=${MINGW_PREFIX}/etc/unbound/root.key \
|
||||
--disable-guile \
|
||||
gl_cv_double_slash_root=yes
|
||||
make
|
||||
make -j1
|
||||
}
|
||||
|
||||
check() {
|
||||
|
||||
Reference in New Issue
Block a user