pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

syncstorage-rs: replace sentry with manual download



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Tue Nov 5 11:48:11 2024 +0100
Changeset:	9e3160b099c59e4919b204afe83d3615bdd201cf

Modified Files:
	syncstorage-rs/Makefile
	syncstorage-rs/distinfo
Added Files:
	syncstorage-rs/TODO
	syncstorage-rs/patches/patch-Cargo.toml
	syncstorage-rs/patches/patch-syncserver-common_Cargo.toml

Log Message:
syncstorage-rs: replace sentry with manual download

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=9e3160b099c59e4919b204afe83d3615bdd201cf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 syncstorage-rs/Makefile                              |  4 ++++
 syncstorage-rs/TODO                                  | 12 ++++++++++++
 syncstorage-rs/distinfo                              |  5 +++++
 syncstorage-rs/patches/patch-Cargo.toml              | 20 ++++++++++++++++++++
 .../patches/patch-syncserver-common_Cargo.toml       | 15 +++++++++++++++
 5 files changed, 56 insertions(+)

diffs:
diff --git a/syncstorage-rs/Makefile b/syncstorage-rs/Makefile
index db10565ab5..f03e03cf70 100644
--- a/syncstorage-rs/Makefile
+++ b/syncstorage-rs/Makefile
@@ -39,6 +39,10 @@ DEADPOOL_REV=				deadpool-v0.7.0
 DISTFILES=				${DEFAULT_DISTFILES}
 DISTFILES+=				deadpool-${DEADPOOL_REV}.tar.gz
 SITES.deadpool-${DEADPOOL_REV}.tar.gz+=	-${MASTER_SITE_GITHUB:=mozilla-services/}deadpool/archive/${DEADPOOL_REV}.tar.gz
+# needs snapshot
+SENTRY_REV=		1b65b5c99af975496880e7325218479e0037d097
+DISTFILES+=		sentry-rust-${SENTRY_REV}.tar.gz
+SITES.sentry-rust-${SENTRY_REV}.tar.gz+=   -${MASTER_SITE_GITHUB:=getsentry/}sentry-rust/archive/${SENTRY_REV}.tar.gz
 
 USE_LANGUAGES=		c c++ # rust, but needs toolchain
 USE_TOOLS+=		pkg-config
diff --git a/syncstorage-rs/TODO b/syncstorage-rs/TODO
new file mode 100644
index 0000000000..110d1fa995
--- /dev/null
+++ b/syncstorage-rs/TODO
@@ -0,0 +1,12 @@
+===> Building for syncstorage-rs-0.17.13
+error: failed to get `sentry` as a dependency of package `syncserver-common v0.17.13 (/scratch/wip/syncstorage-rs/work/syncstorage-rs-0.17.13/syncserver-common)`
+
+Caused by:
+  failed to load source for dependency `sentry`
+
+Caused by:
+  Unable to update /scratch/wip/syncstorage-rs/work/sentry-rust-1b65b5c99af975496880e7325218479e0037d097
+
+Caused by:
+  found a virtual manifest at `/scratch/wip/syncstorage-rs/work/sentry-rust-1b65b5c99af975496880e7325218479e0037d097/Cargo.toml` instead of a package manifest
+*** Error code 101
diff --git a/syncstorage-rs/distinfo b/syncstorage-rs/distinfo
index f3a04bd47c..dedb3897b9 100644
--- a/syncstorage-rs/distinfo
+++ b/syncstorage-rs/distinfo
@@ -747,6 +747,9 @@ Size (sentry-core-0.34.0.crate) = 57227 bytes
 BLAKE2s (sentry-debug-images-0.34.0.crate) = 84a98c6f5f9cd80d4ed334db52edd3e94fcaa16cb01a909c4c491737803d1ee8
 SHA512 (sentry-debug-images-0.34.0.crate) = 597cdb63eaabf682a8b559dcd6699a1d0c3edf0761cdd6cc08bb91f5cbf23484d4000db259e95cc7ecad2075533dc47b83dea71596c6d824404e3d840e48fb8a
 Size (sentry-debug-images-0.34.0.crate) = 7319 bytes
+BLAKE2s (sentry-rust-1b65b5c99af975496880e7325218479e0037d097.tar.gz) = c4a2bdd546f9218c8e010e84842b854fd218b4635778a62cd90eda1e80425104
+SHA512 (sentry-rust-1b65b5c99af975496880e7325218479e0037d097.tar.gz) = 6f637f67ed218952a5d399755950e7e6f1d6f791c82f62a921698d17a5b1ddf1f10000b847ed91efeb548d19a5b0149171c7f9b62dc296be6e59f3badb06ec2e
+Size (sentry-rust-1b65b5c99af975496880e7325218479e0037d097.tar.gz) = 236781 bytes
 BLAKE2s (sentry-tracing-0.34.0.crate) = ab3e6e9aaa53e8b2b1bf6d9f7479783ced49a3e41e25e9ece15b2859ef527b77
 SHA512 (sentry-tracing-0.34.0.crate) = be58e5ad4326f023bc63ff6929f2eed57aed1d8f29ac796532a5289c93d0ba348267f1f03a15ebcd4ca87a536fa3f093765a4ae42d47b6f9c6cbe802ad8705b3
 Size (sentry-tracing-0.34.0.crate) = 12555 bytes
@@ -1119,5 +1122,7 @@ Size (zstd-safe-7.1.0.crate) = 20792 bytes
 BLAKE2s (zstd-sys-2.0.11+zstd.1.5.6.crate) = ef28ef1724e93ad44aa37661a5c1de7dd1650b198c5a42b08dbffc47606db49e
 SHA512 (zstd-sys-2.0.11+zstd.1.5.6.crate) = 37081282feffee1e78ddd8992ad5d8b2179ed7ec1be340d0cef0ce0aeea4aaa57850050f4b896d02875f0dec04ac1c20d9aa392f01b12e49ed885f4b8929f48d
 Size (zstd-sys-2.0.11+zstd.1.5.6.crate) = 749078 bytes
+SHA1 (patch-Cargo.toml) = 937b452e845133e49ee7512047c8a35aec2a72dc
+SHA1 (patch-syncserver-common_Cargo.toml) = 986c45c9f0910dbf1e48ddb41782a548eef95bbe
 SHA1 (patch-syncserver-db-common_Cargo.toml) = 9e79b81cea433afb480c2e600b1dfa9e885407c6
 SHA1 (patch-syncstorage-spanner_Cargo.toml) = 37bfa96b81a49d20a593348a1d6ff2edfd8586ca
diff --git a/syncstorage-rs/patches/patch-Cargo.toml b/syncstorage-rs/patches/patch-Cargo.toml
new file mode 100644
index 0000000000..67d8df5003
--- /dev/null
+++ b/syncstorage-rs/patches/patch-Cargo.toml
@@ -0,0 +1,20 @@
+$NetBSD$
+
+--- Cargo.toml.orig	2024-11-05 10:45:29.552602599 +0000
++++ Cargo.toml
+@@ -66,13 +66,13 @@ reqwest = { version = "0.12", default-fe
+ ] }
+ # rev 1b65b5c includes https://github.com/getsentry/sentry-rust/pull/701
+ # TODO: bump to 0.35 as soon as it's available
+-sentry = { version = "0.34", git = "https://github.com/getsentry/sentry-rust";, rev = "1b65b5c", default-features = false, features = [
++sentry = { path = "../sentry-rust-1b65b5c99af975496880e7325218479e0037d097", default-features = false, features = [
+   "curl",
+   "backtrace",
+   "contexts",
+   "debug-images",
+ ] }
+-sentry-backtrace = { version = "0.34", git = "https://github.com/getsentry/sentry-rust";, rev = "1b65b5c" }
++sentry-backtrace = { path = "../sentry-rust-1b65b5c99af975496880e7325218479e0037d097" }
+ serde = "1.0"
+ serde_derive = "1.0"
+ serde_json = { version = "1.0", features = ["arbitrary_precision"] }
diff --git a/syncstorage-rs/patches/patch-syncserver-common_Cargo.toml b/syncstorage-rs/patches/patch-syncserver-common_Cargo.toml
new file mode 100644
index 0000000000..60d348a89e
--- /dev/null
+++ b/syncstorage-rs/patches/patch-syncserver-common_Cargo.toml
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- syncserver-common/Cargo.toml.orig	2024-11-05 10:46:45.621411238 +0000
++++ syncserver-common/Cargo.toml
+@@ -12,8 +12,8 @@ cadence.workspace = true
+ futures.workspace = true
+ futures-util.workspace = true
+ sha2.workspace = true
+-sentry.workspace = true
+-sentry-backtrace.workspace = true
++sentry = { path = "../../sentry-rust-1b65b5c99af975496880e7325218479e0037d097" }
++sentry-backtrace = { path = "../../sentry-rust-1b65b5c99af975496880e7325218479e0037d097" }
+ serde.workspace = true
+ serde_json.workspace = true
+ slog.workspace = true


Home | Main Index | Thread Index | Old Index