[Pkg-gtkpod-devel] Bug#891507: usbmuxd: Plugging device second time does not start usbmuxd

[Leo Soares]

Package: usbmuxd
Version: 1.1.0-2
Followup-For: Bug #891507
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu disco ubuntu-patch

Hi,

this patch fixes this problem by backporting the udev rule from 1.1.1~git20181007.f838cf6-1

  * debian/patches/fix-on-reconnect.patch: backport udev rule from 1.1.1 (LP:
      #1778767) 


Thanks for considering the patch.


-- System Information:
Debian Release: buster/sid
  APT prefers bionic-updates
  APT policy: (500, 'bionic-updates'), (500, 'bionic-security'), (500, 'bionic'), (100, 'bionic-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.15.0-39-generic (SMP w/32 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8), LANGUAGE=en_GB:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
-------------- next part --------------
diff -Nru usbmuxd-1.1.0/debian/patches/fix-on-reconnect.patch usbmuxd-1.1.0/debian/patches/fix-on-reconnect.patch
--- usbmuxd-1.1.0/debian/patches/fix-on-reconnect.patch	1970-01-01 01:00:00.000000000 +0100
+++ usbmuxd-1.1.0/debian/patches/fix-on-reconnect.patch	2018-11-21 17:40:27.000000000 +0000
@@ -0,0 +1,23 @@
+## Description: restart usbmuxd when reconnecting devices
+## Origin/Author: Leo Soares
+## Bug: https://bugs.launchpad.net/ubuntu/+source/usbmuxd/+bug/1778767
+Index: usbmuxd-1.1.0/udev/39-usbmuxd.rules.in
+===================================================================
+--- usbmuxd-1.1.0.orig/udev/39-usbmuxd.rules.in
++++ usbmuxd-1.1.0/udev/39-usbmuxd.rules.in
+@@ -1,7 +1,13 @@
+ # usbmuxd (Apple Mobile Device Muxer listening on /var/run/usbmuxd)
+ 
++# systemd should receive all events relating to device
++SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{PRODUCT}=="5ac/12[9a][0-9a-f]/*", TAG+="systemd"
++
+ # Initialize iOS devices into "deactivated" USB configuration state and activate usbmuxd
+-ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="12[9a][0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}="0", OWNER="usbmux", @udev_activation_rule@
++SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{PRODUCT}=="5ac/12[9a][0-9a-f]/*", ACTION=="add", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}="0", OWNER="usbmux", @udev_activation_rule@
++
++# Make sure properties don't get lost when bind action is called
++SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{PRODUCT}=="5ac/12[9a][0-9a-f]/*", ACTION=="bind", ENV{USBMUX_SUPPORTED}="1", OWNER="usbmux", @udev_activation_rule@
+ 
+ # Exit usbmuxd when the last device is removed
+-ACTION=="remove", SUBSYSTEM=="usb", ENV{PRODUCT}=="5ac/12[9a][0-9a-f]/*", ENV{INTERFACE}=="255/*", RUN+="@sbindir@/usbmuxd -x"
++SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{PRODUCT}=="5ac/12[9a][0-9a-f]/*", ACTION=="remove", RUN+="@sbindir@/usbmuxd -x"
diff -Nru usbmuxd-1.1.0/debian/patches/series usbmuxd-1.1.0/debian/patches/series
--- usbmuxd-1.1.0/debian/patches/series	2016-01-04 10:03:36.000000000 +0000
+++ usbmuxd-1.1.0/debian/patches/series	2018-11-21 17:33:33.000000000 +0000
@@ -1 +1,2 @@
 Fix-FTBFS-in-kfreebsd.patch
+fix-on-reconnect.patch