Enable CI builds for CentOS Stream/Rocky Linux 10.#240
Enable CI builds for CentOS Stream/Rocky Linux 10.#240fscheiner wants to merge 2 commits intogridcf:masterfrom
Conversation
fscheiner
force-pushed
the
enable-ci-builds-for-el10-distros
branch
from
25b7ecf to
bcb8376
Compare
|
Forgot Let's see if any additional packages are needed to be installed prior to a build... |
This is no longer supported with: * RHEL 10 * CentOS Stream 10 * Rocky Linux 10 ...and also not needed anymore when checking the current GSI-OpenSSH sources. Also see gridcf#234.
fscheiner
force-pushed
the
enable-ci-builds-for-el10-distros
branch
from
b779657 to
91b0f3f
Compare
|
Forgot another special case, but now it's complete. Ok to merge? |
| @@ -1,2 +1,2 @@ | |||
| #! /bin/sh | |||
| "${0%.gnu}" "$@" --without-zlib-version-check --with-ssl-engine --with-ipaddr-display --with-pam --without-kerberos5 --with-libedit --with-gsi --sysconfdir="\${prefix}/etc/gsissh" No newline at end of file | |||
| "${0%.gnu}" "$@" --without-zlib-version-check --with-ipaddr-display --with-pam --without-kerberos5 --with-libedit --with-gsi --sysconfdir="\${prefix}/etc/gsissh" No newline at end of file | |||
There was a problem hiding this comment.
Same question as in PR #241: What is the reason for removing the --with-ssl-engine ? It might no longer be needed but doesn't seem distro specific then?
There was a problem hiding this comment.
This is "needed" for builds on *10 distros, as the engine support was removed there, see commit message for this specific commit. I grepped the source code for any case where this might be needed, but also found none, or none that I cocluded was relevant for us:
$ grep -nri engine
INSTALL:216:--with-ssl-engine enables Libre/OpenSSL's (hardware) ENGINE support
ChangeLog:7971: seed_rng will initialize OpenSSL, and some engine providers (eg Intel's
openbsd-compat/openssl-compat.c:25:#ifdef USE_OPENSSL_ENGINE
openbsd-compat/openssl-compat.c:26:# include <openssl/engine.h>
openbsd-compat/openssl-compat.c:83:#ifdef USE_OPENSSL_ENGINE
openbsd-compat/openssl-compat.c:85: ENGINE_load_builtin_engines();
openbsd-compat/openssl-compat.c:86: ENGINE_register_all_complete();
openbsd-compat/openssl-compat.c:88: /* Load the libcrypto config file to pick up engines defined there */
openbsd-compat/openssl-compat.c:95:#endif /* USE_OPENSSL_ENGINE */
contrib/findssl.sh:27:# checking OpenSSL library version... 90602f (OpenSSL 0.9.6b [engine] 9 Jul 2001)
contrib/redhat/openssh.spec:68:# Options for Smartcard support: (needs libsectok and openssl-engine)
configure.ac:2843:openssl_engine=no
configure.ac:2844:AC_ARG_WITH([ssl-engine],
configure.ac:2845: [ --with-ssl-engine Enable OpenSSL (hardware) ENGINE support ],
configure.ac:2849: AC_MSG_ERROR([cannot use --with-ssl-engine when OpenSSL disabled])
configure.ac:2851: openssl_engine=yes
configure.ac:3107: if test "x$openssl_engine" = "xyes" ; then
configure.ac:3108: AC_MSG_CHECKING([for OpenSSL ENGINE support])
configure.ac:3110: #include <openssl/engine.h>
configure.ac:3112: ENGINE_load_builtin_engines();
configure.ac:3113: ENGINE_register_all_complete();
configure.ac:3116: AC_DEFINE([USE_OPENSSL_ENGINE], [1],
configure.ac:3117: [Enable OpenSSL engine support])
configure.ac:3118: ], [ AC_MSG_ERROR([OpenSSL ENGINE support not found])
I think if #240 and #241 get merged in this order, a rebase might be not needed - or is done implicitly. But we can also (1) just merge #241 only and just close this one instead of (2) first merging #240 and then #241. But then the commit message for the merge of #241 needs to be extended to also mention the enablement of CI builds on *10 distros to be complete. I had to make/made two PRs, because I got the info about the ARM64 runners only after making #240. |
2 participants
Let's see if that works like so.