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

KEEPCNT/KEEPINTVL aren't available on OpenBSD. #1318

Merged
merged 1 commit into from
Oct 18, 2020
Merged

KEEPCNT/KEEPINTVL aren't available on OpenBSD. #1318

merged 1 commit into from
Oct 18, 2020

Conversation

ltratt
Copy link
Contributor

@ltratt ltratt commented Oct 18, 2020

Without this commit, nix doesn't currently compile on OpenBSD. Some keepalive settings can be set globally, but not per-socket (see e.g. https://bugzilla.mozilla.org/show_bug.cgi?id=970550 for some digging into this). Since it seems that NetBSD and DragonflyBSD have these settings, it makes more sense to only exclude them on OpenBSD rather than include them on (pretty much every) other operating systems.

Without this commit, nix doesn't currently compile on OpenBSD. Some keepalive
settings can be set globally, but not per-socket (see e.g.
https://bugzilla.mozilla.org/show_bug.cgi?id=970550 for some digging into this).
Since it seems that NetBSD and DragonflyBSD have these settings, it makes more
sense to only exclude them on OpenBSD rather than include them on (pretty much
every) other operating systems.
Copy link
Member

@asomers asomers left a comment

Choose a reason for hiding this comment

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

bors r+

@bors
Copy link
Contributor

bors bot commented Oct 18, 2020

Build succeeded:

@bors bors bot merged commit 5d2a8c2 into nix-rust:master Oct 18, 2020
bors bot added a commit to softdevteam/snare that referenced this pull request Oct 26, 2020
78: Update dependencies. r=vext01 a=ltratt

There are some minor code changes necessary to deal with changes in hmac.

[Note: currently nix 0.19.0 doesn't build on OpenBSD. A fix has been merged (nix-rust/nix#1318), but until a new release is made, snare's master branch won't build. Since I don't know how long that'll be, I think it's best to merge this now before it gets *too* stale, and pull in a nix fix later.]

Co-authored-by: Laurence Tratt <[email protected]>
bors bot added a commit to softdevteam/snare that referenced this pull request Oct 26, 2020
78: Update dependencies. r=vext01 a=ltratt

There are some minor code changes necessary to deal with changes in hmac.

[Note: currently nix 0.19.0 doesn't build on OpenBSD. A fix has been merged (nix-rust/nix#1318), but until a new release is made, snare's master branch won't build. Since I don't know how long that'll be, I think it's best to merge this now before it gets *too* stale, and pull in a nix fix later.]

Co-authored-by: Laurence Tratt <[email protected]>
@asomers asomers added this to the 0.19.1 milestone Nov 22, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants