From aecf2891b93a4517be3405038476921bdc08c7e5 Mon Sep 17 00:00:00 2001 From: tb <> Date: Sun, 23 Jun 2024 13:53:22 +0000 Subject: rust-openssl: switch from deprecated config to config.toml --- src/regress/lib/libssl/rust-openssl/Makefile | 4 ++-- src/regress/lib/libssl/rust-openssl/config | 6 ------ src/regress/lib/libssl/rust-openssl/config.toml | 6 ++++++ 3 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 src/regress/lib/libssl/rust-openssl/config create mode 100644 src/regress/lib/libssl/rust-openssl/config.toml (limited to 'src') diff --git a/src/regress/lib/libssl/rust-openssl/Makefile b/src/regress/lib/libssl/rust-openssl/Makefile index a243995f20..dc17deee61 100644 --- a/src/regress/lib/libssl/rust-openssl/Makefile +++ b/src/regress/lib/libssl/rust-openssl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2022/12/05 14:43:06 tb Exp $ +# $OpenBSD: Makefile,v 1.5 2024/06/23 13:53:21 tb Exp $ RUST_OPENSSL_TESTS = /usr/local/share/rust-openssl-tests CARGO = /usr/local/bin/cargo @@ -20,7 +20,7 @@ ${_WORKSPACE_COOKIE}: cp ${.CURDIR}/Cargo.toml ${.OBJDIR}/ . endif mkdir -p .cargo - cp ${.CURDIR}/config .cargo/ + cp ${.CURDIR}/config.toml .cargo/ cd ${.OBJDIR} && ln -sf ${WORKSPACE_LINKS:S,^,${RUST_OPENSSL_TESTS}/,} . touch $@ diff --git a/src/regress/lib/libssl/rust-openssl/config b/src/regress/lib/libssl/rust-openssl/config deleted file mode 100644 index a47474744d..0000000000 --- a/src/regress/lib/libssl/rust-openssl/config +++ /dev/null @@ -1,6 +0,0 @@ -[net] - offline = true -[source.modcargo] - directory = '/usr/local/share/rust-openssl-tests/modcargo-crates' -[source.crates-io] - replace-with = 'modcargo' diff --git a/src/regress/lib/libssl/rust-openssl/config.toml b/src/regress/lib/libssl/rust-openssl/config.toml new file mode 100644 index 0000000000..a47474744d --- /dev/null +++ b/src/regress/lib/libssl/rust-openssl/config.toml @@ -0,0 +1,6 @@ +[net] + offline = true +[source.modcargo] + directory = '/usr/local/share/rust-openssl-tests/modcargo-crates' +[source.crates-io] + replace-with = 'modcargo' -- cgit v1.2.3-55-g6feb