networkmanager: 1.36.2 -> 1.36.4

4 files changed, 10 insertions, 48 deletions

diff --git a/networkmanager/.footprint b/networkmanager/.footprint
index 7c1b85047..0db9108d5 100644
--- a/networkmanager/.footprint
+++ b/networkmanager/.footprint
@@ -148,10 +148,10 @@ drwxr-xr-x	root/root	usr/include/libnm/
 -rw-r--r--	root/root	usr/include/libnm/nm-wimax-nsp.h
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/NetworkManager/
-drwxr-xr-x	root/root	usr/lib/NetworkManager/1.36.2/
--rwxr-xr-x	root/root	usr/lib/NetworkManager/1.36.2/libnm-device-plugin-adsl.so
--rwxr-xr-x	root/root	usr/lib/NetworkManager/1.36.2/libnm-device-plugin-wifi.so
--rwxr-xr-x	root/root	usr/lib/NetworkManager/1.36.2/libnm-settings-plugin-ifupdown.so
+drwxr-xr-x	root/root	usr/lib/NetworkManager/1.36.4/
+-rwxr-xr-x	root/root	usr/lib/NetworkManager/1.36.4/libnm-device-plugin-adsl.so
+-rwxr-xr-x	root/root	usr/lib/NetworkManager/1.36.4/libnm-device-plugin-wifi.so
+-rwxr-xr-x	root/root	usr/lib/NetworkManager/1.36.4/libnm-settings-plugin-ifupdown.so
 drwxr-xr-x	root/root	usr/lib/NetworkManager/VPN/
 drwxr-xr-x	root/root	usr/lib/NetworkManager/conf.d/
 drwxr-xr-x	root/root	usr/lib/NetworkManager/dispatcher.d/
diff --git a/networkmanager/.signature b/networkmanager/.signature
index 45788a235..a5f14ff91 100644
--- a/networkmanager/.signature
+++ b/networkmanager/.signature
@@ -1,8 +1,8 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3+GO7vsTGVRPLnLEB3C6on/g+4ObCXqakfYFWs7p8VTGzsxkDdVbvzRQ13Lz3ctLqlSvSK4f20epk6zazvlxfgI=
-SHA256 (Pkgfile) = 54d850dfa5de0e4c690ada657f7f6a36c1b18c9f2b2ecfbf0c6db11a8cdeb0f6
-SHA256 (.footprint) = 9101e14fd016107d65bae2bce38b5ad20d7566ed55f52574ade3493d61bc39fc
-SHA256 (NetworkManager-1.36.2.tar.xz) = ab855cbe3b41832e9a3b003810e7c7313dfe19e630d29806d14d87fdd1470cab
+RWSagIOpLGJF3/9KhdBHdTBF8pVx7E3q9oaPiYvbeHWDcEadKIIPf5pFmYmla+Xoq0matdpSwwI16ekOxCnAd7MRXNwI+Hzu9Aw=
+SHA256 (Pkgfile) = 8810e1258634910ec9d00d19a17d0167225648ebc81e8579f97ce3a5a1a7311f
+SHA256 (.footprint) = 016ca9cd2aab03993a1bbc027f9582fe182904b02fdc92ee7f5e8c1d1769bd67
+SHA256 (NetworkManager-1.36.4.tar.xz) = 61304e937dd926471d56715bdede7bab7ccac827356e67f2700d343317cd3c59
 SHA256 (networkmanager.rc) = dc0b743685214c0402d392a6a9b2632b19714795a04c0f42ba10026250d9f3fc
 SHA256 (NetworkManager.conf) = 44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21
 SHA256 (polkit.conf) = 7410be567871e4dc8ef1e8204f80b7cfd0dd08abfa514408b7d549bdc70dbaba
diff --git a/networkmanager/Pkgfile b/networkmanager/Pkgfile
index ab87042c7..9510b4302 100644
--- a/networkmanager/Pkgfile
+++ b/networkmanager/Pkgfile
@@ -5,7 +5,7 @@
 # Optional: ppp avahi bash-completion dbus libnl jansson libteam dnsmasq wireguard-tools
 
 name=networkmanager
-version=1.36.2
+version=1.36.4
 release=1
 source=(https://download.gnome.org/sources/NetworkManager/${version::4}/NetworkManager-$version.tar.xz
   networkmanager.rc NetworkManager.conf polkit.conf dhcp.conf org.freedesktop.NetworkManager.rules)
@@ -59,5 +59,5 @@ build() {
 
   # cleanup
   rm -rf $PKG/usr/lib/firewalld
-  [ -e /usr/lib/pkgconfig/bash-completion.pc ] || rm -rf $PKG/usr/share/bash-completion
+  prt-get isinst bash-completion || rm -rf $PKG/usr/share/bash-completion
 }
diff --git a/networkmanager/docs.patch b/networkmanager/docs.patch
deleted file mode 100644
index b11b3e464..000000000
--- a/networkmanager/docs.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 54e25f23f53af889703dfc50d51a8afeeea8a439 Mon Sep 17 00:00:00 2001
-From: Valentin David <valentin.david@codethink.co.uk>
-Date: Tue, 8 Sep 2020 17:15:30 +0200
-Subject: [PATCH] build/docs: fix generated XML syntax in
- tools/generate-docs-nm-settings-docs-gir.py
-
-Class description may contains double quotes which is not valid as XML
-attribute value.
-
-[thaller@redhat.com: adjust original patch to reformat code with python black]
-
-https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/620
----
- tools/generate-docs-nm-settings-docs-gir.py | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/tools/generate-docs-nm-settings-docs-gir.py b/tools/generate-docs-nm-settings-docs-gir.py
-index ebda99560a..317b32972a 100755
---- a/tools/generate-docs-nm-settings-docs-gir.py
-+++ b/tools/generate-docs-nm-settings-docs-gir.py
-@@ -244,8 +244,12 @@ for settingxml in settings:
-             "%s needs a gtk-doc block with one-line description" % setting.props.name
-         )
-     outfile.write(
--        '  <setting name="%s" description="%s" name_upper="%s" >\n'
--        % (setting.props.name, class_desc, get_setting_name_define(settingxml))
-+        '  <setting name="%s" description=%s name_upper="%s" >\n'
-+        % (
-+            setting.props.name,
-+            xml_quoteattr(class_desc),
-+            get_setting_name_define(settingxml),
-+        )
-     )
- 
-     setting_properties = {
--- 
-GitLab
-