updpkg: nonsystemd/networkmanager 1.46.0-2.nonsystemd1

Signed-off-by: David P. <megver83@parabola.nu>

2 files changed, 37 insertions, 56 deletions

diff --git a/nonsystemd/networkmanager/0001-connectivity-Make-curl-timeout-callback-non-repeatin.patch b/nonsystemd/networkmanager/0001-connectivity-Make-curl-timeout-callback-non-repeatin.patch
deleted file mode 100644
index f3f547cd1..000000000
--- a/nonsystemd/networkmanager/0001-connectivity-Make-curl-timeout-callback-non-repeatin.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Tatsuyuki Ishi <ishitatsuyuki@gmail.com>
-Date: Fri, 13 Oct 2023 16:46:09 +0000
-Subject: [PATCH] connectivity: Make curl timeout callback non-repeating.
-
-The CURLMOPT_TIMERFUNCTION manual says:
-    Your callback function timer_callback should install a *non-repeating*
-    timer with an expire time of timeout_ms milliseconds.
-
-The previous callback returned G_SOURCE_CONTINUE, resulting in a repeating
-firing callback. curl tweaked some internals in v8.4.0 and started giving
-0 timeouts, which caused this to wreak havoc.
-
-Fix it by making the callback non-repeating as specified by the API contract.
----
- src/core/nm-connectivity.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/core/nm-connectivity.c b/src/core/nm-connectivity.c
-index 92de44f17d99..d8b0004c381f 100644
---- a/src/core/nm-connectivity.c
-+++ b/src/core/nm-connectivity.c
-@@ -406,9 +406,10 @@ _con_curl_timeout_cb(gpointer user_data)
- {
-     NMConnectivityCheckHandle *cb_data = user_data;
- 
-+    cb_data->concheck.curl_timer = 0;
-     _con_curl_check_connectivity(cb_data->concheck.curl_mhandle, CURL_SOCKET_TIMEOUT, 0);
-     _complete_queued(cb_data->self);
--    return G_SOURCE_CONTINUE;
-+    return G_SOURCE_REMOVE;
- }
- 
- static int
diff --git a/nonsystemd/networkmanager/PKGBUILD b/nonsystemd/networkmanager/PKGBUILD
index e6b502c14..c34b8876d 100644
--- a/nonsystemd/networkmanager/PKGBUILD
+++ b/nonsystemd/networkmanager/PKGBUILD
@@ -1,38 +1,43 @@
 # Maintainer: David P. <megver83@parabola.nu>
-# Maintainer (Artix): Nathan <ndowens@artixlinux.org>
+# Maintainer (Arch): Jan Alexander Steffens (heftig) <heftig@archlinux.org>
 # Contributor (Arch): Jan de Groot <jgc@archlinxu.org>
 # Contributor (Arch): Wael Nasreddine <gandalf@siemens-mobiles.org>
 # Contributor (Arch): Tor Krill <tor@krill.nu>
 # Contributor (Arch): Will Rea <sillywilly@gmail.com>
 # Contributor (Arch): Valentine Sinitsyn <e_val@inbox.ru>
 
+# Parabola changes and raationale:
+# • Install python-packaging on build time
+# • Ping https://www.parabola.nu/static/nm-check.txt
+
 pkgbase=networkmanager
 pkgname=(
   networkmanager
   libnm
   nm-cloud-setup
+  networkmanager-docs
 )
-pkgver=1.44.2
-pkgrel=3
+pkgver=1.46.0
+pkgrel=2
 pkgrel+=.nonsystemd1
 pkgdesc="Network connection manager and user applications"
 url="https://networkmanager.dev/"
 arch=(x86_64)
 arch+=(i686 armv7h)
-license=(GPL)
+license=(LGPL-2.1-or-later)
 makedepends=(
   audit
-  bluez-libs
   curl
   dhclient
   dhcpcd
   dnsmasq
+  elogind
   git
   glib2-docs
   gobject-introspection
   gtk-doc
   iproute2
-  iptables-nft
+  iptables
   iwd
   jansson
   libmm-glib
@@ -50,20 +55,20 @@ makedepends=(
   polkit
   ppp
   python-gobject
-  elogind
   vala
   vala
   wpa_supplicant
 )
+makedepends+=(python-packaging)
 checkdepends=(
   libx11
   python-dbus
 )
-_commit=8bee6ef894a27ffc8a464df3b32b03e811e1a15d  # tags/1.44.2^0
-source=("git+https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git#commit=$_commit"
-        0001-connectivity-Make-curl-timeout-callback-non-repeatin.patch)
-b2sums=('SKIP'
-        '51674577e4a2786b6491fdf90cc90734da3792e0a7e224f0eecc9c485a5f81b68a71bb559b23d294d52dc9065ee82c997c31f9272504c3d753e0ffe1321367e9')
+_commit=e39f48a30a2ef7b445276a859bbd5255e4c5071d  # tags/1.46.0^0
+source=(
+  "git+https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git#commit=$_commit"
+)
+b2sums=('SKIP')
 
 pkgver() {
   cd NetworkManager
@@ -72,12 +77,13 @@ pkgver() {
 
 prepare() {
   cd NetworkManager
-  # https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1756
-  git apply -3 ../0001-connectivity-Make-curl-timeout-callback-non-repeatin.patch
 }
 
 build() {
   local meson_options=(
+    # build checks this option; injecting just via *FLAGS is broken
+    -D b_lto=true
+
     # system paths
     -D dbus_conf_dir=/usr/share/dbus-1/system.d
 
@@ -87,15 +93,15 @@ build() {
     -D suspend_resume=elogind
     -D modify_system=true
     -D selinux=false
+    -D selinux=false
     -D systemdsystemunitdir=no
     -D session_tracking=elogind
     -D systemd_journal=false
 
+
     # features
     -D iwd=true
     -D teamdctl=true
-    -D bluez5_dun=true
-    -D ebpf=true
 
     # configuration plugins
     -D config_plugins_default=keyfile
@@ -122,7 +128,7 @@ build() {
 }
 
 check() {
-  meson test -C build --print-errorlogs
+  NMTST_FORCE_REAL_ROOT=1 meson test -C build --print-errorlogs
 }
 
 _pick() {
@@ -138,7 +144,6 @@ _pick() {
 package_networkmanager() {
   depends=(
     audit
-    bluez-libs
     curl
     elogind
     iproute2
@@ -169,6 +174,9 @@ package_networkmanager() {
   )
   backup=(etc/NetworkManager/NetworkManager.conf)
 
+  # NM wants to move to LGPL only, but there's still GPL code left
+  license+=(GPL-2.0-or-later)
+
   meson install -C build --destdir "$pkgdir"
 
   cd "$pkgdir"
@@ -192,19 +200,20 @@ END
 
   shopt -s globstar
 
+  _pick docs usr/share/gtk-doc
+
   _pick libnm usr/include/libnm
   _pick libnm usr/lib/girepository-1.0/NM-*
   _pick libnm usr/lib/libnm.*
   _pick libnm usr/lib/pkgconfig/libnm.pc
   _pick libnm usr/share/gir-1.0/NM-*
-  _pick libnm usr/share/gtk-doc/html/libnm
   _pick libnm usr/share/vala/vapi/libnm.*
 
   _pick cloud usr/lib/**/*nm-cloud-setup*
-#   _pick cloud usr/share/man/*/nm-cloud-setup*
+  _pick cloud usr/share/man/*/nm-cloud-setup*
 
   # Not actually packaged (https://bugs.archlinux.org/task/69138)
-#   _pick ovs usr/lib/systemd/system/NetworkManager.service.d/NetworkManager-ovs.conf
+  # _pick ovs usr/lib/systemd/system/NetworkManager.service.d/NetworkManager-ovs.conf
 
   # Restore empty dir
   install -d usr/lib/NetworkManager/dispatcher.d/no-wait.d
@@ -212,7 +221,6 @@ END
 
 package_libnm() {
   pkgdesc="NetworkManager client library"
-  license=(LGPL)
   depends=(
     glib2
     nss
@@ -231,4 +239,11 @@ package_nm-cloud-setup() {
   mv cloud/* "$pkgdir"
 }
 
+package_networkmanager-docs() {
+  pkgdesc+=" (API documentation)"
+  depends=()
+
+  mv docs/* "$pkgdir"
+}
+
 # vim:set sw=2 sts=-1 et: