From 5281edbdcd77c9e41bb8542a7968de834da4a741 Mon Sep 17 00:00:00 2001 From: Alan Somers Date: Sun, 29 Sep 2024 13:55:00 -0600 Subject: [PATCH] Fix CI for FreeBSD 15, on libc-0.2 branch It was failing for two reasons: * 87fbd9fc71[^1] removed the TCP_MAXPEAKRATE symbol. * 3458bbd392[^2] changed the value of RLIM_NLIMITS Fixes #3947 [^1]: https://github.com/freebsd/freebsd-src/commit/87fbd9fc7fc5f8d79fe5e3dcd13ad02b11a67ef0 [^2]: https://github.com/freebsd/freebsd-src/commit/3458bbd397783f3bb62713c54ae87f19eeb98dc0 --- libc-test/build.rs | 8 +++++++- src/unix/bsd/freebsdlike/freebsd/mod.rs | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/libc-test/build.rs b/libc-test/build.rs index 75dcd14fc83be..b6472b4ea56a8 100644 --- a/libc-test/build.rs +++ b/libc-test/build.rs @@ -2338,6 +2338,9 @@ fn test_freebsd(target: &str) { // base system anyway. "CTL_MAXID" | "KERN_MAXID" | "HW_MAXID" | "USER_MAXID" => true, + // Deprecated and removed in FreeBSD 15. It was never actually implemented. + "TCP_MAXPEAKRATE" => true, + // FIXME: This is deprecated - remove in a couple of releases. // This was removed in FreeBSD 14 (git 1b4701fe1e8) and never // should've been used anywhere anyway. @@ -2364,6 +2367,10 @@ fn test_freebsd(target: &str) { | "PWAIT" | "PLOCK" | "PPAUSE" | "PRI_MIN_TIMESHARE" | "PUSER" | "PI_AV" | "PI_NET" | "PI_DISK" | "PI_TTY" | "PI_DULL" | "PI_SOFT" => true, + // This constant changed in FreeBSD 15 (git 3458bbd397783). It was never intended to + // be stable, and probably shouldn't be bound by libc at all. + "RLIM_NLIMITS" => true, + // This symbol changed in FreeBSD 14 (git 051e7d78b03), but the new // version should be safe to use on older releases. "IFCAP_CANTCHANGE" => true, @@ -2494,7 +2501,6 @@ fn test_freebsd(target: &str) { // Flags introduced in FreeBSD 14. "TCP_MAXUNACKTIME" - | "TCP_MAXPEAKRATE" | "TCP_IDLE_REDUCE" | "TCP_REMOTE_UDP_ENCAPS_PORT" | "TCP_DELACK" diff --git a/src/unix/bsd/freebsdlike/freebsd/mod.rs b/src/unix/bsd/freebsdlike/freebsd/mod.rs index 47b4bd36e6d02..3c47e7b97e2e4 100644 --- a/src/unix/bsd/freebsdlike/freebsd/mod.rs +++ b/src/unix/bsd/freebsdlike/freebsd/mod.rs @@ -3843,6 +3843,8 @@ pub const TCP_INFO: ::c_int = 32; pub const TCP_CONGESTION: ::c_int = 64; pub const TCP_CCALGOOPT: ::c_int = 65; pub const TCP_MAXUNACKTIME: ::c_int = 68; +#[doc(hidden)] +#[deprecated(since = "0.2.160", note = "Removed in FreeBSD 15")] pub const TCP_MAXPEAKRATE: ::c_int = 69; pub const TCP_IDLE_REDUCE: ::c_int = 70; pub const TCP_REMOTE_UDP_ENCAPS_PORT: ::c_int = 71;