mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-13 05:05:29 +03:00
connman: apply patches for CVE-2025-32366 and CVE-2025-32743
https://git.kernel.org/pub/scm/network/connman/connman.git/commit/?id=8d3be0285f1d4667bfe85dba555c663eb3d704b4 https://git.kernel.org/pub/scm/network/connman/connman.git/commit/?id=d90b911f6760959bdf1393c39fe8d1118315490f
This commit is contained in:
parent
b21c2d0de4
commit
e50edd162b
1 changed files with 21 additions and 7 deletions
|
@ -2,6 +2,7 @@
|
||||||
lib,
|
lib,
|
||||||
stdenv,
|
stdenv,
|
||||||
fetchurl,
|
fetchurl,
|
||||||
|
fetchpatch,
|
||||||
autoreconfHook,
|
autoreconfHook,
|
||||||
dbus,
|
dbus,
|
||||||
file,
|
file,
|
||||||
|
@ -78,13 +79,26 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
hash = "sha256-ElfOvjJ+eQC34rhMD7MwqpCBXkVYmM0vlB9DCO0r47w=";
|
hash = "sha256-ElfOvjJ+eQC34rhMD7MwqpCBXkVYmM0vlB9DCO0r47w=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = optionals stdenv.hostPlatform.isMusl [
|
patches =
|
||||||
# Fix Musl build by avoiding a Glibc-only API.
|
[
|
||||||
(fetchurl {
|
(fetchpatch {
|
||||||
url = "https://git.alpinelinux.org/aports/plain/community/connman/libresolv.patch?id=e393ea84386878cbde3cccadd36a30396e357d1e";
|
name = "CVE-2025-32366.patch";
|
||||||
hash = "sha256-7Q1bp8rD/gGVYUqnIXqjr9vypR8jlC926p3KYWl9kLw=";
|
url = "https://git.kernel.org/pub/scm/network/connman/connman.git/patch/?id=8d3be0285f1d4667bfe85dba555c663eb3d704b4";
|
||||||
})
|
hash = "sha256-kPb4pZVWvnvTUcpc4wRc8x/pMUTXGIywj3w8IYKRTBs=";
|
||||||
];
|
})
|
||||||
|
(fetchpatch {
|
||||||
|
name = "CVE-2025-32743.patch";
|
||||||
|
url = "https://git.kernel.org/pub/scm/network/connman/connman.git/patch/?id=d90b911f6760959bdf1393c39fe8d1118315490f";
|
||||||
|
hash = "sha256-odkjYC/iM6dTIJx2WM/KKotXdTtgv8NMFNJMzx5+YU4=";
|
||||||
|
})
|
||||||
|
]
|
||||||
|
++ optionals stdenv.hostPlatform.isMusl [
|
||||||
|
# Fix Musl build by avoiding a Glibc-only API.
|
||||||
|
(fetchurl {
|
||||||
|
url = "https://git.alpinelinux.org/aports/plain/community/connman/libresolv.patch?id=e393ea84386878cbde3cccadd36a30396e357d1e";
|
||||||
|
hash = "sha256-7Q1bp8rD/gGVYUqnIXqjr9vypR8jlC926p3KYWl9kLw=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
autoreconfHook
|
autoreconfHook
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue