summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey D2019-11-07 09:45:00 +0300
committerAlexey D2019-11-07 09:45:00 +0300
commitf19cbc252f7d8339259be75dfd3a16cc7ae08995 (patch)
treee54532be584c0abe09306025b3b137afb7a10e22
parentea11ac277c234432e0de72d3c40ef86bd2f0e9eb (diff)
downloadaur-f19cbc252f7d8339259be75dfd3a16cc7ae08995.tar.gz
version 1.20.6-1
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD10
2 files changed, 8 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 03664c9a9460..7a4a23e02e17 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = networkmanager-consolekit
pkgdesc = NetworkManager with ConsoleKit support for non-systemd systems and user applications
- pkgver = 1.20.4
- pkgrel = 2
+ pkgver = 1.20.6
+ pkgrel = 1
url = https://wiki.gnome.org/Projects/NetworkManager
install = networkmanager.install
arch = i686
@@ -25,7 +25,7 @@ pkgbase = networkmanager-consolekit
makedepends = dhcpcd
makedepends = iwd
makedepends = dnsmasq
- depends = libnm>=1.20.4
+ depends = libnm>=1.20.6
depends = iproute2
depends = polkit-consolekit
depends = consolekit
@@ -46,11 +46,11 @@ pkgbase = networkmanager-consolekit
optdepends = openresolv: resolvconf support
optdepends = ppp: dialup connection support
optdepends = iwd: wpa_supplicant alternative
- provides = networkmanager=1.20.4
+ provides = networkmanager=1.20.6
conflicts = networkmanager
replaces = networkmanager
backup = etc/NetworkManager/NetworkManager.conf
- source = git+https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git#commit=27dee3b113bb45ffb53367f30a7c750eb146d980
+ source = git+https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git#commit=7910cdfe5a9ffe02cd0780d56fcc66500e292d09
source = NetworkManager.conf
source = networkmanager.rc
source = 20-connectivity.conf
diff --git a/PKGBUILD b/PKGBUILD
index 77485e7b6515..a00d8248e2ce 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,8 +10,8 @@
# Contributor: Chris Cromer <chris@cromer.cl>
pkgname=networkmanager-consolekit
-pkgver=1.20.4
-pkgrel=2
+pkgver=1.20.6
+pkgrel=1
_pppver=2.4.7
pkgdesc="NetworkManager with ConsoleKit support for non-systemd systems and user applications"
arch=('i686' 'x86_64')
@@ -37,7 +37,7 @@ conflicts=('networkmanager')
backup=('etc/NetworkManager/NetworkManager.conf')
groups=('gnome')
install=networkmanager.install
-_commit=27dee3b113bb45ffb53367f30a7c750eb146d980 # tags/1.20.4^0
+_commit=7910cdfe5a9ffe02cd0780d56fcc66500e292d09 # tags/1.20.6^0
source=(#https://download.gnome.org/sources/NetworkManager/${pkgver:0:3}/NetworkManager-$pkgver.tar.xz
"git+https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git#commit=$_commit"
NetworkManager.conf
@@ -52,10 +52,6 @@ sha256sums=('SKIP'
prepare() {
cd NetworkManager
- # https://bugs.archlinux.org/task/64335
- git cherry-pick -n 59923ad85d1a1cf2216a4f14649702d24d3f2360
- git cherry-pick -n 186d22a9634e2bf94658ed6f1cf2b332ecb3a32c
-
NOCONFIGURE=1 ./autogen.sh
}