Skip to content
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.

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

Bumps openssl to 1.1.1f #2118

Merged
merged 2 commits into from
Apr 1, 2020

Conversation

AndreMiras
Copy link
Member

No description provided.

Copy link
Member

@inclement inclement left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome, thanks. I also added the version bump here.

@AndreMiras
Copy link
Member Author

./ci/rebuild_updated_recipes.py fails, but this is nothing to do with openssl to me

[ERROR]:   Build failed: Conflict detected: 'sdl2' inducing dependencies ('sdl2',), and 'genericndkbuild' inducing conflicting dependencies ('genericndkbuild',)
Exception in thread background thread for pid 14:
Traceback (most recent call last):
  File "/usr/lib/python3.6/threading.py", line 916, in _bootstrap_inner
    self.run()
  File "/usr/lib/python3.6/threading.py", line 864, in run
    self._target(*self._args, **self._kwargs)
  File "/home/user/venv/lib/python3.6/site-packages/sh.py", line 1540, in wrap
    fn(*args, **kwargs)
  File "/home/user/venv/lib/python3.6/site-packages/sh.py", line 2459, in background_thread
    handle_exit_code(exit_code)
  File "/home/user/venv/lib/python3.6/site-packages/sh.py", line 2157, in fn
    return self.command.handle_command_exit_code(exit_code)
  File "/home/user/venv/lib/python3.6/site-packages/sh.py", line 815, in handle_command_exit_code
    raise exc
sh.ErrorReturnCode_1: 
  RAN: /home/user/venv/bin/python setup_testapp_python2.py apk --sdk-dir /home/user/.android/android-sdk --ndk-dir /home/user/.android/android-ndk --requirements apsw,libnacl,enum34,libxslt,ffpyplayer_codecs,pycrypto,libtorrent,pil,sdl2,gevent,zope_interface,pyicu,cdecimal,zbarlight,ffmpeg,freetype,scrypt,cryptography,omemo-backend-signal,libzbar,coverage,mysqldb,libshine,pymunk,png,boost,genericndkbuild,lxml,pyleveldb,pytz,zbar,libglob,libvorbis,libsodium,libxml2,ifaddrs,pysha3,cffi,python2,harfbuzz,reportlab,icu,pyzbar,opencv,libcurl
  STDOUT:
packages are []

@inclement
Copy link
Member

inclement commented Apr 1, 2020 via email

@AndreMiras AndreMiras merged commit 52abfe9 into kivy:master Apr 1, 2020
@AndreMiras AndreMiras deleted the feature/bump_openssl_master branch April 1, 2020 19:12
@AndreMiras AndreMiras restored the feature/bump_openssl_master branch April 1, 2020 20:32
@AndreMiras AndreMiras deleted the feature/bump_openssl_master branch May 9, 2020 19:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants