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

Fix CI for FreeBSD 15 #3950

Merged
merged 1 commit into from
Sep 29, 2024
Merged

Fix CI for FreeBSD 15 #3950

merged 1 commit into from
Sep 29, 2024

Conversation

asomers
Copy link
Contributor

@asomers asomers commented Sep 29, 2024

It was failing for two reasons:

  • 87fbd9fc71 removed the TCP_MAXPEAKRATE symbol.
  • 3458bbd392 changed the value of RLIM_NLIMITS

Fixes #3947

Footnotes

  1. https://github.com/freebsd/freebsd-src/commit/87fbd9fc7fc5f8d79fe5e3dcd13ad02b11a67ef0

  2. https://github.com/freebsd/freebsd-src/commit/3458bbd397783f3bb62713c54ae87f19eeb98dc0

It was failing for two reasons:

* 87fbd9fc7[^1] removed the TCP_MAXPEAKRATE symbol.
* 3458bbd39[^2] changed the value of RLIM_NLIMITS

Fixes rust-lang#3947

[^1]: freebsd/freebsd-src@87fbd9f
[^2]: freebsd/freebsd-src@3458bbd
@rustbot
Copy link
Collaborator

rustbot commented Sep 29, 2024

r? @tgross35

rustbot has assigned @tgross35.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@tgross35
Copy link
Contributor

Thanks for the fix, feel free to put up a separate PR doing the other updates suggested at #3947.

@tgross35 tgross35 enabled auto-merge September 29, 2024 19:18
@tgross35 tgross35 added this pull request to the merge queue Sep 29, 2024
@asomers
Copy link
Contributor Author

asomers commented Sep 29, 2024

Actually, no other changes were necessary. The other symbols that were removed from FreeBSD by that commit were never part of rust's libc.

Merged via the queue into rust-lang:main with commit c73a50d Sep 29, 2024
41 checks passed
asomers added a commit to asomers/libc that referenced this pull request Sep 29, 2024
It was failing for two reasons:

* 87fbd9fc71[^1] removed the TCP_MAXPEAKRATE symbol.
* 3458bbd392[^2] changed the value of RLIM_NLIMITS

This is effectively a merge of rust-lang#3950 (commit 590d78d) from the main
branch.

Fixes rust-lang#3947

[^1]: freebsd/freebsd-src@87fbd9f
[^2]: freebsd/freebsd-src@3458bbd
github-merge-queue bot pushed a commit that referenced this pull request Sep 30, 2024
It was failing for two reasons:

* 87fbd9fc71[^1] removed the TCP_MAXPEAKRATE symbol.
* 3458bbd392[^2] changed the value of RLIM_NLIMITS

This is effectively a merge of #3950 (commit 590d78d) from the main
branch.

Fixes #3947

[^1]: freebsd/freebsd-src@87fbd9f
[^2]: freebsd/freebsd-src@3458bbd
@asomers asomers deleted the TCP_MAXPEAKRATE branch October 3, 2024 15:32
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.

CI fails on FreeBSD 15 for TCP_MAXPEAKRATE
3 participants