From 971afe416bdb4fcd6614487c4ec66958a39fd936 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 15 Feb 2023 10:28:38 -0500
Subject: [PATCH] NetworkManager: update to 1.42.0

---
 .../NetworkManager/patches/assert-fail.patch  | 23 +++++++++++++++++++
 srcpkgs/NetworkManager/template               |  6 ++---
 2 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/NetworkManager/patches/assert-fail.patch

diff --git a/srcpkgs/NetworkManager/patches/assert-fail.patch b/srcpkgs/NetworkManager/patches/assert-fail.patch
new file mode 100644
index 000000000000..cda9f4011a76
--- /dev/null
+++ b/srcpkgs/NetworkManager/patches/assert-fail.patch
@@ -0,0 +1,23 @@
+Taken from Alpine: https://git.alpinelinux.org/aports/tree/community/networkmanager/assert-fail.patch
+the LSB states __assert_fail is:
+const char*, const char*, unsigned int, const char*
+https://refspecs.linuxbase.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/baselib---assert-fail-1.html
+
+musl uses a signed int instead. however, this is ok:
+https://www.openwall.com/lists/musl/2019/03/04/6
+
+nevertheless, since the application redefines __assert_fail, we have to make
+the types match. (not upstreamable as the opposite breaks glibc)
+diff --git a/src/libnm-std-aux/nm-std-aux.h b/src/libnm-std-aux/nm-std-aux.h
+index e556aa4..0756a7c 100644
+--- a/src/libnm-std-aux/nm-std-aux.h
++++ b/src/libnm-std-aux/nm-std-aux.h
+@@ -230,7 +230,7 @@ typedef uint64_t _nm_bitwise nm_be64_t;
+ _nm_noreturn static inline void
+ _nm_assert_fail_internal(const char  *assertion,
+                          const char  *file,
+-                         unsigned int line,
++                         int line,
+                          const char  *function)
+ {
+     __assert_fail("<dropped>", file, line, "<unknown-fcn>");
diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index c918916cb80c..2096ae3d87e1 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,6 +1,6 @@
 # Template file for 'NetworkManager'
 pkgname=NetworkManager
-version=1.40.10
+version=1.42.0
 revision=1
 build_style=meson
 build_helper="gir qemu"
@@ -33,9 +33,9 @@ short_desc="Network Management daemon"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
-changelog="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/nm-1-40/NEWS"
+changelog="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/nm-1-42/NEWS"
 distfiles="${GNOME_SITE}/NetworkManager/${version%.*}/NetworkManager-${version}.tar.xz"
-checksum=fa251455df3c38e2bf1e1ff806b4bc4346938dd135a3568bd250e92caa85eaf7
+checksum=2f6756d507bb6b46716594b67e6fe7491891e1b5b167bbafc5157dfa7753d5b4
 # TODO: Some tests require network namespaces to run.
 make_check=extended
 lib32disabled=yes