CVS commit: pkgsrc/chat/matrix-synapse

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Sun Nov 24 14:57:46 UTC 2024

Modified Files:
        pkgsrc/chat/matrix-synapse: Makefile distinfo
        pkgsrc/chat/matrix-synapse/patches: patch-synapse_http_proxy.py

Log Message:
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)


To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 pkgsrc/chat/matrix-synapse/Makefile
cvs rdiff -u -r1.72 -r1.73 pkgsrc/chat/matrix-synapse/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/chat/matrix-synapse/patches/patch-synapse_http_proxy.py

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

Modified files:

Index: pkgsrc/chat/matrix-synapse/Makefile
diff -u pkgsrc/chat/matrix-synapse/Makefile:1.102 pkgsrc/chat/matrix-synapse/Makefile:1.103
--- pkgsrc/chat/matrix-synapse/Makefile:1.102   Sun Nov 24 13:57:45 2024
+++ pkgsrc/chat/matrix-synapse/Makefile Sun Nov 24 14:57:46 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.102 2024/11/24 13:57:45 js Exp $
+# $NetBSD: Makefile,v 1.103 2024/11/24 14:57:46 gdt Exp $
 
 DISTNAME=      matrix-synapse-1.114.0
 PKGREVISION=   1
@@ -107,7 +107,10 @@ SUBST_VARS.pl=                     SYNAPSE_DEFAULT_CREATOR
 BUILD_DEFS+=                   SYNAPSE_DEFAULT_CREATOR_PL
 
 post-patch:
-       # Otherwise, these files are installed and pollute the PLIST.
+       # synapse apparently installs "*", wrongly putting foo.orig in
+       # the package.  Remove them.  \todo This should be just before
+       # install, so that a "make" and "pkgvi" session followed by
+       # "mkpatches" will still work.
        cd ${WRKSRC} && find . -name '*.orig' | xargs rm
 
 post-install:

Index: pkgsrc/chat/matrix-synapse/distinfo
diff -u pkgsrc/chat/matrix-synapse/distinfo:1.72 pkgsrc/chat/matrix-synapse/distinfo:1.73
--- pkgsrc/chat/matrix-synapse/distinfo:1.72    Sun Nov 24 13:57:45 2024
+++ pkgsrc/chat/matrix-synapse/distinfo Sun Nov 24 14:57:46 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.72 2024/11/24 13:57:45 js Exp $
+$NetBSD: distinfo,v 1.73 2024/11/24 14:57:46 gdt Exp $
 
 BLAKE2s (aho-corasick-1.1.3.crate) = 36150b5dacb72fa7cd0d33aee15e14857914224878f0af76eabcb9daa68e3ae0
 SHA512 (aho-corasick-1.1.3.crate) = ba422a54688c4678fcf16e34fdf3ed06c333e6e3fc8b75af9272a215add494d43ebaef319021134b61327fd5d3572aec0dc655b714ffb3bc71ba3c265c9ebb69
@@ -262,4 +262,4 @@ BLAKE2s (windows_x86_64_msvc-0.52.5.crat
 SHA512 (windows_x86_64_msvc-0.52.5.crate) = 81176090dc725d7fe3867e6322fdc4a4065168580847b35e6f8da345f685c4f66a81e35cd1880dbaabdd4cdc82446dde9d6a0e583cf0b7fe47dda8bc8002f1c6
 Size (windows_x86_64_msvc-0.52.5.crate) = 827905 bytes
 SHA1 (patch-synapse_handlers_room.py) = f39e6f679a95f7830ba27c007e097c573d953b21
-SHA1 (patch-synapse_http_proxy.py) = ee878d1353b1d83f548861989b5d58aaacd3477d
+SHA1 (patch-synapse_http_proxy.py) = 75430a0585355f38055442aa6c568b4f09375db0

Index: pkgsrc/chat/matrix-synapse/patches/patch-synapse_http_proxy.py
diff -u pkgsrc/chat/matrix-synapse/patches/patch-synapse_http_proxy.py:1.1 pkgsrc/chat/matrix-synapse/patches/patch-synapse_http_proxy.py:1.2
--- pkgsrc/chat/matrix-synapse/patches/patch-synapse_http_proxy.py:1.1  Sun Nov 24 13:57:45 2024
+++ pkgsrc/chat/matrix-synapse/patches/patch-synapse_http_proxy.py      Sun Nov 24 14:57:46 2024
@@ -1,7 +1,9 @@
-$NetBSD: patch-synapse_http_proxy.py,v 1.1 2024/11/24 13:57:45 js Exp $
+$NetBSD: patch-synapse_http_proxy.py,v 1.2 2024/11/24 14:57:46 gdt Exp $
 
 Upstream thinks private Twisted functions are for them to use. And to
-absolutely nobody's surprise, this of course broke when Twised was updated.
+absolutely nobody's surprise, this of course broke when Twisted was updated.
+
+https://github.com/element-hq/synapse/issues/17882#issuecomment-2496000436
 
 --- synapse/http/proxy.py.orig 2024-11-24 13:33:04.649198671 +0000
 +++ synapse/http/proxy.py