syncstorage-rs: update to latest distfile

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: syncstorage-rs: update to latest distfile
From: Thomas Klausner <wiz%gatalith.at@localhost>
Date: Sun, 22 Jan 2023 21:44:00 +0000
Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%gatalith.at@localhost>
Pushed By:	wiz
Date:		Sun Jan 22 22:44:00 2023 +0100
Changeset:	9b11c29053cf66abb53e89661750fbd56c720297

Modified Files:
	syncstorage-rs/Makefile
	syncstorage-rs/TODO
	syncstorage-rs/cargo-depends.mk
	syncstorage-rs/distinfo
Added Files:
	syncstorage-rs/a
	syncstorage-rs/patches/patch-syncserver-db-common_Cargo.toml
	syncstorage-rs/patches/patch-syncserver_Cargo.toml
Removed Files:
	syncstorage-rs/patches/patch-Cargo.toml

Log Message:
syncstorage-rs: update to latest distfile

doesn't build

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

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

diffstat:
 syncstorage-rs/Makefile                            |  2 +-
 syncstorage-rs/TODO                                | 33 +++++++++++-----------
 syncstorage-rs/a                                   |  8 ++++++
 syncstorage-rs/cargo-depends.mk                    |  1 -
 syncstorage-rs/distinfo                            | 12 ++++----
 syncstorage-rs/patches/patch-Cargo.toml            | 15 ----------
 .../patches/patch-syncserver-db-common_Cargo.toml  | 13 +++++++++
 syncstorage-rs/patches/patch-syncserver_Cargo.toml | 13 +++++++++
 8 files changed, 57 insertions(+), 40 deletions(-)

diffs:
diff --git a/syncstorage-rs/Makefile b/syncstorage-rs/Makefile
index 669deb7de1..20b1cec716 100644
--- a/syncstorage-rs/Makefile
+++ b/syncstorage-rs/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=	syncstorage-rs-0.11.0
+DISTNAME=	syncstorage-rs-0.13.1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_GITHUB:=mozilla-services/}
 GITHUB_TAG=	${PKGVERSION_NOREV}
diff --git a/syncstorage-rs/TODO b/syncstorage-rs/TODO
index de87c676d6..ee6c4f2df1 100644
--- a/syncstorage-rs/TODO
+++ b/syncstorage-rs/TODO
@@ -1,18 +1,19 @@
-  = note: ld: /scratch/wip/syncstorage-rs/work/syncstorage-rs-0.11.0/target/release/deps/libgrpcio_sys-47e4d656499c9b98.rlib(mutex.cc.o): in function `absl::lts_20210324::UnrefSynchEvent(absl::lts_20210324::SynchEvent*) [clone .part.0]':
-          /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/third_party/abseil-cpp/absl/synchronization/mutex.cc:361: undefined reference to `absl::lts_20210324::base_internal::LowLevelAlloc::Free(void*)'
-          ld: /scratch/wip/syncstorage-rs/work/syncstorage-rs-0.11.0/target/release/deps/libgrpcio_sys-47e4d656499c9b98.rlib(mutex.cc.o): in function `absl::lts_20210324::ForgetSynchEvent(std::atomic<long>*, long, long)':
-          /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/third_party/abseil-cpp/absl/synchronization/mutex.cc:361: undefined reference to `absl::lts_20210324::base_internal::LowLevelAlloc::Free(void*)'
-          ld: /scratch/wip/syncstorage-rs/work/syncstorage-rs-0.11.0/target/release/deps/libgrpcio_sys-47e4d656499c9b98.rlib(mutex.cc.o): in function `absl::lts_20210324::synchronization_internal::PerThreadSem::Post(absl::lts_20210324::base_internal::ThreadIdentity*)':
-          /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/third_party/abseil-cpp/absl/synchronization/internal/per_thread_sem.h:107: undefined reference to `AbslInternalPerThreadSemPost_lts_20210324'
-          ld: /scratch/wip/syncstorage-rs/work/syncstorage-rs-0.11.0/target/release/deps/libgrpcio_sys-47e4d656499c9b98.rlib(mutex.cc.o): in function `absl::lts_20210324::synchronization_internal::PerThreadSem::Wait(absl::lts_20210324::synchronization_internal::KernelTimeout)':
-          /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/third_party/abseil-cpp/absl/synchronization/internal/per_thread_sem.h:112: undefined reference to `AbslInternalPerThreadSemWait_lts_20210324'
-          ld: /scratch/wip/syncstorage-rs/work/syncstorage-rs-0.11.0/target/release/deps/libgrpcio_sys-47e4d656499c9b98.rlib(mutex.cc.o): in function `absl::lts_20210324::synchronization_internal::GetOrCreateCurrentThreadIdentity()':
-          /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/third_party/abseil-cpp/absl/synchronization/internal/create_thread_identity.h:51: undefined reference to `absl::lts_20210324::synchronization_internal::CreateThreadIdentity()'
-          ld: /scratch/wip/syncstorage-rs/work/vendor/grpcio-sys-0.9.1+1.38.0/grpc/third_party/abseil-cpp/absl/synchronization/internal/create_thread_identity.h:51: undefined reference to `absl::lts_20210324::synchronization_internal::CreateThreadIdentity()'
+error: failed to load manifest for workspace member `/scratch/wip/syncstorage-rs/work/syncstorage-rs-0.13.1/syncserver-settings`
 
-  = help: some `extern` functions couldn't be found; some native libraries may need to be installed or have their path specified
-  = note: use the `-l` flag to specify native libraries to link
-  = note: use the `cargo:rustc-link-lib` directive to specify the native libraries to link with Cargo (see https://doc.rust-lang.org/cargo/reference/build-scripts.html#cargorustc-link-libkindname)
+Caused by:
+  failed to load manifest for dependency `tokenserver-settings`
 
-error: build failed
-*** Error code 101
+Caused by:
+  failed to load manifest for dependency `tokenserver-common`
+
+Caused by:
+  failed to load manifest for dependency `syncserver-db-common`
+
+Caused by:
+  failed to load manifest for dependency `deadpool`
+
+Caused by:
+  failed to read `/scratch/wip/syncstorage-rs/work/syncstorage-rs-0.13.1/deadpool/Cargo.toml`
+
+Caused by:
+  No such file or directory (os error 2)
diff --git a/syncstorage-rs/a b/syncstorage-rs/a
new file mode 100644
index 0000000000..7854511604
--- /dev/null
+++ b/syncstorage-rs/a
@@ -0,0 +1,8 @@
+work/syncstorage-rs-0.13.1/Cargo.toml
+work/syncstorage-rs-0.13.1/syncserver-common/Cargo.toml
+work/syncstorage-rs-0.13.1/syncserver-db-common/Cargo.toml
+work/syncstorage-rs-0.13.1/syncserver-settings/Cargo.toml
+work/syncstorage-rs-0.13.1/syncserver/Cargo.toml
+work/syncstorage-rs-0.13.1/syncstorage-settings/Cargo.toml
+work/syncstorage-rs-0.13.1/tokenserver-common/Cargo.toml
+work/syncstorage-rs-0.13.1/tokenserver-settings/Cargo.toml
diff --git a/syncstorage-rs/cargo-depends.mk b/syncstorage-rs/cargo-depends.mk
index 7e9cc64fd3..57521bff19 100644
--- a/syncstorage-rs/cargo-depends.mk
+++ b/syncstorage-rs/cargo-depends.mk
@@ -15,7 +15,6 @@ CARGO_CRATE_DEPENDS+=	actix-tls-2.0.0
 CARGO_CRATE_DEPENDS+=	actix-utils-2.0.0
 CARGO_CRATE_DEPENDS+=	actix-web-3.3.3
 CARGO_CRATE_DEPENDS+=	actix-web-codegen-0.4.0
-CARGO_CRATE_DEPENDS+=	actix-web-httpauth-0.5.1
 CARGO_CRATE_DEPENDS+=	addr2line-0.17.0
 CARGO_CRATE_DEPENDS+=	adler-1.0.2
 CARGO_CRATE_DEPENDS+=	aho-corasick-0.7.18
diff --git a/syncstorage-rs/distinfo b/syncstorage-rs/distinfo
index 06993c10a9..e4bb3463c7 100644
--- a/syncstorage-rs/distinfo
+++ b/syncstorage-rs/distinfo
@@ -45,9 +45,6 @@ Size (actix-web-3.3.3.crate) = 134624 bytes
 BLAKE2s (actix-web-codegen-0.4.0.crate) = 4fa4879aeb53f8183d85dbcf2c68daec78741ce221cffb2bed3dcf6f61053d67
 SHA512 (actix-web-codegen-0.4.0.crate) = a03ba5a630c096ce175613360d975c2f72d65eb8bf1665f3fe357df107e1683cdd886514707cb5116ab419f29a86e09da89e24c1f30c9f43b212d1525277b49a
 Size (actix-web-codegen-0.4.0.crate) = 13056 bytes
-BLAKE2s (actix-web-httpauth-0.5.1.crate) = 4740a0b988327cbfd77bc69507e4b9b4c6d790105ebabd5c4fcb51fe2b5dc339
-SHA512 (actix-web-httpauth-0.5.1.crate) = 92869f03bf88f21096f70bfc59dcf9a1377f157f70fa1a9c6d53660028a6d56551094d15a30ee2e1d4d0f67d3c402df30fed41bee6434b02918be89cdc1fe0be
-Size (actix-web-httpauth-0.5.1.crate) = 30605 bytes
 BLAKE2s (addr2line-0.17.0.crate) = f7fa3b016f0e80c4ea9967f8947de15edc9fa39d0c0cdea692dccd0c41c28039
 SHA512 (addr2line-0.17.0.crate) = ef3bbd7c6d1dfdd0b47e3be1fb4c8b15ed61a769bed7e80dce80461a1ee13ef21c75e62e9a66328504f862341f1e808abec5790ac79784e18655afcc16206b95
 Size (addr2line-0.17.0.crate) = 32260 bytes
@@ -885,9 +882,9 @@ Size (subtle-2.4.1.crate) = 12630 bytes
 BLAKE2s (syn-1.0.86.crate) = 391940d34709d32841390ff9ab418418a9356f63323c41e2b889d9e16f6cb109
 SHA512 (syn-1.0.86.crate) = 1462dc9fbf0a89b023421064908c7e349ede23c986eddcb8d260559b5e1346fe0206c88e5317eea7e8293ea58b94466d486fae3aa57a1dee4220f5431b1fb68a
 Size (syn-1.0.86.crate) = 235126 bytes
-BLAKE2s (syncstorage-rs-0.11.0.tar.gz) = 7fd76ac220fd0f1a0cc4f2030254cfde902fbd8727f277e78005979cb972ceba
-SHA512 (syncstorage-rs-0.11.0.tar.gz) = 517add63fb9d5982d9793d6da24255ca400e535ba69f47882f3cc4309da6b6d450184c393894713c1af9fbb59fc90b85ff0a1d191407f410dc86be0f9c318696
-Size (syncstorage-rs-0.11.0.tar.gz) = 312556 bytes
+BLAKE2s (syncstorage-rs-0.13.1.tar.gz) = f42781f8b3cf2804b7ea65c45825b78f6c74bb06d85c3833929b47c1736b90c8
+SHA512 (syncstorage-rs-0.13.1.tar.gz) = 11a86b70de05c6cd9f9059f380ef36e24524931c6e2ab80ead7b3d6bcf2cbb6e2a6e0d9210d3b4900af552768fefe8028897b44c84753e0fe58f585e5af1b68a
+Size (syncstorage-rs-0.13.1.tar.gz) = 326761 bytes
 BLAKE2s (synstructure-0.12.6.crate) = 891c609ebfe33301f1b9f08e42abbe31f2de2a7f8d769fdff2c51747acbaa4f7
 SHA512 (synstructure-0.12.6.crate) = 6ec5dd7ade904fb6d79c2be595886289846e064b8c4100f780d8adfcbb41e6ca67f4b1d682212f4673c2169f889a042049b31161ec3cebc3f399751124f01f9c
 Size (synstructure-0.12.6.crate) = 18429 bytes
@@ -1108,10 +1105,11 @@ BLAKE2s (yaml-rust-0.4.5.crate) = 65c7c0fe708cb682959e36fbb03b09a35b09d529e5c873
 SHA512 (yaml-rust-0.4.5.crate) = 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
 Size (yaml-rust-0.4.5.crate) = 47783 bytes
 SHA1 (patch-.._vendor_boringssl-src-0.3.0+688fc5c_boringssl_src_include_openssl_thread.h) = 743c169f65c6911f23fe9b936e3978c0b82e6243
-SHA1 (patch-Cargo.toml) = ca403bb992ab1fa499268c089e19a0709676dd6e
 SHA1 (patch-aa) = 4fc1bf16f1b604aa754fea099c640d418a278bd1
 SHA1 (patch-ab) = 20b8f4ffd4c36a8cad24b9f1c28672027f8db943
 SHA1 (patch-ac) = 1f04dc44972a4f9d4aaff719341d91843ef379d1
 SHA1 (patch-ad) = c55d065053adeb8a716e2e4db91bcc4c393e1269
 SHA1 (patch-ba) = a00e0ed12537b39dea5a0aa059e0627761dc8974
 SHA1 (patch-bb) = d29e8f357ae17ee0ee1aa715ba2de663cf4ccfcb
+SHA1 (patch-syncserver-db-common_Cargo.toml) = 51d5747392be1949b8584890c20cd1e7932c2475
+SHA1 (patch-syncserver_Cargo.toml) = 79b5d6217662aaeec1c3eaab3a1113aac6eae7d2
diff --git a/syncstorage-rs/patches/patch-Cargo.toml b/syncstorage-rs/patches/patch-Cargo.toml
deleted file mode 100644
index d0ea2345e4..0000000000
--- a/syncstorage-rs/patches/patch-Cargo.toml
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Let pkgsrc provide git snapshot of deadpool.
-
---- Cargo.toml.orig	2021-04-28 22:17:28.000000000 +0000
-+++ Cargo.toml
-@@ -30,7 +30,7 @@ config = "0.10"
- # Pin to 0.5 for now, to keep it under tokio 0.2 (issue977).
- # Fix for #803 (deadpool#92) points to our fork for now
- #deadpool = "0.5"  # pin to 0.5
--deadpool = { git = "https://github.com/mozilla-services/deadpool";, branch = "deadpool-v0.5.2-issue92" }
-+deadpool = { path = "../deadpool" }
- diesel = { version = "1.4", features = ["mysql", "r2d2"] }
- diesel_logger = "0.1.1"
- diesel_migrations = { version = "1.4.0", features = ["mysql"] }
diff --git a/syncstorage-rs/patches/patch-syncserver-db-common_Cargo.toml b/syncstorage-rs/patches/patch-syncserver-db-common_Cargo.toml
new file mode 100644
index 0000000000..2486c04d97
--- /dev/null
+++ b/syncstorage-rs/patches/patch-syncserver-db-common_Cargo.toml
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- syncserver-db-common/Cargo.toml.orig	2022-12-16 18:15:37.000000000 +0000
++++ syncserver-db-common/Cargo.toml
+@@ -10,7 +10,7 @@ chrono = "0.4"
+ # Pin to 0.5 for now, to keep it under tokio 0.2 (issue977).
+ # Fix for #803 (deadpool#92) points to our fork for now
+ #deadpool = "0.5"  # pin to 0.5
+-deadpool = { git = "https://github.com/mozilla-services/deadpool";, branch = "deadpool-v0.5.2-issue92" }
++deadpool = { path = "../deadpool" }
+ diesel = { version = "1.4", features = ["mysql", "r2d2"] }
+ diesel_migrations = { version = "1.4.0", features = ["mysql"] }
+ # Some versions of OpenSSL 1.1.1 conflict with grpcio's built-in boringssl which can cause
diff --git a/syncstorage-rs/patches/patch-syncserver_Cargo.toml b/syncstorage-rs/patches/patch-syncserver_Cargo.toml
new file mode 100644
index 0000000000..868bfd4da1
--- /dev/null
+++ b/syncstorage-rs/patches/patch-syncserver_Cargo.toml
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- syncserver/Cargo.toml.orig	2022-12-16 18:15:37.000000000 +0000
++++ syncserver/Cargo.toml
+@@ -26,7 +26,7 @@ chrono = "0.4"
+ # Pin to 0.5 for now, to keep it under tokio 0.2 (issue977).
+ # Fix for #803 (deadpool#92) points to our fork for now
+ #deadpool = "0.5"  # pin to 0.5
+-deadpool = { git = "https://github.com/mozilla-services/deadpool";, branch = "deadpool-v0.5.2-issue92" }
++deadpool = { path = "../deadpool" }
+ diesel = { version = "1.4", features = ["mysql", "r2d2"] }
+ diesel_logger = "0.1.1"
+ diesel_migrations = { version = "1.4.0", features = ["mysql"] }
Prev by Date: xdiary: remove, imported in te main tree.
Next by Date: syncstorage-rs: remove accidentally committed file
Previous by Thread: xdiary: remove, imported in te main tree.
Next by Thread: syncstorage-rs: remove accidentally committed file
Indexes:
Home | Main Index | Thread Index | Old Index