Skip to content

Commit b714e07

Browse files
author
gdt
committed
chat/matrix-synapse: Add comments related to workaround
- add upstream bugtracker URL for patch to avoid use of Twisted private API - expand comment about the build system bug of installing fooorig, and leave a note that it should be changed to happen later. However, with the target as pre-install, the orig files are mysteriously still installed. NFCI; this is a comment-only change (plus distinfo for the new comments)
1 parent dba6c8f commit b714e07

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

chat/matrix-synapse/Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $NetBSD: Makefile,v 1.102 2024/11/24 13:57:45 js Exp $
1+
# $NetBSD: Makefile,v 1.103 2024/11/24 14:57:46 gdt Exp $
22

33
DISTNAME= matrix-synapse-1.114.0
44
PKGREVISION= 1
@@ -107,7 +107,10 @@ SUBST_VARS.pl= SYNAPSE_DEFAULT_CREATOR_PL
107107
BUILD_DEFS+= SYNAPSE_DEFAULT_CREATOR_PL
108108

109109
post-patch:
110-
# Otherwise, these files are installed and pollute the PLIST.
110+
# synapse apparently installs "*", wrongly putting foo.orig in
111+
# the package. Remove them. \todo This should be just before
112+
# install, so that a "make" and "pkgvi" session followed by
113+
# "mkpatches" will still work.
111114
cd ${WRKSRC} && find . -name '*.orig' | xargs rm
112115

113116
post-install:

chat/matrix-synapse/distinfo

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$NetBSD: distinfo,v 1.72 2024/11/24 13:57:45 js Exp $
1+
$NetBSD: distinfo,v 1.73 2024/11/24 14:57:46 gdt Exp $
22

33
BLAKE2s (aho-corasick-1.1.3.crate) = 36150b5dacb72fa7cd0d33aee15e14857914224878f0af76eabcb9daa68e3ae0
44
SHA512 (aho-corasick-1.1.3.crate) = ba422a54688c4678fcf16e34fdf3ed06c333e6e3fc8b75af9272a215add494d43ebaef319021134b61327fd5d3572aec0dc655b714ffb3bc71ba3c265c9ebb69
@@ -262,4 +262,4 @@ BLAKE2s (windows_x86_64_msvc-0.52.5.crate) = cff55ffe9c61794935a56e2c6b21ca5f068
262262
SHA512 (windows_x86_64_msvc-0.52.5.crate) = 81176090dc725d7fe3867e6322fdc4a4065168580847b35e6f8da345f685c4f66a81e35cd1880dbaabdd4cdc82446dde9d6a0e583cf0b7fe47dda8bc8002f1c6
263263
Size (windows_x86_64_msvc-0.52.5.crate) = 827905 bytes
264264
SHA1 (patch-synapse_handlers_room.py) = f39e6f679a95f7830ba27c007e097c573d953b21
265-
SHA1 (patch-synapse_http_proxy.py) = ee878d1353b1d83f548861989b5d58aaacd3477d
265+
SHA1 (patch-synapse_http_proxy.py) = 75430a0585355f38055442aa6c568b4f09375db0

chat/matrix-synapse/patches/patch-synapse_http_proxy.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
$NetBSD: patch-synapse_http_proxy.py,v 1.1 2024/11/24 13:57:45 js Exp $
1+
$NetBSD: patch-synapse_http_proxy.py,v 1.2 2024/11/24 14:57:46 gdt Exp $
22

33
Upstream thinks private Twisted functions are for them to use. And to
4-
absolutely nobody's surprise, this of course broke when Twised was updated.
4+
absolutely nobody's surprise, this of course broke when Twisted was updated.
5+
6+
https://github.com/element-hq/synapse/issues/17882#issuecomment-2496000436
57

68
--- synapse/http/proxy.py.orig 2024-11-24 13:33:04.649198671 +0000
79
+++ synapse/http/proxy.py

0 commit comments

Comments
 (0)