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

Prevent ebpfpub linking against the system zlib #7557

Merged
merged 1 commit into from
Apr 13, 2022

Conversation

Smjert
Copy link
Member

@Smjert Smjert commented Apr 11, 2022

Update the ebpfpub version so that's possible to specify
to link against the osquery compiled zlib static library,
instead of linking against the system one.

Fixes #7553

@Smjert Smjert added bug build Linux libraries For things referring to osquery third party libraries labels Apr 11, 2022
@Smjert Smjert requested review from a team as code owners April 11, 2022 12:50
@Smjert Smjert marked this pull request as draft April 11, 2022 13:01
Update the ebpfpub version so that's possible to specify
to link against the osquery compiled zlib static library,
instead of linking against the system one.
@Smjert Smjert force-pushed the stefano/build/fix-zlib-linking branch from 4bc6d35 to dcb6323 Compare April 11, 2022 19:32
@Smjert Smjert added this to the 5.3.0 milestone Apr 11, 2022
@Smjert Smjert marked this pull request as ready for review April 11, 2022 19:46
Copy link
Member

@directionless directionless left a comment

Choose a reason for hiding this comment

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

I assume the submodule update is intentional

@Smjert
Copy link
Member Author

Smjert commented Apr 13, 2022

I assume the submodule update is intentional

Yeah, the ebpfpub version has been updated because there's a change in its ebpf-common submodule, to permit specifying a different zlib to be linked against the LLVM libraries it's using.

@Smjert Smjert merged commit 5dd8a84 into osquery:master Apr 13, 2022
@Smjert Smjert deleted the stefano/build/fix-zlib-linking branch April 25, 2022 16:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug build libraries For things referring to osquery third party libraries Linux
Projects
None yet
Development

Successfully merging this pull request may close these issues.

osqueryd incorrectly links to libz as a shared library on Linux
3 participants