upgpkg: pcr/networkmanager-elogind 1.10.0-1.parabola1

3 files changed, 27 insertions, 62 deletions

diff --git a/pcr/networkmanager-elogind/01-org.freedesktop.NetworkManager.settings.modify.system.rules b/pcr/networkmanager-elogind/01-org.freedesktop.NetworkManager.settings.modify.system.rules
deleted file mode 100644
index ed4a41f9d..000000000
--- a/pcr/networkmanager-elogind/01-org.freedesktop.NetworkManager.settings.modify.system.rules
+++ /dev/null
@@ -1,6 +0,0 @@
-polkit.addRule(function(action, subject) {
-	if (action.id == "org.freedesktop.NetworkManager.settings.modify.system" &&
-		subject.isInGroup("network")) {
-		return "yes";
-	}
-});
diff --git a/pcr/networkmanager-elogind/50-org.freedesktop.NetworkManager.rules b/pcr/networkmanager-elogind/50-org.freedesktop.NetworkManager.rules
deleted file mode 100644
index b6fe9c73f..000000000
--- a/pcr/networkmanager-elogind/50-org.freedesktop.NetworkManager.rules
+++ /dev/null
@@ -1,5 +0,0 @@
-polkit.addRule(function(action, subject) {
-  if (action.id.indexOf("org.freedesktop.NetworkManager.") == 0 && subject.isInGroup("network")) {
-    return polkit.Result.YES;
-  }
-});
diff --git a/pcr/networkmanager-elogind/PKGBUILD b/pcr/networkmanager-elogind/PKGBUILD
index 544f455f3..7e6ab73c0 100644
--- a/pcr/networkmanager-elogind/PKGBUILD
+++ b/pcr/networkmanager-elogind/PKGBUILD
@@ -1,19 +1,16 @@
-# Maintainer (Manjaro): artoo <artoo@manjaro.org>
-# Contributor (Manjaro): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor (Manjaro): Jan de Groot <jgc@archlinxu.org>
-# Contributor (Manjaro): Wael Nasreddine <gandalf@siemens-mobiles.org>
-# Contributor (Manjaro): Tor Krill <tor@krill.nu>
-# Contributor (Manjaro): Will Rea <sillywilly@gmail.com>
-# Contributor (Manjaro): Valentine Sinitsyn <e_val@inbox.ru>
-# Maintainer: OmarVega Ramos <ovruni@gnu.org.pe>
+# Maintainer: David P. <megver83@parabola.nu>
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Maintainer: Jan de Groot <jgc@archlinxu.org>
+# Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
+# Contributor: Tor Krill <tor@krill.nu>
+# Contributor: Will Rea <sillywilly@gmail.com>
+# Contributor: Valentine Sinitsyn <e_val@inbox.ru>
 
 _pppver=2.4.7
 
-_patch_url=https://cgit.freedesktop.org/NetworkManager/NetworkManager/patch
-
 pkgname=networkmanager-elogind
-pkgver=1.6.2
-pkgrel=3.parabola1
+pkgver=1.10.0
+pkgrel=1.parabola1
 pkgdesc="Network Management daemon"
 arch=('i686' 'x86_64' 'armv7h')
 license=('GPL2' 'LGPL2.1')
@@ -21,12 +18,11 @@ url="http://www.gnome.org/projects/NetworkManager/"
 provides=('networkmanager')
 conflicts=('networkmanager' 'networkmanager-consolekit')
 # replaces=('networkmanager-consolekit')
-makedepends=('intltool' 'dhclient' 'iptables' 'gobject-introspection' 'gtk-doc'
-            "ppp=$_pppver" 'modemmanager' 'dbus-glib' 'iproute2' 'nss'
-            'polkit' 'wpa_supplicant' 'libsoup' 'libgudev' 'libmm-glib'
-            'rp-pppoe' 'libnewt' 'libndp' 'libteam' 'vala' 'perl-yaml' 'python-gobject' 'git' 'vala'
-            'jansson' 'bluez-libs' 'glib2-docs' 'elogind')
-checkdepends=('libx11' 'python-dbus' 'elogind')
+makedepends=(intltool dhclient iptables gobject-introspection gtk-doc "ppp=$_pppver" modemmanager
+             dbus-glib iproute2 nss polkit wpa_supplicant libsoup elogind libgudev libmm-glib
+             libnewt libndp libteam vala perl-yaml python-gobject git vala jansson bluez-libs
+             glib2-docs eudev-systemd)
+checkdepends=('libx11' 'python-dbus')
 depends=('libnm-glib' 'iproute2' 'polkit' 'wpa_supplicant' 'libsoup' 'libmm-glib' 'libnewt' 'libndp' 'libteam' 'elogind')
 optdepends=('dnsmasq: connection sharing'
             'bluez: Bluetooth support'
@@ -37,31 +33,17 @@ optdepends=('dnsmasq: connection sharing'
             'modemmanager: cellular network support'
             'networkmanager-openrc: networkmanager initscript')
 backup=('etc/NetworkManager/NetworkManager.conf')
-_commit=037a12f96eff09aa48481fda7ea602a3388afc74  # tags/1.6.2^0
+_commit=1193fb1b08fe45ce8713220132184581c4669362  # tags/1.10.0^0
 source=("git+https://anongit.freedesktop.org/git/NetworkManager/NetworkManager#commit=$_commit"
-        #"https://download.gnome.org/sources/NetworkManager/${pkgver:0:3}/NetworkManager-$pkgver.tar.xz"
-        'NetworkManager.conf'
-        '01-org.freedesktop.NetworkManager.settings.modify.system.rules'
-        '50-org.freedesktop.NetworkManager.rules'
-        '20-connectivity.conf'
-        "elogind1.patch::${_patch_url}/?id=360e80b75faead6595ceb4ca8cd91dd7fbaa2f47"
-        "elogind2.patch::${_patch_url}/?id=c0d9243e7ebdb6efd5c3e866b03a28cd91b08c83")
-sha256sums=('SKIP'
-            'dd2d3a9c8a08ce961e263e1847453890f1b24c72a806d8c83a5b69b227a5ccec'
-            '4b815f43de58379e68653d890f529485aec4d2f83f11d050b08b31489d2267c2'
-            '02d9f7d836d297d6ddf39482d86a8573b3e41735b408aa2cd6df22048ec5f6c4'
-            '477d609aefd991c48aca93dc7ea5a77ebebf46e0481184530cceda4c0d8d72c6'
-            'f008c03a1b500bcdde176505e338280246af9431703951f97a88b4ae484c7e9b'
-            'e845261a468586a360f68f812c5ca69c86a08cb455e3df430bda4cce58307ae4')
+        NetworkManager.conf 20-connectivity.conf)
+sha512sums=('SKIP'
+            '25866b000096003d4c90decb6e19a742cf62792ddd217616b12a6415cd05514a6023d9986743b548a99d0e1c70acd0a3849144807228a59361b3493c879ffa56'
+            'da52ba9603c279c1c865cc3bf63606e1daeeb2a22c68e4b0077e15c312e251b494c4f0c94bcb27c9f6923f8b69cd7ab9062d9b7ce499222d3d2240864ed9345f')
 
 prepare() {
   mkdir -p libnm{,-glib}/usr/{include,lib/{girepository-1.0,pkgconfig},share/{gir-1.0,gtk-doc/html,vala/vapi}}
 
   cd NetworkManager
-
-  patch -Np 1 -i ${srcdir}/elogind1.patch
-  patch -Np 1 -i ${srcdir}/elogind2.patch
-
   NOCONFIGURE=1 ./autogen.sh
 }
 
@@ -138,14 +120,20 @@ build() {
 }
 
 check() {
-    cd NetworkManager #-$pkgver
+    cd NetworkManage
     make -k check
 }
 
 package() {
-    cd NetworkManager #-$pkgver
+    cd NetworkManager
     make DESTDIR="$pkgdir" install
 
+    install -dm700 "$pkgdir/etc/NetworkManager/system-connections"
+    install -d "$pkgdir"/etc/NetworkManager/{conf,dnsmasq}.d
+    install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/"
+    install -Dm644 ../20-connectivity.conf \
+    "$pkgdir/usr/lib/NetworkManager/conf.d/20-connectivity.conf"
+
     ### rm libnm
 
     cd ../libnm
@@ -172,16 +160,4 @@ package() {
     "$pkgdir"/usr/include \
     "$pkgdir"/usr/lib/{girepository-1.0,pkgconfig} \
     "$pkgdir"/usr/share/{gir-1.0,vala/vapi}
-
-    install -m644 ${srcdir}/NetworkManager.conf "$pkgdir/etc/NetworkManager/"
-    install -dm700 "$pkgdir/etc/NetworkManager/system-connections"
-    install -d "$pkgdir"/etc/NetworkManager/{conf,dnsmasq}.d
-
-    install -dm 750 -o polkitd "${pkgdir}"/usr/share/polkit-1/rules.d
-
-    install -m 644 ${srcdir}/01-org.freedesktop.NetworkManager.settings.modify.system.rules $pkgdir/usr/share/polkit-1/rules.d/
-
-    install -m 644 ${srcdir}/50-org.freedesktop.NetworkManager.rules $pkgdir/usr/share/polkit-1/rules.d/
-
-    install -Dm644 ${srcdir}/20-connectivity.conf "$pkgdir/usr/lib/NetworkManager/conf.d/20-connectivity.conf"
 }