Skip to content

Conversation

@fscheiner
Copy link
Member

Let's see if that works like so.

@fscheiner fscheiner force-pushed the enable-ci-builds-for-el10-distros branch from 25b7ecf to bcb8376 Compare November 16, 2025 14:42
@fscheiner
Copy link
Member Author

Forgot -y for dnf and looks like Docker images of Rocky Linux are now prefixed with rockylinux/. The older ones seem to still work as is though.

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 fscheiner force-pushed the enable-ci-builds-for-el10-distros branch from b779657 to 91b0f3f Compare November 16, 2025 16:59
@fscheiner
Copy link
Member Author

Forgot another special case, but now it's complete. Ok to merge?

@fscheiner fscheiner requested review from ellert and msalle November 16, 2025 17:35
Copy link
Member

@msalle msalle left a comment

Choose a reason for hiding this comment

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

How is this PR related to #241? It looks (after a brief look) like #241 supersedes this one?

@@ -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"
"${0%.gnu}" "$@" --without-zlib-version-check --with-ipaddr-display --with-pam --without-kerberos5 --with-libedit --with-gsi --sysconfdir="\${prefix}/etc/gsissh"
Copy link
Member

Choose a reason for hiding this comment

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

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?

Copy link
Member Author

Choose a reason for hiding this comment

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

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])

@fscheiner
Copy link
Member Author

How is this PR related to #241? It looks (after a brief look) like #241 supersedes this one?

#241 was branched off from the branch this PR is based on, so inherits its commits.

@msalle
Copy link
Member

msalle commented Nov 18, 2025

How is this PR related to #241? It looks (after a brief look) like #241 supersedes this one?

#241 was branched off from the branch this PR is based on, so inherits its commits.

Ah right, so means whichever PR gets merged first, the other needs to be rebased.

@fscheiner
Copy link
Member Author

#241 was branched off from the branch this PR is based on, so inherits its commits.

Ah right, so means whichever PR gets merged first, the other needs to be rebased.

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.

@fscheiner
Copy link
Member Author

@msalle : I added a memo to #241 with title and description for the merge window when #241 gets merged instead of both #240 and #241. So let's close this one unmerged in favor of the other one.

@fscheiner fscheiner closed this Nov 18, 2025
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