Hello community, here is the log from the commit of package python-M2Crypto for openSUSE:Factory checked in at 2015-02-27 11:03:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-M2Crypto (Old) and /work/SRC/openSUSE:Factory/.python-M2Crypto.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-M2Crypto" Changes: -------- --- /work/SRC/openSUSE:Factory/python-M2Crypto/python-M2Crypto.changes 2014-04-18 12:37:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-M2Crypto.new/python-M2Crypto.changes 2015-02-27 11:03:53.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Feb 24 11:35:42 UTC 2015 - dims...@opensuse.org + +- Add python-M2Crypto-SWIG-3.0.5.patch: Fix generation of M2Crypto + module when using SWIG 3.0.5. +- Manually install _m2crypto shadow file: setup.py misses it. + (boo#917759, boo#917815). + +------------------------------------------------------------------- New: ---- python-M2Crypto-SWIG-3.0.5.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-M2Crypto.spec ++++++ --- /var/tmp/diff_new_pack.TsNZxN/_old 2015-02-27 11:03:54.000000000 +0100 +++ /var/tmp/diff_new_pack.TsNZxN/_new 2015-02-27 11:03:54.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-M2Crypto # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,6 +24,8 @@ License: MIT and ZPL-2.0 and BSD-3-Clause Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-%{version}.tar.gz +# PATCH-FIX-UPSTREAM python-M2Crypto-SWIG-3.0.5.patch -- https://github.com/martinpaljak/M2Crypto/issues/60 +Patch0: python-M2Crypto-SWIG-3.0.5.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: openssl BuildRequires: openssl-devel @@ -57,12 +59,15 @@ %prep %setup -n M2Crypto-%{version} +%patch0 -p1 %build CFLAGS="%{optflags}" python setup.py build %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} +# The SWIG shadow file is not being installed by setup.py +cp SWIG/_m2crypto.py %{buildroot}%{python_sitearch}/M2Crypto/ # install demo files manually # (otherwise we can't perform %%fdupes on them the right way) ++++++ python-M2Crypto-SWIG-3.0.5.patch ++++++ Index: M2Crypto-0.22.3/M2Crypto/__init__.py =================================================================== --- M2Crypto-0.22.3.orig/M2Crypto/__init__.py +++ M2Crypto-0.22.3/M2Crypto/__init__.py @@ -19,7 +19,7 @@ Copyright 2008-2011 Heikki Toivonen. All version_info = (0, 22) version = '.'.join([str(_v) for _v in version_info]) -import __m2crypto +import _m2crypto import m2 import ASN1 import AuthCookie Index: M2Crypto-0.22.3/M2Crypto/m2.py =================================================================== --- M2Crypto-0.22.3.orig/M2Crypto/m2.py +++ M2Crypto-0.22.3/M2Crypto/m2.py @@ -25,7 +25,7 @@ Portions created by Open Source Applicat Copyright (C) 2004 OSAF. All Rights Reserved. """ -from __m2crypto import * +from _m2crypto import * lib_init() Index: M2Crypto-0.22.3/SWIG/_lib.i =================================================================== --- M2Crypto-0.22.3.orig/SWIG/_lib.i +++ M2Crypto-0.22.3/SWIG/_lib.i @@ -66,6 +66,8 @@ int ssl_verify_callback(int ok, X509_STO int cret; int new_style_callback = 0, warning_raised_exception=0; PyGILState_STATE gilstate; + PyObject *self = 0; + (void)self; ssl = (SSL *)X509_STORE_CTX_get_app_data(ctx); @@ -151,6 +153,8 @@ int ssl_verify_callback(int ok, X509_STO void ssl_info_callback(const SSL *s, int where, int ret) { PyObject *argv, *retval, *_SSL; PyGILState_STATE gilstate; + PyObject *self = 0; + (void)self; gilstate = PyGILState_Ensure(); @@ -170,6 +174,8 @@ DH *ssl_set_tmp_dh_callback(SSL *ssl, in PyObject *argv, *ret, *_ssl; DH *dh; PyGILState_STATE gilstate; + PyObject *self = 0; + (void)self; gilstate = PyGILState_Ensure(); @@ -193,6 +199,8 @@ RSA *ssl_set_tmp_rsa_callback(SSL *ssl, PyObject *argv, *ret, *_ssl; RSA *rsa; PyGILState_STATE gilstate; + PyObject *self = 0; + (void)self; gilstate = PyGILState_Ensure(); Index: M2Crypto-0.22.3/SWIG/_pkcs7.i =================================================================== --- M2Crypto-0.22.3.orig/SWIG/_pkcs7.i +++ M2Crypto-0.22.3/SWIG/_pkcs7.i @@ -157,6 +157,8 @@ PyObject *smime_read_pkcs7(BIO *bio) { BIO *bcont = NULL; PKCS7 *p7; PyObject *tuple, *_p7, *_BIO; + PyObject *self = 0; + (void)self; if (BIO_method_type(bio) == BIO_TYPE_MEM) { /* OpenSSL FAQ explains that this is needed for mem BIO to return EOF, Index: M2Crypto-0.22.3/setup.py =================================================================== --- M2Crypto-0.22.3.orig/setup.py +++ M2Crypto-0.22.3/setup.py @@ -76,7 +76,9 @@ class _M2CryptoBuildExt(build_ext.build_ self.swig_opts = ['-I%s' % i for i in self.include_dirs + \ [opensslIncludeDir, os.path.join(opensslIncludeDir, "openssl")]] self.swig_opts.append('-includeall') - self.swig_opts.append('-modern') + ##self.swig_opts.append('-modern') + self.swig_opts.append('-builtin') + self.swig_opts.append('-relativeimport') # Fedora does hat tricks. if platform.linux_distribution()[0] in ['Fedora', 'CentOS']: -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
