diff --git a/cross/diesel/Makefile b/cross/diesel/Makefile index 2a12d1381d8..148d383f9d6 100644 --- a/cross/diesel/Makefile +++ b/cross/diesel/Makefile @@ -1,5 +1,5 @@ PKG_NAME = diesel -PKG_VERS = 2.1.4 +PKG_VERS = 2.1.6 PKG_EXT = tar.gz PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://github.com/diesel-rs/diesel/archive diff --git a/cross/diesel/digests b/cross/diesel/digests index bc4d98c7631..8edac5e464b 100644 --- a/cross/diesel/digests +++ b/cross/diesel/digests @@ -1,3 +1,3 @@ -diesel-2.1.4.tar.gz SHA1 ea4fd4a77bcd90038a04bcfefcee7448b63e5b03 -diesel-2.1.4.tar.gz SHA256 5aac923078a5b431902d75cfca36f2990b3f11dbb2bbbc44f4538305af939657 -diesel-2.1.4.tar.gz MD5 d570cfe9013331fad318a94a6a389b8d +diesel-2.1.6.tar.gz SHA1 ddb02dcb75dbfe03c8ab9cf905599390ae62d329 +diesel-2.1.6.tar.gz SHA256 60775915f615d41b65f31861ed01e467961677b7e430c6cc58d22c0b9bc17baf +diesel-2.1.6.tar.gz MD5 294d6e5a841aaa4ec54ecf786f0e8993 diff --git a/cross/syncstorage-rs/Makefile b/cross/syncstorage-rs/Makefile index f81d9cb55ca..2b751a5eed7 100644 --- a/cross/syncstorage-rs/Makefile +++ b/cross/syncstorage-rs/Makefile @@ -1,5 +1,5 @@ PKG_NAME = syncstorage-rs -PKG_VERS = 0.14.3 +PKG_VERS = 0.17.3 PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://github.com/mozilla-services/$(PKG_NAME)/archive/${PKG_VERS} diff --git a/cross/syncstorage-rs/digests b/cross/syncstorage-rs/digests index e0f50a12217..0962a0ac239 100644 --- a/cross/syncstorage-rs/digests +++ b/cross/syncstorage-rs/digests @@ -1,3 +1,3 @@ -syncstorage-rs-0.14.3.tar.gz SHA1 0982c8f6d471d277b94596ecca6d8966e26826f4 -syncstorage-rs-0.14.3.tar.gz SHA256 7ece5b08b2160b04ff01fa1fa61069973a63ec2f6aa34ae53fc29c9252539d96 -syncstorage-rs-0.14.3.tar.gz MD5 8b96d242d3e194b50c4f2ffa18b8979f +syncstorage-rs-0.17.3.tar.gz SHA1 e6da28070110db3ca84288944ba7a91724c594f8 +syncstorage-rs-0.17.3.tar.gz SHA256 ebf25922bca64d6a0acfc25a8aee400cd0ac0f39ebe1315251fe67a59ff20964 +syncstorage-rs-0.17.3.tar.gz MD5 2954ee9715062ea1ca8bc3f56dcb46af diff --git a/cross/syncstorage-rs/patches/01-tokenserver-auth_pyo3-version.patch b/cross/syncstorage-rs/patches/01-tokenserver-auth_pyo3-version.patch deleted file mode 100644 index f9bcdf7ef7f..00000000000 --- a/cross/syncstorage-rs/patches/01-tokenserver-auth_pyo3-version.patch +++ /dev/null @@ -1,17 +0,0 @@ -# pyo3 0.14.2 (as locked in Cargo.lock) does not support Python 3.10 and 3.11 -# error: the configured Python interpreter version (3.1) is lower than PyO3's minimum supported version (3.6) -# -# This patch updates to pyo3 0.17.* -# At time of writing pyo3 0.17.3 is used -# ---- tokenserver-auth/Cargo.toml.orig 2023-11-30 02:34:56.000000000 +0000 -+++ tokenserver-auth/Cargo.toml 2023-11-30 18:24:35.953670206 +0000 -@@ -14,7 +14,7 @@ - - async-trait = "0.1.40" - dyn-clone = "1.0.4" --pyo3 = { version = "0.14", features = ["auto-initialize"] } -+pyo3 = { version = "0.17", features = ["auto-initialize"] } - reqwest = { version = "0.10.10", features = ["json", "rustls-tls"] } - syncserver-common = { path = "../syncserver-common" } - tokenserver-common = { path = "../tokenserver-common" } diff --git a/spk/ffsync/Makefile b/spk/ffsync/Makefile index 0c20252e067..c8649b4b1c7 100644 --- a/spk/ffsync/Makefile +++ b/spk/ffsync/Makefile @@ -1,6 +1,6 @@ SPK_NAME = ffsync -SPK_VERS = 0.14.3 -SPK_REV = 1 +SPK_VERS = 0.17.3 +SPK_REV = 2 SPK_ICON = src/ffsync.png DEPENDS = cross/syncstorage-rs cross/diesel @@ -14,9 +14,9 @@ REQUIRED_MIN_DSM = 6.0 SPK_DEPENDS = MariaDB10:$(PYTHON_PACKAGE) MAINTAINER = SynoCommunity -DESCRIPTION = An implementation of the Mozilla Sync-1.5 Server protocol used by the sync service in Firefox 29 and later. You can use Mozilla Sync Server to exchange browser data \(bookmarks, history, open tabs, passwords, add-ons, and the like\) between 'clients' in a manner that respects a user's security and privacy. The service runs on port 8132. +DESCRIPTION = An implementation of the Mozilla Sync-1.5 Server protocol used by the sync service in Firefox 29 and later. You can use Mozilla Sync Server to exchange browser data \(bookmarks, history, open tabs, passwords, add-ons, and the like\) between \'clients\' in a manner that respects a user\'s security and privacy. The service runs on port 8132. DISPLAY_NAME = Mozilla Sync Server -CHANGELOG = "Initial Mozilla Sync Server package." +CHANGELOG = "Update Mozilla Sync Server package to v0.17.3." HOMEPAGE = https://mozilla-services.readthedocs.io/en/latest/howtos/run-sync-1.5.html LICENSE = MPL 2.0 diff --git a/spk/ffsync/src/requirements-crossenv-greenlet-v2.txt b/spk/ffsync/src/requirements-crossenv-greenlet-v2.txt index 47a0d61c465..c2b4802c7ad 100644 --- a/spk/ffsync/src/requirements-crossenv-greenlet-v2.txt +++ b/spk/ffsync/src/requirements-crossenv-greenlet-v2.txt @@ -6,4 +6,4 @@ # [greenlet] # - Mandatory require full c++11 support -greenlet==2.0.2 +greenlet==3.0.3 diff --git a/spk/ffsync/src/requirements-crossenv.txt b/spk/ffsync/src/requirements-crossenv.txt index d74972f17ff..e4efa3ffee6 100644 --- a/spk/ffsync/src/requirements-crossenv.txt +++ b/spk/ffsync/src/requirements-crossenv.txt @@ -1,19 +1,11 @@ # From requirements.txt -# original dependency does not work with openssl3: -# We pin cryptography to 3.4.8 due to a build error that occurs with the -# current version (36.0.0 at the time of this commit). In short, building -# the cryptography package with Rust results in a segfault, so we need to -# set the CRYPTOGRAPHY_DONT_BUILD_RUST env var to force the package to build -# with C instead. This env var is only present in cryptography<3.5. -#cryptography==3.4.8 - # [cryptography] # Mandatory of using OPENSSL_*_DIR starting with version >= 40 # https://docs.rs/openssl/latest/openssl/#automatic # ENV += OPENSSL_LIB_DIR=$(STAGING_INSTALL_PREFIX)/lib/ # ENV += OPENSSL_INCLUDE_DIR=$(STAGING_INSTALL_PREFIX)/include/ -cryptography==41.0.3 +cryptography==42.0.8 # From tools/tokenserver/requirements.txt @@ -27,7 +19,7 @@ mysqlclient==2.1.1 sqlalchemy==1.4.46 # further crossenv dependencies -cffi==1.16.0 +cffi==1.17.1 charset_normalizer==3.3.2 -# greenlet==3.0.1 => supported version depends on gcc version -zope.interface==6.1 +# greenlet==3.0.3 => supported version depends on gcc version +zope.interface==7.0.3 diff --git a/spk/ffsync/src/requirements-pure.txt b/spk/ffsync/src/requirements-pure.txt index 732d747fe17..c9b796d8f43 100644 --- a/spk/ffsync/src/requirements-pure.txt +++ b/spk/ffsync/src/requirements-pure.txt @@ -7,23 +7,25 @@ tokenlib==2.0.0 boto==2.49.0 hawkauthlib==2.0.0 -pyramid==2.0.1 +pyramid==2.0.2 #sqlalchemy==1.4.46 => crossenv -testfixtures==7.2.2 +testfixtures==8.3.0 #tokenlib==2.0.0 => same as above PyBrowserID==0.14.0 +datadog==0.50.0 +backoff==2.2.1 # further dependencies -hupper==1.12 -idna==3.6 +hupper==1.12.1 +idna==3.8 PasteDeploy==3.1.0 plaster==1.1.2 plaster_pastedeploy==1.0.1 -PyJWT==2.8.0 -requests==2.31.0 +PyJWT==2.9.0 +requests==2.32.3 translationstring==1.4 -urllib3==2.1.0 +urllib3==2.2.2 venusian==3.1.0 -WebOb==1.8.7 +WebOb==1.8.8 zope.deprecation==5.0 diff --git a/spk/ffsync/src/wizard/install_uifile.sh b/spk/ffsync/src/wizard/install_uifile.sh index 9220b6cbfc5..13bf28e4784 100644 --- a/spk/ffsync/src/wizard/install_uifile.sh +++ b/spk/ffsync/src/wizard/install_uifile.sh @@ -29,7 +29,7 @@ checkPublicUrl() var domainRegex = /^http:\/\/((?:[a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}):8132$/; if (ipRegex.test(publicUrl) || domainRegex.test(publicUrl)) { clientUrl.setReadOnly(false); - clientUrl.setValue(publicUrl + "/token/1.0/sync/1.5"); + clientUrl.setValue(publicUrl + "/1.0/sync/1.5"); clientUrl.setReadOnly(true); } else { return "Invalid URL format. Please provide a valid URL.";