diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-08 10:54:13 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-08 10:54:13 -0300 |
| commit | e0981df8c5fce1353e1499a5085e27f92afddcea (patch) | |
| tree | 06de6ad8de74d4b7b040d67f050c1fd43fe83a33 /extra/usbmuxd | |
| parent | 97a74a6a87ccbeb5649f226377d0c10ae824f1e1 (diff) | |
| parent | 0f9e4ba23bb6296d8bb8010f70d868fd08db9c54 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/curlftpfs/PKGBUILD
core/libcap/PKGBUILD
core/libsasl/PKGBUILD
core/udev/PKGBUILD
extra/cyrus-sasl/PKGBUILD
extra/dbus/PKGBUILD
extra/fluidsynth/PKGBUILD
extra/mercurial/PKGBUILD
extra/redland/PKGBUILD
extra/soprano/PKGBUILD
multilib/lib32-curl/PKGBUILD
multilib/lib32-freetype2/PKGBUILD
multilib/lib32-mesa/PKGBUILD
multilib/wine/PKGBUILD
Diffstat (limited to 'extra/usbmuxd')
| -rw-r--r-- | extra/usbmuxd/PKGBUILD | 11 | ||||
| -rw-r--r-- | extra/usbmuxd/usbmuxd-udevuser.patch | 12 |
2 files changed, 19 insertions, 4 deletions
diff --git a/extra/usbmuxd/PKGBUILD b/extra/usbmuxd/PKGBUILD index 96b2e3cbb..217a0acf6 100644 --- a/extra/usbmuxd/PKGBUILD +++ b/extra/usbmuxd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 130891 2011-07-08 15:48:48Z ibiru $ +# $Id: PKGBUILD 134490 2011-08-04 15:41:22Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Gabriel Martinez < reitaka at gmail dot com > pkgname=usbmuxd pkgver=1.0.7 -pkgrel=1 +pkgrel=2 pkgdesc="USB Multiplex Daemon" url="http://marcansoft.com/blog/iphonelinux/usbmuxd/" arch=('i686' 'x86_64' 'mips64el') @@ -12,11 +12,14 @@ license=('GPL2' 'GPL3' 'LGPL2.1') depends=('libusb>=1.0.8') makedepends=('cmake') install=usbmuxd.install -source=(http://marcansoft.com/uploads/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('6f431541f3177fa06aa6df9ceecb2da0') +source=(http://marcansoft.com/uploads/${pkgname}/${pkgname}-${pkgver}.tar.bz2 + usbmuxd-udevuser.patch) +md5sums=('6f431541f3177fa06aa6df9ceecb2da0' + '8526f24f4ad16cd6b2a7321c0b59592c') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/usbmuxd-udevuser.patch" mkdir build cd build cmake ../ -DCMAKE_INSTALL_PREFIX:PATH=/usr -DLIB_SUFFIX="" diff --git a/extra/usbmuxd/usbmuxd-udevuser.patch b/extra/usbmuxd/usbmuxd-udevuser.patch new file mode 100644 index 000000000..51c8f3d3a --- /dev/null +++ b/extra/usbmuxd/usbmuxd-udevuser.patch @@ -0,0 +1,12 @@ +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" |