syncstorage-rs-git: add missing dependencies

diff --git a/syncstorage-rs-git/Makefile b/syncstorage-rs-git/Makefile
index 33c278d4820607238ed0a644b0ed790a83951c6d..231a060e25fd0e480b04826d786afc45bbf9d1a5 100644 (file)
--- a/syncstorage-rs-git/Makefile
+++ b/syncstorage-rs-git/Makefile
@@ -3,7 +3,7 @@
 DISTNAME=      syncstorage-rs-0.13.6
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=mozilla-services/}
-GIT_REPO=       https://github.com/mozilla-services/syncstorage-rs.git
+GIT_REPO=      https://github.com/mozilla-services/syncstorage-rs.git
 
 MAINTAINER=    pkgsrc-users@NetBSD.org
 HOMEPAGE=      https://github.com/mozilla-services/syncstorage-rs/
@@ -12,9 +12,8 @@ LICENSE=      mpl-2.0
 
 TOOL_DEPENDS+= cmake-[0-9]*:../../devel/cmake
 DEPENDS+=      ${PYPKGPREFIX}-cryptography-[0-9]*:../../security/py-cryptography
-#unpackaged:
-#pyfxa==0.7.7
-#tokenlib==2.0.0
+DEPENDS+=      ${PYPKGPREFIX}-FxA-[0-9]*:../../www/py-FxA
+DEPENDS+=      ${PYPKGPREFIX}-tokenlib-[0-9]*:../../security/py-tokenlib
 
 .include "cargo-depends.mk"
 

diff --git a/syncstorage-rs-git/TODO b/syncstorage-rs-git/TODO
index bc2d2f543abebf4569eeff0faa8e3ffa9144ecc9..85da33268be30429f02803e6fa4a269c1f78753c 100644 (file)
--- a/syncstorage-rs-git/TODO
+++ b/syncstorage-rs-git/TODO
@@ -1,2 +1 @@
-- package missing python modules
 - test how to start this from the pkgsrc installation

diff --git a/syncstorage-rs-git/distinfo b/syncstorage-rs-git/distinfo
index 3e1ed88c00a5ce38610cf10c6430bdacc77c144e..452c4bb225da9fff9069c6d3f250ddf6063054cb 100644 (file)
--- a/syncstorage-rs-git/distinfo
+++ b/syncstorage-rs-git/distinfo
@@ -1164,5 +1164,5 @@ Size (ws2_32-sys-0.2.1.crate) = 4697 bytes
 BLAKE2s (yaml-rust-0.4.5.crate) = 65c7c0fe708cb682959e36fbb03b09a35b09d529e5c87364107f5985940a1404
 SHA512 (yaml-rust-0.4.5.crate) = 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
 Size (yaml-rust-0.4.5.crate) = 47783 bytes
-SHA1 (patch-syncserver-db-common_Cargo.toml) = e0589b54d5a98ea87c233ba1fa86dde7c908a0e0
-SHA1 (patch-syncstorage-spanner_Cargo.toml) = c7893f2a629ee95761aa81b96bcbc6f9ffe536b3
+SHA1 (patch-syncserver-db-common_Cargo.toml) = 1f40a94f1e61f2d6db61157411cc1ed67e2b336a
+SHA1 (patch-syncstorage-spanner_Cargo.toml) = e5d092a9fd918a30df42ea4553b73f6271b3bc38

diff --git a/syncstorage-rs-git/patches/patch-syncserver-db-common_Cargo.toml b/syncstorage-rs-git/patches/patch-syncserver-db-common_Cargo.toml
index 2299d56a89f7c979333db7729a03c81baee9152e..b556d7a6b2b7106294b5962d5c7f0bd4e9d3ccf2 100644 (file)
--- a/syncstorage-rs-git/patches/patch-syncserver-db-common_Cargo.toml
+++ b/syncstorage-rs-git/patches/patch-syncserver-db-common_Cargo.toml
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Let pkgsrc provide the file instead of running git to fetch.
+
 --- syncserver-db-common/Cargo.toml.orig       2023-06-10 19:04:16.000000000 +0000
 +++ syncserver-db-common/Cargo.toml
 @@ -8,7 +8,7 @@ backtrace = "0.3.61"

diff --git a/syncstorage-rs-git/patches/patch-syncstorage-spanner_Cargo.toml b/syncstorage-rs-git/patches/patch-syncstorage-spanner_Cargo.toml
index 2340b3ca9696ed598c7edeb3bc76e3d96a91cb67..4b70fc4cde7b4b3f14f4b9e369743cebe857af47 100644 (file)
--- a/syncstorage-rs-git/patches/patch-syncstorage-spanner_Cargo.toml
+++ b/syncstorage-rs-git/patches/patch-syncstorage-spanner_Cargo.toml
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Let pkgsrc provide the file instead of running git to fetch.
+
 --- syncstorage-spanner/Cargo.toml.orig        2023-06-10 19:04:16.000000000 +0000
 +++ syncstorage-spanner/Cargo.toml
 @@ -10,7 +10,7 @@ cadence = "0.26"