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

Bump highwayhash to pull in FreeBSD 14 fix #1680

Merged
merged 1 commit into from
Jul 19, 2021

Conversation

ckreibich
Copy link
Member

Upstream has merged @leres's fix for FreeBSD 14, this pulls our build up to include that bump.

@leres
Copy link
Contributor

leres commented Jul 16, 2021

If you wait for this to pull request to clear, you'll get two FreeBSD fixes for the price of one...

@0xxon
Copy link
Member

0xxon commented Jul 19, 2021

That one is only for OpenBSD on power though, right? Which is such a rare combination that I think we should not wait for it. Bumping to upstream once they merged that is not a problem in any case.

@timwoj timwoj added this to the 4.1.0 milestone Jul 19, 2021
@timwoj timwoj merged commit d8b0ee0 into master Jul 19, 2021
@leres
Copy link
Contributor

leres commented Jul 19, 2021

That one is only for OpenBSD on power though, right?

I believe it impacts FreeBSD on powerpc64* based on this commit to the FreeBSD security/zeek port.

It's been a couple of weeks so maybe @jasperla isn't going to sign the google CLA. (I'd be happen to re-submit the PR...)

@0xxon
Copy link
Member

0xxon commented Jul 20, 2021

That patch is different. The one linked above is gated in a way that won't do anything outside of OpenBSD.

@leres
Copy link
Contributor

leres commented Jul 20, 2021

That patch is different. The one linked above is gated in a way that won't do anything outside of OpenBSD.

Hah, you're right! The FreeBSD and github usernames were similar so I assumed it was the same fix, my bad.

I'll submit an upstream PR for the security/zeek patch @pkubaj committed.

@leres
Copy link
Contributor

leres commented Jul 20, 2021

I'll submit an upstream PR for the security/zeek patch @pkubaj committed.

I filed the PR and it was accepted and merged (google/highwayhash#101) so it would be nice to do merge the current google/highway has back into zeek.

@ckreibich ckreibich deleted the topic/christian/bump-highwayhash branch August 19, 2021 01:12
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.

4 participants