From: tb <tb@openbsd.org>
Date: Sun, 23 Jun 2024 13:53:21 +0000 (+0000)
Subject: rust-openssl: switch from deprecated config to config.toml
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=a8396bba287763f3617961762e98baaf9a2528eb;p=openbsd

rust-openssl: switch from deprecated config to config.toml
---

diff --git a/regress/lib/libssl/rust-openssl/Makefile b/regress/lib/libssl/rust-openssl/Makefile
index a243995f204..dc17deee61f 100644
--- a/regress/lib/libssl/rust-openssl/Makefile
+++ b/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/regress/lib/libssl/rust-openssl/config b/regress/lib/libssl/rust-openssl/config
deleted file mode 100644
index a47474744d4..00000000000
--- a/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/regress/lib/libssl/rust-openssl/config.toml b/regress/lib/libssl/rust-openssl/config.toml
new file mode 100644
index 00000000000..a47474744d4
--- /dev/null
+++ b/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'