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

grafana: 5.1.4 -> 5.2.3 #45746

Merged
merged 1 commit into from Aug 29, 2018
Merged

grafana: 5.1.4 -> 5.2.3 #45746

merged 1 commit into from Aug 29, 2018

Conversation

WilliButz
Copy link
Member

includes fix for CVE-2018-558213

(cherry picked from commit c847fbb)

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/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

/cc @fpletz @vcunat

@WilliButz
grafana: 5.1.4 -> 5.2.3
5af35f0 
includes fix for CVE-2018-558213

(cherry picked from commit c847fbb)
@WilliButz WilliButz changed the title grafana: 5.2.2 -> 5.2.3 grafana: 5.1.4 -> 5.2.3 Aug 29, 2018
@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: grafana

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.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: grafana

Partial log (click to expand)

/nix/store/qj97hq519h2r8am23x0v67qqcz9x6a6s-grafana-5.2.3/share/go/src/github.com/grafana/grafana/packaging/publish/publish_both.sh: interpreter directive changed from " /usr/bin/env bash" to "/nix/store/lw7xaqhakk0i1c631m3cvac3x4lc5gr5-bash-4.4-p12/bin/bash"
/nix/store/qj97hq519h2r8am23x0v67qqcz9x6a6s-grafana-5.2.3/share/go/src/github.com/grafana/grafana/packaging/rpm/init.d/grafana-server: interpreter directive changed from " /usr/bin/env bash" to "/nix/store/lw7xaqhakk0i1c631m3cvac3x4lc5gr5-bash-4.4-p12/bin/bash"
/nix/store/qj97hq519h2r8am23x0v67qqcz9x6a6s-grafana-5.2.3/share/go/src/github.com/grafana/grafana/packaging/rpm/control/postinst: interpreter directive changed from "/bin/sh" to "/nix/store/lw7xaqhakk0i1c631m3cvac3x4lc5gr5-bash-4.4-p12/bin/sh"
/nix/store/qj97hq519h2r8am23x0v67qqcz9x6a6s-grafana-5.2.3/share/go/src/github.com/grafana/grafana/packaging/rpm/control/posttrans: interpreter directive changed from "/bin/sh" to "/nix/store/lw7xaqhakk0i1c631m3cvac3x4lc5gr5-bash-4.4-p12/bin/sh"
/nix/store/qj97hq519h2r8am23x0v67qqcz9x6a6s-grafana-5.2.3/share/go/src/github.com/grafana/grafana/packaging/mac/bin/grafana: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/lw7xaqhakk0i1c631m3cvac3x4lc5gr5-bash-4.4-p12/bin/bash"
/nix/store/qj97hq519h2r8am23x0v67qqcz9x6a6s-grafana-5.2.3/share/go/src/github.com/grafana/grafana/packaging/deb/init.d/grafana-server: interpreter directive changed from " /usr/bin/env bash" to "/nix/store/lw7xaqhakk0i1c631m3cvac3x4lc5gr5-bash-4.4-p12/bin/bash"
/nix/store/qj97hq519h2r8am23x0v67qqcz9x6a6s-grafana-5.2.3/share/go/src/github.com/grafana/grafana/packaging/deb/control/postinst: interpreter directive changed from "/bin/sh" to "/nix/store/lw7xaqhakk0i1c631m3cvac3x4lc5gr5-bash-4.4-p12/bin/sh"
/nix/store/gpy3r9ss5ngfkib8ylx7jzgahq7m0x5b-patch-shebangs.sh: line 22: warning: command substitution: ignored null byte in input
checking for references to /build in /nix/store/qj97hq519h2r8am23x0v67qqcz9x6a6s-grafana-5.2.3...
/nix/store/13ny62s3qs16a724rqh26z2x8nj26wdv-grafana-5.2.3-bin

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: grafana

Partial log (click to expand)

/nix/store/g6vaq4w0piz747pxg8mzyma0l02ywp3w-grafana-5.2.3/share/go/src/github.com/grafana/grafana/packaging/deb/init.d/grafana-server: interpreter directive changed from " /usr/bin/env bash" to "/nix/store/i7pgaclm3qrcm9gpqxb5mbw9wsn7prd0-bash-4.4-p12/bin/bash"
/nix/store/g6vaq4w0piz747pxg8mzyma0l02ywp3w-grafana-5.2.3/share/go/src/github.com/grafana/grafana/packaging/mac/bin/grafana: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/i7pgaclm3qrcm9gpqxb5mbw9wsn7prd0-bash-4.4-p12/bin/bash"
/nix/store/g6vaq4w0piz747pxg8mzyma0l02ywp3w-grafana-5.2.3/share/go/src/github.com/grafana/grafana/packaging/publish/publish_both.sh: interpreter directive changed from " /usr/bin/env bash" to "/nix/store/i7pgaclm3qrcm9gpqxb5mbw9wsn7prd0-bash-4.4-p12/bin/bash"
/nix/store/g6vaq4w0piz747pxg8mzyma0l02ywp3w-grafana-5.2.3/share/go/src/github.com/grafana/grafana/packaging/publish/publish_testing.sh: interpreter directive changed from " /usr/bin/env bash" to "/nix/store/i7pgaclm3qrcm9gpqxb5mbw9wsn7prd0-bash-4.4-p12/bin/bash"
/nix/store/g6vaq4w0piz747pxg8mzyma0l02ywp3w-grafana-5.2.3/share/go/src/github.com/grafana/grafana/packaging/rpm/control/postinst: interpreter directive changed from "/bin/sh" to "/nix/store/i7pgaclm3qrcm9gpqxb5mbw9wsn7prd0-bash-4.4-p12/bin/sh"
/nix/store/g6vaq4w0piz747pxg8mzyma0l02ywp3w-grafana-5.2.3/share/go/src/github.com/grafana/grafana/packaging/rpm/control/posttrans: interpreter directive changed from "/bin/sh" to "/nix/store/i7pgaclm3qrcm9gpqxb5mbw9wsn7prd0-bash-4.4-p12/bin/sh"
/nix/store/g6vaq4w0piz747pxg8mzyma0l02ywp3w-grafana-5.2.3/share/go/src/github.com/grafana/grafana/packaging/rpm/init.d/grafana-server: interpreter directive changed from " /usr/bin/env bash" to "/nix/store/i7pgaclm3qrcm9gpqxb5mbw9wsn7prd0-bash-4.4-p12/bin/bash"
/nix/store/gpy3r9ss5ngfkib8ylx7jzgahq7m0x5b-patch-shebangs.sh: line 22: warning: command substitution: ignored null byte in input
checking for references to /build in /nix/store/g6vaq4w0piz747pxg8mzyma0l02ywp3w-grafana-5.2.3...
/nix/store/zwk2f4bfyz81vzpq4909w63gr41zinsz-grafana-5.2.3-bin

@WilliButz
Copy link
Member Author

@GrahamcOfBorg test grafana

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: tests.grafana

Partial log (click to expand)

machine: exit status 1
syncing
machine: running command: sync
machine: exit status 0
test script finished in 26.35s
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/v6ljz24prpxmvw400dbp0m9xx8266igr-vm-test-run-grafana

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: tests.grafana

Partial log (click to expand)

machine: running command: sync
machine# [    6.133121] grafana-server[522]: t=2018-08-29T13:26:40+0000 lvl=info msg="Executing migration" logger=migrator id="add index alert_notification org_id & name"[    6.142996] NET: Registered protocol family 17
machine#
machine: exit status 0
test script finished in 7.13s
cleaning up
killing machine (pid 596)
vde_switch: EOF on stdin, cleaning up and exiting
vde_switch: Could not remove ctl dir '/build/vde1.ctl': Directory not empty
/nix/store/r7idbmpgz06llg01435kr42r2f8239w1-vm-test-run-grafana

@globin globin merged commit edd63e0 into NixOS:release-18.03 Aug 29, 2018
@globin globin mentioned this pull request Aug 29, 2018
Closed
@WilliButz WilliButz deleted the grafana-security-update branch August 29, 2018 14:15
@vcunat
Copy link
Member

vcunat commented Aug 30, 2018 •
edited

I only hope there are no breaking changes in 5.1 -> 5.2; there don't appear to be any, at a quick look: https://github.com/grafana/grafana/blob/master/CHANGELOG.md

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
1.severity: security 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
4 participants
@WilliButz @GrahamcOfBorg @vcunat @globin