Date: Thursday, July 13, 2017 @ 16:18:49 Author: spupykin Revision: 244988
archrelease: copy trunk to community-i686, community-x86_64 Added: python2-m2crypto/repos/community-i686/LICENSE (from rev 244987, python2-m2crypto/trunk/LICENSE) python2-m2crypto/repos/community-i686/PKGBUILD (from rev 244987, python2-m2crypto/trunk/PKGBUILD) python2-m2crypto/repos/community-i686/openssl-1.1.0-force.patch (from rev 244987, python2-m2crypto/trunk/openssl-1.1.0-force.patch) python2-m2crypto/repos/community-x86_64/LICENSE (from rev 244987, python2-m2crypto/trunk/LICENSE) python2-m2crypto/repos/community-x86_64/PKGBUILD (from rev 244987, python2-m2crypto/trunk/PKGBUILD) python2-m2crypto/repos/community-x86_64/openssl-1.1.0-force.patch (from rev 244987, python2-m2crypto/trunk/openssl-1.1.0-force.patch) Deleted: python2-m2crypto/repos/community-i686/LICENSE python2-m2crypto/repos/community-i686/PKGBUILD python2-m2crypto/repos/community-i686/openssl-1.1.0-force.patch python2-m2crypto/repos/community-x86_64/LICENSE python2-m2crypto/repos/community-x86_64/PKGBUILD python2-m2crypto/repos/community-x86_64/openssl-1.1.0-force.patch --------------------------------------------+ /LICENSE | 52 ++++++++++++++++++ /PKGBUILD | 78 +++++++++++++++++++++++++++ /openssl-1.1.0-force.patch | 66 ++++++++++++++++++++++ community-i686/LICENSE | 26 --------- community-i686/PKGBUILD | 40 ------------- community-i686/openssl-1.1.0-force.patch | 33 ----------- community-x86_64/LICENSE | 26 --------- community-x86_64/PKGBUILD | 40 ------------- community-x86_64/openssl-1.1.0-force.patch | 33 ----------- 9 files changed, 196 insertions(+), 198 deletions(-) Deleted: community-i686/LICENSE =================================================================== --- community-i686/LICENSE 2017-07-13 16:18:27 UTC (rev 244987) +++ community-i686/LICENSE 2017-07-13 16:18:49 UTC (rev 244988) @@ -1,26 +0,0 @@ -Copyright (c) 1999-2004 Ng Pheng Siong. All rights reserved. - -Portions copyright (c) 2004-2006 Open Source Applications Foundation. -All rights reserved. - -Portions copyright (c) 2005-2006 Vrije Universiteit Amsterdam. -All rights reserved. - -Copyright (c) 2008-2010 Heikki Toivonen. All rights reserved. - -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, -provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in -supporting documentation. - -THE AUTHOR PROVIDES THIS SOFTWARE ``AS IS'' AND ANY EXPRESSED OR -IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Copied: python2-m2crypto/repos/community-i686/LICENSE (from rev 244987, python2-m2crypto/trunk/LICENSE) =================================================================== --- community-i686/LICENSE (rev 0) +++ community-i686/LICENSE 2017-07-13 16:18:49 UTC (rev 244988) @@ -0,0 +1,26 @@ +Copyright (c) 1999-2004 Ng Pheng Siong. All rights reserved. + +Portions copyright (c) 2004-2006 Open Source Applications Foundation. +All rights reserved. + +Portions copyright (c) 2005-2006 Vrije Universiteit Amsterdam. +All rights reserved. + +Copyright (c) 2008-2010 Heikki Toivonen. All rights reserved. + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation. + +THE AUTHOR PROVIDES THIS SOFTWARE ``AS IS'' AND ANY EXPRESSED OR +IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2017-07-13 16:18:27 UTC (rev 244987) +++ community-i686/PKGBUILD 2017-07-13 16:18:49 UTC (rev 244988) @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 140196 2011-10-09 08:27:16Z angvp $ -# Maintainer: Angel Velasquez <an...@archlinux.org> -# Contributor: Sergej Pupykin <ser...@aur.archlinux.org> -# Contributor: William Rea <sillywi...@gmail.com> - -pkgname=python2-m2crypto -pkgver=0.24.0 -pkgrel=4 -pkgdesc="A crypto and SSL toolkit for Python" -arch=('i686' 'x86_64') -url="https://pypi.python.org/pypi/M2Crypto" -license=('BSD') -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 -} - -package() { - cd "${srcdir}/M2Crypto-${pkgver}" - python2 setup.py install --root="${pkgdir}/" --optimize=1 - install -D -m644 "$srcdir"/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} Copied: python2-m2crypto/repos/community-i686/PKGBUILD (from rev 244987, python2-m2crypto/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2017-07-13 16:18:49 UTC (rev 244988) @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 140196 2011-10-09 08:27:16Z angvp $ +# Maintainer: Angel Velasquez <an...@archlinux.org> +# Contributor: Sergej Pupykin <ser...@aur.archlinux.org> +# Contributor: William Rea <sillywi...@gmail.com> + +pkgname=python2-m2crypto +pkgver=0.26.0 +pkgrel=1 +pkgdesc="A crypto and SSL toolkit for Python" +arch=('i686' 'x86_64') +url="https://pypi.python.org/pypi/M2Crypto" +license=('BSD') +depends=('python2' 'openssl-1.0') +makedepends=('swig' 'python2-setuptools') +source=("https://pypi.python.org/packages/11/29/0b075f51c38df4649a24ecff9ead1ffc57b164710821048e3d997f1363b9/M2Crypto-$pkgver.tar.gz" + "openssl-1.1.0-force.patch" + "LICENSE") +sha256sums=('05d94fd9b2dae2fb8e072819a795f0e05d3611b09ea185f68e1630530ec09ae8' + '459143ec4ceb5dfccfb5603d7543122886e6cee08f92047a3a2675b6fa145e64' + '4eca478396f4b2b020729a111fce3f096456d74500bfd8f2b0388c3c69f997c0') + +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 +} + +package() { + cd "${srcdir}/M2Crypto-${pkgver}" + python2 setup.py install --root="${pkgdir}/" --optimize=1 + install -D -m644 "$srcdir"/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} Deleted: community-i686/openssl-1.1.0-force.patch =================================================================== --- community-i686/openssl-1.1.0-force.patch 2017-07-13 16:18:27 UTC (rev 244987) +++ community-i686/openssl-1.1.0-force.patch 2017-07-13 16:18:49 UTC (rev 244988) @@ -1,33 +0,0 @@ ---- 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. Copied: python2-m2crypto/repos/community-i686/openssl-1.1.0-force.patch (from rev 244987, python2-m2crypto/trunk/openssl-1.1.0-force.patch) =================================================================== --- community-i686/openssl-1.1.0-force.patch (rev 0) +++ community-i686/openssl-1.1.0-force.patch 2017-07-13 16:18:49 UTC (rev 244988) @@ -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. Deleted: community-x86_64/LICENSE =================================================================== --- community-x86_64/LICENSE 2017-07-13 16:18:27 UTC (rev 244987) +++ community-x86_64/LICENSE 2017-07-13 16:18:49 UTC (rev 244988) @@ -1,26 +0,0 @@ -Copyright (c) 1999-2004 Ng Pheng Siong. All rights reserved. - -Portions copyright (c) 2004-2006 Open Source Applications Foundation. -All rights reserved. - -Portions copyright (c) 2005-2006 Vrije Universiteit Amsterdam. -All rights reserved. - -Copyright (c) 2008-2010 Heikki Toivonen. All rights reserved. - -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, -provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in -supporting documentation. - -THE AUTHOR PROVIDES THIS SOFTWARE ``AS IS'' AND ANY EXPRESSED OR -IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Copied: python2-m2crypto/repos/community-x86_64/LICENSE (from rev 244987, python2-m2crypto/trunk/LICENSE) =================================================================== --- community-x86_64/LICENSE (rev 0) +++ community-x86_64/LICENSE 2017-07-13 16:18:49 UTC (rev 244988) @@ -0,0 +1,26 @@ +Copyright (c) 1999-2004 Ng Pheng Siong. All rights reserved. + +Portions copyright (c) 2004-2006 Open Source Applications Foundation. +All rights reserved. + +Portions copyright (c) 2005-2006 Vrije Universiteit Amsterdam. +All rights reserved. + +Copyright (c) 2008-2010 Heikki Toivonen. All rights reserved. + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation. + +THE AUTHOR PROVIDES THIS SOFTWARE ``AS IS'' AND ANY EXPRESSED OR +IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2017-07-13 16:18:27 UTC (rev 244987) +++ community-x86_64/PKGBUILD 2017-07-13 16:18:49 UTC (rev 244988) @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 140196 2011-10-09 08:27:16Z angvp $ -# Maintainer: Angel Velasquez <an...@archlinux.org> -# Contributor: Sergej Pupykin <ser...@aur.archlinux.org> -# Contributor: William Rea <sillywi...@gmail.com> - -pkgname=python2-m2crypto -pkgver=0.24.0 -pkgrel=4 -pkgdesc="A crypto and SSL toolkit for Python" -arch=('i686' 'x86_64') -url="https://pypi.python.org/pypi/M2Crypto" -license=('BSD') -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 -} - -package() { - cd "${srcdir}/M2Crypto-${pkgver}" - python2 setup.py install --root="${pkgdir}/" --optimize=1 - install -D -m644 "$srcdir"/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} Copied: python2-m2crypto/repos/community-x86_64/PKGBUILD (from rev 244987, python2-m2crypto/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2017-07-13 16:18:49 UTC (rev 244988) @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 140196 2011-10-09 08:27:16Z angvp $ +# Maintainer: Angel Velasquez <an...@archlinux.org> +# Contributor: Sergej Pupykin <ser...@aur.archlinux.org> +# Contributor: William Rea <sillywi...@gmail.com> + +pkgname=python2-m2crypto +pkgver=0.26.0 +pkgrel=1 +pkgdesc="A crypto and SSL toolkit for Python" +arch=('i686' 'x86_64') +url="https://pypi.python.org/pypi/M2Crypto" +license=('BSD') +depends=('python2' 'openssl-1.0') +makedepends=('swig' 'python2-setuptools') +source=("https://pypi.python.org/packages/11/29/0b075f51c38df4649a24ecff9ead1ffc57b164710821048e3d997f1363b9/M2Crypto-$pkgver.tar.gz" + "openssl-1.1.0-force.patch" + "LICENSE") +sha256sums=('05d94fd9b2dae2fb8e072819a795f0e05d3611b09ea185f68e1630530ec09ae8' + '459143ec4ceb5dfccfb5603d7543122886e6cee08f92047a3a2675b6fa145e64' + '4eca478396f4b2b020729a111fce3f096456d74500bfd8f2b0388c3c69f997c0') + +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 +} + +package() { + cd "${srcdir}/M2Crypto-${pkgver}" + python2 setup.py install --root="${pkgdir}/" --optimize=1 + install -D -m644 "$srcdir"/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} Deleted: community-x86_64/openssl-1.1.0-force.patch =================================================================== --- community-x86_64/openssl-1.1.0-force.patch 2017-07-13 16:18:27 UTC (rev 244987) +++ community-x86_64/openssl-1.1.0-force.patch 2017-07-13 16:18:49 UTC (rev 244988) @@ -1,33 +0,0 @@ ---- 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. Copied: python2-m2crypto/repos/community-x86_64/openssl-1.1.0-force.patch (from rev 244987, python2-m2crypto/trunk/openssl-1.1.0-force.patch) =================================================================== --- community-x86_64/openssl-1.1.0-force.patch (rev 0) +++ community-x86_64/openssl-1.1.0-force.patch 2017-07-13 16:18:49 UTC (rev 244988) @@ -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.