Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit 4cd2a4a

Browse files
committed
Merge branch 'release-v1.12.4' into HEAD
* release-v1.12.4: Only register devices edu handler on the master process (#7255) tweak changelog 1.12.3 Fix the debian build in a better way. (#7212) Fix changelog wording 1.12.2 Pin Pillow>=4.3.0,<7.1.0 to fix dep issue 1.12.1
2 parents 66cd243 + ac6a848 commit 4cd2a4a

File tree

6 files changed

+85
-14
lines changed

6 files changed

+85
-14
lines changed

CHANGES.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
Synapse 1.12.3 (2020-04-03)
2+
===========================
3+
4+
- Remove the the pin to Pillow 7.0 which was introduced in Synapse 1.12.2, and
5+
correctly fix the issue with building the Debian packages. ([\#7212](https://github.com/matrix-org/synapse/issues/7212))
6+
7+
Synapse 1.12.2 (2020-04-02)
8+
===========================
9+
10+
This release works around [an
11+
issue](https://github.com/matrix-org/synapse/issues/7208) with building the
12+
debian packages.
13+
14+
No other significant changes since 1.12.1.
15+
16+
17+
Synapse 1.12.1 (2020-04-02)
18+
===========================
19+
20+
No significant changes since 1.12.1rc1.
21+
22+
123
Synapse 1.12.1rc1 (2020-03-31)
224
==============================
325

changelog.d/7255.bugfix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix a bug that prevented cross-signing with users on worker-mode synapses.

debian/changelog

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,26 @@
1+
matrix-synapse-py3 (1.12.3) stable; urgency=medium
2+
3+
[ Richard van der Hoff ]
4+
* Update the Debian build scripts to handle the new installation paths
5+
for the support libraries introduced by Pillow 7.1.1.
6+
7+
[ Synapse Packaging team ]
8+
* New synapse release 1.12.3.
9+
10+
-- Synapse Packaging team <[email protected]> Fri, 03 Apr 2020 10:55:03 +0100
11+
12+
matrix-synapse-py3 (1.12.2) stable; urgency=medium
13+
14+
* New synapse release 1.12.2.
15+
16+
-- Synapse Packaging team <[email protected]> Mon, 02 Apr 2020 19:02:17 +0000
17+
18+
matrix-synapse-py3 (1.12.1) stable; urgency=medium
19+
20+
* New synapse release 1.12.1.
21+
22+
-- Synapse Packaging team <[email protected]> Mon, 02 Apr 2020 11:30:47 +0000
23+
124
matrix-synapse-py3 (1.12.0) stable; urgency=medium
225

326
* New synapse release 1.12.0.

debian/rules

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,38 @@ override_dh_installinit:
1515
# we don't really want to strip the symbols from our object files.
1616
override_dh_strip:
1717

18+
# dh_shlibdeps calls dpkg-shlibdeps, which finds all the binary files
19+
# (executables and shared libs) in the package, and looks for the shared
20+
# libraries that they depend on. It then adds a dependency on the package that
21+
# contains that library to the package.
22+
#
23+
# We make two modifications to that process...
24+
#
1825
override_dh_shlibdeps:
19-
# make the postgres package's dependencies a recommendation
20-
# rather than a hard dependency.
26+
# Firstly, postgres is not a hard dependency for us, so we want to make
27+
# the things that psycopg2 depends on (such as libpq) be
28+
# recommendations rather than hard dependencies. We do so by
29+
# running dpkg-shlibdeps manually on psycopg2's libs.
30+
#
2131
find debian/$(PACKAGE_NAME)/ -path '*/site-packages/psycopg2/*.so' | \
2232
xargs dpkg-shlibdeps -Tdebian/$(PACKAGE_NAME).substvars \
2333
-pshlibs1 -dRecommends
2434

25-
# all the other dependencies can be normal 'Depends' requirements,
26-
# except for PIL's, which is self-contained and which confuses
27-
# dpkg-shlibdeps.
28-
dh_shlibdeps -X site-packages/PIL/.libs -X site-packages/psycopg2
35+
# secondly, we exclude PIL's libraries from the process. They are known
36+
# to be self-contained, but they have interdependencies and
37+
# dpkg-shlibdeps doesn't know how to resolve them.
38+
#
39+
# As of Pillow 7.1.0, these libraries are in
40+
# site-packages/Pillow.libs. Previously, they were in
41+
# site-packages/PIL/.libs.
42+
#
43+
# (we also need to exclude psycopg2, of course, since we've already
44+
# dealt with that.)
45+
#
46+
dh_shlibdeps \
47+
-X site-packages/PIL/.libs \
48+
-X site-packages/Pillow.libs \
49+
-X site-packages/psycopg2
2950

3051
override_dh_virtualenv:
3152
./debian/build_virtualenv

synapse/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
except ImportError:
3737
pass
3838

39-
__version__ = "1.12.1rc1"
39+
__version__ = "1.12.3"
4040

4141
if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)):
4242
# We import here so that we don't have to install a bunch of deps when

synapse/handlers/e2e_keys.py

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,19 +54,23 @@ def __init__(self, hs):
5454

5555
self._edu_updater = SigningKeyEduUpdater(hs, self)
5656

57+
federation_registry = hs.get_federation_registry()
58+
5759
self._is_master = hs.config.worker_app is None
5860
if not self._is_master:
5961
self._user_device_resync_client = ReplicationUserDevicesResyncRestServlet.make_client(
6062
hs
6163
)
64+
else:
65+
# Only register this edu handler on master as it requires writing
66+
# device updates to the db
67+
#
68+
# FIXME: switch to m.signing_key_update when MSC1756 is merged into the spec
69+
federation_registry.register_edu_handler(
70+
"org.matrix.signing_key_update",
71+
self._edu_updater.incoming_signing_key_update,
72+
)
6273

63-
federation_registry = hs.get_federation_registry()
64-
65-
# FIXME: switch to m.signing_key_update when MSC1756 is merged into the spec
66-
federation_registry.register_edu_handler(
67-
"org.matrix.signing_key_update",
68-
self._edu_updater.incoming_signing_key_update,
69-
)
7074
# doesn't really work as part of the generic query API, because the
7175
# query request requires an object POST, but we abuse the
7276
# "query handler" interface.

0 commit comments

Comments
 (0)