Date: Saturday, April 7, 2018 @ 13:55:47
Author: foxboron
Revision: 314837
archrelease: copy trunk to community-x86_64
Added:
python-m2crypto/repos/community-x86_64/LICENSE
(from rev 314836, python-m2crypto/trunk/LICENSE)
python-m2crypto/repos/community-x86_64/PKGBUILD
(from rev 314836, python-m2crypto/trunk/PKGBUILD)
Deleted:
python-m2crypto/repos/community-x86_64/LICENSE
python-m2crypto/repos/community-x86_64/PKGBUILD
python-m2crypto/repos/community-x86_64/openssl-1.1.0-force.patch
---------------------------+
LICENSE | 52 +++++++++++++-------------
PKGBUILD | 87 ++++++++++++++++++++++++--------------------
openssl-1.1.0-force.patch | 33 ----------------
3 files changed, 75 insertions(+), 97 deletions(-)
Deleted: LICENSE
===================================================================
--- LICENSE 2018-04-07 13:47:22 UTC (rev 314836)
+++ LICENSE 2018-04-07 13:55:47 UTC (rev 314837)
@@ -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: python-m2crypto/repos/community-x86_64/LICENSE (from rev 314836,
python-m2crypto/trunk/LICENSE)
===================================================================
--- LICENSE (rev 0)
+++ LICENSE 2018-04-07 13:55:47 UTC (rev 314837)
@@ -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: PKGBUILD
===================================================================
--- PKGBUILD 2018-04-07 13:47:22 UTC (rev 314836)
+++ PKGBUILD 2018-04-07 13:55:47 UTC (rev 314837)
@@ -1,38 +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.27.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' 'python2-typing')
-makedepends=('swig' 'python2-setuptools')
-source=("https://pypi.python.org/packages/01/bd/a41491718f9e2bebab015c42b5be7071c6695acfa301e3fc0480bfd6a15b/M2Crypto-$pkgver.tar.gz";
- "openssl-1.1.0-force.patch"
- "LICENSE")
-sha256sums=('82317459d653322d6b37f122ce916dc91ddcd9d1b814847497ac796c4549dd68'
- '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"
-}
Copied: python-m2crypto/repos/community-x86_64/PKGBUILD (from rev 314836,
python-m2crypto/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-04-07 13:55:47 UTC (rev 314837)
@@ -0,0 +1,49 @@
+# $Id: PKGBUILD 140196 2011-10-09 08:27:16Z angvp $
+# Maintainer: Morten Linderud <foxbo...@archlinux.org>
+# Contributor: Angel Velasquez <an...@archlinux.org>
+# Contributor: Sergej Pupykin <ser...@aur.archlinux.org>
+# Contributor: William Rea <sillywi...@gmail.com>
+
+pkgbase=python-m2crypto
+pkgname=(python2-m2crypto python-m2crypto)
+pkgver=0.29.0
+pkgrel=1
+pkgdesc="A crypto and SSL toolkit for Python"
+arch=('x86_64')
+url="https://pypi.python.org/pypi/M2Crypto";
+license=('BSD')
+makedepends=('python' 'python-setuptools'
+ 'python2' 'python2-setuptools'
+ 'swig')
+source=("${pkgname}-${pkgver}.tar.gz::https://gitlab.com/m2crypto/m2crypto/repository/${pkgver}/archive.tar.gz";
+ "LICENSE")
+sha256sums=('3884d98802014679d0fc38c2de6549d0259d5a89855a93d5eb264edabe67d536'
+ '4eca478396f4b2b020729a111fce3f096456d74500bfd8f2b0388c3c69f997c0')
+
+prepare() {
+ mv m2crypto-${pkgver}-* m2crypto-${pkgver}
+ cp -a m2crypto-$pkgver{,-py2}
+}
+
+build(){
+ cd "$srcdir/m2crypto-$pkgver-py2"
+ python2 setup.py build
+
+ cd "$srcdir/m2crypto-$pkgver"
+ python setup.py build
+
+}
+
+package_python2-m2crypto() {
+ depends=('python2' 'openssl' 'python2-typing')
+ cd "${srcdir}/m2crypto-${pkgver}-py2"
+ python2 setup.py install --root="${pkgdir}/" --optimize=1 --skip-build
+ install -D -m644 "$srcdir"/LICENSE
"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+
+package_python-m2crypto() {
+ depends=('python' 'openssl')
+ cd "${srcdir}/m2crypto-${pkgver}"
+ python setup.py install --root="${pkgdir}/" --optimize=1 --skip-build
+ install -D -m644 "$srcdir"/LICENSE
"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
Deleted: openssl-1.1.0-force.patch
===================================================================
--- openssl-1.1.0-force.patch 2018-04-07 13:47:22 UTC (rev 314836)
+++ openssl-1.1.0-force.patch 2018-04-07 13:55:47 UTC (rev 314837)
@@ -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.
