osquery: fix build #55690
Merged
osquery: fix build #55690
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The build missed `openssl` as input and failed with an error like this:
```
/nix/store/7n1h80xkbjhcijzp0iylk0nc7w05vy8k-net-snmp-5.8/include/net-snmp/library/scapi.h:14:10: fatal error: openssl/ossl_typ.h: No such file or directory
#include <openssl/ossl_typ.h> /* EVP_MD */
^~~~~~~~~~~~~~~~~~~~
compilation terminated.
```
This also unbreaks `osquery` (https://hydra.nixos.org/build/88547811).
See also https://hydra.nixos.org/build/88562937
We use `dpkg` 1.19.2 since 2366125. This version dropped pkg_db_reset` in `<dpkg/dpkg_db.h>` which broke compilation with the following errors: ``` /build/source/osquery/tables/system/linux/deb_packages.cpp: In function 'void osquery::tables::dpkg_setup(pkg_array*)': /build/source/osquery/tables/system/linux/deb_packages.cpp:83:3: error: 'pkg_array_init_from_db' was not declared in this scope pkg_array_init_from_db(packages); ^~~~~~~~~~~~~~~~~~~~~~ /build/source/osquery/tables/system/linux/deb_packages.cpp:83:3: note: suggested alternative: 'pkg_array_init_from_hash' pkg_array_init_from_db(packages); ^~~~~~~~~~~~~~~~~~~~~~ pkg_array_init_from_hash /build/source/osquery/tables/system/linux/deb_packages.cpp: In function 'void osquery::tables::dpkg_teardown(pkg_array*)': /build/source/osquery/tables/system/linux/deb_packages.cpp:93:3: error: 'pkg_db_reset' was not declared in this scope pkg_db_reset(); ^~~~~~~~~~~~ /build/source/osquery/tables/system/linux/deb_packages.cpp:93:3: note: suggested alternative: 'pkg_hash_reset' pkg_db_reset(); ^~~~~~~~~~~~ pkg_hash_reset make[2]: *** [osquery/tables/CMakeFiles/osquery_system_tables.dir/build.make:115: osquery/tables/CMakeFiles/osquery_system_tables.dir/system/linux/deb_packages.cpp.o] Error 1 ``` As there's currently no upstream fix, it's better to use an older version of `dpkg` for now.
GrahamcOfBorg
added
10.rebuild-darwin: 0
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Fixing osquery required the following changes:
lldpd(missingopenssl, see also https://hydra.nixos.org/build/88562937)dpkgforosquery(1.19.2 had some api changes, the problem is reported at Compilation breaks with dpkg 1.19.2 osquery/osquery#5435)Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)