[arch-commits] Commit in python2-m2crypto/trunk (PKGBUILD openssl-1.1.0-force.patch)

[Jelle van der Waa]

    Date: Thursday, March 23, 2017 @ 17:28:23
  Author: jelle
Revision: 218549

upgpkg: python2-m2crypto 0.24.0-2

openssl 1.1.0 rebuild

Added:
  python2-m2crypto/trunk/openssl-1.1.0-force.patch
Modified:
  python2-m2crypto/trunk/PKGBUILD

---------------------------+
 PKGBUILD                  |   10 ++++++++--
 openssl-1.1.0-force.patch |   33 +++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-03-23 17:25:32 UTC (rev 218548)
+++ PKGBUILD	2017-03-23 17:28:23 UTC (rev 218549)
@@ -5,25 +5,31 @@
 
 pkgname=python2-m2crypto
 pkgver=0.24.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A crypto and SSL toolkit for Python"
 arch=('i686' 'x86_64')
 url="https://pypi.python.org/pypi/M2Crypto"
 license=('BSD')
-depends=('python2' 'openssl')
+depends=('python2' 'openssl-1.0')
 makedepends=('swig' 'python2-setuptools')
 #source=("m2crypto-${pkgver}.tar.gz::https://github.com/martinpaljak/M2Crypto/archive/v$pkgver.tar.gz"
 source=("https://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-$pkgver.tar.gz"
+        "openssl-1.1.0-force.patch"
 	"LICENSE")
 md5sums=('8e87235942c76d1ba9f999ee33764fdb'
+         '6fde6efbc37fcb971e23125a396f4963'
          'b0e1f0b7d0ce8a62c18b1287b991800e')
 
 prepare() {
   cd "${srcdir}/M2Crypto-${pkgver}"
+  patch -Np1 -i $srcdir/openssl-1.1.0-force.patch
 }
 
 build() {
   cd "${srcdir}/M2Crypto-${pkgver}"
+  export CFLAGS="$CFLASG -I/usr/include/openssl-1.0"
+  export LDFLAGS="$LDFLAGS -L/usr/lib/openssl-1.0 -lssl -lcrypto"
+
   python2 setup.py build
 }
 

Added: openssl-1.1.0-force.patch
===================================================================
--- openssl-1.1.0-force.patch	                        (rev 0)
+++ openssl-1.1.0-force.patch	2017-03-23 17:28:23 UTC (rev 218549)
@@ -0,0 +1,33 @@
+--- M2Crypto-0.25.1/setup.py	2016-07-22 14:43:17.000000000 +0200
++++ M2Crypto-0.25.1.dirty/setup.py	2017-03-23 18:18:35.128517781 +0100
+@@ -70,8 +70,8 @@
+             self.libraries = ['ssleay32', 'libeay32']
+             self.openssl = 'c:\\pkg'
+         else:
+-            self.libraries = ['ssl', 'crypto']
+-            self.openssl = '/usr'
++            self.libraries = [':libssl.so.1.0.0', ':libcrypto.so.1.0.0']
++            self.openssl = '/usr/lib/openssl-1.0/'
+ 
+     def finalize_options(self):
+         '''Overloaded build_ext implementation to append custom openssl
+@@ -87,16 +87,11 @@
+         if _openssl and os.path.isdir(_openssl):
+             self.openssl = _openssl
+ 
+-        self.include_dirs.append(os.path.join(self.openssl, 'include'))
+-        openssl_library_dir = os.path.join(self.openssl, 'lib')
++        self.include_dirs.append(os.path.join('/usr/include/', 'openssl-1.0'))
++
++        openssl_library_dir = os.path.join('/usr/lib/', 'openssl-1.0')
+ 
+         if platform.system() == "Linux":
+-            if _multiarch:  # on Fedora/RHEL it is an empty string
+-                self.include_dirs.append(
+-                    os.path.join(self.openssl, 'include', _multiarch))
+-            else:
+-                self.include_dirs.append(
+-                    os.path.join(self.openssl, 'include', 'openssl'))
+ 
+             # For RedHat-based distros, the '-D__{arch}__' option for
+             # Swig needs to be normalized, particularly on i386.