summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Springer2021-05-13 11:04:36 +0200
committerStephan Springer2021-05-13 11:04:36 +0200
commit27bf79c34ee105e17a7336673096b8f6322ade21 (patch)
tree549cadbe4e58a38d93ba006ee1375e0c369cc7fb
parent9e226d3e82eb238a6be91aa86bdf7148d95dcedb (diff)
downloadaur-27bf79c34ee105e17a7336673096b8f6322ade21.tar.gz
apply changes from extra/networkmanager
• ppp 2.4.9 • FS#66231: Allow dhcpcd again • FS#70710
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD11
2 files changed, 9 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8d7ff596112b..47af45a87422 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = networkmanager-iwd
pkgdesc = Network connection manager and user applications; using iwd backend instead of wpa_supplicant
pkgver = 1.30.4
- pkgrel = 1
+ pkgrel = 2
url = https://wiki.gnome.org/Projects/NetworkManager
arch = x86_64
license = GPL2
@@ -13,7 +13,7 @@ pkgbase = networkmanager-iwd
makedepends = iptables
makedepends = gobject-introspection
makedepends = gtk-doc
- makedepends = ppp=2.4.8
+ makedepends = ppp=2.4.9
makedepends = modemmanager
makedepends = iproute2
makedepends = nss
@@ -65,6 +65,7 @@ pkgname = networkmanager-iwd
optdepends = ppp: dialup connection support
optdepends = modemmanager: cellular network support
optdepends = dhclient: alternative DHCP client
+ optdepends = dhcpcd: alternative DHCP client
optdepends = openresolv: alternative resolv.conf manager
optdepends = firewalld: Firewall support
provides = networkmanager
diff --git a/PKGBUILD b/PKGBUILD
index 7d257ca48f2c..18fa84207cf1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,12 +11,12 @@
pkgbase=networkmanager-iwd
pkgname=(networkmanager-iwd libnm-iwd nm-iwd-cloud-setup)
pkgver=1.30.4
-pkgrel=1
+pkgrel=2
pkgdesc="Network connection manager and user applications; using iwd backend instead of wpa_supplicant"
url="https://wiki.gnome.org/Projects/NetworkManager"
arch=(x86_64)
license=(GPL2 LGPL2.1)
-_pppver=2.4.8
+_pppver=2.4.9
makedepends=(intltool dhclient iptables gobject-introspection gtk-doc "ppp=$_pppver" modemmanager
iproute2 nss polkit wpa_supplicant curl systemd libmm-glib
libnewt libndp libteam vala perl-yaml python-gobject git vala jansson bluez-libs
@@ -34,6 +34,9 @@ pkgver() {
prepare() {
cd NetworkManager
+
+ # https://bugs.archlinux.org/task/70710
+ git cherry-pick -n 8acad5a20cc61081438294efc634c0e245452e35
}
build() {
@@ -64,9 +67,6 @@ build() {
-D netconfig=no
-D config_dns_rc_manager_default=symlink
- # dhcp clients
- -D dhcpcd=no
-
# miscellaneous
-D vapi=true
-D docs=true
@@ -103,6 +103,7 @@ package_networkmanager-iwd() {
'ppp: dialup connection support'
'modemmanager: cellular network support'
'dhclient: alternative DHCP client'
+ 'dhcpcd: alternative DHCP client'
'openresolv: alternative resolv.conf manager'
'firewalld: Firewall support')
backup=(etc/NetworkManager/NetworkManager.conf)