From c90068d44cda1319f3471beecec3b909e627f70f Mon Sep 17 00:00:00 2001
From: Tyler Swagar <ugw.ugw@gmail.com>
Date: Jul 07 2021 02:58:14 +0000
Subject: updpkg: nonsystemd/networkmanager 1.30.4-3.nonsystemd1


---

diff --git a/nonsystemd/networkmanager/PKGBUILD b/nonsystemd/networkmanager/PKGBUILD
index 8f3b7c9..72d9a3e 100644
--- a/nonsystemd/networkmanager/PKGBUILD
+++ b/nonsystemd/networkmanager/PKGBUILD
@@ -8,20 +8,20 @@
 
 pkgbase=networkmanager
 pkgname=(networkmanager libnm)
-pkgver=1.20.6
-pkgrel=1
+pkgver=1.30.4
+pkgrel=3
 pkgrel+=.nonsystemd1
 pkgdesc="Network connection manager and user applications"
 url="https://wiki.gnome.org/Projects/NetworkManager"
 arch=(x86_64 i686 armv7h)
 license=(GPL2 LGPL2.1)
-_pppver=2.4.7
+_pppver=2.4.9
 makedepends=(intltool dhclient iptables gobject-introspection gtk-doc "ppp=$_pppver" modemmanager
              iproute2 nss polkit wpa_supplicant curl elogind libmm-glib
              libnewt libndp libteam vala perl-yaml python-gobject git vala jansson bluez-libs
              glib2-docs dhcpcd iwd dnsmasq openresolv libpsl audit meson)
 checkdepends=(libx11 python-dbus)
-_commit=7910cdfe5a9ffe02cd0780d56fcc66500e292d09  # tags/1.20.6^0
+_commit=a3e45da9f984d58e3b76d6ca064033541d819eca  # tags/1.30.4^0
 source=("git+https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git#commit=$_commit"
         NetworkManager.{confd,initd} 10-openrc-status)
 sha256sums=('SKIP'
@@ -31,11 +31,14 @@ sha256sums=('SKIP'
 
 pkgver() {
   cd NetworkManager
-  git describe | sed 's/-dev/dev/;s/-rc/rc/;s/-/+/g'
+  git describe --abbrev=10 | sed 's/-dev/dev/;s/-rc/rc/;s/-/+/g'
 }
 
 prepare() {
   cd NetworkManager
+
+  # https://bugs.archlinux.org/task/70710
+  git cherry-pick -n 8acad5a20cc61081438294efc634c0e245452e35
 }
 
 build() {