Update clone URL, remove out-of-tree udev rule and systemd unit.

4 files changed, 11 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e78514fba2de..43ba58a54384 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Mon Jan  9 23:51:29 UTC 2017
 pkgbase = usbmuxd-git
 	pkgdesc = USB Multiplex Daemon
-	pkgver = 1.1.0.r18.g423fb8c
-	pkgrel = 2
+	pkgver = 1.1.0.r25.g35e5d48
+	pkgrel = 1
 	epoch = 1
 	url = http://www.libimobiledevice.org/
 	install = usbmuxd.install
@@ -15,12 +17,8 @@ pkgbase = usbmuxd-git
 	depends = libimobiledevice-git
 	provides = usbmuxd
 	conflicts = usbmuxd
-	source = git://git.sukimashita.com/usbmuxd.git
-	source = usbmuxd.service
-	source = 39-usbmuxd.rules
+	source = git+https://git.libimobiledevice.org/usbmuxd.git
 	sha512sums = SKIP
-	sha512sums = 9771b422e9b48e11a0c2ecaafda06ea9acee651afd4f7e7589e9704d60bd9eb014f6b737d1e279735225f68d910183c698949ee153275e0873940dae00911210
-	sha512sums = dc5af2442584e51ddd5828dc7f0d9d670da7026eedf1a3694f59a07741bd9280b90932c73b6ee8e95b993304c4ca3b787119f23125a232fbc5527c44dde64641
 
 pkgname = usbmuxd-git
 
diff --git a/39-usbmuxd.rules b/39-usbmuxd.rules
deleted file mode 100644
index 2a71285a2b70..000000000000
--- a/39-usbmuxd.rules
+++ /dev/null
@@ -1,7 +0,0 @@
-# usbmuxd ("Apple Mobile Device" muxer listening on /var/run/usbmuxd)
-
-# Initialize iOS devices into "deactivated" USB configuration state and run usbmuxd (via systemd)
-ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="12[9a][0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}="0", OWNER="usbmux", TAG+="systemd", ENV{SYSTEMD_WANTS}="usbmuxd.service"
-
-# Exit usbmuxd when the last device is removed
-ACTION=="remove", SUBSYSTEM=="usb", ENV{PRODUCT}=="5ac/12[9a][0-9a-f]/*", ENV{INTERFACE}=="255/*", RUN+="/usr/sbin/usbmuxd -x"
diff --git a/PKGBUILD b/PKGBUILD
index bd746850bb27..815af3c1b7c3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 
 pkgname=usbmuxd-git
 epoch=1
-pkgver=1.1.0.r18.g423fb8c
-pkgrel=2
+pkgver=1.1.0.r25.g35e5d48
+pkgrel=1
 pkgdesc="USB Multiplex Daemon"
 url="http://www.libimobiledevice.org/"
 arch=('i686' 'x86_64')
@@ -14,13 +14,8 @@ makedepends=('git' 'cmake')
 provides=('usbmuxd')
 conflicts=('usbmuxd')
 install='usbmuxd.install'
-
-source=("git://git.sukimashita.com/usbmuxd.git"
-        'usbmuxd.service'
-        '39-usbmuxd.rules')
-sha512sums=('SKIP'
-            '9771b422e9b48e11a0c2ecaafda06ea9acee651afd4f7e7589e9704d60bd9eb014f6b737d1e279735225f68d910183c698949ee153275e0873940dae00911210'
-            'dc5af2442584e51ddd5828dc7f0d9d670da7026eedf1a3694f59a07741bd9280b90932c73b6ee8e95b993304c4ca3b787119f23125a232fbc5527c44dde64641')
+source=("git+https://git.libimobiledevice.org/usbmuxd.git")
+sha512sums=('SKIP')
 
 pkgver() {
 	cd usbmuxd
@@ -31,19 +26,14 @@ pkgver() {
 build() {
 	cd usbmuxd
 
-	./autogen.sh --prefix=/usr --sbindir=/usr/bin
+	./autogen.sh --prefix=/usr --sbindir=/usr/bin --with-systemd
 	make
 }
 
 package() {
 	cd usbmuxd
-	make DESTDIR="${pkgdir}" install
-
-	# install systemd service file
-	install -Dm644 "${srcdir}/usbmuxd.service" "${pkgdir}/usr/lib/systemd/system/usbmuxd.service"
 
-	# use udev rule that works with systemd
-	install -Dm644 "${srcdir}/39-usbmuxd.rules" "${pkgdir}/usr/lib/udev/rules.d/39-usbmuxd.rules"
+	make DESTDIR="$pkgdir" install
 }
 
 # vim:set ts=2 sw=2:
diff --git a/usbmuxd.service b/usbmuxd.service
deleted file mode 100644
index fbebf65b9d42..000000000000
--- a/usbmuxd.service
+++ /dev/null
@@ -1,5 +0,0 @@
-[Unit]
-Description=iOS USB Muxer
-
-[Service]
-ExecStart=/usr/sbin/usbmuxd -u -f -U usbmux