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

[18.03] graylog: 2.4.3 -> 2.4.4 #40450

Merged
merged 2 commits into from May 13, 2018
Merged

[18.03] graylog: 2.4.3 -> 2.4.4 #40450

merged 2 commits into from May 13, 2018

Conversation

fadenb
Copy link
Contributor

@fadenb fadenb commented May 13, 2018

Motivation for this change

Graylog 2.4.4 release contains a security fix, we should have the fixed version available in 18.03.

The 2nd commit ( 2693d6b98323a5a65e84a293942c38298a7e7c50 ) is not strictly necessary but it keeps 18.03 in sync with master and fixes graylogctl complaining when using it outside of the NixOS module.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/)
  • YOLOed it in production without noticing any issues
  • Fits CONTRIBUTING.md.

@xeji
Copy link
Contributor

xeji commented May 13, 2018

@GrahamcOfBorg build graylog

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: graylog

Partial log (click to expand)


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

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

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: graylog

Partial log (click to expand)

shrinking /nix/store/ln3qffrxysxsp6yzk1i44hys1w8dnm8q-graylog-2.4.4/lib/sigar/libsigar-amd64-linux.so
shrinking /nix/store/ln3qffrxysxsp6yzk1i44hys1w8dnm8q-graylog-2.4.4/lib/sigar/libsigar-s390x-linux.so
shrinking /nix/store/ln3qffrxysxsp6yzk1i44hys1w8dnm8q-graylog-2.4.4/lib/sigar/libsigar-ppc64-linux.so
shrinking /nix/store/ln3qffrxysxsp6yzk1i44hys1w8dnm8q-graylog-2.4.4/lib/sigar/libsigar-sparc64-solaris.so
shrinking /nix/store/ln3qffrxysxsp6yzk1i44hys1w8dnm8q-graylog-2.4.4/lib/sigar/libsigar-x86-freebsd-6.so
shrinking /nix/store/ln3qffrxysxsp6yzk1i44hys1w8dnm8q-graylog-2.4.4/lib/sigar/libsigar-x86-linux.so
patching script interpreter paths in /nix/store/ln3qffrxysxsp6yzk1i44hys1w8dnm8q-graylog-2.4.4
/nix/store/ln3qffrxysxsp6yzk1i44hys1w8dnm8q-graylog-2.4.4/bin/.graylogctl-wrapped: interpreter directive changed from "/bin/bash" to "/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/bash"
checking for references to /build in /nix/store/ln3qffrxysxsp6yzk1i44hys1w8dnm8q-graylog-2.4.4...
/nix/store/ln3qffrxysxsp6yzk1i44hys1w8dnm8q-graylog-2.4.4

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: graylog

Partial log (click to expand)

source root is graylog-2.4.4
setting SOURCE_DATE_EPOCH to timestamp 1525264957 of file graylog-2.4.4/plugin/graylog-plugin-threatintel-2.4.4.jar
patching sources
configuring
no configure script, doing nothing
installing
post-installation fixup
patching script interpreter paths in /nix/store/hvhn2s6glb2mb5klqrb8yj5bbbf2rhii-graylog-2.4.4
/nix/store/hvhn2s6glb2mb5klqrb8yj5bbbf2rhii-graylog-2.4.4/bin/.graylogctl-wrapped: interpreter directive changed from "/bin/bash" to "/nix/store/i2wr98av5x68cif4z9zzkq37i5ji74dq-bash-4.4-p12/bin/bash"
/nix/store/hvhn2s6glb2mb5klqrb8yj5bbbf2rhii-graylog-2.4.4

xeji
xeji approved these changes May 13, 2018
View reviewed changes
Copy link
Contributor

@xeji xeji left a comment

Choose a reason for hiding this comment

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

Backport of #40133

@dotlambda
Copy link
Member

dotlambda commented May 13, 2018 •
edited

Please use git cherry-pick -x. See https://nixos.org/nixpkgs/manual/#idm140737315713648.

@fadenb
graylog: 2.4.3 -> 2.4.4
7d8dbc5 
(cherry picked from commit 08eba84)
Reason: 2.4.4 contains a security fix
@fadenb
graylog: wrap graylogctl
8252dee 
Wrapper ensures graylogctl script can find java

(cherry picked from commit 9817b4a)
@fadenb fadenb force-pushed the graylog_2.4.4_on_release-18.03 branch from 2693d6b to 8252dee Compare May 13, 2018 18:36
@xeji
Copy link
Contributor

xeji commented May 13, 2018

@GrahamcOfBorg build graylog

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: graylog

Partial log (click to expand)

/nix/store/ln3qffrxysxsp6yzk1i44hys1w8dnm8q-graylog-2.4.4

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: graylog

Partial log (click to expand)

source root is graylog-2.4.4
setting SOURCE_DATE_EPOCH to timestamp 1525264957 of file graylog-2.4.4/plugin/graylog-plugin-threatintel-2.4.4.jar
patching sources
configuring
no configure script, doing nothing
installing
post-installation fixup
patching script interpreter paths in /nix/store/hvhn2s6glb2mb5klqrb8yj5bbbf2rhii-graylog-2.4.4
/nix/store/hvhn2s6glb2mb5klqrb8yj5bbbf2rhii-graylog-2.4.4/bin/.graylogctl-wrapped: interpreter directive changed from "/bin/bash" to "/nix/store/i2wr98av5x68cif4z9zzkq37i5ji74dq-bash-4.4-p12/bin/bash"
/nix/store/hvhn2s6glb2mb5klqrb8yj5bbbf2rhii-graylog-2.4.4

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: graylog

Partial log (click to expand)


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

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

@dotlambda
Copy link
Member

dotlambda commented May 13, 2018 •
edited

I actually think that only the version bump should be backported. The second commit makes the package unfree on aarch64 due to jre referring to Oracle's implementation.

@xeji
Copy link
Contributor

xeji commented May 13, 2018

The package depends on a JRE. If the one available on aarch64 is unfree, what can we do?
The alternative is a missing runtime dependency on all platforms.

@dotlambda
Copy link
Member

All right, let's merge this as is.

@dotlambda dotlambda merged commit 465de59 into NixOS:release-18.03 May 13, 2018
@fadenb fadenb deleted the graylog_2.4.4_on_release-18.03 branch May 13, 2018 18:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xeji xeji xeji approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 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
@fadenb @xeji @GrahamcOfBorg @dotlambda