root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

the rpki-client external test should use relase version not a master branch on github 

@botovq asked me not to use master branch of rpki-client. This will keep CI-run
green regardless of what happens in rpki-client active development branch.
Once new version of rpki-client will be released we will just update the
test here to fetch new msater version.

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/28136)
This commit is contained in:
Alexandr Nedvedicky 2025-07-31 14:15:13 +02:00 committed by Neil Horman
parent 036a46d2a4
commit b5157f29a9
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci.yml vendored
View File

@ -628,7 +628,7 @@ jobs:
- name: package installs - name: package installs
run: | run: |
sudo apt-get update sudo apt-get update
sudo apt-get -yq install bison gettext keyutils ldap-utils libldap2-dev libkeyutils-dev python3 python3-paste python3-pyrad slapd tcsh python3-virtualenv virtualenv python3-kdcproxy gdb libtls-dev sudo apt-get -yq install bison gettext keyutils ldap-utils libldap2-dev libkeyutils-dev python3 python3-paste python3-pyrad slapd tcsh python3-virtualenv virtualenv python3-kdcproxy gdb libtls-dev wget
- name: install cpanm and Test2::V0 for gost_engine testing - name: install cpanm and Test2::V0 for gost_engine testing
uses: perl-actions/install-with-cpanm@10d60f00b4073f484fc29d45bfbe2f776397ab3d # v1.7 uses: perl-actions/install-with-cpanm@10d60f00b4073f484fc29d45bfbe2f776397ab3d # v1.7
with: with:

3
.gitmodules vendored
View File

@ -35,6 +35,3 @@
[submodule "pkcs11-provider"] [submodule "pkcs11-provider"]
path = pkcs11-provider path = pkcs11-provider
url = https://github.com/latchset/pkcs11-provider.git url = https://github.com/latchset/pkcs11-provider.git
[submodule "rpki-client-portable"]
path = rpki-client-portable
url = https://github.com/rpki-client/rpki-client-portable

1
rpki-client-portable

@ -1 +0,0 @@
Subproject commit 4fe1d9b72dfd6b8745b8a3d66b388526835998be

13
test/recipes/95-test_external_rpki-client-portable.t
View File

@ -16,14 +16,19 @@ setup("test_external_rpki-client-portable");
plan skip_all => "No external tests in this configuration" plan skip_all => "No external tests in this configuration"
if disabled("external-tests"); if disabled("external-tests");
plan skip_all => "rpki-client-portable not available"
if ! -f srctop_file("rpki-client-portable", "configure.ac");
plan tests => 1; plan tests => 1;
$RPKI_VERSION = "9.5";
$RPKI_SRC = "rpki-client-".$RPKI_VERSION;
$RPKI_SUFFIX = ".tar.gz";
$RPKI_TARBALL = $RPKI_SRC.$RPKI_SUFFIX;
$RPKI_BASE_URL = "https://cdn.openbsd.org/pub/OpenBSD/rpki-client/";
$ENV{OPENSSL_MODULES} = abs_path(bldtop_dir("providers")); $ENV{OPENSSL_MODULES} = abs_path(bldtop_dir("providers"));
$ENV{OPENSSL_CONF} = abs_path(srctop_file("test", "default-and-legacy.cnf")); $ENV{OPENSSL_CONF} = abs_path(srctop_file("test", "default-and-legacy.cnf"));
$ENV{ AUTOCONF_VERSION} = 2.72; $ENV{RPKI_DOWNLOAD_URL} = $RPKI_BASE_URL.$RPKI_TARBALL;
$ENV{ AUTOMAKE_VERSION} = 1.16; $ENV{RPKI_TARBALL} = $RPKI_TARBALL;
$ENV{RPKI_SRC} = $RPKI_SRC;
ok(run(cmd([data_file("rpki-client-portable.sh")])), "running rpki-client tests"); ok(run(cmd([data_file("rpki-client-portable.sh")])), "running rpki-client tests");

5
test/recipes/95-test_external_rpki-client-portable_data/rpki-client-portable.sh
View File

@ -11,9 +11,8 @@
LDFLAGS="-L`pwd`/$BLDTOP -Wl,-rpath,`pwd`/$BLDTOP" LDFLAGS="-L`pwd`/$BLDTOP -Wl,-rpath,`pwd`/$BLDTOP"
CFLAGS="-I`pwd`/$BLDTOP/include -I`pwd`/$SRCTOP/include" CFLAGS="-I`pwd`/$BLDTOP/include -I`pwd`/$SRCTOP/include"
cd $SRCTOP/rpki-client-portable wget -O $RPKI_TARBALL $RPKI_DOWNLOAD_URL && tar xzf $RPKI_TARBALL
cd $RPKI_SRC
./autogen.sh
./configure --with-openssl-cflags="$CFLAGS" --with-openssl-ldflags="$LDFLAGS" \ ./configure --with-openssl-cflags="$CFLAGS" --with-openssl-ldflags="$LDFLAGS" \
CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"