Merge pull request #2480 from containers/cargo-deps

Update cargo dependencies

.cargo-vendor/libc/CHANGELOG.md

@@ -2,6 +2,43 @@
 
 ## [Unreleased]
 
+## [0.2.164](https://github.com/rust-lang/libc/compare/0.2.163...0.2.164) - 2024-11-16
+
+### MSRV
+
+This release increases the MSRV of `libc` to 1.63.
+
+### Other
+
+- CI: remove tests with rust < 1.63 <https://github.com/rust-lang/libc/pull/4051>
+- MSRV: document the MSRV of the stable channel to be 1.63 <https://github.com/rust-lang/libc/pull/4040>
+- MacOS: move ifconf to s_no_extra_traits <https://github.com/rust-lang/libc/pull/4051>
+
+## [0.2.163](https://github.com/rust-lang/libc/compare/0.2.162...0.2.163) - 2024-11-16
+
+### Added
+
+- Aix: add more `dlopen` flags <https://github.com/rust-lang/libc/pull/4044>
+- Android: add group calls <https://github.com/rust-lang/libc/pull/3499>
+- FreeBSD: add `TCP_FUNCTION_BLK` and `TCP_FUNCTION_ALIAS` <https://github.com/rust-lang/libc/pull/4047>
+- Linux: add `confstr` <https://github.com/rust-lang/libc/pull/3612>
+- Solarish: add `aio` <https://github.com/rust-lang/libc/pull/4033>
+- Solarish: add `arc4random*` <https://github.com/rust-lang/libc/pull/3944>
+
+### Changed
+
+- Emscripten: upgrade emsdk to 3.1.68 <https://github.com/rust-lang/libc/pull/3962>
+- Hurd: use more standard types <https://github.com/rust-lang/libc/pull/3733>
+- Hurd: use the standard `ssize_t = isize` <https://github.com/rust-lang/libc/pull/4029>
+- Solaris: fix `confstr` and `ucontext_t` <https://github.com/rust-lang/libc/pull/4035>
+
+### Other
+
+- CI: add Solaris <https://github.com/rust-lang/libc/pull/4035>
+- CI: add `i686-unknown-freebsd` <https://github.com/rust-lang/libc/pull/3997>
+- CI: ensure that calls to `sort` do not depend on locale <https://github.com/rust-lang/libc/pull/4026>
+- Specify `rust-version` in `Cargo.toml` <https://github.com/rust-lang/libc/pull/4041>
+
 ## [0.2.162](https://github.com/rust-lang/libc/compare/0.2.161...0.2.162) - 2024-11-07
 
 ### Added

.cargo-vendor/libc/Cargo.toml

@@ -10,8 +10,9 @@
 # See Cargo.toml.orig for the original contents.
 
 [package]
+rust-version = "1.63"
 name = "libc"
-version = "0.2.162"
+version = "0.2.164"
 authors = ["The Rust Project Developers"]
 build = "build.rs"
 exclude = [

.cargo-vendor/libc/README.md

@@ -55,21 +55,13 @@ libc = "0.2"
 
 ## Rust version support
 
-The minimum supported Rust toolchain version is currently **Rust 1.13.0**. (libc
-does not currently have any policy regarding changes to the minimum supported
-Rust version; such policy is a work in progress.) APIs requiring newer Rust
-features are only available on newer Rust toolchains:
-
-| Feature              | Version |
-| -------------------- | ------- |
-| `union`              | 1.19.0  |
-| `const mem::size_of` | 1.24.0  |
-| `repr(align)`        | 1.25.0  |
-| `extra_traits`       | 1.25.0  |
-| `core::ffi::c_void`  | 1.30.0  |
-| `repr(packed(N))`    | 1.33.0  |
-| `cfg(target_vendor)` | 1.33.0  |
-| `const-extern-fn`    | 1.62.0  |
+The minimum supported Rust toolchain version is currently **Rust 1.63**.
+
+Increases to the MSRV are allowed to change without a major (i.e. semver-
+breaking) release in order to avoid a ripple effect in the ecosystem.
+
+`libc` may continue to compile with Rust versions older than the current MSRV
+but this is not guaranteed.
 
 ## Platform support
 

.cargo-vendor/libc/src/unix/aix/mod.rs

@@ -708,6 +708,8 @@ pub const RTLD_LAZY: ::c_int = 0x4;
 pub const RTLD_NOW: ::c_int = 0x2;
 pub const RTLD_GLOBAL: ::c_int = 0x10000;
 pub const RTLD_LOCAL: ::c_int = 0x80000;
+pub const RTLD_MEMBER: ::c_int = 0x40000;
+pub const RTLD_NOAUTODEFER: ::c_int = 0x20000;
 pub const RTLD_DEFAULT: *mut ::c_void = -1isize as *mut ::c_void;
 pub const RTLD_MYSELF: *mut ::c_void = -2isize as *mut ::c_void;
 pub const RTLD_NEXT: *mut ::c_void = -3isize as *mut ::c_void;

.cargo-vendor/libc/src/unix/bsd/apple/mod.rs

@@ -1143,15 +1143,6 @@ s! {
         pub nativeattr: attribute_set_t,
     }
 
-    #[cfg_attr(libc_packedN, repr(packed(4)))]
-    pub struct ifconf {
-        pub ifc_len: ::c_int,
-        #[cfg(libc_union)]
-        pub ifc_ifcu: __c_anonymous_ifc_ifcu,
-        #[cfg(not(libc_union))]
-        pub ifc_ifcu: *mut ifreq,
-    }
-
     #[cfg_attr(libc_align, repr(align(8)))]
     pub struct tcp_connection_info {
         pub tcpi_state: u8,
@@ -1202,6 +1193,15 @@ s! {
 }
 
 s_no_extra_traits! {
+    #[cfg_attr(libc_packedN, repr(packed(4)))]
+    pub struct ifconf {
+        pub ifc_len: ::c_int,
+        #[cfg(libc_union)]
+        pub ifc_ifcu: __c_anonymous_ifc_ifcu,
+        #[cfg(not(libc_union))]
+        pub ifc_ifcu: *mut ifreq,
+    }
+
     #[cfg_attr(libc_packedN, repr(packed(4)))]
     pub struct kevent {
         pub ident: ::uintptr_t,
@@ -1617,6 +1617,32 @@ cfg_if! {
 
 cfg_if! {
     if #[cfg(feature = "extra_traits")] {
+        impl PartialEq for ifconf
+        where
+            Self: Copy
+        {
+            fn eq(&self, other: &Self) -> bool {
+                let len_ptr1 = core::ptr::addr_of!(self.ifc_len);
+                let len_ptr2 = core::ptr::addr_of!(other.ifc_len);
+                let ifcu_ptr1 = core::ptr::addr_of!(self.ifc_ifcu);
+                let ifcu_ptr2 = core::ptr::addr_of!(other.ifc_ifcu);
+
+                // SAFETY: `ifconf` implements `Copy` so the reads are valid
+                let len1 = unsafe { len_ptr1.read_unaligned() };
+                let len2 = unsafe { len_ptr2.read_unaligned() };
+                let ifcu1 = unsafe { ifcu_ptr1.read_unaligned() };
+                let ifcu2 = unsafe { ifcu_ptr2.read_unaligned() };
+
+                len1 == len2 && ifcu1 == ifcu2
+            }
+        }
+        impl Eq for ifconf {}
+        impl ::fmt::Debug for ifconf {
+            fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
+                f.debug_struct("ifconf").finish_non_exhaustive()
+            }
+        }
+
         impl PartialEq for kevent {
             fn eq(&self, other: &kevent) -> bool {
                 self.ident == other.ident
@@ -1627,6 +1653,7 @@ cfg_if! {
                     && self.udata == other.udata
             }
         }
+
         impl Eq for kevent {}
         impl ::fmt::Debug for kevent {
             fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
@@ -5657,11 +5684,6 @@ extern "C" {
     pub fn fchflags(fd: ::c_int, flags: ::c_uint) -> ::c_int;
     pub fn clock_getres(clk_id: ::clockid_t, tp: *mut ::timespec) -> ::c_int;
     pub fn clock_gettime(clk_id: ::clockid_t, tp: *mut ::timespec) -> ::c_int;
-    #[cfg_attr(
-        all(target_os = "macos", target_arch = "x86"),
-        link_name = "confstr$UNIX2003"
-    )]
-    pub fn confstr(name: ::c_int, buf: *mut ::c_char, len: ::size_t) -> ::size_t;
     pub fn lio_listio(
         mode: ::c_int,
         aiocb_list: *const *mut aiocb,

.cargo-vendor/libc/src/unix/bsd/freebsdlike/freebsd/mod.rs

@@ -3895,6 +3895,8 @@ pub const TCP_KEEPINIT: ::c_int = 128;
 pub const TCP_FASTOPEN: ::c_int = 1025;
 pub const TCP_PCAP_OUT: ::c_int = 2048;
 pub const TCP_PCAP_IN: ::c_int = 4096;
+pub const TCP_FUNCTION_BLK: ::c_int = 8192;
+pub const TCP_FUNCTION_ALIAS: ::c_int = 8193;
 pub const TCP_FASTOPEN_PSK_LEN: ::c_int = 16;
 pub const TCP_FUNCTION_NAME_LEN_MAX: ::c_int = 32;
 

.cargo-vendor/libc/src/unix/hurd/mod.rs

@@ -72,8 +72,6 @@ pub type __ptrdiff_t = __sword_type;
 pub type __socklen_t = __u32_type;
 pub type __sig_atomic_t = ::c_int;
 pub type __time64_t = __int64_t;
-pub type ssize_t = __ssize_t;
-pub type size_t = ::c_ulong;
 pub type wchar_t = ::c_int;
 pub type wint_t = ::c_uint;
 pub type gid_t = __gid_t;
@@ -341,19 +339,19 @@ s! {
         pub ai_family: ::c_int,
         pub ai_socktype: ::c_int,
         pub ai_protocol: ::c_int,
-        pub ai_addrlen: socklen_t,
+        pub ai_addrlen: ::socklen_t,
         pub ai_addr: *mut sockaddr,
         pub ai_canonname: *mut ::c_char,
         pub ai_next: *mut addrinfo,
     }
 
     pub struct msghdr {
         pub msg_name: *mut ::c_void,
-        pub msg_namelen: socklen_t,
+        pub msg_namelen: ::socklen_t,
         pub msg_iov: *mut ::iovec,
         pub msg_iovlen: ::c_int,
         pub msg_control: *mut ::c_void,
-        pub msg_controllen: socklen_t,
+        pub msg_controllen: ::socklen_t,
         pub msg_flags: ::c_int,
     }
 
@@ -683,8 +681,8 @@ s! {
     pub struct __pthread_attr {
         pub __schedparam: sched_param,
         pub __stackaddr: *mut ::c_void,
-        pub __stacksize: size_t,
-        pub __guardsize: size_t,
+        pub __stacksize: ::size_t,
+        pub __guardsize: ::size_t,
         pub __detachstate: __pthread_detachstate,
         pub __inheritsched: __pthread_inheritsched,
         pub __contentionscope: __pthread_contentionscope,
@@ -733,7 +731,7 @@ s! {
 
     pub struct iovec {
         pub iov_base: *mut ::c_void,
-        pub iov_len: size_t,
+        pub iov_len: ::size_t,
     }
 
     pub struct passwd {
@@ -3651,13 +3649,13 @@ extern "C" {
         __iovec: *const ::iovec,
         __count: ::c_int,
         __offset: __off_t,
-    ) -> ssize_t;
+    ) -> ::ssize_t;
     pub fn pwritev(
         __fd: ::c_int,
         __iovec: *const ::iovec,
         __count: ::c_int,
         __offset: __off_t,
-    ) -> ssize_t;
+    ) -> ::ssize_t;
 
     pub fn preadv64(
         fd: ::c_int,
@@ -3738,7 +3736,7 @@ extern "C" {
     pub fn fsetpos64(stream: *mut ::FILE, ptr: *const fpos64_t) -> ::c_int;
     pub fn ftello64(stream: *mut ::FILE) -> ::off64_t;
 
-    pub fn bind(__fd: ::c_int, __addr: *const sockaddr, __len: socklen_t) -> ::c_int;
+    pub fn bind(__fd: ::c_int, __addr: *const sockaddr, __len: ::socklen_t) -> ::c_int;
 
     pub fn accept4(
         fd: ::c_int,
@@ -3756,7 +3754,7 @@ extern "C" {
 
     pub fn recvmsg(__fd: ::c_int, __message: *mut msghdr, __flags: ::c_int) -> ::ssize_t;
 
-    pub fn sendmsg(__fd: ::c_int, __message: *const msghdr, __flags: ::c_int) -> ssize_t;
+    pub fn sendmsg(__fd: ::c_int, __message: *const msghdr, __flags: ::c_int) -> ::ssize_t;
 
     pub fn recvfrom(
         socket: ::c_int,
@@ -4360,7 +4358,7 @@ extern "C" {
 
     pub fn mmap64(
         __addr: *mut ::c_void,
-        __len: size_t,
+        __len: ::size_t,
         __prot: ::c_int,
         __flags: ::c_int,
         __fd: ::c_int,
@@ -4677,16 +4675,6 @@ safe_f! {
     }
 }
 
-cfg_if! {
-    if #[cfg(libc_align)] {
-        mod align;
-        pub use self::align::*;
-    } else {
-        mod no_align;
-        pub use self::no_align::*;
-    }
-}
-
 cfg_if! {
     if #[cfg(target_pointer_width = "64")] {
         mod b64;

.cargo-vendor/libc/src/unix/linux_like/android/mod.rs

@@ -3675,6 +3675,9 @@ safe_f! {
 }
 
 extern "C" {
+    pub fn setgrent();
+    pub fn endgrent();
+    pub fn getgrent() -> *mut ::group;
     pub fn getrlimit64(resource: ::c_int, rlim: *mut rlimit64) -> ::c_int;
     pub fn setrlimit64(resource: ::c_int, rlim: *const rlimit64) -> ::c_int;
     pub fn getrlimit(resource: ::c_int, rlim: *mut ::rlimit) -> ::c_int;

.cargo-vendor/libc/src/unix/linux_like/emscripten/align.rs

@@ -38,9 +38,9 @@ macro_rules! expand_align {
             }
 
             #[allow(missing_debug_implementations)]
-            #[repr(align(16))]
+            #[repr(align(8))]
             pub struct max_align_t {
-                priv_: [f64; 4]
+                priv_: [f64; 3]
             }
 
         }