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

[Jan de Groot]

    Date: Tuesday, March 3, 2015 @ 09:35:47
  Author: jgc
Revision: 232445

upgpkg: usbmuxd 1.1.0-2

Fix user management, use upstream systemd/udev files

Modified:
  usbmuxd/trunk/PKGBUILD
  usbmuxd/trunk/usbmuxd.install
Deleted:
  usbmuxd/trunk/39-usbmuxd.rules
  usbmuxd/trunk/usbmuxd.service

------------------+
 39-usbmuxd.rules |    9 ---------
 PKGBUILD         |   21 +++------------------
 usbmuxd.install  |   10 +---------
 usbmuxd.service  |    5 -----
 4 files changed, 4 insertions(+), 41 deletions(-)

Deleted: 39-usbmuxd.rules
===================================================================
--- 39-usbmuxd.rules	2015-03-03 07:30:31 UTC (rev 232444)
+++ 39-usbmuxd.rules	2015-03-03 08:35:47 UTC (rev 232445)
@@ -1,9 +0,0 @@
-# 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	2015-03-03 07:30:31 UTC (rev 232444)
+++ PKGBUILD	2015-03-03 08:35:47 UTC (rev 232445)
@@ -4,7 +4,7 @@
 
 pkgname=usbmuxd
 pkgver=1.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="USB Multiplex Daemon"
 url="http://marcansoft.com/blog/iphonelinux/usbmuxd/"
 arch=('i686' 'x86_64')
@@ -12,19 +12,9 @@
 depends=('libimobiledevice')
 makedepends=('git')
 install=usbmuxd.install
-source=("http://www.libimobiledevice.org/downloads/usbmuxd-$pkgver.tar.bz2"
-	'usbmuxd.service'
-	'39-usbmuxd.rules')
-md5sums=('34361c59320cb0b1f9ebcd2798ee1b39'
-         'dae0660f972510a6483992b5b81e1b5a'
-         'dc4b2893651149eccbf7b2c8467cd288')
+source=(http://www.libimobiledevice.org/downloads/usbmuxd-$pkgver.tar.bz2)
+md5sums=('34361c59320cb0b1f9ebcd2798ee1b39')
 
-prepare() {
-  cd usbmuxd-$pkgver
-  sed -i -e 's|udevrulesdir = /lib/udev/rules.d|udevrulesdir = /usr/lib/udev/rules.d|' Makefile.am
-  autoreconf -fi
-}
-
 build() {
   cd usbmuxd-$pkgver
   ./configure --prefix=/usr --sbindir=/usr/bin
@@ -34,9 +24,4 @@
 package() {
   cd usbmuxd-$pkgver
   make DESTDIR="${pkgdir}" install
-
-  # install systemd service file
-  install -D -m644 ../usbmuxd.service "${pkgdir}/usr/lib/systemd/system/usbmuxd.service"
-  # use udev rule that works with systemd
-  install -m644 ../39-usbmuxd.rules "${pkgdir}/usr/lib/udev/rules.d/" 
 }

Modified: usbmuxd.install
===================================================================
--- usbmuxd.install	2015-03-03 07:30:31 UTC (rev 232444)
+++ usbmuxd.install	2015-03-03 08:35:47 UTC (rev 232445)
@@ -7,13 +7,5 @@
 post_upgrade() {
     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
+    passwd -l usbmux &>/dev/null
 }
-
-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
-}

Deleted: usbmuxd.service
===================================================================
--- usbmuxd.service	2015-03-03 07:30:31 UTC (rev 232444)
+++ usbmuxd.service	2015-03-03 08:35:47 UTC (rev 232445)
@@ -1,5 +0,0 @@
-[Unit]
-Description=iOS USB Muxer
-
-[Service]
-ExecStart=/usr/sbin/usbmuxd -u -f -U usbmux