From 859b1d46e6d5f7e223c780c4fc5c0d652cce1681d77ce8002168b1f3a4e8922c Mon Sep 17 00:00:00 2001 From: Jan Matejek Date: Wed, 26 Mar 2014 15:28:17 +0000 Subject: [PATCH] Accepting request 227513 from home:mvyskocil:branches:devel:languages:python OBS-URL: https://build.opensuse.org/request/show/227513 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyOpenSSL?expand=0&rev=28 --- bug-lp-1265482.diff | 10 +++--- pyOpenSSL-0.13.1.tar.gz | 3 -- pyOpenSSL-0.14.tar.gz | 3 ++ python-pyOpenSSL-doc.changes | 53 --------------------------- python-pyOpenSSL-doc.spec | 70 ------------------------------------ python-pyOpenSSL.changes | 18 ++++++++++ python-pyOpenSSL.spec | 49 ++++++++++++++++++------- 7 files changed, 63 insertions(+), 143 deletions(-) delete mode 100644 pyOpenSSL-0.13.1.tar.gz create mode 100644 pyOpenSSL-0.14.tar.gz delete mode 100644 python-pyOpenSSL-doc.changes delete mode 100644 python-pyOpenSSL-doc.spec diff --git a/bug-lp-1265482.diff b/bug-lp-1265482.diff index 6018bb4..b050b67 100644 --- a/bug-lp-1265482.diff +++ b/bug-lp-1265482.diff @@ -1,8 +1,10 @@ ---- OpenSSL/test/test_crypto.py +Index: OpenSSL/test/test_crypto.py +=================================================================== +--- OpenSSL/test/test_crypto.py.orig +++ OpenSSL/test/test_crypto.py -@@ -608,7 +608,7 @@ - L{PKeyType.generate_key} generates an RSA key when passed - L{TYPE_RSA} as a type and a reasonable number of bits. +@@ -627,7 +627,7 @@ class PKeyTests(TestCase): + :py:meth:`PKeyType.generate_key` generates an RSA key when passed + :py:data:`TYPE_RSA` as a type and a reasonable number of bits. """ - bits = 128 + bits = 2048 diff --git a/pyOpenSSL-0.13.1.tar.gz b/pyOpenSSL-0.13.1.tar.gz deleted file mode 100644 index e772d7c..0000000 --- a/pyOpenSSL-0.13.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ba06ec710414f6dfe5566ec24c81882547c3e6fc48458d64315b73a0d5142fdb -size 254431 diff --git a/pyOpenSSL-0.14.tar.gz b/pyOpenSSL-0.14.tar.gz new file mode 100644 index 0000000..0ecd1a5 --- /dev/null +++ b/pyOpenSSL-0.14.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a99db8e59c120138ad8a72eecedcc24b4510d2eed3ce48213b7e32f22cc4ee6e +size 128005 diff --git a/python-pyOpenSSL-doc.changes b/python-pyOpenSSL-doc.changes deleted file mode 100644 index fb286d3..0000000 --- a/python-pyOpenSSL-doc.changes +++ /dev/null @@ -1,53 +0,0 @@ -------------------------------------------------------------------- -Sun Oct 6 07:58:13 UTC 2013 - tchvatal@suse.com - -- Fix the doc build for real - -------------------------------------------------------------------- -Tue Oct 1 08:55:05 UTC 2013 - speilicke@suse.com - -- BuildRequire texlive-babel to get access to english.tpl - -------------------------------------------------------------------- -Mon Jul 23 12:48:35 UTC 2012 - werner@suse.de - -- Make it build with TeXLive 2012 - -------------------------------------------------------------------- -Mon Jul 9 18:34:08 PDT 2012 - msuman@opensuse.org - -- Update to version 0.13 - * Add OPENSSL_VERSION_NUMBER, SSLeay_version and related - constants for retrieving version information about the - underlying OpenSSL library. - * Support OpenSSL 1.0.0a and related changes. - * Remove SSLv2 support if the underlying OpenSSL library does - not provide it. - * Add a new method to the X509 type, get_signature_algorithm. - * Add a new method to the Connection type, get_peer_cert_chain. - * Add the PKey.check method to verify the internal consistency - of a PKey instance. - * Bug fixes. - -------------------------------------------------------------------- -Fri Jun 15 14:36:11 UTC 2012 - saschpe@suse.de - -- Changed license of doc package to Apache-2.0 (bnc#767269) - -------------------------------------------------------------------- -Tue Sep 13 20:55:06 UTC 2011 - saschpe@suse.de - -- Recommend base package instead of requiring it - -------------------------------------------------------------------- -Thu Sep 1 08:48:23 UTC 2011 - saschpe@suse.de - -- Changed license to Apache-2.0, to fix bnc#715423 - -------------------------------------------------------------------- -Wed Aug 31 14:21:58 UTC 2011 - saschpe@suse.de - -- Initial version, obsoletes 'python-openssl': - * Builds properly on all SUSE version - * Has real HTML documentation - diff --git a/python-pyOpenSSL-doc.spec b/python-pyOpenSSL-doc.spec deleted file mode 100644 index 0f749de..0000000 --- a/python-pyOpenSSL-doc.spec +++ /dev/null @@ -1,70 +0,0 @@ -# -# spec file for package python-pyOpenSSL-doc -# -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - - -Name: python-pyOpenSSL-doc -Version: 0.13.1 -Release: 0 -Url: http://launchpad.net/pyopenssl -Summary: Python wrapper module around the OpenSSL library - Documentation -License: Apache-2.0 -Group: Development/Languages/Python -Source: http://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: latex2html -BuildRequires: python-devel -BuildRequires: texlive-latex -%if %suse_version > 1220 -BuildRequires: texlive-cm-super -BuildRequires: texlive-ec -BuildRequires: texlive-times -BuildRequires: tex(english.ldf) -BuildRequires: tex(fancyhdr.sty) -BuildRequires: tex(fncychap.sty) -BuildRequires: tex(longtable.sty) -%endif -%if 0%{?suse_version} -Recommends: python-pyOpenSSL -%endif - -%description -High-level wrapper around a subset of the OpenSSL library, includes - * SSL.Connection objects, wrapping the methods of Python's portable - sockets - * Callbacks written in Python - * Extensive error-handling mechanism, mirroring OpenSSL's error codes -... and much more ;) - -This is the documentation for pyOpenSSL - -%prep -%setup -q -n pyOpenSSL-%{version} - -%build -cd doc && make html - -%install -install -d %{buildroot}%{_docdir}/python-pyOpenSSL -mv doc/html %{buildroot}%{_docdir}/python-pyOpenSSL/ - -%files -%defattr(-,root,root,-) -%doc LICENSE README -%{_docdir}/python-pyOpenSSL -%{_docdir}/python-pyOpenSSL/html - -%changelog diff --git a/python-pyOpenSSL.changes b/python-pyOpenSSL.changes index 2fa9dc2..48daa96 100644 --- a/python-pyOpenSSL.changes +++ b/python-pyOpenSSL.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Mon Feb 24 12:58:58 UTC 2014 - mvyskocil@suse.com + +- update to 0.14 + * Support for TLSv1.1 and TLSv1.2 + * First-class support for PyPy + * New flags, such as MODE_RELEASE_BUFFERS and OP_NO_COMPRESSION + * Some APIs to access to the SSL session cache + * A variety of bug fixes for error handling cases + * Documentation has been converted from LaTeX + + python-pyOpenSSL-doc is now build from single spec file + * pyOpenSSL now depends on cryptography, so it became pure-python + module + + changed to noarch package, add proper dependencies + * Development moved to github + + changed Url tag respectivelly +- refreshed bug-lp-1265482.diff + ------------------------------------------------------------------- Thu Jan 2 11:17:23 UTC 2014 - dmueller@suse.com diff --git a/python-pyOpenSSL.spec b/python-pyOpenSSL.spec index 4236d1b..92acaaf 100644 --- a/python-pyOpenSSL.spec +++ b/python-pyOpenSSL.spec @@ -17,31 +17,46 @@ Name: python-pyOpenSSL -Version: 0.13.1 +Version: 0.14 Release: 0 -Url: http://launchpad.net/pyopenssl +Url: https://github.com/pyca/pyopenssl Summary: Python wrapper module around the OpenSSL library License: Apache-2.0 Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-%{version}.tar.gz Patch0: bug-lp-1265482.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: libopenssl-devel +BuildArch: noarch + +BuildRequires: python-cryptography >= 0.2 BuildRequires: python-devel +BuildRequires: python-setuptools +BuildRequires: python-Sphinx + +Requires: python-cryptography >= 0.2 + Provides: pyOpenSSL = %{version} Provides: python-openssl = %{version} Obsoletes: python-openssl < %{version} %if 0%{?suse_version} && 0%{?suse_version} <= 1110 -%{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %endif %description -High-level wrapper around a subset of the OpenSSL library, includes - * SSL.Connection objects, wrapping the methods of Python's portable - sockets - * Callbacks written in Python - * Extensive error-handling mechanism, mirroring OpenSSL's error codes -... and much more ;) +pyOpenSSL is a set of Python bindings for OpenSSL. It includes some low-level +cryptography APIs but is primarily focused on providing an API for using the +TLS protocol from Python. + +pyOpenSSL is now a pure-Python project with a dependency on a new project, +cryptography (), which provides (among +other things) a cffi-based interface to OpenSSL. + +%package doc +Summary: Documentation for %{name} +Group: Documentation/HTML + +%description doc +Provides documentation for %{name}. %prep %setup -q -n pyOpenSSL-%{version} @@ -50,12 +65,20 @@ High-level wrapper around a subset of the OpenSSL library, includes %build CFLAGS="%{optflags} -fno-strict-aliasing" python setup.py build +python setup.py build_sphinx && rm build/sphinx/html/.buildinfo + %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} %files -%defattr(-,root,root,-) -%doc LICENSE README TODO examples -%{python_sitearch}/* +%defattr(0644,root,root,0755) +%doc LICENSE README TODO +%{python_sitelib}/OpenSSL/ +%{python_sitelib}/pyOpenSSL-0.14-py*.egg-info/ + +%files doc +%defattr(0644,root,root,0755) +%doc build/sphinx/html/ +%doc examples/ %changelog