Date: Tuesday, December 17, 2013 @ 17:59:26
Author: spupykin
Revision: 102696
upgpkg: python2-gnutls 1.2.5-2
upd
Modified:
python2-gnutls/trunk/PKGBUILD
python2-gnutls/trunk/gnutls3.patch
---------------+
PKGBUILD | 8 ++++----
gnutls3.patch | 22 +++++++++++++---------
2 files changed, 17 insertions(+), 13 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-12-17 15:04:41 UTC (rev 102695)
+++ PKGBUILD 2013-12-17 16:59:26 UTC (rev 102696)
@@ -5,7 +5,7 @@
pkgname=python2-gnutls
pkgver=1.2.5
-pkgrel=1
+pkgrel=2
pkgdesc="Python wrapper for the GNUTLS library"
arch=('i686' 'x86_64')
url="http://cheeseshop.python.org/pypi/python-gnutls";
@@ -14,11 +14,11 @@
source=(http://pypi.python.org/packages/source/p/python-gnutls/python-gnutls-${pkgver}.tar.gz
gnutls3.patch)
md5sums=('a398a75b1f366857cf2628cf4d62dd34'
- '24bc95d9f5e71e9f5e180706cbb09248')
+ 'e3df8fb19cf4cc96b8cf9fa69bd532e0')
-build() {
+prepare() {
cd ${srcdir}/python-gnutls-${pkgver}
- patch -Np0 <$srcdir/gnutls3.patch
+ patch -Np1 <$srcdir/gnutls3.patch
}
package() {
Modified: gnutls3.patch
===================================================================
--- gnutls3.patch 2013-12-17 15:04:41 UTC (rev 102695)
+++ gnutls3.patch 2013-12-17 16:59:26 UTC (rev 102696)
@@ -1,6 +1,6 @@
-diff -ru gnutls/library/functions.py gnutls.fixed/library/functions.py
---- gnutls/library/functions.py 2011-08-19 04:48:14.000000000 +0100
-+++ gnutls.fixed/library/functions.py 2012-08-01 11:56:43.450975419 +0100
+diff -wbBur python-gnutls-1.2.5/gnutls/library/functions.py
python-gnutls-1.2.5.my/gnutls/library/functions.py
+--- python-gnutls-1.2.5/gnutls/library/functions.py 2011-08-19
07:48:14.000000000 +0400
++++ python-gnutls-1.2.5.my/gnutls/library/functions.py 2013-12-17
19:57:57.393043074 +0400
@@ -4,7 +4,7 @@
import sys
from ctypes import *
@@ -223,9 +223,9 @@
gnutls_x509_rdn_get = libgnutls.gnutls_x509_rdn_get
gnutls_x509_rdn_get.argtypes = [POINTER(gnutls_datum_t), c_char_p,
POINTER(size_t)]
gnutls_x509_rdn_get.restype = c_int
-diff -ru gnutls/library/__init__.py gnutls.fixed/library/__init__.py
---- gnutls/library/__init__.py 2011-11-11 17:23:49.000000000 +0000
-+++ gnutls.fixed/library/__init__.py 2012-08-01 11:57:42.284290997 +0100
+diff -wbBur python-gnutls-1.2.5/gnutls/library/__init__.py
python-gnutls-1.2.5.my/gnutls/library/__init__.py
+--- python-gnutls-1.2.5/gnutls/library/__init__.py 2013-12-12
20:29:45.000000000 +0400
++++ python-gnutls-1.2.5.my/gnutls/library/__init__.py 2013-12-17
19:58:10.393043366 +0400
@@ -53,6 +53,9 @@
else:
raise RuntimeError('cannot find lib%s on this system' % name)
@@ -236,7 +236,7 @@
def initialize_gcrypt():
from ctypes import c_void_p
-@@ -104,7 +107,7 @@
+@@ -104,10 +107,10 @@
libgcrypt = load_library(name='gcrypt', version=11)
gcry_control = libgcrypt.gcry_control
else:
@@ -244,8 +244,12 @@
+ gcry_control = do_nothing
gcry_control(GCRYCTL_SET_THREAD_CBS,
c_void_p(gcrypt_thread_callbacks_ptr))
+- libgnutls.gcry_check_version('1.2.4') # GNUTLS_MIN_LIBGCRYPT_VERSION
++# libgnutls.gcry_check_version('1.2.4') # GNUTLS_MIN_LIBGCRYPT_VERSION
if system == 'cygwin':
-@@ -117,12 +120,10 @@
+ gcry_control(GCRYCTL_DISABLE_SECMEM, 0)
+ else:
+@@ -118,12 +121,10 @@
@@ -259,7 +263,7 @@
from gnutls.library import constants
-@@ -136,9 +137,6 @@
+@@ -137,9 +138,6 @@
if functions.gnutls_check_version(__need_version__) is None:
version = functions.gnutls_check_version(None)
raise RuntimeError("Found GNUTLS library version %s, but at least version
%s is required" % (version, __need_version__))
