CVS commit: pkgsrc/chat/matrix-synapse

["Jonathan Schleifer" <js%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   js
Date:           Sun Jun  6 09:40:34 UTC 2021

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

Log Message:
chat/matrix-synapse: Add a variable for the default creator power level


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/chat/matrix-synapse/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/chat/matrix-synapse/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/chat/matrix-synapse/patches/patch-synapse_handlers_room.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.25 pkgsrc/chat/matrix-synapse/Makefile:1.26
--- pkgsrc/chat/matrix-synapse/Makefile:1.25    Sat Jun  5 15:28:02 2021
+++ pkgsrc/chat/matrix-synapse/Makefile Sun Jun  6 09:40:34 2021
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2021/06/05 15:28:02 js Exp $
+# $NetBSD: Makefile,v 1.26 2021/06/06 09:40:34 js Exp $
 
 DISTNAME=      matrix-synapse-1.35.1
+PKGREVISION=   1
 CATEGORIES=    chat
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=matrix-org/}
 EGG_NAME=      matrix_synapse-${PKGVERSION_NOREV}
@@ -74,6 +75,13 @@ FILES_SUBST+=        SYNAPSE_GROUP=${SYNAPSE_GR
 MESSAGE_SUBST+=        PYTHONBIN=${PYTHONBIN:Q}
 MESSAGE_SUBST+=        SYNAPSE_DATA=${SYNAPSE_DATA:Q}
 
+SYNAPSE_DEFAULT_CREATOR_PL?=   100
+SUBST_CLASSES+=                        pl
+SUBST_STAGE.pl=                        post-patch
+SUBST_FILES.pl=                        synapse/handlers/room.py
+SUBST_VARS.pl=                 SYNAPSE_DEFAULT_CREATOR_PL
+BUILD_DEFS+=                   SYNAPSE_DEFAULT_CREATOR_PL
+
 .include "../../lang/python/egg.mk"
 .include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/chat/matrix-synapse/distinfo
diff -u pkgsrc/chat/matrix-synapse/distinfo:1.17 pkgsrc/chat/matrix-synapse/distinfo:1.18
--- pkgsrc/chat/matrix-synapse/distinfo:1.17    Sat Jun  5 15:28:02 2021
+++ pkgsrc/chat/matrix-synapse/distinfo Sun Jun  6 09:40:34 2021
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.17 2021/06/05 15:28:02 js Exp $
+$NetBSD: distinfo,v 1.18 2021/06/06 09:40:34 js Exp $
 
 SHA1 (matrix-synapse-1.35.1.tar.gz) = db4bda55f94b523176a2322665390b637d75618d
 RMD160 (matrix-synapse-1.35.1.tar.gz) = 3493881a1038319eae27a5b6f8e161a214294f69
 SHA512 (matrix-synapse-1.35.1.tar.gz) = 02a7a23f8d004c3e7d1af6904f4fac5d403335a7f089b80af367a833c292d0f970938f62a87f87a94ebee5acb41c87d50e337a8a38b0294657731155e7bfa3b3
 Size (matrix-synapse-1.35.1.tar.gz) = 7301793 bytes
+SHA1 (patch-synapse_handlers_room.py) = 5c4a5ff4773b9ae4a8ce2b66ac7cd8aa678627ca
 SHA1 (patch-synapse_python_dependencies.py) = 914ae3a34a9367b2d479d393ddc7a07cbff65b36

Added files:

Index: pkgsrc/chat/matrix-synapse/patches/patch-synapse_handlers_room.py
diff -u /dev/null pkgsrc/chat/matrix-synapse/patches/patch-synapse_handlers_room.py:1.1
--- /dev/null   Sun Jun  6 09:40:34 2021
+++ pkgsrc/chat/matrix-synapse/patches/patch-synapse_handlers_room.py   Sun Jun  6 09:40:34 2021
@@ -0,0 +1,19 @@
+$NetBSD: patch-synapse_handlers_room.py,v 1.1 2021/06/06 09:40:34 js Exp $
+
+This patch allows changing the default power level for the creator of a new
+room. It's useful to set this higher than 100 so that the creator of the room
+can give admin to others while still retaining the ability to revoke admin from
+someone. In the past, this turned out to be the only thing that could recover a
+room in which a bridge with admin permissions went wild and kicked everybody.
+
+--- synapse/handlers/room.py.orig      2021-06-03 12:24:19.000000000 +0000
++++ synapse/handlers/room.py
+@@ -936,7 +936,7 @@ class RoomCreationHandler(BaseHandler):
+             )
+         else:
+             power_level_content = {
+-                "users": {creator_id: 100},
++                "users": {creator_id: @SYNAPSE_DEFAULT_CREATOR_PL@},
+                 "users_default": 0,
+                 "events": {
+                     EventTypes.Name: 50,