upgpkg: connman-git 1.36.r151

3 files changed, 76 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eaf3d5a36ac6..644dec14d4e7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,32 @@
 pkgbase = connman-git
-	pkgdesc = Wireless LAN network manager (git version)
-	pkgver = 1.29.22.g71657ff
+	pkgdesc = Intel's modular network connection manager. Git version.
+	pkgver = 1.36.r151.ga51d7f68
 	pkgrel = 1
 	url = https://01.org/connman
-	arch = i686
 	arch = x86_64
 	license = GPL2
-	makedepends = git
+	makedepends = bluez
+	makedepends = wpa_supplicant
+	makedepends = openconnect
+	makedepends = openvpn
+	makedepends = ppp
+	makedepends = iwd
 	depends = dbus
 	depends = iptables
 	depends = gnutls
 	depends = glib2
-	depends = wpa_supplicant
-	depends = pptpclient
-	provides = connman
+	optdepends = bluez: Support for Bluetooth devices
+	optdepends = wpa_supplicant: for WiFi devices
+	optdepends = pptpclient: for ppp support
+	optdepends = openvpn: for VPN Support
+	optdepends = iwd: for WiFi devices
+	provides = connman=1.36.r151.ga51d7f68
 	conflicts = connman
-	source = git://git.kernel.org/pub/scm/network/connman/connman.git
-	md5sums = SKIP
+	replaces = connman
+	source = git+https://git.kernel.org/pub/scm/network/connman/connman.git
+	source = allow_group_network.diff
+	sha512sums = SKIP
+	sha512sums = SKIP
 
 pkgname = connman-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 034398dc1d2b..95cb992b82a3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,40 +1,62 @@
-# Maintainer: tailinchu <use_my_id at gmail dot com>
+# Based on the files created for Arch Linux by:
+# Christian Rebischke <Chris.Rebischke[at]archlinux[dot]org>
+# Daniel Wallace <danielwallace at gtmanfred dot com>
+# Lucas De Marchi <lucas.de.marchi@gmail.com>
+# Tailinchu <tailinchu at gmail dot com>
 
 pkgname=connman-git
-pkgver=1.29.22.g71657ff
+pkgver=1.36.r151.ga51d7f68
 pkgrel=1
-pkgdesc="Wireless LAN network manager (git version)"
-arch=('i686' 'x86_64')
+pkgdesc="Intel's modular network connection manager. Git version."
 url="https://01.org/connman"
+arch=('x86_64')
 license=('GPL2')
-depends=('dbus' 'iptables' 'gnutls' 'glib2' 'wpa_supplicant' 'pptpclient')
-makedepends=('git')
+provides=("connman=$pkgver")
 conflicts=('connman')
-provides=('connman')
-source=("git://git.kernel.org/pub/scm/network/connman/connman.git")
-md5sums=('SKIP')
+replaces=('connman')
+makedepends=('bluez' 'wpa_supplicant' 'openconnect' 'openvpn' 'ppp' 'iwd')
+depends=('dbus' 'iptables' 'gnutls' 'glib2')
+optdepends=('bluez: Support for Bluetooth devices'
+            'wpa_supplicant: for WiFi devices'
+            'pptpclient: for ppp support'
+            'openvpn: for VPN Support'
+            'iwd: for WiFi devices')
+source=("git+https://git.kernel.org/pub/scm/network/connman/connman.git"
+        'allow_group_network.diff')
+sha512sums=('SKIP' 'SKIP')
 
-_gitroot="connman"
+pkgver() {
+    cd ${pkgname%-*}
+    git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+}
 
-pkgver () {
-	cd "$srcdir/$_gitroot"
-	git describe --always | sed 's|-|.|g'
+prepare(){
+  cd ${pkgname%-*}
+  patch -Np1 -i "${srcdir}/allow_group_network.diff"
 }
 
 build() {
-	cd "$srcdir/$_gitroot"
-	./bootstrap
-	./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-		--bindir=/usr/bin \
-		--sbindir=/usr/bin \
-		--with-systemdunitdir=/usr/lib/systemd/system \
-		--enable-pptp \
-		--enable-polkit \
-		--enable-client
+	cd "$srcdir/${pkgname%-*}"
+
+        ./configure --prefix=/usr \
+            --sysconfdir=/etc \
+            --localstatedir=/var \
+            --bindir=/usr/bin \
+            --sbindir=/usr/bin \
+            --with-systemdunitdir=/usr/lib/systemd/system \
+            --enable-pptp \
+            --enable-openconnect \
+            --enable-vpnc \
+            --enable-openvpn \
+            --enable-polkit \
+            --enable-client \
+            --enable-nmcompat \
+            --enable-pie \
+            --enable-iwd
 	make
 }
 
 package() {
-	cd "$srcdir/$_gitroot"
+	cd "$srcdir/${pkgname%-*}"
 	make DESTDIR="$pkgdir" install
 }
diff --git a/allow_group_network.diff b/allow_group_network.diff
new file mode 100644
index 000000000000..027d933f7cff
--- /dev/null
+++ b/allow_group_network.diff
@@ -0,0 +1,12 @@
+--- a/src/connman-polkit.conf	2010-11-05 12:09:04.285423955 -0200
++++ b/src/connman-polkit.conf	2010-11-05 12:10:53.041423934 -0200
+@@ -5,6 +5,9 @@
+         <allow own="net.connman"/>
+         <allow send_interface="net.connman.Agent"/>
+     </policy>
++    <policy group="network">
++       <allow send_interface="net.connman.Agent"/>
++    </policy>
+     <policy context="default">
+         <allow send_destination="net.connman"/>
+     </policy>