From 0969d688e321e0a419e427e728b425fdfcdea8ec Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Date: Fri, 22 Feb 2019 15:02:39 +0000
Subject: Debian: fix overwriting of config settings on upgrade (#4696)

Make sure that users' changes to the config files are preserved.

Fixes #4440.
---
 debian/changelog                   |   6 ++
 debian/config                      |   9 ---
 debian/install                     |   1 +
 debian/manage_debconf.pl           | 130 +++++++++++++++++++++++++++++++++++++
 debian/matrix-synapse-py3.config   |  12 ++++
 debian/matrix-synapse-py3.postinst |  33 +++++++---
 6 files changed, 174 insertions(+), 17 deletions(-)
 delete mode 100755 debian/config
 create mode 100755 debian/manage_debconf.pl
 create mode 100755 debian/matrix-synapse-py3.config

(limited to 'debian')

diff --git a/debian/changelog b/debian/changelog
index 124128920b..7631406a68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (0.99.2) UNRELEASED; urgency=medium
+
+  * Fix overwriting of config settings on upgrade.
+
+ -- Synapse Packaging team <packages@matrix.org>  Wed, 20 Feb 2019 17:11:25 +0000
+
 matrix-synapse-py3 (0.99.1.1) stable; urgency=medium
 
   * New synapse release 0.99.1.1
diff --git a/debian/config b/debian/config
deleted file mode 100755
index 9fb6913298..0000000000
--- a/debian/config
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-set -e
-
-. /usr/share/debconf/confmodule
-
-db_input high matrix-synapse/server-name || true
-db_input high matrix-synapse/report-stats || true
-db_go
diff --git a/debian/install b/debian/install
index 3d916a9718..43dc8c6904 100644
--- a/debian/install
+++ b/debian/install
@@ -1 +1,2 @@
 debian/log.yaml etc/matrix-synapse
+debian/manage_debconf.pl /opt/venvs/matrix-synapse/lib/
diff --git a/debian/manage_debconf.pl b/debian/manage_debconf.pl
new file mode 100755
index 0000000000..be8ed32050
--- /dev/null
+++ b/debian/manage_debconf.pl
@@ -0,0 +1,130 @@
+#!/usr/bin/perl
+#
+# Interface between our config files and the debconf database.
+#
+# Usage:
+#
+#   manage_debconf.pl <action>
+#
+# where <action> can be:
+#
+#   read:    read the configuration from the yaml into debconf
+#   update:  update the yaml config according to the debconf database
+use strict;
+use warnings;
+
+use Debconf::Client::ConfModule (qw/get set/);
+
+# map from the name of a setting in our .yaml file to the relevant debconf
+# setting.
+my %MAPPINGS=(
+    server_name => 'matrix-synapse/server-name',
+    report_stats => 'matrix-synapse/report-stats',
+);
+
+# enable debug if dpkg --debug
+my $DEBUG = $ENV{DPKG_MAINTSCRIPT_DEBUG};
+
+sub read_config {
+    my @files = @_;
+
+    foreach my $file (@files)  {
+        print STDERR "reading $file\n" if $DEBUG;
+
+        open my $FH, "<", $file or next;
+
+        # rudimentary parsing which (a) avoids having to depend on a yaml library,
+        # and (b) is tolerant of yaml errors
+        while($_ = <$FH>) {
+            while (my ($setting, $debconf) = each %MAPPINGS) {
+                $setting = quotemeta $setting;
+                if(/^${setting}\s*:(.*)$/) {
+                    my $val = $1;
+
+                    # remove leading/trailing whitespace
+                    $val =~ s/^\s*//;
+                    $val =~ s/\s*$//;
+
+                    # remove surrounding quotes
+                    if ($val =~ /^"(.*)"$/ || $val =~ /^'(.*)'$/) {
+                        $val = $1;
+                    }
+
+                    print STDERR ">> $debconf = $val\n" if $DEBUG;
+                    set($debconf, $val);
+                }
+            }
+        }
+        close $FH;
+    }
+}
+
+sub update_config {
+    my @files = @_;
+
+    my %substs = ();
+    while (my ($setting, $debconf) = each %MAPPINGS) {
+        my @res = get($debconf);
+        $substs{$setting} = $res[1] if $res[0] == 0;
+    }
+
+    foreach my $file (@files) {
+        print STDERR "checking $file\n" if $DEBUG;
+
+        open my $FH, "<", $file or next;
+
+        my $updated = 0;
+
+        # read the whole file into memory
+        my @lines = <$FH>;
+
+        while (my ($setting, $val) = each %substs) {
+            $setting = quotemeta $setting;
+
+            map {
+                if (/^${setting}\s*:\s*(.*)\s*$/) {
+                    my $current = $1;
+                    if ($val ne $current) {
+                        $_ = "${setting}: $val\n";
+                        $updated = 1;
+                    }
+                }
+            } @lines;
+        }
+        close $FH;
+
+        next unless $updated;
+
+        print STDERR "updating $file\n" if $DEBUG;
+        open $FH, ">", $file or die "unable to update $file";
+        print $FH @lines;
+        close $FH;
+    }
+}
+
+
+my $cmd = $ARGV[0];
+
+my $read = 0;
+my $update = 0;
+
+if (not $cmd) {
+    die "must specify a command to perform\n";
+} elsif ($cmd eq 'read') {
+    $read = 1;
+} elsif ($cmd eq 'update') {
+    $update = 1;
+} else {
+    die "unknown command '$cmd'\n";
+}
+
+my @files = (
+    "/etc/matrix-synapse/homeserver.yaml",
+    glob("/etc/matrix-synapse/conf.d/*.yaml"),
+);
+
+if ($read) {
+    read_config(@files);
+} elsif ($update) {
+    update_config(@files);
+}
diff --git a/debian/matrix-synapse-py3.config b/debian/matrix-synapse-py3.config
new file mode 100755
index 0000000000..3bda3292f1
--- /dev/null
+++ b/debian/matrix-synapse-py3.config
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+# try to update the debconf db according to whatever is in the config files
+/opt/venvs/matrix-synapse/lib/manage_debconf.pl read || true
+
+db_input high matrix-synapse/server-name || true
+db_input high matrix-synapse/report-stats || true
+db_go
diff --git a/debian/matrix-synapse-py3.postinst b/debian/matrix-synapse-py3.postinst
index 0509acd0a4..c0dd7e5534 100644
--- a/debian/matrix-synapse-py3.postinst
+++ b/debian/matrix-synapse-py3.postinst
@@ -8,19 +8,36 @@ USER="matrix-synapse"
 
 case "$1" in
   configure|reconfigure)
-    # Set server name in config file
-    mkdir -p "/etc/matrix-synapse/conf.d/"
-    db_get matrix-synapse/server-name
 
-    if [ "$RET" ]; then
-        echo "server_name: $RET" > $CONFIGFILE_SERVERNAME
+    # generate template config files if they don't exist
+    mkdir -p "/etc/matrix-synapse/conf.d/"
+    if [ ! -e "$CONFIGFILE_SERVERNAME" ]; then
+        cat > "$CONFIGFILE_SERVERNAME" <<EOF
+# This file is autogenerated, and will be recreated on upgrade if it is deleted.
+# Any changes you make will be preserved.
+
+# The domain name of the server, with optional explicit port.
+# This is used by remote servers to connect to this server,
+# e.g. matrix.org, localhost:8080, etc.
+# This is also the last part of your UserID.
+#
+server_name: ''
+EOF
     fi
 
-    db_get matrix-synapse/report-stats
-    if [ "$RET" ]; then
-        echo "report_stats: $RET" > $CONFIGFILE_REPORTSTATS
+    if [ ! -e "$CONFIGFILE_REPORTSTATS" ]; then
+        cat > "$CONFIGFILE_REPORTSTATS" <<EOF
+# This file is autogenerated, and will be recreated on upgrade if it is deleted.
+# Any changes you make will be preserved.
+
+# Whether to report anonymized homeserver usage statistics.
+report_stats: false
+EOF
     fi
 
+    # update the config files according to whatever is in the debconf database
+    /opt/venvs/matrix-synapse/lib/manage_debconf.pl update
+
     if ! getent passwd $USER >/dev/null; then
       adduser --quiet --system --no-create-home --home /var/lib/matrix-synapse $USER
     fi
-- 
cgit 1.4.1


From 44a4d65586b231d62efea6e473e4343c17fca059 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Wed, 27 Feb 2019 10:48:34 +0000
Subject: 0.99.2rc1

---
 CHANGES.md               | 59 ++++++++++++++++++++++++++++++++++++++++++++++++
 changelog.d/4263.bugfix  |  1 -
 changelog.d/4450.bugfix  |  2 --
 changelog.d/4541.feature |  1 -
 changelog.d/4632.feature |  1 -
 changelog.d/4635.misc    |  1 -
 changelog.d/4642.feature |  1 -
 changelog.d/4643.misc    |  1 -
 changelog.d/4644.misc    |  1 -
 changelog.d/4647.feature |  1 -
 changelog.d/4651.bugfix  |  1 -
 changelog.d/4652.feature |  1 -
 changelog.d/4657.misc    |  1 -
 changelog.d/4666.feature |  1 -
 changelog.d/4667.bugfix  |  1 -
 changelog.d/4668.misc    |  1 -
 changelog.d/4669.misc    |  1 -
 changelog.d/4670.feature |  1 -
 changelog.d/4671.misc    |  1 -
 changelog.d/4674.feature |  1 -
 changelog.d/4676.misc    |  1 -
 changelog.d/4677.misc    |  1 -
 changelog.d/4680.bugfix  |  3 ---
 changelog.d/4681.misc    |  1 -
 changelog.d/4682.feature |  1 -
 changelog.d/4688.misc    |  1 -
 changelog.d/4689.misc    |  1 -
 changelog.d/4690.bugfix  |  1 -
 changelog.d/4691.misc    |  1 -
 changelog.d/4694.feature |  1 -
 changelog.d/4695.feature |  1 -
 changelog.d/4698.misc    |  1 -
 changelog.d/4706.misc    |  1 -
 changelog.d/4707.misc    |  1 -
 changelog.d/4709.misc    |  1 -
 changelog.d/4715.misc    |  1 -
 changelog.d/4716.misc    |  1 -
 changelog.d/4717.bugfix  |  1 -
 changelog.d/4718.bugfix  |  1 -
 changelog.d/4721.feature |  1 -
 changelog.d/4722.misc    |  1 -
 changelog.d/4723.misc    |  1 -
 changelog.d/4737.misc    |  1 -
 changelog.d/4738.misc    |  1 -
 changelog.d/4746.feature |  1 -
 changelog.d/4748.misc    |  1 -
 changelog.d/4750.misc    |  1 -
 changelog.d/4753.misc    |  1 -
 debian/changelog         |  5 ++--
 synapse/__init__.py      |  2 +-
 50 files changed, 63 insertions(+), 53 deletions(-)
 delete mode 100644 changelog.d/4263.bugfix
 delete mode 100644 changelog.d/4450.bugfix
 delete mode 100644 changelog.d/4541.feature
 delete mode 100644 changelog.d/4632.feature
 delete mode 100644 changelog.d/4635.misc
 delete mode 100644 changelog.d/4642.feature
 delete mode 100644 changelog.d/4643.misc
 delete mode 100644 changelog.d/4644.misc
 delete mode 100644 changelog.d/4647.feature
 delete mode 100644 changelog.d/4651.bugfix
 delete mode 100644 changelog.d/4652.feature
 delete mode 100644 changelog.d/4657.misc
 delete mode 100644 changelog.d/4666.feature
 delete mode 100644 changelog.d/4667.bugfix
 delete mode 100644 changelog.d/4668.misc
 delete mode 100644 changelog.d/4669.misc
 delete mode 100644 changelog.d/4670.feature
 delete mode 100644 changelog.d/4671.misc
 delete mode 100644 changelog.d/4674.feature
 delete mode 100644 changelog.d/4676.misc
 delete mode 100644 changelog.d/4677.misc
 delete mode 100644 changelog.d/4680.bugfix
 delete mode 100644 changelog.d/4681.misc
 delete mode 100644 changelog.d/4682.feature
 delete mode 100644 changelog.d/4688.misc
 delete mode 100644 changelog.d/4689.misc
 delete mode 100644 changelog.d/4690.bugfix
 delete mode 100644 changelog.d/4691.misc
 delete mode 100644 changelog.d/4694.feature
 delete mode 100644 changelog.d/4695.feature
 delete mode 100644 changelog.d/4698.misc
 delete mode 100644 changelog.d/4706.misc
 delete mode 100644 changelog.d/4707.misc
 delete mode 100644 changelog.d/4709.misc
 delete mode 100644 changelog.d/4715.misc
 delete mode 100644 changelog.d/4716.misc
 delete mode 100644 changelog.d/4717.bugfix
 delete mode 100644 changelog.d/4718.bugfix
 delete mode 100644 changelog.d/4721.feature
 delete mode 100644 changelog.d/4722.misc
 delete mode 100644 changelog.d/4723.misc
 delete mode 100644 changelog.d/4737.misc
 delete mode 100644 changelog.d/4738.misc
 delete mode 100644 changelog.d/4746.feature
 delete mode 100644 changelog.d/4748.misc
 delete mode 100644 changelog.d/4750.misc
 delete mode 100644 changelog.d/4753.misc

(limited to 'debian')

diff --git a/CHANGES.md b/CHANGES.md
index f1a9d58e4d..22684420a4 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,62 @@
+Synapse 0.99.2rc1 (2019-02-27)
+==============================
+
+Features
+--------
+
+- Added an HAProxy example in the reverse proxy documentation. Contributed by Benoît S. (“Benpro”). ([\#4541](https://github.com/matrix-org/synapse/issues/4541))
+- Add basic optional sentry integration. ([\#4632](https://github.com/matrix-org/synapse/issues/4632), [\#4694](https://github.com/matrix-org/synapse/issues/4694))
+- Transfer bans on room upgrade. ([\#4642](https://github.com/matrix-org/synapse/issues/4642))
+- Add configurable room list publishing rules. ([\#4647](https://github.com/matrix-org/synapse/issues/4647))
+- Support .well-known delegation when issuing certificates through ACME. ([\#4652](https://github.com/matrix-org/synapse/issues/4652))
+- Allow registration and login to be handled by a worker instance. ([\#4666](https://github.com/matrix-org/synapse/issues/4666), [\#4670](https://github.com/matrix-org/synapse/issues/4670), [\#4682](https://github.com/matrix-org/synapse/issues/4682))
+- Reduce the overhead of creating outbound federation connections over TLS by caching the TLS client options. ([\#4674](https://github.com/matrix-org/synapse/issues/4674))
+- Add prometheus metrics for number of outgoing EDUs, by type. ([\#4695](https://github.com/matrix-org/synapse/issues/4695))
+- Return correct error code when inviting a remote user to a room whose homeserver does not support the room version. ([\#4721](https://github.com/matrix-org/synapse/issues/4721))
+- Prevent showing rooms to other servers that were set to not federate. ([\#4746](https://github.com/matrix-org/synapse/issues/4746))
+
+
+Bugfixes
+--------
+
+- Fix possible exception when paginating. ([\#4263](https://github.com/matrix-org/synapse/issues/4263))
+- The dependency checker now correctly reports a version mismatch for optional
+  dependencies, instead of reporting the dependency missing. ([\#4450](https://github.com/matrix-org/synapse/issues/4450))
+- Set CORS headers on .well-known requests. ([\#4651](https://github.com/matrix-org/synapse/issues/4651))
+- Fix kicking guest users on guest access revocation in worker mode. ([\#4667](https://github.com/matrix-org/synapse/issues/4667))
+- Fix an issue in the database migration script where the
+  `e2e_room_keys.is_verified` column wasn't considered as
+  a boolean. ([\#4680](https://github.com/matrix-org/synapse/issues/4680))
+- Fix TaskStopped exceptions in logs when outbound requests time out. ([\#4690](https://github.com/matrix-org/synapse/issues/4690))
+- Fix ACME config for python 2. ([\#4717](https://github.com/matrix-org/synapse/issues/4717))
+- Fix paginating over federation persisting incorrect state. ([\#4718](https://github.com/matrix-org/synapse/issues/4718))
+
+
+Internal Changes
+----------------
+
+- Run `black` to reformat user directory code. ([\#4635](https://github.com/matrix-org/synapse/issues/4635))
+- Reduce number of exceptions we log. ([\#4643](https://github.com/matrix-org/synapse/issues/4643), [\#4668](https://github.com/matrix-org/synapse/issues/4668))
+- Introduce upsert batching functionality in the database layer. ([\#4644](https://github.com/matrix-org/synapse/issues/4644))
+- Fix various spelling mistakes. ([\#4657](https://github.com/matrix-org/synapse/issues/4657))
+- Cleanup request exception logging. ([\#4669](https://github.com/matrix-org/synapse/issues/4669), [\#4737](https://github.com/matrix-org/synapse/issues/4737), [\#4738](https://github.com/matrix-org/synapse/issues/4738))
+- Improve replication performance by reducing cache invalidation traffic. ([\#4671](https://github.com/matrix-org/synapse/issues/4671), [\#4715](https://github.com/matrix-org/synapse/issues/4715), [\#4748](https://github.com/matrix-org/synapse/issues/4748))
+- Test against Postgres 9.5 as well as 9.4. ([\#4676](https://github.com/matrix-org/synapse/issues/4676))
+- Run unit tests against python 3.7. ([\#4677](https://github.com/matrix-org/synapse/issues/4677))
+- Attempt to clarify installation instructions/config. ([\#4681](https://github.com/matrix-org/synapse/issues/4681))
+- Clean up gitignores. ([\#4688](https://github.com/matrix-org/synapse/issues/4688))
+- Minor tweaks to acme docs. ([\#4689](https://github.com/matrix-org/synapse/issues/4689))
+- Improve the logging in the pusher process. ([\#4691](https://github.com/matrix-org/synapse/issues/4691))
+- Better checks on newsfragments. ([\#4698](https://github.com/matrix-org/synapse/issues/4698), [\#4750](https://github.com/matrix-org/synapse/issues/4750))
+- Avoid some redundant work when processing read receipts. ([\#4706](https://github.com/matrix-org/synapse/issues/4706))
+- Run `push_receipts_to_remotes` as background job. ([\#4707](https://github.com/matrix-org/synapse/issues/4707))
+- Add prometheus metrics for number of badge update pushes. ([\#4709](https://github.com/matrix-org/synapse/issues/4709))
+- Reduce pusher logging on startup ([\#4716](https://github.com/matrix-org/synapse/issues/4716))
+- Don't log exceptions when failing to fetch remote server keys. ([\#4722](https://github.com/matrix-org/synapse/issues/4722))
+- Correctly proxy exception in frontend_proxy worker. ([\#4723](https://github.com/matrix-org/synapse/issues/4723))
+- Add database version to phonehome stats. ([\#4753](https://github.com/matrix-org/synapse/issues/4753))
+
+
 Synapse 0.99.1.1 (2019-02-14)
 =============================
 
diff --git a/changelog.d/4263.bugfix b/changelog.d/4263.bugfix
deleted file mode 100644
index 3dc1d7c732..0000000000
--- a/changelog.d/4263.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Prevent crash on pagination.
diff --git a/changelog.d/4450.bugfix b/changelog.d/4450.bugfix
deleted file mode 100644
index b194e94c15..0000000000
--- a/changelog.d/4450.bugfix
+++ /dev/null
@@ -1,2 +0,0 @@
-The dependency checker now correctly reports a version mismatch for optional
-dependencies, instead of reporting the dependency missing.
diff --git a/changelog.d/4541.feature b/changelog.d/4541.feature
deleted file mode 100644
index 1d0e7bdfdc..0000000000
--- a/changelog.d/4541.feature
+++ /dev/null
@@ -1 +0,0 @@
-Added an HAProxy example in the reverse proxy documentation. Contributed by Benoît S. (“Benpro”).
diff --git a/changelog.d/4632.feature b/changelog.d/4632.feature
deleted file mode 100644
index d053ab5a25..0000000000
--- a/changelog.d/4632.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add basic optional sentry integration
diff --git a/changelog.d/4635.misc b/changelog.d/4635.misc
deleted file mode 100644
index 0f45957b84..0000000000
--- a/changelog.d/4635.misc
+++ /dev/null
@@ -1 +0,0 @@
-Run `black` to reformat user directory code.
diff --git a/changelog.d/4642.feature b/changelog.d/4642.feature
deleted file mode 100644
index bfbf95bcbb..0000000000
--- a/changelog.d/4642.feature
+++ /dev/null
@@ -1 +0,0 @@
-Transfer bans on room upgrade.
\ No newline at end of file
diff --git a/changelog.d/4643.misc b/changelog.d/4643.misc
deleted file mode 100644
index 556cdd2240..0000000000
--- a/changelog.d/4643.misc
+++ /dev/null
@@ -1 +0,0 @@
-Reduce number of exceptions we log
diff --git a/changelog.d/4644.misc b/changelog.d/4644.misc
deleted file mode 100644
index 84137c3412..0000000000
--- a/changelog.d/4644.misc
+++ /dev/null
@@ -1 +0,0 @@
-Introduce upsert batching functionality in the database layer.
diff --git a/changelog.d/4647.feature b/changelog.d/4647.feature
deleted file mode 100644
index 5a5b1dcebb..0000000000
--- a/changelog.d/4647.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add configurable room list publishing rules
diff --git a/changelog.d/4651.bugfix b/changelog.d/4651.bugfix
deleted file mode 100644
index 15cb1e58c4..0000000000
--- a/changelog.d/4651.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Set CORS headers on .well-known requests
diff --git a/changelog.d/4652.feature b/changelog.d/4652.feature
deleted file mode 100644
index ebe6880b21..0000000000
--- a/changelog.d/4652.feature
+++ /dev/null
@@ -1 +0,0 @@
-Support .well-known delegation when issuing certificates through ACME.
diff --git a/changelog.d/4657.misc b/changelog.d/4657.misc
deleted file mode 100644
index 8872765819..0000000000
--- a/changelog.d/4657.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix various spelling mistakes.
diff --git a/changelog.d/4666.feature b/changelog.d/4666.feature
deleted file mode 100644
index b3a3915eb0..0000000000
--- a/changelog.d/4666.feature
+++ /dev/null
@@ -1 +0,0 @@
-Allow registration and login to be handled by a worker instance.
diff --git a/changelog.d/4667.bugfix b/changelog.d/4667.bugfix
deleted file mode 100644
index 33ad00c137..0000000000
--- a/changelog.d/4667.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix kicking guest users on guest access revocation in worker mode.
diff --git a/changelog.d/4668.misc b/changelog.d/4668.misc
deleted file mode 100644
index 556cdd2240..0000000000
--- a/changelog.d/4668.misc
+++ /dev/null
@@ -1 +0,0 @@
-Reduce number of exceptions we log
diff --git a/changelog.d/4669.misc b/changelog.d/4669.misc
deleted file mode 100644
index d5d0e27731..0000000000
--- a/changelog.d/4669.misc
+++ /dev/null
@@ -1 +0,0 @@
-Cleanup request exception logging.
diff --git a/changelog.d/4670.feature b/changelog.d/4670.feature
deleted file mode 100644
index b3a3915eb0..0000000000
--- a/changelog.d/4670.feature
+++ /dev/null
@@ -1 +0,0 @@
-Allow registration and login to be handled by a worker instance.
diff --git a/changelog.d/4671.misc b/changelog.d/4671.misc
deleted file mode 100644
index 4dc18378e7..0000000000
--- a/changelog.d/4671.misc
+++ /dev/null
@@ -1 +0,0 @@
-Improve replication performance by reducing cache invalidation traffic.
diff --git a/changelog.d/4674.feature b/changelog.d/4674.feature
deleted file mode 100644
index 84630bb201..0000000000
--- a/changelog.d/4674.feature
+++ /dev/null
@@ -1 +0,0 @@
-Reduce the overhead of creating outbound federation connections over TLS by caching the TLS client options.
diff --git a/changelog.d/4676.misc b/changelog.d/4676.misc
deleted file mode 100644
index a250558e69..0000000000
--- a/changelog.d/4676.misc
+++ /dev/null
@@ -1 +0,0 @@
-Test against Postgres 9.5 as well as 9.4
diff --git a/changelog.d/4677.misc b/changelog.d/4677.misc
deleted file mode 100644
index 6f4596be4a..0000000000
--- a/changelog.d/4677.misc
+++ /dev/null
@@ -1 +0,0 @@
-Run unit tests against python 3.7.
diff --git a/changelog.d/4680.bugfix b/changelog.d/4680.bugfix
deleted file mode 100644
index 4aad8ecde3..0000000000
--- a/changelog.d/4680.bugfix
+++ /dev/null
@@ -1,3 +0,0 @@
-Fix an issue in the database migration script where the 
-`e2e_room_keys.is_verified` column wasn't considered as 
-a boolean
diff --git a/changelog.d/4681.misc b/changelog.d/4681.misc
deleted file mode 100644
index 37d3588804..0000000000
--- a/changelog.d/4681.misc
+++ /dev/null
@@ -1 +0,0 @@
-Attempt to clarify installation instructions/config
diff --git a/changelog.d/4682.feature b/changelog.d/4682.feature
deleted file mode 100644
index b3a3915eb0..0000000000
--- a/changelog.d/4682.feature
+++ /dev/null
@@ -1 +0,0 @@
-Allow registration and login to be handled by a worker instance.
diff --git a/changelog.d/4688.misc b/changelog.d/4688.misc
deleted file mode 100644
index 24cd2eb424..0000000000
--- a/changelog.d/4688.misc
+++ /dev/null
@@ -1 +0,0 @@
-Clean up gitignores
diff --git a/changelog.d/4689.misc b/changelog.d/4689.misc
deleted file mode 100644
index 15c4d9404b..0000000000
--- a/changelog.d/4689.misc
+++ /dev/null
@@ -1 +0,0 @@
-Minor tweaks to acme docs.
diff --git a/changelog.d/4690.bugfix b/changelog.d/4690.bugfix
deleted file mode 100644
index e4cfc5e413..0000000000
--- a/changelog.d/4690.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix TaskStopped exceptions in logs when outbound requests time out.
\ No newline at end of file
diff --git a/changelog.d/4691.misc b/changelog.d/4691.misc
deleted file mode 100644
index 8eb825edf0..0000000000
--- a/changelog.d/4691.misc
+++ /dev/null
@@ -1 +0,0 @@
-Improve the logging in the pusher process.
diff --git a/changelog.d/4694.feature b/changelog.d/4694.feature
deleted file mode 100644
index d053ab5a25..0000000000
--- a/changelog.d/4694.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add basic optional sentry integration
diff --git a/changelog.d/4695.feature b/changelog.d/4695.feature
deleted file mode 100644
index 3816c9dec8..0000000000
--- a/changelog.d/4695.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add prometheus metrics for number of outgoing EDUs, by type.
diff --git a/changelog.d/4698.misc b/changelog.d/4698.misc
deleted file mode 100644
index 9dea5dd2be..0000000000
--- a/changelog.d/4698.misc
+++ /dev/null
@@ -1 +0,0 @@
-Better checks on newsfragments.
diff --git a/changelog.d/4706.misc b/changelog.d/4706.misc
deleted file mode 100644
index 73d1ddcc56..0000000000
--- a/changelog.d/4706.misc
+++ /dev/null
@@ -1 +0,0 @@
-Avoid some redundant work when processing read receipts
diff --git a/changelog.d/4707.misc b/changelog.d/4707.misc
deleted file mode 100644
index ef0772b9af..0000000000
--- a/changelog.d/4707.misc
+++ /dev/null
@@ -1 +0,0 @@
-Run push_receipts_to_remotes as background job.
diff --git a/changelog.d/4709.misc b/changelog.d/4709.misc
deleted file mode 100644
index ca47a6f327..0000000000
--- a/changelog.d/4709.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add prometheus metrics for number of badge update pushes.
diff --git a/changelog.d/4715.misc b/changelog.d/4715.misc
deleted file mode 100644
index 4dc18378e7..0000000000
--- a/changelog.d/4715.misc
+++ /dev/null
@@ -1 +0,0 @@
-Improve replication performance by reducing cache invalidation traffic.
diff --git a/changelog.d/4716.misc b/changelog.d/4716.misc
deleted file mode 100644
index 5935f3af24..0000000000
--- a/changelog.d/4716.misc
+++ /dev/null
@@ -1 +0,0 @@
-Reduce pusher logging on startup
diff --git a/changelog.d/4717.bugfix b/changelog.d/4717.bugfix
deleted file mode 100644
index 79ab231477..0000000000
--- a/changelog.d/4717.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix ACME config for python 2.
diff --git a/changelog.d/4718.bugfix b/changelog.d/4718.bugfix
deleted file mode 100644
index a7d1963ee1..0000000000
--- a/changelog.d/4718.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix paginating over federation persisting incorrect state.
diff --git a/changelog.d/4721.feature b/changelog.d/4721.feature
deleted file mode 100644
index f932843ce7..0000000000
--- a/changelog.d/4721.feature
+++ /dev/null
@@ -1 +0,0 @@
-Return correct error code when inviting a remote user to a room whose homeserver does not support the room version.
diff --git a/changelog.d/4722.misc b/changelog.d/4722.misc
deleted file mode 100644
index e9158c4dc2..0000000000
--- a/changelog.d/4722.misc
+++ /dev/null
@@ -1 +0,0 @@
-Don't log exceptions when failing to fetch remote server keys
diff --git a/changelog.d/4723.misc b/changelog.d/4723.misc
deleted file mode 100644
index 96958036ca..0000000000
--- a/changelog.d/4723.misc
+++ /dev/null
@@ -1 +0,0 @@
-Correctly proxy exception in frontend_proxy worker
diff --git a/changelog.d/4737.misc b/changelog.d/4737.misc
deleted file mode 100644
index d5d0e27731..0000000000
--- a/changelog.d/4737.misc
+++ /dev/null
@@ -1 +0,0 @@
-Cleanup request exception logging.
diff --git a/changelog.d/4738.misc b/changelog.d/4738.misc
deleted file mode 100644
index d5d0e27731..0000000000
--- a/changelog.d/4738.misc
+++ /dev/null
@@ -1 +0,0 @@
-Cleanup request exception logging.
diff --git a/changelog.d/4746.feature b/changelog.d/4746.feature
deleted file mode 100644
index 97c253eccf..0000000000
--- a/changelog.d/4746.feature
+++ /dev/null
@@ -1 +0,0 @@
-Prevent showing rooms to other servers that were set to not federate.
\ No newline at end of file
diff --git a/changelog.d/4748.misc b/changelog.d/4748.misc
deleted file mode 100644
index 4dc18378e7..0000000000
--- a/changelog.d/4748.misc
+++ /dev/null
@@ -1 +0,0 @@
-Improve replication performance by reducing cache invalidation traffic.
diff --git a/changelog.d/4750.misc b/changelog.d/4750.misc
deleted file mode 100644
index 3bb9c48f1a..0000000000
--- a/changelog.d/4750.misc
+++ /dev/null
@@ -1 +0,0 @@
-Better checks on newsfragments.
\ No newline at end of file
diff --git a/changelog.d/4753.misc b/changelog.d/4753.misc
deleted file mode 100644
index 98532cc971..0000000000
--- a/changelog.d/4753.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add database version to phonehome stats.
diff --git a/debian/changelog b/debian/changelog
index 7631406a68..8a59c708d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-matrix-synapse-py3 (0.99.2) UNRELEASED; urgency=medium
+matrix-synapse-py3 (0.99.2rc1) stable; urgency=medium
 
   * Fix overwriting of config settings on upgrade.
+  * New synapse release 0.99.2rc1.
 
- -- Synapse Packaging team <packages@matrix.org>  Wed, 20 Feb 2019 17:11:25 +0000
+ -- Synapse Packaging team <packages@matrix.org>  Wed, 27 Feb 2019 10:45:58 +0000
 
 matrix-synapse-py3 (0.99.1.1) stable; urgency=medium
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 2004375f98..29b1fe4c03 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -27,4 +27,4 @@ try:
 except ImportError:
     pass
 
-__version__ = "0.99.1.1"
+__version__ = "0.99.2rc1"
-- 
cgit 1.4.1


From 9ac72d9543011a1b34fbcfa9a0973b57309c5c44 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Fri, 1 Mar 2019 10:55:44 +0000
Subject: 0.99.2

---
 CHANGES.md          | 6 ++++++
 debian/changelog    | 6 +++---
 synapse/__init__.py | 2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'debian')

diff --git a/CHANGES.md b/CHANGES.md
index 22684420a4..58028dc32f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,9 @@
+Synapse 0.99.2 (2019-03-01)
+===========================
+
+No significant changes.
+
+
 Synapse 0.99.2rc1 (2019-02-27)
 ==============================
 
diff --git a/debian/changelog b/debian/changelog
index 8a59c708d7..fd77ce13a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-matrix-synapse-py3 (0.99.2rc1) stable; urgency=medium
+matrix-synapse-py3 (0.99.2) stable; urgency=medium
 
   * Fix overwriting of config settings on upgrade.
-  * New synapse release 0.99.2rc1.
+  * New synapse release 0.99.2.
 
- -- Synapse Packaging team <packages@matrix.org>  Wed, 27 Feb 2019 10:45:58 +0000
+ -- Synapse Packaging team <packages@matrix.org>  Fri, 01 Mar 2019 10:55:08 +0000
 
 matrix-synapse-py3 (0.99.1.1) stable; urgency=medium
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 29b1fe4c03..25c10244d3 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -27,4 +27,4 @@ try:
 except ImportError:
     pass
 
-__version__ = "0.99.2rc1"
+__version__ = "0.99.2"
-- 
cgit 1.4.1