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.

Sign up for GitHub

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

prosody: 0.10.0 -> 0.10.2 #41406

Merged
merged 1 commit into from Jun 3, 2018
Merged

prosody: 0.10.0 -> 0.10.2 #41406

merged 1 commit into from Jun 3, 2018

Conversation

andir
Copy link
Member

@andir andir commented Jun 3, 2018 •
edited

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)

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@andir
prosody: 0.10.0 -> 0.10.2
f937009 
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
Copy link
Member Author

andir commented Jun 3, 2018

@GrahamcOfBorg test prosody

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: tests.prosody

Partial log (click to expand)

machine: exit status 1
syncing
machine: running command: sync
machine: exit status 0
test script finished in 73.03s
cleaning up
killing machine (pid 593)
vde_switch: EOF on stdin, cleaning up and exiting
vde_switch: Could not remove ctl dir '/build/vde1.ctl': Directory not empty
/nix/store/gvqcpam37gf1pp26bi1ijrj83p7zsg4x-vm-test-run-prosody

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: prosody

Partial log (click to expand)

shrinking /nix/store/1aj10mx6dp0f9z8s44xfdjqc6dngmm4z-prosody-0.10.2/lib/prosody/util/signal.so
shrinking /nix/store/1aj10mx6dp0f9z8s44xfdjqc6dngmm4z-prosody-0.10.2/lib/prosody/util/table.so
gzipping man pages under /nix/store/1aj10mx6dp0f9z8s44xfdjqc6dngmm4z-prosody-0.10.2/share/man/
strip is /nix/store/b0zlxla7dmy1iwc3g459rjznx59797xy-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/1aj10mx6dp0f9z8s44xfdjqc6dngmm4z-prosody-0.10.2/lib  /nix/store/1aj10mx6dp0f9z8s44xfdjqc6dngmm4z-prosody-0.10.2/bin
patching script interpreter paths in /nix/store/1aj10mx6dp0f9z8s44xfdjqc6dngmm4z-prosody-0.10.2
/nix/store/1aj10mx6dp0f9z8s44xfdjqc6dngmm4z-prosody-0.10.2/bin/.prosody-wrapped: interpreter directive changed from "/usr/bin/env lua" to "/nix/store/6c759348ldbvi0hgvrskyr9pcwvz6zwx-lua-5.2.3/bin/lua"
/nix/store/1aj10mx6dp0f9z8s44xfdjqc6dngmm4z-prosody-0.10.2/bin/.prosodyctl-wrapped: interpreter directive changed from "/usr/bin/env lua" to "/nix/store/6c759348ldbvi0hgvrskyr9pcwvz6zwx-lua-5.2.3/bin/lua"
checking for references to /build in /nix/store/1aj10mx6dp0f9z8s44xfdjqc6dngmm4z-prosody-0.10.2...
/nix/store/1aj10mx6dp0f9z8s44xfdjqc6dngmm4z-prosody-0.10.2

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: prosody

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.

@andir andir merged commit 320e278 into NixOS:release-18.03 Jun 3, 2018
@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: prosody

Partial log (click to expand)

shrinking /nix/store/4zq2jyxyvh56cpl8ybv5k47hgz5ka5dh-prosody-0.10.2/lib/prosody/util/hashes.so
shrinking /nix/store/4zq2jyxyvh56cpl8ybv5k47hgz5ka5dh-prosody-0.10.2/lib/prosody/util/encodings.so
gzipping man pages under /nix/store/4zq2jyxyvh56cpl8ybv5k47hgz5ka5dh-prosody-0.10.2/share/man/
strip is /nix/store/ppn001bfygzlqx4h50n9zgxc3kqv2d6k-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/4zq2jyxyvh56cpl8ybv5k47hgz5ka5dh-prosody-0.10.2/lib  /nix/store/4zq2jyxyvh56cpl8ybv5k47hgz5ka5dh-prosody-0.10.2/bin
patching script interpreter paths in /nix/store/4zq2jyxyvh56cpl8ybv5k47hgz5ka5dh-prosody-0.10.2
/nix/store/4zq2jyxyvh56cpl8ybv5k47hgz5ka5dh-prosody-0.10.2/bin/.prosodyctl-wrapped: interpreter directive changed from "/usr/bin/env lua" to "/nix/store/g4dvxs2rrn3jxng4dx1klgaw4z019zwb-lua-5.2.3/bin/lua"
/nix/store/4zq2jyxyvh56cpl8ybv5k47hgz5ka5dh-prosody-0.10.2/bin/.prosody-wrapped: interpreter directive changed from "/usr/bin/env lua" to "/nix/store/g4dvxs2rrn3jxng4dx1klgaw4z019zwb-lua-5.2.3/bin/lua"
checking for references to /build in /nix/store/4zq2jyxyvh56cpl8ybv5k47hgz5ka5dh-prosody-0.10.2...
/nix/store/4zq2jyxyvh56cpl8ybv5k47hgz5ka5dh-prosody-0.10.2

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: tests.prosody

Partial log (click to expand)

machine: exit status 1
syncing
machine: running command: sync
machine: exit status 0
test script finished in 93.91s
cleaning up
killing machine (pid 627)
vde_switch: EOF on stdin, cleaning up and exiting
vde_switch: Could not remove ctl dir '/build/vde1.ctl': Directory not empty
/nix/store/45b6ip0swpj8714sfnzw8ly8nryjffnw-vm-test-run-prosody

@andir andir deleted the 18.03/prosody-cve-2018-10847 branch June 3, 2018 15:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@andir @GrahamcOfBorg