Attachment 242660 Details for Bug 271787 – update to 1.85.1

[patch] update to 1.85.1

0001-net-im-py-matrix-synapse-Update-to-1.85.1.patch (text/plain), 7.30 KB, created by Li-Wen Hsu on 2023-06-07 14:44:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Li-Wen Hsu

Created: 2023-06-07 14:44:53 UTC

Size: 7.30 KB

patch

obsolete

>From abe8a1e490a8e0d2ae31753254ee782b1871cecc Mon Sep 17 00:00:00 2001
>From: Li-Wen Hsu <lwhsu@FreeBSD.org>
>Date: Tue, 6 Jun 2023 18:25:03 +0800
>Subject: [PATCH] net-im/py-matrix-synapse: Update to 1.85.1
>
>---
> net-im/py-matrix-synapse/Makefile             |  4 ++--
> net-im/py-matrix-synapse/Makefile.crates      |  8 +++----
> net-im/py-matrix-synapse/distinfo             | 22 +++++++++----------
> .../files/patch-pyproject.toml                | 18 +++++++++++----
> net-im/py-matrix-synapse/files/patch-setup.py |  4 ++--
> 5 files changed, 33 insertions(+), 23 deletions(-)
>
>diff --git a/net-im/py-matrix-synapse/Makefile b/net-im/py-matrix-synapse/Makefile
>index 88a3729d78fc..a66f847f41fa 100644
>--- a/net-im/py-matrix-synapse/Makefile
>+++ b/net-im/py-matrix-synapse/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	matrix-synapse
>-DISTVERSION=	1.82.0
>+DISTVERSION=	1.85.1
> CATEGORIES=	net-im python
> MASTER_SITES=	PYPI
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -12,7 +12,7 @@ WWW=		https://www.matrix.org
> LICENSE=	APACHE20
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}poetry-core>=1.0.0:devel/py-poetry-core@${PY_FLAVOR} \
>+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}poetry-core>=1.1.0<=1.6.0:devel/py-poetry-core@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}setuptools-rust>=1.3:devel/py-setuptools-rust@${PY_FLAVOR}
> 
> # Keep the RUN_DEPENDS layout similar to the pyproject.toml file
>diff --git a/net-im/py-matrix-synapse/Makefile.crates b/net-im/py-matrix-synapse/Makefile.crates
>index 91aa07243da9..9c02d080262a 100644
>--- a/net-im/py-matrix-synapse/Makefile.crates
>+++ b/net-im/py-matrix-synapse/Makefile.crates
>@@ -1,5 +1,5 @@
> CARGO_CRATES=	aho-corasick-0.7.19 \
>-		anyhow-1.0.70 \
>+		anyhow-1.0.71 \
> 		arc-swap-1.5.1 \
> 		autocfg-1.1.0 \
> 		bitflags-1.3.2 \
>@@ -15,7 +15,7 @@ CARGO_CRATES=	aho-corasick-0.7.19 \
> 		lazy_static-1.4.0 \
> 		libc-0.2.135 \
> 		lock_api-0.4.9 \
>-		log-0.4.17 \
>+		log-0.4.18 \
> 		memchr-2.5.0 \
> 		memoffset-0.6.5 \
> 		once_cell-1.15.0 \
>@@ -35,8 +35,8 @@ CARGO_CRATES=	aho-corasick-0.7.19 \
> 		regex-syntax-0.6.29 \
> 		ryu-1.0.11 \
> 		scopeguard-1.1.0 \
>-		serde-1.0.160 \
>-		serde_derive-1.0.160 \
>+		serde-1.0.163 \
>+		serde_derive-1.0.163 \
> 		serde_json-1.0.96 \
> 		smallvec-1.10.0 \
> 		subtle-2.4.1 \
>diff --git a/net-im/py-matrix-synapse/distinfo b/net-im/py-matrix-synapse/distinfo
>index 831450cdffb0..d61e7bd36556 100644
>--- a/net-im/py-matrix-synapse/distinfo
>+++ b/net-im/py-matrix-synapse/distinfo
>@@ -1,10 +1,10 @@
>-TIMESTAMP = 1682497261
>-SHA256 (matrix_synapse-1.82.0.tar.gz) = 593a72fbb6d18100a6dc837aa8420128ebdd32ffd77a9c2daaf4eb550a6358e7
>-SIZE (matrix_synapse-1.82.0.tar.gz) = 3158269
>+TIMESTAMP = 1686146622
>+SHA256 (matrix_synapse-1.85.1.tar.gz) = d58c896cdecac17f0cfbbcc98b1332eede766f52262f753e1411c9e47e21a070
>+SIZE (matrix_synapse-1.85.1.tar.gz) = 3199675
> SHA256 (rust/crates/aho-corasick-0.7.19.crate) = b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e
> SIZE (rust/crates/aho-corasick-0.7.19.crate) = 113070
>-SHA256 (rust/crates/anyhow-1.0.70.crate) = 7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4
>-SIZE (rust/crates/anyhow-1.0.70.crate) = 43803
>+SHA256 (rust/crates/anyhow-1.0.71.crate) = 9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8
>+SIZE (rust/crates/anyhow-1.0.71.crate) = 43808
> SHA256 (rust/crates/arc-swap-1.5.1.crate) = 983cd8b9d4b02a6dc6ffa557262eb5858a27a0038ffffe21a0f133eaa819a164
> SIZE (rust/crates/arc-swap-1.5.1.crate) = 66157
> SHA256 (rust/crates/autocfg-1.1.0.crate) = d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa
>@@ -35,8 +35,8 @@ SHA256 (rust/crates/libc-0.2.135.crate) = 68783febc7782c6c5cb401fbda4de5a9898be1
> SIZE (rust/crates/libc-0.2.135.crate) = 604591
> SHA256 (rust/crates/lock_api-0.4.9.crate) = 435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df
> SIZE (rust/crates/lock_api-0.4.9.crate) = 25685
>-SHA256 (rust/crates/log-0.4.17.crate) = abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e
>-SIZE (rust/crates/log-0.4.17.crate) = 38028
>+SHA256 (rust/crates/log-0.4.18.crate) = 518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de
>+SIZE (rust/crates/log-0.4.18.crate) = 38339
> SHA256 (rust/crates/memchr-2.5.0.crate) = 2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d
> SIZE (rust/crates/memchr-2.5.0.crate) = 65812
> SHA256 (rust/crates/memoffset-0.6.5.crate) = 5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce
>@@ -75,10 +75,10 @@ SHA256 (rust/crates/ryu-1.0.11.crate) = 4501abdff3ae82a1c1b477a17252eb69cee9e66e
> SIZE (rust/crates/ryu-1.0.11.crate) = 47007
> SHA256 (rust/crates/scopeguard-1.1.0.crate) = d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd
> SIZE (rust/crates/scopeguard-1.1.0.crate) = 11470
>-SHA256 (rust/crates/serde-1.0.160.crate) = bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c
>-SIZE (rust/crates/serde-1.0.160.crate) = 77010
>-SHA256 (rust/crates/serde_derive-1.0.160.crate) = 291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df
>-SIZE (rust/crates/serde_derive-1.0.160.crate) = 55081
>+SHA256 (rust/crates/serde-1.0.163.crate) = 2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2
>+SIZE (rust/crates/serde-1.0.163.crate) = 77030
>+SHA256 (rust/crates/serde_derive-1.0.163.crate) = 8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e
>+SIZE (rust/crates/serde_derive-1.0.163.crate) = 54447
> SHA256 (rust/crates/serde_json-1.0.96.crate) = 057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1
> SIZE (rust/crates/serde_json-1.0.96.crate) = 144652
> SHA256 (rust/crates/smallvec-1.10.0.crate) = a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0
>diff --git a/net-im/py-matrix-synapse/files/patch-pyproject.toml b/net-im/py-matrix-synapse/files/patch-pyproject.toml
>index cc42bc42414a..5686b1433743 100644
>--- a/net-im/py-matrix-synapse/files/patch-pyproject.toml
>+++ b/net-im/py-matrix-synapse/files/patch-pyproject.toml
>@@ -1,9 +1,19 @@
>---- pyproject.toml.orig	2023-04-21 21:40:26 UTC
>+--- pyproject.toml.orig	2023-05-09 16:38:29 UTC
> +++ pyproject.toml
>-@@ -219,7 +219,6 @@ pydantic = ">=1.7.4"
>- # needed.
>- setuptools_rust = ">=1.3"
>+@@ -209,17 +209,6 @@ importlib_metadata = { version = ">=1.4", python = "<3
>+ # This is the most recent version of Pydantic with available on common distros.
>+ pydantic = ">=1.7.4"
>  
>+-# This is for building the rust components during "poetry install", which
>+-# currently ignores the `build-system.requires` directive (c.f.
>+-# https://github.com/python-poetry/poetry/issues/6154). Both `pip install` and
>+-# `poetry build` do the right thing without this explicit dependency.
>+-#
>+-# This isn't really a dev-dependency, as `poetry install --no-dev` will fail,
>+-# but the alternative is to add it to the main list of deps where it isn't
>+-# needed.
>+-setuptools_rust = ">=1.3"
>+-
> -
>  # Optional Dependencies
>  # ---------------------
>diff --git a/net-im/py-matrix-synapse/files/patch-setup.py b/net-im/py-matrix-synapse/files/patch-setup.py
>index 09a64a64e14a..304fd42477d2 100644
>--- a/net-im/py-matrix-synapse/files/patch-setup.py
>+++ b/net-im/py-matrix-synapse/files/patch-setup.py
>@@ -1,6 +1,6 @@
>---- setup.py.orig	2023-04-21 21:41:33 UTC
>+--- setup.py.orig	1970-01-01 00:00:00 UTC
> +++ setup.py
>-@@ -170,7 +170,6 @@ install_requires = \
>+@@ -169,7 +169,6 @@ install_requires = \
>   'pydantic>=1.7.4',
>   'pymacaroons>=0.13.0',
>   'service-identity>=18.1.0',
>-- 
>2.40.1
>

Actions: View | Diff

Attachments on bug 271787: 242557 | 242637 | 242660 | 242697