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.

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

osquery: 3.2.9 -> 3.3.2 #62099

Merged
merged 2 commits into from May 28, 2019
Merged

osquery: 3.2.9 -> 3.3.2 #62099

merged 2 commits into from May 28, 2019

Conversation

Ma27
Copy link
Member

@Ma27 Ma27 commented May 26, 2019

Motivation for this change

Bumps osquery to the latest version available and clean up the derivation.

The PR consists of two commits:

  • 36cdfa3: add libelfin, a new dependency of osquery.
  • 64f373d: bump osquery to 3.3.2, please read the commit message for all details.
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 nix-review --run "nix-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@Ma27 Ma27 changed the title Bump osquery osquery: 3.2.9 -> 3.3.2 May 26, 2019
@Ma27
Copy link
Member Author

Ma27 commented May 26, 2019

@GrahamcOfBorg test osquery

@c0bw3b
Copy link
Contributor

c0bw3b commented May 27, 2019

It seems libelfin should be restricted to platforms.linux too

Ma27 added 2 commits May 27, 2019 16:15
Needed by osquery to monitor which binaries are using e.g. hardening
features: osquery/osquery#4708
Although there's already a windows-only 3.4[1], the latest release for
Unix systems is 3.3.2[2] with the following changes:

* SELinux event recording[3]
* SMART drive information[4]
* ELF parsing to monitor compiler-level protections for binaries[5]

The diff became rather big in the end due to the following changes:

* The SMART information feature uses a custom fork of smartmontools to
  retrieve SMART data programatically[6].

* Replaced the old, bloated `misc.patch` by a simpler patch that only
  fixes two (actual) issues in the CMake build, unnecessary link targets
  and an invalid compiler flag.

* I tried to clean the derivation's code up a little bit by
  simplifying the `preConfigure` hook and adding only one build-input
  per line (that makes merging of several changes to the derivation
  easier as well).

[1] https://github.com/facebook/osquery/releases/tag/3.4.0
[2] https://github.com/facebook/osquery/releases/tag/3.3.2
[3] osquery/osquery#4224
[4] osquery/osquery#4133
[5] osquery/osquery#4708
[6] https://github.com/allanliu/smartmontools
@Ma27
Copy link
Member Author

Ma27 commented May 27, 2019

Ahh, you're absolutely right, fixed! :)

@infinisil infinisil merged commit 2762950 into NixOS:master May 28, 2019
@Ma27 Ma27 deleted the bump-osquery branch May 28, 2019 07:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants