NetworkManager: update to 1.42.0
This commit is contained in:
parent
b93d611b20
commit
6de83c275b
|
@ -0,0 +1,32 @@
|
||||||
|
# https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/a29eb970c89f12d118830d0ee46cdda2b6cd7f8b
|
||||||
|
# Removes type conflict with _assert_fail between glibc and musl, will be in next release
|
||||||
|
diff --git a/src/libnm-std-aux/nm-std-aux.h b/src/libnm-std-aux/nm-std-aux.h
|
||||||
|
index e556aa4b52a37f2fab9459314726b1b78fc068d9..75703e70b41d22d414af537b0bccc042e4d4ff1b 100644
|
||||||
|
--- a/src/libnm-std-aux/nm-std-aux.h
|
||||||
|
+++ b/src/libnm-std-aux/nm-std-aux.h
|
||||||
|
@@ -219,25 +219,6 @@ typedef uint64_t _nm_bitwise nm_be64_t;
|
||||||
|
#define NM_MORE_ASSERTS 0
|
||||||
|
#endif
|
||||||
|
|
||||||
|
-#if NM_MORE_ASSERTS == 0
|
||||||
|
-/* The string with the assertion check and the function name blows up the
|
||||||
|
- * binary size. In production mode, let's drop those, similar to
|
||||||
|
- * g_assertion_message_expr.
|
||||||
|
- *
|
||||||
|
- * Note that <assert.h> can be included multiple times. We can thus
|
||||||
|
- * not redefine __assert_fail(...). Instead, just redefine the name
|
||||||
|
- * __assert_fail. */
|
||||||
|
-_nm_noreturn static inline void
|
||||||
|
-_nm_assert_fail_internal(const char *assertion,
|
||||||
|
- const char *file,
|
||||||
|
- unsigned int line,
|
||||||
|
- const char *function)
|
||||||
|
-{
|
||||||
|
- __assert_fail("<dropped>", file, line, "<unknown-fcn>");
|
||||||
|
-}
|
||||||
|
-#define __assert_fail _nm_assert_fail_internal
|
||||||
|
-#endif
|
||||||
|
-
|
||||||
|
#ifndef NDEBUG
|
||||||
|
#define _NM_ASSERT_FAIL_ENABLED 1
|
||||||
|
#define _nm_assert_fail(msg) __assert_fail((msg), __FILE__, __LINE__, __func__)
|
|
@ -1,6 +1,6 @@
|
||||||
# Template file for 'NetworkManager'
|
# Template file for 'NetworkManager'
|
||||||
pkgname=NetworkManager
|
pkgname=NetworkManager
|
||||||
version=1.40.10
|
version=1.42.0
|
||||||
revision=1
|
revision=1
|
||||||
build_style=meson
|
build_style=meson
|
||||||
build_helper="gir qemu"
|
build_helper="gir qemu"
|
||||||
|
@ -33,9 +33,9 @@ short_desc="Network Management daemon"
|
||||||
maintainer="Enno Boland <gottox@voidlinux.org>"
|
maintainer="Enno Boland <gottox@voidlinux.org>"
|
||||||
license="GPL-2.0-or-later"
|
license="GPL-2.0-or-later"
|
||||||
homepage="https://wiki.gnome.org/Projects/NetworkManager"
|
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"
|
distfiles="${GNOME_SITE}/NetworkManager/${version%.*}/NetworkManager-${version}.tar.xz"
|
||||||
checksum=fa251455df3c38e2bf1e1ff806b4bc4346938dd135a3568bd250e92caa85eaf7
|
checksum=2f6756d507bb6b46716594b67e6fe7491891e1b5b167bbafc5157dfa7753d5b4
|
||||||
# TODO: Some tests require network namespaces to run.
|
# TODO: Some tests require network namespaces to run.
|
||||||
make_check=extended
|
make_check=extended
|
||||||
lib32disabled=yes
|
lib32disabled=yes
|
||||||
|
|
Loading…
Reference in New Issue