Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

matrix-synapse: 1.12.0 #83239

Merged
merged 2 commits into from Mar 23, 2020
Merged

matrix-synapse: 1.12.0 #83239

merged 2 commits into from Mar 23, 2020

Conversation

ajs124
Copy link
Member

@ajs124 ajs124 commented Mar 23, 2020

Motivation for this change

Just a week after a consensus was finally reached on #80447 and it was merged, upstream has already put out a new release.

This one mentions some CVE fixes in Twisted, so I updated that as well.

cc @Ma27

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot requested review from Ma27, Ralith, pacien and Ekleog March 23, 2020 19:30
@pacien
Copy link
Contributor

pacien commented Mar 23, 2020

@ofborg test matrix-synapse

@Ma27 Ma27 added 1.severity: security 9.needs: port to stable A PR needs a backport to the stable release. labels Mar 23, 2020
pacien
pacien approved these changes Mar 23, 2020
View reviewed changes
Copy link
Contributor

@pacien pacien left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would need to be backported to release-20.03 and release-19.09 as this is a security update.

@Ma27
Copy link
Member

Ma27 commented Mar 23, 2020

Thanks! Actually tested an update on my server, but you were faster with filing a PR 😄

As my HS works fine (and I got the same hashes :p), LGTM 👍

@Ma27 Ma27 merged commit 5975794 into NixOS:master Mar 23, 2020
@Ma27
Copy link
Member

Ma27 commented Mar 23, 2020

Btw if you're interested in helping out maintaining matrix-related stuff in NixOS, you may want to join this (unofficial) channel: https://matrix.to/#/!vxTmkuJzhGPsMdkAOc:transformierende-gesellschaft.org?via=transformierende-gesellschaft.org&via=matrix.org&via=sene.ovh (AFAICS it's public, so an invite shouldn't be needed).

Will directly push the cherry-picked commits to the stable branches now.

@ajs124 ajs124 deleted the upd/matrix-synapse branch March 23, 2020 21:27
@Ma27
Copy link
Member

Ma27 commented Mar 23, 2020

Backported to 20.03: fa02997, 905316d

19.09 will take a bit more time as I need to fight python's dependency-hell first :)

@Ma27
Copy link
Member

Ma27 commented Mar 24, 2020

Unfortunately, I'm currently lackig time to do the backport to 19.09. Will take care of it tomorrow!

@Ma27 Ma27 mentioned this pull request Mar 27, 2020
Merged
10 tasks
@TredwellGit TredwellGit added 8.has: port to stable A PR already has a backport to the stable release. and removed 9.needs: port to stable A PR needs a backport to the stable release. labels Aug 20, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pacien pacien pacien approved these changes

@Ma27 Ma27 Ma27 approved these changes

@FRidh FRidh Awaiting requested review from FRidh

@jonringer jonringer Awaiting requested review from jonringer

@Ralith Ralith Awaiting requested review from Ralith

@Ekleog Ekleog Awaiting requested review from Ekleog

Assignees
No one assigned
Labels
1.severity: security 6.topic: python 8.has: port to stable A PR already has a backport to the stable release. 10.rebuild-darwin: 101-500 10.rebuild-linux: 101-500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@ajs124 @pacien @Ma27 @TredwellGit