Skip to content

update cryptography to 1.2.3 #679

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kived merged 1 commit into from
Mar 8, 2016
Merged

update cryptography to 1.2.3 #679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pythonforandroid/recipes/cryptography/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

class CryptographyRecipe(CompiledComponentsPythonRecipe):
name = 'cryptography'
version = '1.1.2'
version = '1.2.3'
url = 'https://pypi.python.org/packages/source/c/cryptography/cryptography-{version}.tar.gz'

depends = [('python2', 'python3crystax'), 'cffi', 'enum34', 'openssl', 'ipaddress', 'idna']
Expand Down
14 changes: 7 additions & 7 deletions pythonforandroid/recipes/cryptography/link-static.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
--- cryptography/src/_cffi_src/build_openssl.py 2015-12-10 13:53:28.000000000 -0600
+++ b/src/_cffi_src/build_openssl.py 2016-01-06 14:58:59.735728893 -0600
@@ -10,50 +10,6 @@
from _cffi_src.utils import build_ffi_for_binding, extra_link_args
--- cryptography/src/_cffi_src/build_openssl.py 2016-03-07 17:20:59.771109661 -0600
+++ b/src/_cffi_src/build_openssl.py 2016-03-07 17:22:00.167111227 -0600
@@ -12,50 +12,6 @@
)


-def _get_openssl_libraries(platform):
Expand Down Expand Up @@ -51,14 +51,14 @@
ffi = build_ffi_for_binding(
module_name="_openssl",
module_prefix="_cffi_src.openssl.",
@@ -89,8 +45,6 @@
"x509_vfy",
@@ -92,8 +48,6 @@
"pkcs7",
"callbacks",
],
- pre_include=_OSX_PRE_INCLUDE,
- post_include=_OSX_POST_INCLUDE,
- libraries=_get_openssl_libraries(sys.platform),
- extra_link_args=extra_link_args(sys.platform),
- extra_link_args=extra_link_args(compiler_type()),
+ libraries=[],
+ extra_link_args=[os.environ['LIBSSL'], os.environ['LIBCRYPTO']],
)