Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 0286c2b2e172
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 320e278ffb40
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jun 3, 2018

  1. prosody: 0.10.0 -> 0.10.2 

    Fixes CVE-2018-10847 [1] and a bunch of minor things [2].

This backport from master also includes the intermediate bump to 0.10.1
which was never backported. That change also contains a security fix
related to purging chat history of deleted users amongst other fixes
[3].

[1] https://prosody.im/security/advisory_20180531/
[2] http://blog.prosody.im/prosody-0-10-2-security-release/
[3] http://blog.prosody.im/prosody-0-10-1-released/

(cherry picked from commit 83e4f66)
    @andir
    andir committed Jun 3, 2018
    Copy the full SHA
    f937009 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #41406 from andir/18.03/prosody-cve-2018-10847 

    prosody: 0.10.0 -> 0.10.2
    @andir
    andir committed Jun 3, 2018
    Copy the full SHA
    320e278 View commit details
    Browse the repository at this point in the history