[arch-commits] Commit in usbmuxd/trunk (4 files)
Tom Gundersen
tomegun at archlinux.org
Fri Jul 20 13:58:45 UTC 2012
Date: Friday, July 20, 2012 @ 09:58:45
Author: tomegun
Revision: 163813
upgpkg: usbmuxd 1.0.8-1
upstream release, bump so version, make it work with systemd again
Added:
usbmuxd/trunk/85-usbmuxd.rules
usbmuxd/trunk/usbmuxd.service
Modified:
usbmuxd/trunk/PKGBUILD
Deleted:
usbmuxd/trunk/usbmuxd-udevuser.patch
------------------------+
85-usbmuxd.rules | 9 +++++++++
PKGBUILD | 22 ++++++++++++++--------
usbmuxd-udevuser.patch | 12 ------------
usbmuxd.service | 5 +++++
4 files changed, 28 insertions(+), 20 deletions(-)
Added: 85-usbmuxd.rules
===================================================================
--- 85-usbmuxd.rules (rev 0)
+++ 85-usbmuxd.rules 2012-07-20 13:58:45 UTC (rev 163813)
@@ -0,0 +1,9 @@
+# usbmuxd ("Apple Mobile Device" muxer listening on /var/run/usbmuxd)
+
+# Forces iDevices to the last USB configuration and runs usbmuxd
+TEST=="/sys/fs/cgroup/systemd", ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="12[9a][0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", OWNER="usbmux", TAG+="systemd", ENV{SYSTEMD_WANTS}="usbmuxd.service", GOTO="usbmuxd_systemd_end"
+ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="12[9a][0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", OWNER="usbmux", RUN+="/usr/sbin/usbmuxd -u -U usbmux"
+LABEL="usbmuxd_systemd_end"
+
+# 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"
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-07-20 12:21:50 UTC (rev 163812)
+++ PKGBUILD 2012-07-20 13:58:45 UTC (rev 163813)
@@ -3,23 +3,22 @@
# Contributor: Gabriel Martinez < reitaka at gmail dot com >
pkgname=usbmuxd
-pkgver=1.0.7
-pkgrel=3
+pkgver=1.0.8
+pkgrel=1
pkgdesc="USB Multiplex Daemon"
url="http://marcansoft.com/blog/iphonelinux/usbmuxd/"
arch=('i686' 'x86_64')
license=('GPL2' 'GPL3' 'LGPL2.1')
-depends=('libusb>=1.0.8')
+depends=('libusb' 'libplist')
makedepends=('cmake')
install=usbmuxd.install
-source=(http://marcansoft.com/uploads/${pkgname}/${pkgname}-${pkgver}.tar.bz2
- usbmuxd-udevuser.patch)
-md5sums=('6f431541f3177fa06aa6df9ceecb2da0'
- '8526f24f4ad16cd6b2a7321c0b59592c')
+source=("http://cgit.sukimashita.com/${pkgname}.git/snapshot/${pkgname}-${pkgver}.tar.bz2"
+ 'usbmuxd.service'
+ '85-usbmuxd.rules')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i "${srcdir}/usbmuxd-udevuser.patch"
+ echo "${pkgver}" > version.tag
mkdir build
cd build
cmake ../ -DCMAKE_INSTALL_PREFIX:PATH=/usr -DLIB_SUFFIX=""
@@ -33,4 +32,11 @@
# fix udev dir being hardcoded
mv "${pkgdir}/lib/udev" "${pkgdir}/usr/lib/"
rmdir "${pkgdir}/lib"
+ # install systemd service file
+ install -D -m644 ${srcdir}/usbmuxd.service ${pkgdir}/usr/lib/systemd/system/usbmuxd.service
+ # use udev rule that works with systemd
+ install -m644 ${srcdir}/85-usbmuxd.rules ${pkgdir}/usr/lib/udev/rules.d/
}
+md5sums=('87fd27773a84e97ac6e2dc28b08d682e'
+ 'dae0660f972510a6483992b5b81e1b5a'
+ 'dc4b2893651149eccbf7b2c8467cd288')
Deleted: usbmuxd-udevuser.patch
===================================================================
--- usbmuxd-udevuser.patch 2012-07-20 12:21:50 UTC (rev 163812)
+++ usbmuxd-udevuser.patch 2012-07-20 13:58:45 UTC (rev 163813)
@@ -1,12 +0,0 @@
-diff -Nur usbmuxd-1.0.7.orig/udev/85-usbmuxd.rules.in usbmuxd-1.0.7/udev/85-usbmuxd.rules.in
---- usbmuxd-1.0.7.orig/udev/85-usbmuxd.rules.in 2011-08-04 15:28:32.751579507 +0000
-+++ usbmuxd-1.0.7/udev/85-usbmuxd.rules.in 2011-08-04 15:36:20.139265124 +0000
-@@ -1,7 +1,7 @@
- # usbmuxd (iPhone "Apple Mobile Device" MUXer listening on /var/run/usbmuxd)
-
- # Forces iDevices to the last USB configuration and runs usbmuxd
--ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="12[9a][0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -u -U usbmux"
-+ACTION=="add", SUBSYSTEM=="usb", OWNER="usbmux", ATTR{idVendor}=="05ac", ATTR{idProduct}=="12[9a][0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -u -U usbmux"
-
- # Exit usbmuxd when the last device is removed
- ACTION=="remove", SUBSYSTEM=="usb", ENV{PRODUCT}=="5ac/12[9a][0-9a-f]/*", ENV{INTERFACE}=="255/*", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -x"
Added: usbmuxd.service
===================================================================
--- usbmuxd.service (rev 0)
+++ usbmuxd.service 2012-07-20 13:58:45 UTC (rev 163813)
@@ -0,0 +1,5 @@
+[Unit]
+Description=iOS USB Muxer
+
+[Service]
+ExecStart=/usr/sbin/usbmuxd -u -f -U usbmux
More information about the arch-commits
mailing list