* Re: [PR PATCH] [Updated] NetworkManager: update to 1.40.12
2023-01-27 23:34 [PR PATCH] NetworkManager: update to 1.40.12 cinerea0
@ 2023-02-12 2:55 ` cinerea0
2023-02-15 15:28 ` [PR PATCH] [Updated] NetworkManager: update to 1.42.0 cinerea0
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: cinerea0 @ 2023-02-12 2:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 390 bytes --]
There is an updated pull request by cinerea0 against master on the void-packages repository
https://github.com/cinerea0/void-packages nm
https://github.com/void-linux/void-packages/pull/41907
NetworkManager: update to 1.40.12
#### Testing the changes
- I tested the changes in this PR: **YES**
A patch file from https://github.com/void-linux/void-packages/pull/41907.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nm-41907.patch --]
[-- Type: text/x-diff, Size: 1371 bytes --]
From b25fc9db1b2097499d8763cd2547023957fb205d Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sat, 11 Feb 2023 21:55:30 -0500
Subject: [PATCH] NetworkManager: update to 1.42.0
---
srcpkgs/NetworkManager/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
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
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PR PATCH] [Updated] NetworkManager: update to 1.42.0
2023-01-27 23:34 [PR PATCH] NetworkManager: update to 1.40.12 cinerea0
2023-02-12 2:55 ` [PR PATCH] [Updated] " cinerea0
@ 2023-02-15 15:28 ` cinerea0
2023-02-15 19:27 ` cinerea0
2023-02-16 2:58 ` [PR PATCH] [Merged]: " classabbyamp
3 siblings, 0 replies; 5+ messages in thread
From: cinerea0 @ 2023-02-15 15:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 389 bytes --]
There is an updated pull request by cinerea0 against master on the void-packages repository
https://github.com/cinerea0/void-packages nm
https://github.com/void-linux/void-packages/pull/41907
NetworkManager: update to 1.42.0
#### Testing the changes
- I tested the changes in this PR: **YES**
A patch file from https://github.com/void-linux/void-packages/pull/41907.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nm-41907.patch --]
[-- Type: text/x-diff, Size: 2905 bytes --]
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
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PR PATCH] [Updated] NetworkManager: update to 1.42.0
2023-01-27 23:34 [PR PATCH] NetworkManager: update to 1.40.12 cinerea0
2023-02-12 2:55 ` [PR PATCH] [Updated] " cinerea0
2023-02-15 15:28 ` [PR PATCH] [Updated] NetworkManager: update to 1.42.0 cinerea0
@ 2023-02-15 19:27 ` cinerea0
2023-02-16 2:58 ` [PR PATCH] [Merged]: " classabbyamp
3 siblings, 0 replies; 5+ messages in thread
From: cinerea0 @ 2023-02-15 19:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 389 bytes --]
There is an updated pull request by cinerea0 against master on the void-packages repository
https://github.com/cinerea0/void-packages nm
https://github.com/void-linux/void-packages/pull/41907
NetworkManager: update to 1.42.0
#### Testing the changes
- I tested the changes in this PR: **YES**
A patch file from https://github.com/void-linux/void-packages/pull/41907.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nm-41907.patch --]
[-- Type: text/x-diff, Size: 3216 bytes --]
From d51e482f0627e6f2b8226d94e9d9f15e2684ae24 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 15 Feb 2023 14:27:40 -0500
Subject: [PATCH] NetworkManager: update to 1.42.0
---
.../patches/drop-assertion.patch | 32 +++++++++++++++++++
srcpkgs/NetworkManager/template | 6 ++--
2 files changed, 35 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/NetworkManager/patches/drop-assertion.patch
diff --git a/srcpkgs/NetworkManager/patches/drop-assertion.patch b/srcpkgs/NetworkManager/patches/drop-assertion.patch
new file mode 100644
index 000000000000..32d7c5d5f41f
--- /dev/null
+++ b/srcpkgs/NetworkManager/patches/drop-assertion.patch
@@ -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__)
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
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PR PATCH] [Merged]: NetworkManager: update to 1.42.0
2023-01-27 23:34 [PR PATCH] NetworkManager: update to 1.40.12 cinerea0
` (2 preceding siblings ...)
2023-02-15 19:27 ` cinerea0
@ 2023-02-16 2:58 ` classabbyamp
3 siblings, 0 replies; 5+ messages in thread
From: classabbyamp @ 2023-02-16 2:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 236 bytes --]
There's a merged pull request on the void-packages repository
NetworkManager: update to 1.42.0
https://github.com/void-linux/void-packages/pull/41907
Description:
#### Testing the changes
- I tested the changes in this PR: **YES**
^ permalink raw reply [flat|nested] 5+ messages in thread