Fri Dec 27 23:54:04 UTC 2013

3 files changed, 56 insertions, 56 deletions

diff --git a/community/python2-gnutls/PKGBUILD b/community/python2-gnutls/PKGBUILD
index 3a7c86a04..42912d1bd 100644
--- a/community/python2-gnutls/PKGBUILD
+++ b/community/python2-gnutls/PKGBUILD
@@ -4,20 +4,27 @@
 # Contributor: N3RD3X <n3rd3x@linuxmail.org>
 
 pkgname=python2-gnutls
-pkgver=1.2.4
-pkgrel=2
+pkgver=1.2.5
+pkgrel=3
 pkgdesc="Python wrapper for the GNUTLS library"
 arch=('i686' 'x86_64')
 url="http://cheeseshop.python.org/pypi/python-gnutls"
-depends=('python2' 'gnutls')
+depends=('python2' 'gnutls' 'libgcrypt')
 license=('LGPL')
 source=(http://pypi.python.org/packages/source/p/python-gnutls/python-gnutls-${pkgver}.tar.gz
-	gnutls3.patch)
-md5sums=('e3536c421291a791869d875a41dcb26a'
-         '24bc95d9f5e71e9f5e180706cbb09248')
+	libraryinit.patch
+        libraryfunctions.patch)
+md5sums=('a398a75b1f366857cf2628cf4d62dd34'
+         '28227b8626e8a7df81cf3b7dae88bd80'
+         '9907d3a446fdc3b33a70e57925d67298')
 
 build() {
   cd ${srcdir}/python-gnutls-${pkgver}
-  patch -Np0 <$srcdir/gnutls3.patch
+  patch -Np0 <$srcdir/libraryinit.patch
+  patch -Np0 <$srcdir/libraryfunctions.patch
+}
+
+package() {
+  cd ${srcdir}/python-gnutls-${pkgver}
   python2 setup.py install --root=${pkgdir}
 }
diff --git a/community/python2-gnutls/gnutls3.patch b/community/python2-gnutls/libraryfunctions.patch
index 5110de2f2..da5ad390f 100644
--- a/community/python2-gnutls/gnutls3.patch
+++ b/community/python2-gnutls/libraryfunctions.patch
@@ -1,6 +1,5 @@
-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
+--- gnutls/library/functions.py	2011-08-19 07:48:14.000000000 +0400
++++ gnutls.fixed/library/functions.py	2013-12-17 21:08:35.512682514 +0400
 @@ -4,7 +4,7 @@
  import sys
  from ctypes import *
@@ -223,49 +222,3 @@ diff -ru gnutls/library/functions.py gnutls.fixed/library/functions.py
  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
-@@ -53,6 +53,9 @@
-     else:
-         raise RuntimeError('cannot find lib%s on this system' % name)
- 
-+def do_nothing(*args, **kwargs):
-+    pass
-+
- 
- def initialize_gcrypt():
-     from ctypes import c_void_p
-@@ -104,7 +107,7 @@
-         libgcrypt = load_library(name='gcrypt', version=11)
-         gcry_control = libgcrypt.gcry_control
-     else:
--        gcry_control = libgnutls.gcry_control
-+        gcry_control = do_nothing
- 
-     gcry_control(GCRYCTL_SET_THREAD_CBS, c_void_p(gcrypt_thread_callbacks_ptr))
-     if system == 'cygwin':
-@@ -117,12 +120,10 @@
- 
- 
- 
--libgnutls = load_library(name='gnutls', version=26)
--libgnutls_extra = load_library(name='gnutls-extra', version=26)
-+libgnutls = load_library(name='gnutls', version=28)
- 
- initialize_gcrypt()
- libgnutls.gnutls_global_init()
--libgnutls_extra.gnutls_global_init_extra()
- 
- 
- from gnutls.library import constants
-@@ -136,9 +137,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__))
--if functions.gnutls_extra_check_version(__need_version__) is None:
--    version = functions.gnutls_extra_check_version(None)
--    raise RuntimeError("Found GNUTLS extra library version %s, but at least version %s is required" % (version, __need_version__))
- 
- 
- del get_system_name, library_locations, load_library, initialize_gcrypt
diff --git a/community/python2-gnutls/libraryinit.patch b/community/python2-gnutls/libraryinit.patch
new file mode 100644
index 000000000..5f987b513
--- /dev/null
+++ b/community/python2-gnutls/libraryinit.patch
@@ -0,0 +1,40 @@
+--- gnutls/library/__init__.py	2013-12-12 20:29:45.000000000 +0400
++++ gnutls.fixed/library/__init__.py	2013-12-17 20:56:48.637256402 +0400
+@@ -104,10 +104,11 @@
+         libgcrypt = load_library(name='gcrypt', version=11)
+         gcry_control = libgcrypt.gcry_control
+     else:
+-        gcry_control = libgnutls.gcry_control
++        libgcrypt = load_library(name='gcrypt', version=11)
++        gcry_control = libgcrypt.gcry_control
+ 
+     gcry_control(GCRYCTL_SET_THREAD_CBS, c_void_p(gcrypt_thread_callbacks_ptr))
+-    libgnutls.gcry_check_version('1.2.4')    # GNUTLS_MIN_LIBGCRYPT_VERSION
++    libgcrypt.gcry_check_version('1.2.4')    # GNUTLS_MIN_LIBGCRYPT_VERSION
+     if system == 'cygwin':
+         gcry_control(GCRYCTL_DISABLE_SECMEM, 0)
+     else:
+@@ -118,12 +119,10 @@
+ 
+ 
+ 
+-libgnutls = load_library(name='gnutls', version=26)
+-libgnutls_extra = load_library(name='gnutls-extra', version=26)
++libgnutls = load_library(name='gnutls', version=28)
+ 
+ initialize_gcrypt()
+ libgnutls.gnutls_global_init()
+-libgnutls_extra.gnutls_global_init_extra()
+ 
+ 
+ from gnutls.library import constants
+@@ -137,9 +136,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__))
+-if functions.gnutls_extra_check_version(__need_version__) is None:
+-    version = functions.gnutls_extra_check_version(None)
+-    raise RuntimeError("Found GNUTLS extra library version %s, but at least version %s is required" % (version, __need_version__))
+ 
+ 
+ del get_system_name, library_locations, load_library, initialize_gcrypt