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

openssh/9.1p1: Added openssh recipe #19031

Merged
merged 20 commits into from
Apr 2, 2024

Conversation

klausholstjacobsen
Copy link
Contributor

openssh/9.1p1
openssh/8.1p1

Added recipe!


@conan-center-bot

This comment has been minimized.

@conan-center-bot

This comment has been minimized.

@klausholstjacobsen klausholstjacobsen force-pushed the openssh branch 3 times, most recently from 59bf3f6 to be32ec2 Compare August 4, 2023 13:54
@conan-center-bot

This comment has been minimized.

@conan-center-bot

This comment has been minimized.

@conan-center-bot

This comment has been minimized.

@conan-center-bot

This comment has been minimized.

@conan-center-bot

This comment has been minimized.

@conan-center-bot

This comment has been minimized.

@conan-center-bot

This comment has been minimized.

@conan-center-bot

This comment has been minimized.

@AbrilRBS AbrilRBS self-assigned this Aug 21, 2023
Copy link
Member

@AbrilRBS AbrilRBS left a comment

Choose a reason for hiding this comment

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

Thanks a lot! I have a few comments, but the overall structure of the recipe looks good, thank you as always :)

recipes/openssh/all/conanfile.py Outdated Show resolved Hide resolved
recipes/openssh/all/conanfile.py Outdated Show resolved Hide resolved
recipes/openssh/all/conanfile.py Show resolved Hide resolved
recipes/openssh/all/conanfile.py Outdated Show resolved Hide resolved
Copy link
Member

@AbrilRBS AbrilRBS left a comment

Choose a reason for hiding this comment

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

Hi! Sorry about the delay - the PR fell thru the cracks and got lost on the sea of PRs

The good news is that the PR looks great, one minor thing remaining before merging - feel free to ping me directly once that's done so that I can approve asap :)

recipes/openssh/all/conanfile.py Outdated Show resolved Hide resolved
Co-authored-by: Rubén Rincón Blanco <git@rinconblanco.es>
@klausholstjacobsen
Copy link
Contributor Author

@RubenRBS your suggestion is committed! Have a nice weekend!

@conan-center-bot

This comment has been minimized.

Copy link
Contributor

@valgur valgur left a comment

Choose a reason for hiding this comment

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

LGTM, but I would adjust the negative option values a bit to match other recipes better.

recipes/openssh/all/conanfile.py Outdated Show resolved Hide resolved
recipes/openssh/all/conanfile.py Outdated Show resolved Hide resolved
klausholstjacobsen and others added 3 commits March 26, 2024 07:55
Co-authored-by: Martin Valgur <martin.valgur@gmail.com>
Co-authored-by: Martin Valgur <martin.valgur@gmail.com>
@conan-center-bot

This comment has been minimized.

Copy link
Contributor

@franramirez688 franramirez688 left a comment

Choose a reason for hiding this comment

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

Hi @klausholstjacobsen

Thanks a lot for adding this recipe, and sorry for the long delay in reviewing this PR.

I just added one commit to simplify a couple of things, but it looks great! 👏

Before approving, I have a question. I just tried this command and got some errors in macOS Sonoma 14.4.1 (failed with both *:shared=True and False):

$ conan create . --version 9.6p1 --build missing -o with_libcrypto="libressl"
. . . 
cc -m64 -O3 -pipe -Wunknown-warning-option -Qunused-arguments -Wall -Wextra -Wpointer-arith -Wuninitialized -Wsign-compare -Wformat-security -Wsizeof-pointer-memaccess -Wno-pointer-sign -Wno-unused-parameter -Wno-unused-result -Wmisleading-indentation -Wbitwise-instead-of-logical -fno-strict-aliasing -mretpoline -D_FORTIFY_SOURCE=2 -ftrapv -fzero-call-used-regs=used -ftrivial-auto-var-init=zero -fno-builtin-memset -fstack-protector-strong   -fPIC -I. -I.. -I/Users/conanuser/.conan2/p/b/opensc8a0037d6a765/b/src/openbsd-compat -I/Users/conanuser/.conan2/p/b/opensc8a0037d6a765/b/src/openbsd-compat/.. -I/Users/conanuser/.conan2/p/b/libreef807320845de/p/include  -I/Users/conanuser/.conan2/p/b/libreef807320845de/p/include -I/Users/conanuser/.conan2/p/b/zlibf6519252f237d/p/include -DNDEBUG -DHAVE_CONFIG_H -c /Users/conanuser/.conan2/p/b/opensc8a0037d6a765/b/src/openbsd-compat/fmt_scaled.c
/Users/conanuser/.conan2/p/b/opensc8a0037d6a765/b/src/openbsd-compat/xcrypt.c:88:4: error: call to undeclared function 'explicit_bzero'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
                        explicit_bzero(passwd, strlen(passwd));
                        ^
1 error generated.
make[1]: *** [xcrypt.o] Error 1
make[1]: *** Waiting for unfinished jobs....
/Users/conanuser/.conan2/p/b/opensc8a0037d6a765/b/src/openbsd-compat/bcrypt_pbkdf.c:108:2: error: call to undeclared function 'explicit_bzero'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
        explicit_bzero(ciphertext, sizeof(ciphertext));
        ^
/Users/conanuser/.conan2/p/b/opensc8a0037d6a765/b/src/openbsd-compat/bcrypt_pbkdf.c:177:2: error: call to undeclared function 'freezero'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
        freezero(countsalt, saltlen + 4);
        ^
/Users/conanuser/.conan2/p/b/opensc8a0037d6a765/b/src/openbsd-compat/bcrypt_pbkdf.c:178:2: error: call to undeclared function 'explicit_bzero'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
        explicit_bzero(out, sizeof(out));
        ^
3 errors generated.
make[1]: *** [bcrypt_pbkdf.o] Error 1
make: *** [openbsd-compat/libopenbsd-compat.a] Error 2

openssh/9.6p1: ERROR:
Package '9831a80989c890ca8957350d5a90e23b88ab109c' build failed
openssh/9.6p1: WARN: Build folder /Users/conanuser/.conan2/p/b/opensc8a0037d6a765/b/build-release
ERROR: openssh/9.6p1: Error in build() method, line 110
	autotools.make()
	ConanException: Error 2 while executing

Could it be a bug in openssh using libressl in macOS? Maybe related to this openssh/openssh-portable#203 ??

For the record, I just tried it in Linux and it works fine.

@conan-center-bot

This comment has been minimized.

@jwillikers
Copy link
Contributor

jwillikers commented Apr 1, 2024

@franramirez688 I recently worked with the util-linux project to fix a usage of explicit_bzero on macOS that produced the same error. That symbol isn't available on macOS. It appears that their Autotools script checks for this function and defines its own if it is not available. Something must be off in the build system regarding this.

@franramirez688
Copy link
Contributor

@franramirez688 I recently worked with the util-linux project to fix a usage of explicit_bzero on macOS that produced the same error. That symbol isn't available on macOS. It appears that their Autotools script checks for this function and defines its own if it is not available. Something must be off in the build system regarding this.

Thanks @jwillikers for the explanation. Given that, would it make sense to add a validate step for raising an invalid configuration exception when using with_libcrypto == "libressl" and macOS?

@jwillikers
Copy link
Contributor

@franramirez688 The configure output should note whether explicit_bzero was detected or not. In CI, I see checking for explicit_bzero... no. Do you see that as well? I don't think this issue has anything to do with libressl, since OpenSSH Portable should be declaring and defining this function as needed on macOS. It's required regardless of the implementation of libcrypto, unless OpenSSL is declaring the function.

@jwillikers
Copy link
Contributor

@franramirez688 Perhaps explicit_bzero is being picked up from the libressl project in the configure checks? I wonder if this was fixed in libressl/portable#961.

@franramirez688
Copy link
Contributor

@franramirez688 Perhaps explicit_bzero is being picked up from the libressl project in the configure checks? I wonder if this was fixed in libressl/portable#961.

@jwillikers thanks for that one. Indeed, it was the key point. Using libressl/3.9.1 (#23325), that problem would be solved 👏

Waiting for your PR to be merged, so we can add it directly here.

@franramirez688 franramirez688 requested a review from valgur April 2, 2024 08:51
@conan-center-bot
Copy link
Collaborator

Conan v1 pipeline ✔️

All green in build 6 (2692da4bfed12374728a6dd447aa03863851156f):

  • openssh/9.6p1:
    All packages built successfully! (All logs)

  • openssh/9.1p1:
    All packages built successfully! (All logs)


Conan v2 pipeline ✔️

Note: Conan v2 builds are now mandatory. Please read our discussion about it.

All green in build 6 (2692da4bfed12374728a6dd447aa03863851156f):

  • openssh/9.6p1:
    All packages built successfully! (All logs)

  • openssh/9.1p1:
    All packages built successfully! (All logs)

@franramirez688 franramirez688 self-assigned this Apr 2, 2024
@conan-center-bot conan-center-bot merged commit 8837465 into conan-io:master Apr 2, 2024
18 checks passed
yhsng pushed a commit to yhsng/conan-center-index that referenced this pull request Apr 12, 2024
* openssh: Added openssh recipe

* Update zlib dependency range

Co-authored-by: Rubén Rincón Blanco <git@rinconblanco.es>

* Empty commit for pipeline re-run

* openssh: Disbaled zlib version check during configure

* Simplify conditional patching & test package

* Update recipes/openssh/all/conanfile.py

Co-authored-by: Jordan Williams <jordan@jwillikers.com>

* Update recipes/openssh/all/conanfile.py

Co-authored-by: Jordan Williams <jordan@jwillikers.com>

* Update recipes/openssh/all/conanfile.py

Co-authored-by: Jordan Williams <jordan@jwillikers.com>

* openssh: Updated recipe according to PR discusion and suggestions

* openssh:: Fixed imports and indentation

* openssh: Fixed configure args

* openssh: removed support for old version 8.1p1

* Update recipes/openssh/all/conanfile.py

Co-authored-by: Jordan Williams <jordan@jwillikers.com>

* openssh: Added support for libressl

* Update recipes/openssh/all/conanfile.py

Co-authored-by: Rubén Rincón Blanco <git@rinconblanco.es>

* Update recipes/openssh/all/conanfile.py

Co-authored-by: Martin Valgur <martin.valgur@gmail.com>

* Update recipes/openssh/all/conanfile.py

Co-authored-by: Martin Valgur <martin.valgur@gmail.com>

* openssh: Updated with_pam default value

* Limited use of virtualrunenv in build scope. Applied suggestions

* Solved implicit function declarations errors

---------

Co-authored-by: Rubén Rincón Blanco <git@rinconblanco.es>
Co-authored-by: Rubén Rincón <rubenrb@jfrog.com>
Co-authored-by: Jordan Williams <jordan@jwillikers.com>
Co-authored-by: Martin Valgur <martin.valgur@gmail.com>
Co-authored-by: Francisco Ramirez de Anton <franchuti688@gmail.com>
ericLemanissier pushed a commit to ericLemanissier/conan-center-index that referenced this pull request Apr 16, 2024
* openssh: Added openssh recipe

* Update zlib dependency range

Co-authored-by: Rubén Rincón Blanco <git@rinconblanco.es>

* Empty commit for pipeline re-run

* openssh: Disbaled zlib version check during configure

* Simplify conditional patching & test package

* Update recipes/openssh/all/conanfile.py

Co-authored-by: Jordan Williams <jordan@jwillikers.com>

* Update recipes/openssh/all/conanfile.py

Co-authored-by: Jordan Williams <jordan@jwillikers.com>

* Update recipes/openssh/all/conanfile.py

Co-authored-by: Jordan Williams <jordan@jwillikers.com>

* openssh: Updated recipe according to PR discusion and suggestions

* openssh:: Fixed imports and indentation

* openssh: Fixed configure args

* openssh: removed support for old version 8.1p1

* Update recipes/openssh/all/conanfile.py

Co-authored-by: Jordan Williams <jordan@jwillikers.com>

* openssh: Added support for libressl

* Update recipes/openssh/all/conanfile.py

Co-authored-by: Rubén Rincón Blanco <git@rinconblanco.es>

* Update recipes/openssh/all/conanfile.py

Co-authored-by: Martin Valgur <martin.valgur@gmail.com>

* Update recipes/openssh/all/conanfile.py

Co-authored-by: Martin Valgur <martin.valgur@gmail.com>

* openssh: Updated with_pam default value

* Limited use of virtualrunenv in build scope. Applied suggestions

* Solved implicit function declarations errors

---------

Co-authored-by: Rubén Rincón Blanco <git@rinconblanco.es>
Co-authored-by: Rubén Rincón <rubenrb@jfrog.com>
Co-authored-by: Jordan Williams <jordan@jwillikers.com>
Co-authored-by: Martin Valgur <martin.valgur@gmail.com>
Co-authored-by: Francisco Ramirez de Anton <franchuti688@gmail.com>
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.

8 participants