[arch-commits] Commit in usbmuxd/trunk (3 files)

[Ionut Biru]

    Date: Tuesday, November 9, 2010 @ 07:37:10
  Author: ibiru
Revision: 98455

upgpkg: usbmuxd 1.0.6-1
update to 1.0.6

Modified:
  usbmuxd/trunk/PKGBUILD
  usbmuxd/trunk/usbmuxd-udevuser.patch
  usbmuxd/trunk/usbmuxd.install

------------------------+
 PKGBUILD               |   10 +++++-----
 usbmuxd-udevuser.patch |   10 +++++-----
 usbmuxd.install        |   20 ++++++++++++--------
 3 files changed, 22 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-11-09 08:56:20 UTC (rev 98454)
+++ PKGBUILD	2010-11-09 12:37:10 UTC (rev 98455)
@@ -3,23 +3,23 @@
 # Contributor: Gabriel Martinez < reitaka at gmail dot com >
 
 pkgname=usbmuxd
-pkgver=1.0.5
+pkgver=1.0.6
 pkgrel=1
 pkgdesc="USB Multiplex Daemon"
 url="http://marcansoft.com/blog/iphonelinux/usbmuxd/"
 arch=('i686' 'x86_64')
 license=('GPL2' 'GPL3' 'LGPL2.1')
-depends=('libusb1>=1.0.3')
+depends=('libusb1>=1.0.8')
 makedepends=('cmake')
 install=usbmuxd.install
 source=(http://marcansoft.com/uploads/${pkgname}/${pkgname}-${pkgver}.tar.bz2
 	usbmuxd-udevuser.patch)
-md5sums=('484970632a739206afe86802c6169300'
-         'dbb0ab80ab70d571fc2113ee72592d5f')
+md5sums=('c8909cfd9253d8d1a5e26f2ff7e5908b'
+         '299349dcacd60af9dceecec1ceebce06')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/usbmuxd-udevuser.patch" || return 1
+  patch -Np1 -i "${srcdir}/usbmuxd-udevuser.patch"
   mkdir build
   cd build
   cmake ../ -DCMAKE_INSTALL_PREFIX:PATH=/usr -DLIB_SUFFIX=""

Modified: usbmuxd-udevuser.patch
===================================================================
--- usbmuxd-udevuser.patch	2010-11-09 08:56:20 UTC (rev 98454)
+++ usbmuxd-udevuser.patch	2010-11-09 12:37:10 UTC (rev 98455)
@@ -1,11 +1,11 @@
---- usbmuxd-1.0.4/udev/85-usbmuxd.rules.in.orig	2010-05-11 15:36:08.000000000 +0100
-+++ usbmuxd-1.0.4/udev/85-usbmuxd.rules.in	2010-05-11 21:48:23.361733289 +0100
+--- usbmuxd-1.0.6/udev/85-usbmuxd.rules.in.orig	2010-11-09 04:23:44.873368717 -0800
++++ usbmuxd-1.0.6/udev/85-usbmuxd.rules.in	2010-11-09 04:24:13.986655838 -0800
 @@ -1,7 +1,7 @@
  # usbmuxd (iPhone "Apple Mobile Device" MUXer listening on /var/run/usbmuxd)
  
  # Forces iPhone 1.0, 3G, 3GS, iPodTouch 1/2 and iPad to USB configuration 3 and run usbmuxd
--ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="129[0-9a]", 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}=="129[0-9a]", 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", ATTR{idVendor}=="05ac", ATTR{idProduct}=="129[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}=="129[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/129[0-9a]/*", ENV{INTERFACE}=="255/*", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -x"
+ ACTION=="remove", SUBSYSTEM=="usb", ENV{PRODUCT}=="5ac/129[0-9a-f]/*", ENV{INTERFACE}=="255/*", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -x"

Modified: usbmuxd.install
===================================================================
--- usbmuxd.install	2010-11-09 08:56:20 UTC (rev 98454)
+++ usbmuxd.install	2010-11-09 12:37:10 UTC (rev 98455)
@@ -1,15 +1,19 @@
 post_install() {
-    getent group usbmux >/dev/null 2>&1 || usr/sbin/groupadd -g 140 usbmux
-    getent passwd usbmux >/dev/null 2>&1 || usr/sbin/useradd -c 'usbmux user' -u 140 -g usbmux -d / -s /sbin/nologin usbmux
-
-    usr/bin/passwd -l usbmux &>/dev/null
+    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() {
-    post_install $1
+    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
 }
 
-pre_remove() {
-    getent passwd usbmux >/dev/null 2>&1 && userdel usbmux
-    getent group usbmux >/dev/null 2>&1 && groupdel usbmux
+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
 }