From b000650488a4bbef168cc5bcf51145368d3f8489 Mon Sep 17 00:00:00 2001
From: Alexander Manning <mail@alex-m.co.uk>
Date: Wed, 16 Jun 2021 01:39:27 +0100
Subject: [PATCH] Update synapse, and add an entrypoint.

---
 matrix-synapse.spec | 4 +++-
 synapse-homeserver  | 9 +++++++++
 synapse.service     | 2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100755 synapse-homeserver

diff --git a/matrix-synapse.spec b/matrix-synapse.spec
index 7c367d2..c26ddec 100644
--- a/matrix-synapse.spec
+++ b/matrix-synapse.spec
@@ -1,7 +1,7 @@
 %global srcname synapse
 
 # Version suffix in URL when building release candidates
-%global rcx rc2
+%global rcx %{nil}
 %global ghversion 1.36.0
 
 %{?python_enable_dependency_generator}
@@ -21,6 +21,7 @@ URL:        https://github.com/matrix-org/%{srcname}
 Source0:    %{url}/archive/v%{ghversion}%{rcx}/%{srcname}-%{ghversion}%{rcx}.tar.gz
 Source1:    synapse.sysconfig
 Source2:    synapse.service
+Source3:    synapse-homeserver
 BuildArch:  noarch
 
 BuildRequires:  python3-devel
@@ -111,6 +112,7 @@ install -p -D -T -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/synapse
 install -p -D -T -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/synapse.service
 install -p -d -m 755 %{buildroot}/%{_sharedstatedir}/synapse
 
+install -p -D -T -m 755 %{SOURCE3} %{buildroot}%{_bindir}/synapse-homeserver
 
 %check
 PYTHONPATH=. trial-3 tests
diff --git a/synapse-homeserver b/synapse-homeserver
new file mode 100755
index 0000000..8cc0260
--- /dev/null
+++ b/synapse-homeserver
@@ -0,0 +1,9 @@
+#!/usr/bin/python3
+import re
+import sys
+
+from synapse.app.homeserver import main
+
+if __name__ == "__main__":
+    sys.argv[0] = re.sub(r"(-script\.pyw?|\.exe)?$", "", sys.argv[0])
+    sys.exit(main())
diff --git a/synapse.service b/synapse.service
index d0ffe60..f1e7343 100644
--- a/synapse.service
+++ b/synapse.service
@@ -7,7 +7,7 @@ NotifyAccess=main
 User=synapse
 Group=synapse
 WorkingDirectory=/var/lib/synapse
-ExecStart=/usr/bin/python3 -m synapse.app.homeserver --config-path=/etc/synapse/homeserver.yaml
+ExecStart=/usr/bin/synapse-homeserver --config-path=/etc/synapse/homeserver.yaml
 ExecReload=/bin/kill -HUP $MAINPID
 # EnvironmentFile=-/etc/sysconfig/synapse  # Can be used to e.g. set SYNAPSE_CACHE_FACTOR
 SyslogIdentifier=synapse