Bump; sync with repo

4 files changed, 29 insertions, 45 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 43ba58a54384..22403f8f93a0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,21 @@
-# Generated by mksrcinfo v8
-# Mon Jan  9 23:51:29 UTC 2017
 pkgbase = usbmuxd-git
-	pkgdesc = USB Multiplex Daemon
-	pkgver = 1.1.0.r25.g35e5d48
+	pkgdesc = A socket daemon to multiplex connections from and to iOS devices
+	pkgver = 1.1.0.r66.g9af2b12
 	pkgrel = 1
 	epoch = 1
 	url = http://www.libimobiledevice.org/
-	install = usbmuxd.install
 	arch = i686
 	arch = x86_64
-	license = GPL
+	license = GPL2
+	license = GPL3
 	makedepends = git
-	makedepends = cmake
-	depends = libusb
-	depends = libplist-git
-	depends = libimobiledevice-git
+	depends = libimobiledevice
 	provides = usbmuxd
 	conflicts = usbmuxd
-	source = git+https://git.libimobiledevice.org/usbmuxd.git
-	sha512sums = SKIP
+	source = git+https://github.com/libimobiledevice/usbmuxd
+	source = usbmuxd.sysusers
+	sha256sums = SKIP
+	sha256sums = 044bfb2810b27f7d6c066f142210775176b7484e76a78ea91794f40fdcda6fd9
 
 pkgname = usbmuxd-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 02c5aaa259d2..c1c5397df77d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,39 +1,44 @@
 # Maintainer: Ivan Shapovalov <intelfx@intelfx.name>
+# Contriburor: Ionut Biru <ibiru@archlinux.org>
+# Contributor: Gabriel Martinez < reitaka at gmail dot com >
 # Contributor: Alex Brinister <alex_brinister at yahoo dot com>
 
 pkgname=usbmuxd-git
 epoch=1
-pkgver=1.1.0.r25.g35e5d48
+pkgver=1.1.0.r66.g9af2b12
 pkgrel=1
-pkgdesc="USB Multiplex Daemon"
+pkgdesc="A socket daemon to multiplex connections from and to iOS devices"
 url="http://www.libimobiledevice.org/"
 arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libusb' 'libplist-git' 'libimobiledevice-git')
-makedepends=('git' 'cmake')
+license=('GPL2' 'GPL3')
+depends=('libimobiledevice')
+makedepends=('git')
 provides=('usbmuxd')
 conflicts=('usbmuxd')
-install='usbmuxd.install'
-source=("git+https://git.libimobiledevice.org/usbmuxd.git")
-sha512sums=('SKIP')
+source=("git+https://github.com/libimobiledevice/usbmuxd"
+        usbmuxd.sysusers)
+sha256sums=('SKIP'
+            '044bfb2810b27f7d6c066f142210775176b7484e76a78ea91794f40fdcda6fd9')
 
 pkgver() {
 	cd usbmuxd
+	git describe --long --tags | sed 's/-/.r/;s/-/./'
+}
 
-	git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+prepare() {
+	cd usbmuxd
+	NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
 	cd usbmuxd
-
-	./autogen.sh --prefix=/usr --sbindir=/usr/bin --with-systemd
+	./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin
 	make
 }
 
 package() {
 	cd usbmuxd
-
 	make DESTDIR="$pkgdir" install
-}
 
-# vim:set ts=2 sw=2:
+	install -Dm644 "$srcdir/usbmuxd.sysusers" "$pkgdir/usr/lib/sysusers.d/usbmuxd.conf"
+}
diff --git a/usbmuxd.install b/usbmuxd.install
deleted file mode 100644
index 21ca31279bd0..000000000000
--- a/usbmuxd.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-    groupadd -g 140 usbmux &>/dev/null
-    useradd -c 'usbmux user' -u 140 -g usbmux -d / -s /sbin/nologin usbmux &>/dev/null
-    passwd -l usbmux &>/dev/null
-}
-
-post_upgrade() {
-    getent group usbmux >/dev/null 2>&1 || groupadd -g 140 usbmux &>/dev/null
-    getent passwd usbmux >/dev/null 2>&1 || useradd -c 'usbmux user' -u 140 -g usbmux -d / -s /sbin/nologin usbmux &>/dev/null
-}
-
-post_remove() {
-    if getent passwd usbmux >/dev/null 2>&1; then
-        userdel usbmux
-    fi
-    if getent group usbmux >/dev/null 2>&1; then
-        groupdel usbmux
-    fi
-}
\ No newline at end of file
diff --git a/usbmuxd.sysusers b/usbmuxd.sysusers
new file mode 100644
index 000000000000..ce0aeaef4537
--- /dev/null
+++ b/usbmuxd.sysusers
@@ -0,0 +1 @@
+u usbmux 140 "usbmux user"