diff options
Diffstat (limited to 'abs/extra/usbmuxd')
| -rw-r--r-- | abs/extra/usbmuxd/85-usbmuxd.rules | 9 | ||||
| -rw-r--r-- | abs/extra/usbmuxd/PKGBUILD | 34 | ||||
| -rw-r--r-- | abs/extra/usbmuxd/__changelog | 4 | ||||
| -rw-r--r-- | abs/extra/usbmuxd/usbmuxd-describe.patch | 20 | ||||
| -rw-r--r-- | abs/extra/usbmuxd/usbmuxd-udevuser.patch | 12 | ||||
| -rw-r--r-- | abs/extra/usbmuxd/usbmuxd.service | 5 |
6 files changed, 39 insertions, 45 deletions
diff --git a/abs/extra/usbmuxd/85-usbmuxd.rules b/abs/extra/usbmuxd/85-usbmuxd.rules new file mode 100644 index 0000000..ec9f725 --- /dev/null +++ b/abs/extra/usbmuxd/85-usbmuxd.rules @@ -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" diff --git a/abs/extra/usbmuxd/PKGBUILD b/abs/extra/usbmuxd/PKGBUILD index 758cb66..885dcae 100644 --- a/abs/extra/usbmuxd/PKGBUILD +++ b/abs/extra/usbmuxd/PKGBUILD @@ -1,25 +1,24 @@ -# $Id$ +# $Id: PKGBUILD 164371 2012-07-31 19:43:35Z eric $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Gabriel Martinez < reitaka at gmail dot com > pkgname=usbmuxd -pkgver=1.0.7 -pkgrel=2 +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 - usbmuxd-describe.patch) +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" - patch -Np1 -i "${srcdir}/usbmuxd-describe.patch" + echo "${pkgver}" > version.tag mkdir build cd build cmake ../ -DCMAKE_INSTALL_PREFIX:PATH=/usr -DLIB_SUFFIX="" @@ -29,7 +28,18 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}/build" make DESTDIR="${pkgdir}" install + + # 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/ + #fix version + sed -i "s/Version.*$/Version: ${pkgver}/g" $pkgdir/usr/lib/pkgconfig/libusbmuxd.pc + } -md5sums=('6f431541f3177fa06aa6df9ceecb2da0' - '8526f24f4ad16cd6b2a7321c0b59592c' - 'bac157d6e01e1e0d56750f73850b96fb') +md5sums=('87fd27773a84e97ac6e2dc28b08d682e' + 'dae0660f972510a6483992b5b81e1b5a' + 'dc4b2893651149eccbf7b2c8467cd288') diff --git a/abs/extra/usbmuxd/__changelog b/abs/extra/usbmuxd/__changelog index 7b30556..e5a6fbf 100644 --- a/abs/extra/usbmuxd/__changelog +++ b/abs/extra/usbmuxd/__changelog @@ -1 +1,3 @@ -- added usbmuxd-describe.patch so version number is correctly detected +#fix version -jm +sed -i "s/Version.*$/Version: ${pkgver}/g" $pkgdir/usr/lib/pkgconfig/libusbmuxd.pc + diff --git a/abs/extra/usbmuxd/usbmuxd-describe.patch b/abs/extra/usbmuxd/usbmuxd-describe.patch deleted file mode 100644 index 3023235..0000000 --- a/abs/extra/usbmuxd/usbmuxd-describe.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- usbmuxd-1.0.7/Modules/describe.sh.orig 2012-04-07 22:37:03.218203610 +0000 -+++ usbmuxd-1.0.7/Modules/describe.sh 2012-04-07 22:37:22.979010437 +0000 -@@ -1,17 +1,8 @@ - #!/bin/bash - --# Check for git and a git repo. --if head=`git rev-parse --verify HEAD 2>/dev/null`; then -- /bin/echo -n `git describe` -- -- # Are there uncommitted changes? -- git update-index --refresh --unmerged > /dev/null -- git diff-index --quiet HEAD || /bin/echo -n -dirty --else - # Check for version tag - if [ -e version.tag ]; then - /bin/echo -n `cat version.tag` - fi --fi - - echo diff --git a/abs/extra/usbmuxd/usbmuxd-udevuser.patch b/abs/extra/usbmuxd/usbmuxd-udevuser.patch deleted file mode 100644 index 51c8f3d..0000000 --- a/abs/extra/usbmuxd/usbmuxd-udevuser.patch +++ /dev/null @@ -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" diff --git a/abs/extra/usbmuxd/usbmuxd.service b/abs/extra/usbmuxd/usbmuxd.service new file mode 100644 index 0000000..fbebf65 --- /dev/null +++ b/abs/extra/usbmuxd/usbmuxd.service @@ -0,0 +1,5 @@ +[Unit] +Description=iOS USB Muxer + +[Service] +ExecStart=/usr/sbin/usbmuxd -u -f -U usbmux |