From 621b2e8dcc7fff494beae457dda7f8431848ed45 Mon Sep 17 00:00:00 2001 From: Eric Scouten Date: Tue, 27 May 2025 11:54:17 -0700 Subject: [PATCH 1/5] fix: Remove use of workspace versioning for the moment crates.io doesn't like it --- Cargo.lock | 103 +++++++++++++++++++++++++++++++++++++++++++++++-- cli/Cargo.toml | 4 +- 2 files changed, 100 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d8d965c1b..920ab841b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -816,6 +816,101 @@ dependencies = [ "zip", ] +[[package]] +name = "c2pa" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3ff3acedd17ff4646a88e823deab77f971e31386ea5a8775ca6d7e6ae4d756a" +dependencies = [ + "asn1-rs", + "async-generic", + "async-recursion", + "async-trait", + "atree", + "base64 0.22.1", + "bcder", + "byteorder", + "byteordered", + "bytes", + "chrono", + "ciborium", + "config", + "console_log", + "const-hex", + "const-oid", + "conv", + "coset", + "der", + "ed25519-dalek", + "extfmt", + "getrandom 0.2.16", + "hex", + "hex-literal", + "id3", + "image 0.24.9", + "img-parts", + "iref", + "jfifdump", + "js-sys", + "lazy_static", + "log", + "lopdf", + "memchr", + "mp4", + "multibase", + "nom", + "non-empty-string", + "nonempty-collections", + "num-bigint-dig", + "openssl", + "pem", + "pkcs1", + "pkcs8", + "png_pong", + "quick-xml", + "rand 0.8.5", + "rand_chacha 0.3.1", + "rand_core 0.9.3", + "range-set", + "rasn", + "rasn-ocsp", + "rasn-pkix", + "regex", + "reqwest", + "riff", + "ring", + "rsa", + "serde", + "serde-transcode", + "serde-wasm-bindgen", + "serde_bytes", + "serde_cbor", + "serde_derive", + "serde_json", + "serde_with", + "sha1", + "sha2", + "spki", + "static-iref", + "tempfile", + "thiserror 2.0.12", + "treeline", + "ureq", + "url", + "uuid", + "wasi 0.14.2+wasi-0.2.4", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "web-time", + "windows-core", + "wstd", + "x509-certificate", + "x509-parser", + "zeroize", + "zip", +] + [[package]] name = "c2patool" version = "0.17.0" @@ -824,7 +919,7 @@ dependencies = [ "assert_cmd", "async-std", "atree", - "c2pa", + "c2pa 0.54.0 (registry+https://github.com/rust-lang/crates.io-index)", "clap", "env_logger", "glob", @@ -849,7 +944,7 @@ dependencies = [ name = "c_api" version = "0.54.0" dependencies = [ - "c2pa", + "c2pa 0.54.0", "cbindgen", "scopeguard", "serde", @@ -1578,7 +1673,7 @@ name = "export_schema" version = "0.54.0" dependencies = [ "anyhow", - "c2pa", + "c2pa 0.54.0", "schemars", "serde_json", ] @@ -2639,7 +2734,7 @@ name = "make_test_images" version = "0.54.0" dependencies = [ "anyhow", - "c2pa", + "c2pa 0.54.0", "env_logger", "image 0.25.6", "log", diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 73574f687..66bd9a5b2 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -22,7 +22,7 @@ unexpected_cfgs = { level = "warn", check-cfg = ['cfg(test)'] } [dependencies] anyhow = "1.0" atree = "0.5.2" -c2pa = { workspace = true , features = [ +c2pa = { version = "0.54.0", features = [ "fetch_remote_manifests", "file_io", "add_thumbnails", @@ -56,5 +56,3 @@ mockall = "0.13.0" assert_cmd = "2.0.14" httpmock = "0.7.0" predicates = "3.1" - - From 659497adf1faa77abafe197fee266aa14283b934 Mon Sep 17 00:00:00 2001 From: Eric Scouten Date: Tue, 27 May 2025 12:10:41 -0700 Subject: [PATCH 2/5] Restore explicit version reference :-/ --- cli/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 66bd9a5b2..adafd115a 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -22,7 +22,7 @@ unexpected_cfgs = { level = "warn", check-cfg = ['cfg(test)'] } [dependencies] anyhow = "1.0" atree = "0.5.2" -c2pa = { version = "0.54.0", features = [ +c2pa = { path = "../sdk", version = "0.54.0", features = [ "fetch_remote_manifests", "file_io", "add_thumbnails", From 41991aa0e5fb1b8a7bc3975523dccc3b006e8951 Mon Sep 17 00:00:00 2001 From: Eric Scouten Date: Tue, 27 May 2025 12:11:15 -0700 Subject: [PATCH 3/5] Update Cargo.lock --- Cargo.lock | 103 +++-------------------------------------------------- 1 file changed, 4 insertions(+), 99 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 920ab841b..d8d965c1b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -816,101 +816,6 @@ dependencies = [ "zip", ] -[[package]] -name = "c2pa" -version = "0.54.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3ff3acedd17ff4646a88e823deab77f971e31386ea5a8775ca6d7e6ae4d756a" -dependencies = [ - "asn1-rs", - "async-generic", - "async-recursion", - "async-trait", - "atree", - "base64 0.22.1", - "bcder", - "byteorder", - "byteordered", - "bytes", - "chrono", - "ciborium", - "config", - "console_log", - "const-hex", - "const-oid", - "conv", - "coset", - "der", - "ed25519-dalek", - "extfmt", - "getrandom 0.2.16", - "hex", - "hex-literal", - "id3", - "image 0.24.9", - "img-parts", - "iref", - "jfifdump", - "js-sys", - "lazy_static", - "log", - "lopdf", - "memchr", - "mp4", - "multibase", - "nom", - "non-empty-string", - "nonempty-collections", - "num-bigint-dig", - "openssl", - "pem", - "pkcs1", - "pkcs8", - "png_pong", - "quick-xml", - "rand 0.8.5", - "rand_chacha 0.3.1", - "rand_core 0.9.3", - "range-set", - "rasn", - "rasn-ocsp", - "rasn-pkix", - "regex", - "reqwest", - "riff", - "ring", - "rsa", - "serde", - "serde-transcode", - "serde-wasm-bindgen", - "serde_bytes", - "serde_cbor", - "serde_derive", - "serde_json", - "serde_with", - "sha1", - "sha2", - "spki", - "static-iref", - "tempfile", - "thiserror 2.0.12", - "treeline", - "ureq", - "url", - "uuid", - "wasi 0.14.2+wasi-0.2.4", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "web-time", - "windows-core", - "wstd", - "x509-certificate", - "x509-parser", - "zeroize", - "zip", -] - [[package]] name = "c2patool" version = "0.17.0" @@ -919,7 +824,7 @@ dependencies = [ "assert_cmd", "async-std", "atree", - "c2pa 0.54.0 (registry+https://github.com/rust-lang/crates.io-index)", + "c2pa", "clap", "env_logger", "glob", @@ -944,7 +849,7 @@ dependencies = [ name = "c_api" version = "0.54.0" dependencies = [ - "c2pa 0.54.0", + "c2pa", "cbindgen", "scopeguard", "serde", @@ -1673,7 +1578,7 @@ name = "export_schema" version = "0.54.0" dependencies = [ "anyhow", - "c2pa 0.54.0", + "c2pa", "schemars", "serde_json", ] @@ -2734,7 +2639,7 @@ name = "make_test_images" version = "0.54.0" dependencies = [ "anyhow", - "c2pa 0.54.0", + "c2pa", "env_logger", "image 0.25.6", "log", From 98ab3641f31e33b566fc8ad66782c371582ba6ee Mon Sep 17 00:00:00 2001 From: Gavin Peacock Date: Tue, 27 May 2025 12:56:02 -0700 Subject: [PATCH 4/5] build: update test-wasi for conflict --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b599c666b..e186a2644 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,7 @@ test-wasi: ifeq ($(PLATFORM),mac) $(eval CC := /opt/homebrew/opt/llvm/bin/clang) endif - CC=$(CC) CARGO_TARGET_WASM32_WASIP2_RUNNER="wasmtime -S cli -S http --dir ." cargo +nightly test --target wasm32-wasip2 -p c2pa -p c2patool --all-features + CC=$(CC) CARGO_TARGET_WASM32_WASIP2_RUNNER="wasmtime -S cli -S http --dir ." cargo +nightly test --target wasm32-wasip2 -p c2pa -p c2patool --no-default-features --features="rust_native_crypto, file_io, fetch_remote_manifests, add_thumbnails, v1_api" rm -r sdk/Users # Full local validation, build and test all features including wasm From 55f9b7866efdbff093a5862aef9a2184353eb3cf Mon Sep 17 00:00:00 2001 From: Gavin Peacock Date: Tue, 27 May 2025 13:16:10 -0700 Subject: [PATCH 5/5] test: Remove c2patool from wasi test --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e186a2644..f47f97472 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,7 @@ test-wasi: ifeq ($(PLATFORM),mac) $(eval CC := /opt/homebrew/opt/llvm/bin/clang) endif - CC=$(CC) CARGO_TARGET_WASM32_WASIP2_RUNNER="wasmtime -S cli -S http --dir ." cargo +nightly test --target wasm32-wasip2 -p c2pa -p c2patool --no-default-features --features="rust_native_crypto, file_io, fetch_remote_manifests, add_thumbnails, v1_api" + CC=$(CC) CARGO_TARGET_WASM32_WASIP2_RUNNER="wasmtime -S cli -S http --dir ." cargo +nightly test --target wasm32-wasip2 -p c2pa --no-default-features --features="rust_native_crypto, file_io, fetch_remote_manifests, add_thumbnails, v1_api" rm -r sdk/Users # Full local validation, build and test all features including wasm