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

openssl: closes #4740 #5441

Merged
merged 2 commits into from
May 20, 2021
Merged

openssl: closes #4740 #5441

merged 2 commits into from
May 20, 2021

Conversation

db4
Copy link
Contributor

@db4 db4 commented May 5, 2021

openssl/1.1.1h

Closes #4740


  • I've read the guidelines for contributing.
  • I've followed the PEP8 style guides for Python code in the recipes.
  • I've used the latest Conan client version.
  • I've tried at least one configuration locally with the
    conan-center hook activated.

@ghost
Copy link

ghost commented May 5, 2021

I detected other pull requests that are modifying openssl/1.x.x recipe:

This message is automatically generated by https://github.com/ericLemanissier/conan-center-conflicting-prs so don't hesitate to report issues/improvements there.

@conan-center-bot

This comment has been minimized.

Comment on lines 638 to 644
if self._use_nmake:
# Windows: when cmake generates its cache, it populates some environment variables as well.
# If cmake also initiates openssl build, their values (containing spaces and forward slashes)
# break nmake (don't know about mingw make). So we fix them
for v in ['CC', 'CXX', 'RC']:
if v in os.environ and not '"' in os.environ[v]:
os.environ[v] = '"' + os.environ[v].replace('/', '\\') + '"'
Copy link
Contributor

Choose a reason for hiding this comment

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

This modifies the environment permanently.
When using a context, the changes to the environment are undone.

e.g.

from contextlib import contextmanager

@contextmanager
def _build_context(self):
    if self._use_nmake:
        def sanitize_env_var(var):
            return '"{}"'.format(var) if '"' not in var else var
        env = {key: sanitize_env_var(tools.get_env(key)) for key in ("CC", "CXX", "RC") if tools.get_env(key)}
        with tools.environment_append(env):
            yield
    else:
        yield

def build(self):
    with self._build_context():
        self.run("perl ./Configure")
        ...
        self._run_make()

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, it sounds reasonable. But the environment modification should only be done for nmake (it breaks perl configure). I've committed the appropriate changes.

@SSE4 SSE4 requested a review from uilianries May 6, 2021 07:58
@conan-center-bot

This comment has been minimized.

@db4
Copy link
Contributor Author

db4 commented May 6, 2021

openssl/1.0.2t: Forced build from source
Installing package: openssl/1.0.2t
Requirements
    openssl/1.0.2t from local cache - Cache
    zlib/1.2.11 from 'conan-center' - Cache
Packages
    openssl/1.0.2t:ac9d5cdf5785dec11eebde092369aebc238741d2 - Build
    zlib/1.2.11:2345d377da94e8ffae1333469573b8215c98c514 - Missing

Installing (downloading, building) binaries...

ERROR: Missing binary: zlib/1.2.11:2345d377da94e8ffae1333469573b8215c98c514
zlib/1.2.11: WARN: Can't find a 'zlib/1.2.11' package for the specified settings, options and dependencies:
- Settings: arch=x86_64, build_type=Debug, compiler=gcc, compiler.version=4.9, os=Linux
- Options: fPIC=True, minizip=deprecated, shared=False
- Dependencies: 
- Requirements: 
- Package ID: 2345d377da94e8ffae1333469573b8215c98c514

ERROR: Missing prebuilt package for 'zlib/1.2.11'

can anyone explain why it is failing now but succeeded yesterday?

@conan-center-bot

This comment has been minimized.

@conan-center-bot

This comment has been minimized.

@@ -699,6 +714,7 @@ def build(self):
else:
self._patch_configure()
self._patch_makefile_org()
with self._make_context():
Copy link
Contributor

Choose a reason for hiding this comment

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

I think this needs to be indented an extra level.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for noting this!

@conan-center-bot

This comment has been minimized.

@@ -699,7 +714,8 @@ def build(self):
else:
self._patch_configure()
self._patch_makefile_org()
self._make()
with self._make_context():
Copy link
Contributor

Choose a reason for hiding this comment

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

A few lines above, env_vars is already setting the CC environment variable.
Maybe combine the sanitizing done in _make_context with that or refactor the env_vars on the top into a _build_context helper method?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

A few lines above, env_vars is already setting the CC environment variable.
Maybe combine the sanitizing done in _make_context with that or refactor the env_vars on the top into a _build_context helper method?

You can't do that easily: if your environment modification affects self._patch_configure(), the recipe will be broken because _patch_configure expects CC variable value without quotes. Anyway this _make_context solves one very special problem and IMHO should not be mixed with anything else.

@conan-center-bot
Copy link
Collaborator

All green in build 7 (5ff0eee178bb4471cf76013a758baad00e774846):

  • openssl/1.0.2s@:
    All packages built successfully! (All logs)

  • openssl/1.0.2u@:
    All packages built successfully! (All logs)

  • openssl/1.1.1e@:
    All packages built successfully! (All logs)

  • openssl/1.0.2t@:
    All packages built successfully! (All logs)

  • openssl/1.1.0k@:
    All packages built successfully! (All logs)

  • openssl/1.1.0l@:
    All packages built successfully! (All logs)

  • openssl/1.1.1c@:
    All packages built successfully! (All logs)

  • openssl/1.1.1i@:
    All packages built successfully! (All logs)

  • openssl/1.1.1d@:
    All packages built successfully! (All logs)

  • openssl/1.1.1g@:
    All packages built successfully! (All logs)

  • openssl/1.1.1k@:
    All packages built successfully! (All logs)

  • openssl/1.1.1f@:
    All packages built successfully! (All logs)

  • openssl/1.1.1h@:
    All packages built successfully! (All logs)

  • openssl/1.1.1j@:
    All packages built successfully! (All logs)

@conan-center-bot conan-center-bot merged commit fc395df into conan-io:master May 20, 2021
Croydon added a commit to bincrafters/conan-center-index that referenced this pull request Sep 9, 2021
conan-center-bot pushed a commit that referenced this pull request Sep 11, 2021
* openssl: create 3.x.x directory

* openssl/3.x.x: Update license to Apache-2.0

* openssl/3.x.x: Update reporting issues URL

* openssl/3.x.x: Add no_deprecated, no_legacy and no_fips options

* openssl/3.x.x: Delete patch for 1.1.1

* openssl/3.x.x: Update option from no_zlib to zlib

* openssl/3.x.x: Remove removed options no_md2 and no_rc5

* openssl/3.x.x.: no_rc4 is still a valid option

https://github.com/openssl/openssl/blob/1b495200436b57309ca958a7a72affaf75171c1a/INSTALL.md#no-algorithm

* openssl/3.x.x: Remove legacy target names

* openssl/3.x.x.: Remove more legacy conditions

* openssl/3.x.x: Fix zlib option name

* Revert "openssl/3.x.x: Update license to Apache-2.0"

This reverts commit 13852ab1da9678d3700440bee862561af7878b37.

* openssl/3.x.x: Actually update license to Apache-2.0

* openssl/3.x.x.: Remove all legacy version switches

* openssl/3.x.x: Use OpenSSL_version instead of legacy SSLeay_version

* openssl/3.x.x.: update test_package to never  use find_package()

Several reasons for this decision:

1) No matter the value of the paramter use_find_package CMake did always use a FindOpenSSL.cmake file

2) On my machine that meant that CMake used a FindOpenSSL.cmake file from my Python installation, which can't yet handle version 3.0.0 due to a regex error

3) Even when I addded the Conan cmake_find_package generator, it did not work (more cpp_info work needed, maybe?)

4) Even when 3) would be fixed, it would still always use the FindOpenSSL.cmake approach for some reason (I guess), so the entire use_find_package switch is pointless

* openssl/3.x.x.: Remove custom OpenSSLVersion object

* openssl/3.x.x.: Remove legacy target_prefix

* openssl/3.x.x.: Remove custom _cross_building method

Since tools.cross_building() has now a skip_x64_x86 flag

* openssl/3.x.x: Some formatting

* openssl/3.x.x: Remove old workaround for MinGW

This got fixed in the meantime via openssl/openssl@9694ebf

See also openssl/openssl#7653

* openssl/3.x.x: add no_engine option

* openssl/3.x.x: Add 3.0.0-alpha5

* openssl/3.x.x: Port #1782 from @syoliver - add components

* openssl/3.x.x: Fix license test

The LICENSE file got renamed to LICENSE.txt

* openssl/3.x.x: add old/ URLs as mirrors

* openssl/3.x.x: threat URLs explicit as strings

* openssl/3.x.x: add 3.0.0-alpha6

* openssl/3.x.x: the downloads have permament locations now

This seems to be the case for a while now, but not for all old versions we support in the recipe for the 1.x.x versions

It also does not seem to apply for pre-release versions, which rather  seem to get de-published

See also here: openssl/openssl#4469

* openssl: Update Conan conventions

Automatically created by bincrafters-conventions 0.26.0

* openssl/3.x.x: reorder methods

* openssl/3.x.x: add 3.0.0-alpha7

* openssl/3.x.x: test upstream PR 13225

openssl/openssl#13225

* openssl/3.x.x: update patch from upstream PR13225

* openssl/3.x.x: port #2944 Require installation of msys2 for MinGW builds

* openssl/3.x.x: port #3214 fix openssl/** build with shared and fPIC option for OS Neutrino

* openssl/3.x.x: add 3.0.0-alpha8

* openssl/3.x.x: remove fPIC when shared

Co-authored-by: Anonymous Maarten <[email protected]>

* openssl/3.x.x: add 3.0.0-alpha9

* openssl/3.x.x: use get_safe for fPIC

* openssl/3.x.x: don't use get_safe for zlib option

Co-authored-by: Anonymous Maarten <[email protected]>

* openssl/3.x.x: add 3.0.0-alpha10

* openssl/3.x.x: add openssl/3.0.0-alpha11

* openssl: Update Conan conventions

Automatically created by bincrafters-conventions 0.30.2

* openssl/3.x.x: add openssl/3.0.0

* openssl: Update Conan conventions

Automatically created by bincrafters-conventions 0.30.5

* openssl/3.x.x: modernize

Co-Authored-By: Anonymous Maarten <[email protected]>

* openssl/3.x.x: modernize

Co-Authored-By: Anonymous Maarten <[email protected]>

* openssl/3.x.x: replace os.rename -> tools.rename

* opeensl/3.x.x.: nit

Co-authored-by: Anonymous Maarten <[email protected]>

* openssl/3.x.x: readd old versions to config.yml

Co-Authored-By: Anonymous Maarten <[email protected]>

* openssl/3.x.x: remove platform import

Co-authored-by: Anonymous Maarten <[email protected]>

* openssl/3.x.x: fix typo in option name

* openssl/3.x.x: more tools modernizations

* openssl/3.x.x: use textwrap

Co-authored-by: Anonymous Maarten <[email protected]>

* openssl/3.x.x: remove MD5 and SHA1 from test_package

* openssl/3.x.x: use self.options.get_safe()

* openssl: add openssl.pc + fix libdir

* openssl: convert test to pure C source

* openssl: use spaces in test source

* openssl/3.x.x: remove SSL_library_init from test_package

* openssl: run openssl binary in test package

* openssl: digest.c only needs crypto library

* openssl: remove unused definitions for cmake

* openssl: enable fPIC when not enabled + use zlib's shared option correctly

* openssl: don't echo args (there is log.print_run_commands) + don't add shared/zlib multiple times

* openssl: tools.XCRun only acceps Settings object

* openssl: use self.settings.os

* openssl: reformatting + be the first to use f-strings + functools.lru_cache

* openssl: ./Configure --help does not print any targets.

* openssl: fix critical typo

* openssl: fix sneaky usage of tools.os_info in build_requirements

* openssl/3.x.x: remove patch for macOS shared

Co-Authored-By: Bowb <[email protected]>

* openssl/3.x.x: port #4460 remove explicit apple deployment target flag

Co-Authored-By: SSE4 <[email protected]>

* openssl/3.x.x: port #4597 provide official variables in cmake_find_package

Co-Authored-By: SpaceIm <[email protected]>

* openssl/3.x.x: port #4698 fix rt dependency for SUSE11

Co-Authored-By: Alexey Klimkin <[email protected]>

* openssl/3.x.x: port #4772 fix builddirs and add vars module to cmake_find_package only

Co-Authored-By: SpaceIm <[email protected]>

* openssl/3.x.x: port #5441 closes #4740

Co-Authored-By: Dmitry Bely <[email protected]>

* openssl/3.x.x: port #3998 add libatomic in build dependency for Neutrino OS

Co-Authored-By: Arenoros <[email protected]>

* openssl/3.x.x: port #6337 OpenSSL on Windows: multi-profile support

Co-Authored-By: Stefan Floeren <[email protected]>

* openssl/3.x.x: port #6588 Add macOS ARM target

Co-Authored-By: gmeeker <[email protected]>

* openssl/3.x.x: port #6884 Build openssl for emscripten

Co-Authored-By: Volodymyr B. <[email protected]>

* openssl: reformatting fixes

* openssl: make method property + remove unused import

* openssl: reverse sort openssl's config.yml

* openssl: only run openssl when not cross building

* openssl: port options of openssl 1.1.1

* openssl: fix MSVC install + remove options unsupported by openssl 3 + openssl exe is only available when building with no_stio=False

* force push

Signed-off-by: Uilian Ries <[email protected]>

* openssl: add missing options + various reformatting

Co-authored-by: bincrafters-user <[email protected]>
Co-authored-by: Anonymous Maarten <[email protected]>
Co-authored-by: Anonymous Maarten <[email protected]>
Co-authored-by: Bowb <[email protected]>
Co-authored-by: SSE4 <[email protected]>
Co-authored-by: SpaceIm <[email protected]>
Co-authored-by: Alexey Klimkin <[email protected]>
Co-authored-by: Dmitry Bely <[email protected]>
Co-authored-by: Arenoros <[email protected]>
Co-authored-by: Stefan Floeren <[email protected]>
Co-authored-by: gmeeker <[email protected]>
Co-authored-by: Volodymyr B. <[email protected]>
Co-authored-by: Uilian Ries <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
5 participants