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

osquery: 3.2.8 -> 3.2.9 #43690

Merged
merged 1 commit into from Jul 18, 2018
Merged

osquery: 3.2.8 -> 3.2.9 #43690

merged 1 commit into from Jul 18, 2018

Conversation

Ma27
Copy link
Member

@Ma27 Ma27 commented Jul 17, 2018 •
edited

Motivation for this change

Latest bugfix release with the following notable changes:

Additionally the patch had to be rebased onto the 3.2.9 branch as it
added XCode support including some CLang flags (namely -fno-limit-debug-info)
which are unsupported on GCC.
(see osquery/osquery@bccc28d)

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.

@Ma27
osquery: 3.2.8 -> 3.2.9
d94b25b 
Latest bugfix release with the following notable changes:

* Memory leak resolve for dispatcher
  (osquery/osquery@06d4865)

* Fix include path on status.h
  (osquery/osquery@5bd4984)

Additionally the patch had to be rebased onto the 3.2.9 branch as it
added XCode support including some CLang flags (namely `-fno-limit-debug-info`)
which are unsupported on GCC.
(see osquery/osquery@bccc28d)
@Ma27
Copy link
Member Author

Ma27 commented Jul 17, 2018

as mentioned in IRC, upstream has added XCode support, but I don't have the hardware to test it which is why I left meta.platforms at platforms.linux.

@xeji
Copy link
Contributor

xeji commented Jul 17, 2018

@GrahamcOfBorg eval

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

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

Partial log (click to expand)


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

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

@GrahamcOfBorg
Copy link

Failure on x86_64-linux (full log)

Attempted: osquery

Partial log (click to expand)

[ 88%] Built target shell
Scanning dependencies of target osquery_benchmarks
[ 88%] Building CXX object osquery/CMakeFiles/osquery_benchmarks.dir/main/benchmarks.cpp.o
<command-line>:0:15: warning: ISO C++11 requires whitespace after the macro name
[ 88%] Building CXX object osquery/CMakeFiles/osquery_benchmarks.dir/database/benchmarks/database_benchmarks.cpp.o
<command-line>:0:15: warning: ISO C++11 requires whitespace after the macro name
[ 89%] Building CXX object osquery/CMakeFiles/osquery_benchmarks.dir/events/benchmarks/events_benchmarks.cpp.o
<command-line>:0:15: warning: ISO C++11 requires whitespace after the macro name
building of '/nix/store/k9vlyc66arfnlyi67d1sfzv02ba1hjc4-osquery-3.2.9.drv' timed out after 3600 seconds
error: build of '/nix/store/k9vlyc66arfnlyi67d1sfzv02ba1hjc4-osquery-3.2.9.drv' failed

@Ma27
Copy link
Member Author

Ma27 commented Jul 18, 2018

Evaluation seems to fail due to a lack of memory:

GC Warning: Out of Memory! Heap size: 8418 MiB. Returning NULL!
error: out of memory

@grahamc is it sufficientto retrigger ofborg or are there any further things tobe done?

@grahamc
Copy link
Member

grahamc commented Jul 18, 2018

Give it a try, the failing error message indicates the problem was with master not this branch, so trying again can't hurt in case it has been fixed there.

However specific to today: there was a bit of an issue with too little memory allocated for the evaluator, which should be fixed now.

@Ma27
Copy link
Member Author

Ma27 commented Jul 18, 2018

thanks for the fast reply!

@GrahamcOfBorg eval

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

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

Partial log (click to expand)


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

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

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: osquery

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/b2lw86975xgzvyflajjfv17zqskwga4d-osquery-3.2.9
shrinking /nix/store/b2lw86975xgzvyflajjfv17zqskwga4d-osquery-3.2.9/bin/osqueryd
shrinking /nix/store/b2lw86975xgzvyflajjfv17zqskwga4d-osquery-3.2.9/bin/osqueryi
strip is /nix/store/90vmpr41dzsx350k5argycaf693hnl1l-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/b2lw86975xgzvyflajjfv17zqskwga4d-osquery-3.2.9/bin
patching script interpreter paths in /nix/store/b2lw86975xgzvyflajjfv17zqskwga4d-osquery-3.2.9
/nix/store/b2lw86975xgzvyflajjfv17zqskwga4d-osquery-3.2.9/etc/init.d/osqueryd: interpreter directive changed from "/bin/sh" to "/nix/store/z9qg7lpkrajdnlgw5pxp9yx984prl1fi-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/b2lw86975xgzvyflajjfv17zqskwga4d-osquery-3.2.9...
/nix/store/b2lw86975xgzvyflajjfv17zqskwga4d-osquery-3.2.9

@xeji
Copy link
Contributor

xeji commented Jul 18, 2018

@GrahamcOfBorg test osquery

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

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

Partial log (click to expand)


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

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

@GrahamcOfBorg
Copy link

Failure on x86_64-linux (full log)

Attempted: tests.osquery

Partial log (click to expand)

cannot build derivation '/nix/store/sb4qk1n5s6svw6wxh6kngdard4p0b28l-system-units.drv': 4 dependencies couldn't be built
cannot build derivation '/nix/store/2ajz4k0ayk6pffqgapk8jmjhhc280mri-user-units.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/wlvdn3jh8cn36zpb2smdn66g28d3azzi-etc.drv': 4 dependencies couldn't be built
cannot build derivation '/nix/store/2vs702r2jysd4bd0sg31cwa15valdghb-nixos-system-machine-18.09.git.45edb22.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/6lqihmyrx49zn2rmah5x6mx3y1szcclf-closure-info.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/8hd901ahkk2i98f4i9p3m3x5788mi4gn-run-nixos-vm.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/v7fa3gxkl46xfm8fc7gc5rcdhpmzy01n-nixos-vm.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/3gf9ghcai9nbqpzvrrnrhf8rjpvvfkfw-nixos-test-driver-osquery.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/na8466gpfhlndvmzzrihx55fryfk75mr-vm-test-run-osquery.drv': 1 dependencies couldn't be built
error: build of '/nix/store/na8466gpfhlndvmzzrihx55fryfk75mr-vm-test-run-osquery.drv' failed

@Ma27
Copy link
Member Author

Ma27 commented Jul 18, 2018

I'm slightly surprised about the broken test as tests.osquery works fine on my machine, will start to investigate %)

@xeji
Copy link
Contributor

xeji commented Jul 18, 2018

Nevermind, it's just a build timeout. Good enough if the test works on your machine

@xeji
Copy link
Contributor

xeji commented Jul 18, 2018

Test works fine on my machine too.

@xeji xeji merged commit fbc009f into NixOS:master Jul 18, 2018
@Ma27 Ma27 deleted the bump-osquery branch July 18, 2018 20:29
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
4 participants
@Ma27 @xeji @GrahamcOfBorg @grahamc