From bea57c02c4d77309bdd79dc59147324269cf7fb4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 6 May 2025 11:26:26 +1000
Subject: [PATCH] build(deps): bump libc from 0.2.171 to 0.2.172 in /rust
(#9031)
Bumps [libc](https://github.com/rust-lang/libc) from 0.2.171 to 0.2.172.
Release notes
Sourced from libc's
releases.
0.2.172
Added
- Android: Add
getauxval for 32-bit targets (#4338)
- Android: Add
if_tun.h ioctls (#4379)
- Android: Define
SO_BINDTOIFINDEX (#4391)
- Cygwin: Add
posix_spawn_file_actions_add[f]chdir[_np]
(#4387)
- Cygwin: Add new socket options (#4350)
- Cygwin: Add statfs & fcntl (#4321)
- FreeBSD: Add
filedesc and fdescenttbl (#4327)
- Glibc: Add unstable support for _FILE_OFFSET_BITS=64 (#4345)
- Hermit: Add
AF_UNSPEC (#4344)
- Hermit: Add
AF_VSOCK (#4344)
- Illumos, NetBSD: Add
timerfd APIs (#4333)
- Linux: Add
_IO, _IOW, _IOR,
_IOWR to the exported API (#4325)
- Linux: Add
tcp_info to uClibc bindings (#4347)
- Linux: Add further BPF program flags (#4356)
- Linux: Add missing INPUT_PROP_XXX flags from
input-event-codes.h (#4326)
- Linux: Add missing TLS bindings (#4296)
- Linux: Add more constants from
seccomp.h (#4330)
- Linux: Add more glibc
ptrace_sud_config and related
PTRACE_*ET_SYSCALL_USER_DISPATCH_CONFIG. (#4386)
- Linux: Add new netlink flags (#4288)
- Linux: Define ioctl codes on more architectures (#4382)
- Linux: Add missing
pthread_attr_setstack (#4349)
- Musl: Add missing
utmpx API (#4332)
- Musl: Enable
getrandom on all platforms (#4346)
- NuttX: Add more signal constants (#4353)
- QNX: Add QNX 7.1-iosock and 8.0 to list of additional cfgs (#4169)
- QNX: Add support for alternative Neutrino network stack
io-sock (#4169)
- Redox: Add more
sys/socket.h and sys/uio.h
definitions (#4388)
- Solaris: Temporarily define
O_DIRECT and
SIGINFO (#4348)
- Solarish: Add
secure_getenv (#4342)
- VxWorks: Add missing
d_type member to
dirent (#4352)
- VxWorks: Add missing signal-related constsants (#4352)
- VxWorks: Add more error codes (#4337)
Deprecated
- FreeBSD: Deprecate
TCP_PCAP_OUT and
TCP_PCAP_IN (#4381)
Fixed
- Cygwin: Fix member types of
statfs (#4324)
- Cygwin: Fix tests (#4357)
- Hermit: Make
AF_INET = 3 (#4344)
- Musl: Fix the syscall table on RISC-V-32 (#4335)
- Musl: Fix the value of
SA_ONSTACK on RISC-V-32 (#4335)
- VxWorks: Fix a typo in the
waitpid parameter name (#4334)
Removed
... (truncated)
Changelog
Sourced from libc's
changelog.
Added
- Android: Add
getauxval for 32-bit targets (#4338)
- Android: Add
if_tun.h ioctls (#4379)
- Android: Define
SO_BINDTOIFINDEX (#4391)
- Cygwin: Add
posix_spawn_file_actions_add[f]chdir[_np]
(#4387)
- Cygwin: Add new socket options (#4350)
- Cygwin: Add statfs & fcntl (#4321)
- FreeBSD: Add
filedesc and fdescenttbl (#4327)
- Glibc: Add unstable support for _FILE_OFFSET_BITS=64 (#4345)
- Hermit: Add
AF_UNSPEC (#4344)
- Hermit: Add
AF_VSOCK (#4344)
- Illumos, NetBSD: Add
timerfd APIs (#4333)
- Linux: Add
_IO, _IOW, _IOR,
_IOWR to the exported API (#4325)
- Linux: Add
tcp_info to uClibc bindings (#4347)
- Linux: Add further BPF program flags (#4356)
- Linux: Add missing INPUT_PROP_XXX flags from
input-event-codes.h (#4326)
- Linux: Add missing TLS bindings (#4296)
- Linux: Add more constants from
seccomp.h (#4330)
- Linux: Add more glibc
ptrace_sud_config and related
PTRACE_*ET_SYSCALL_USER_DISPATCH_CONFIG. (#4386)
- Linux: Add new netlink flags (#4288)
- Linux: Define ioctl codes on more architectures (#4382)
- Linux: Add missing
pthread_attr_setstack (#4349)
- Musl: Add missing
utmpx API (#4332)
- Musl: Enable
getrandom on all platforms (#4346)
- NuttX: Add more signal constants (#4353)
- QNX: Add QNX 7.1-iosock and 8.0 to list of additional cfgs (#4169)
- QNX: Add support for alternative Neutrino network stack
io-sock (#4169)
- Redox: Add more
sys/socket.h and sys/uio.h
definitions (#4388)
- Solaris: Temporarily define
O_DIRECT and
SIGINFO (#4348)
- Solarish: Add
secure_getenv (#4342)
- VxWorks: Add missing
d_type member to
dirent (#4352)
- VxWorks: Add missing signal-related constsants (#4352)
- VxWorks: Add more error codes (#4337)
Deprecated
- FreeBSD: Deprecate
TCP_PCAP_OUT and
TCP_PCAP_IN (#4381)
Fixed
- Cygwin: Fix member types of
statfs (#4324)
- Cygwin: Fix tests (#4357)
- Hermit: Make
AF_INET = 3 (#4344)
- Musl: Fix the syscall table on RISC-V-32 (#4335)
- Musl: Fix the value of
SA_ONSTACK on RISC-V-32 (#4335)
- VxWorks: Fix a typo in the
waitpid parameter name (#4334)
... (truncated)
Commits
a5eab58
Merge pull request #4410
from tgross35/release-libc481eca7
chore: release libc 0.2.172ce2edbb
Merge pull request #4399
from tgross35/backport-triagebot-branch-warn31b3200
Suggest stable-nominated in the PR template3bffe1d
Make triagebot warn on non-default branches03e6ffc
Merge pull request #4396
from tgross35/backport-serranof9a47ac
Define SO_BINDTOIFINDEX on Androida358dae
Add missing utmpx apis for linux musl1ff2f21
adding linux glibc ptrace_sud_config and related
PTRACE_*ET_SYSCALL_USER_DISP...55c58c9
Add more redox sys/socket.h and sys/uio.h definitions- Additional commits viewable in compare
view
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
---------
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Thomas Eizinger
---
.github/actions/setup-rust/action.yml | 2 +-
rust/Cargo.lock | 4 ++--
rust/Cargo.toml | 2 +-
rust/connlib/clients/android/src/tun.rs | 3 +--
4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/.github/actions/setup-rust/action.yml b/.github/actions/setup-rust/action.yml
index 1c32214b2..0a4aa9546 100644
--- a/.github/actions/setup-rust/action.yml
+++ b/.github/actions/setup-rust/action.yml
@@ -18,7 +18,7 @@ outputs:
description: Compilable packages for the current OS
value: ${{
(runner.os == 'Linux' && '--workspace') ||
- (runner.os == 'macOS' && '--workspace --exclude ebpf-turn-router --exclude gui-smoke-test') ||
+ (runner.os == 'macOS' && '--workspace --exclude ebpf-turn-router --exclude gui-smoke-test --exclude connlib-client-android') ||
(runner.os == 'Windows' && '--workspace --exclude ebpf-turn-router --exclude connlib-client-apple --exclude connlib-client-android') }}
test-packages:
description: Testable packages for the current OS
diff --git a/rust/Cargo.lock b/rust/Cargo.lock
index 83fe39633..e06de021c 100644
--- a/rust/Cargo.lock
+++ b/rust/Cargo.lock
@@ -3748,9 +3748,9 @@ dependencies = [
[[package]]
name = "libc"
-version = "0.2.171"
+version = "0.2.172"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"
+checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
[[package]]
name = "libdbus-sys"
diff --git a/rust/Cargo.toml b/rust/Cargo.toml
index 15b8e08ea..18bebed8a 100644
--- a/rust/Cargo.toml
+++ b/rust/Cargo.toml
@@ -99,7 +99,7 @@ known-folders = "1.2.0"
l4-tcp-dns-server = { path = "connlib/l4-tcp-dns-server" }
l4-udp-dns-server = { path = "connlib/l4-udp-dns-server" }
bufferpool = { path = "bufferpool" }
-libc = "0.2.171"
+libc = "0.2.172"
lockfree-object-pool = "0.1.6"
log = "0.4"
lru = "0.12.5"
diff --git a/rust/connlib/clients/android/src/tun.rs b/rust/connlib/clients/android/src/tun.rs
index 12f1ef10a..a17c409db 100644
--- a/rust/connlib/clients/android/src/tun.rs
+++ b/rust/connlib/clients/android/src/tun.rs
@@ -92,10 +92,9 @@ impl Tun {
///
/// The file descriptor must be open.
unsafe fn interface_name(fd: RawFd) -> io::Result {
- const TUNGETIFF: libc::c_ulong = 0x800454d2;
let mut request = tun::ioctl::Request::::new();
- unsafe { ioctl::exec(fd, TUNGETIFF, &mut request)? };
+ unsafe { ioctl::exec(fd, libc::TUNGETIFF as libc::c_ulong, &mut request)? };
Ok(request.name().to_string())
}