diff --git a/0000-udev-ensure-that-all-events-relating-to-device-are-t.patch b/0000-udev-ensure-that-all-events-relating-to-device-are-t.patch deleted file mode 100644 index 064ef68..0000000 --- a/0000-udev-ensure-that-all-events-relating-to-device-are-t.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 7f54d304149f405dc70ac924471df0d5e3e5ea09 Mon Sep 17 00:00:00 2001 -From: Gavin Li -Date: Sun, 14 Jan 2018 02:10:18 -0800 -Subject: [PATCH 1/2] udev: ensure that all events relating to device are - tagged systemd - -systemd will not restart the usbmuxd service the after the first time it -is plugged in if it does not receive the "remove" events, which also -happen to lack the idVendor and idProduct attributes, so use -ENV{PRODUCT} instead. ---- - configure.ac | 2 +- - udev/39-usbmuxd.rules.in | 7 +++++-- - 2 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index b836f45..1ce46d8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -74,7 +74,7 @@ fi - AM_CONDITIONAL(WANT_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno -a "x$with_systemd" = "xyes" ]) - - if test "x$with_systemd" = xyes; then -- udev_activation_rule="TAG+=\"systemd\", ENV{SYSTEMD_WANTS}=\"usbmuxd.service\"" -+ udev_activation_rule="ENV{SYSTEMD_WANTS}=\"usbmuxd.service\"" - else - udev_activation_rule="RUN+=\"@sbindir@/usbmuxd --user usbmux --udev\"" - fi -diff --git a/udev/39-usbmuxd.rules.in b/udev/39-usbmuxd.rules.in -index 91b14db..7d14d22 100644 ---- a/udev/39-usbmuxd.rules.in -+++ b/udev/39-usbmuxd.rules.in -@@ -1,7 +1,10 @@ - # usbmuxd (Apple Mobile Device Muxer listening on /var/run/usbmuxd) - -+# systemd should receive all events relating to device -+SUBSYSTEM=="usb", 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{PRODUCT}=="5ac/12[9a][0-9a-f]/*", ACTION=="add", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}="0", 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{PRODUCT}=="5ac/12[9a][0-9a-f]/*", ACTION=="remove", RUN+="@sbindir@/usbmuxd -x" --- -2.17.0 - diff --git a/0001-udev-Handle-all-events-only-once.patch b/0001-udev-Handle-all-events-only-once.patch deleted file mode 100644 index 1f2891a..0000000 --- a/0001-udev-Handle-all-events-only-once.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b888970f68fb16961a7cc3a526065fab7a5d96ca Mon Sep 17 00:00:00 2001 -From: Rudolf Tammekivi -Date: Wed, 31 Jan 2018 01:10:54 +0100 -Subject: [PATCH 2/2] udev: Handle all events only once - -This fixes spontaneous USB reconfiguration causing "remove" event to be sent to -the daemon, which causes it to close itself if it did not have enough time to -connect to phone. ---- - udev/39-usbmuxd.rules.in | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/udev/39-usbmuxd.rules.in b/udev/39-usbmuxd.rules.in -index 7d14d22..140869e 100644 ---- a/udev/39-usbmuxd.rules.in -+++ b/udev/39-usbmuxd.rules.in -@@ -1,10 +1,10 @@ - # usbmuxd (Apple Mobile Device Muxer listening on /var/run/usbmuxd) - - # systemd should receive all events relating to device --SUBSYSTEM=="usb", ENV{PRODUCT}=="5ac/12[9a][0-9a-f]/*", TAG+="systemd" -+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 --SUBSYSTEM=="usb", ENV{PRODUCT}=="5ac/12[9a][0-9a-f]/*", ACTION=="add", 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@ - - # Exit usbmuxd when the last device is removed --SUBSYSTEM=="usb", ENV{PRODUCT}=="5ac/12[9a][0-9a-f]/*", ACTION=="remove", RUN+="@sbindir@/usbmuxd -x" -+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{PRODUCT}=="5ac/12[9a][0-9a-f]/*", ACTION=="remove", RUN+="@sbindir@/usbmuxd -x" --- -2.17.0 - diff --git a/0002-udev-Work-around-systemd-bug-related-to-bind-events.patch b/0002-udev-Work-around-systemd-bug-related-to-bind-events.patch deleted file mode 100644 index c102122..0000000 --- a/0002-udev-Work-around-systemd-bug-related-to-bind-events.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a4c34c493e5d40395b55871b52b75f33550b9590 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Wed, 18 Apr 2018 15:00:25 +0200 -Subject: [PATCH] udev: Work around systemd bug related to bind events - -Make sure that udev doesn't lose our properties when bind events come -in, as implemented in kernels 4.12+. - -See https://github.com/systemd/systemd/issues/8221 -and https://github.com/systemd/systemd/issues/7109 ---- - udev/39-usbmuxd.rules.in | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/udev/39-usbmuxd.rules.in b/udev/39-usbmuxd.rules.in -index 140869e..4e84755 100644 ---- a/udev/39-usbmuxd.rules.in -+++ b/udev/39-usbmuxd.rules.in -@@ -6,5 +6,8 @@ SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{PRODUCT}=="5ac/12[9a][0-9a-f]/ - # Initialize iOS devices into "deactivated" USB configuration state and activate usbmuxd - 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 - SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{PRODUCT}=="5ac/12[9a][0-9a-f]/*", ACTION=="remove", RUN+="@sbindir@/usbmuxd -x" --- -2.17.0 - diff --git a/usbmuxd-1.1.0.tar.bz2 b/usbmuxd-1.1.0.tar.bz2 deleted file mode 100644 index d8dacdc..0000000 Binary files a/usbmuxd-1.1.0.tar.bz2 and /dev/null differ diff --git a/usbmuxd-1.1.1.tar.bz2 b/usbmuxd-1.1.1.tar.bz2 new file mode 100644 index 0000000..ec49ef5 Binary files /dev/null and b/usbmuxd-1.1.1.tar.bz2 differ diff --git a/usbmuxd.spec b/usbmuxd.spec index f816ffb..ddc42e5 100644 --- a/usbmuxd.spec +++ b/usbmuxd.spec @@ -1,14 +1,10 @@ Name: usbmuxd -Version: 1.1.0 -Release: 16 +Version: 1.1.1 +Release: 1 Summary: Daemon for communicating with Apple's iOS devices License: GPLv3+ or GPLv2+ URL: http://www.libimobiledevice.org/ -Source0: http://www.libimobiledevice.org/downloads/%{name}-%{version}.tar.bz2 - -Patch0000: 0000-udev-ensure-that-all-events-relating-to-device-are-t.patch -Patch0001: 0001-udev-Handle-all-events-only-once.patch -Patch0002: 0002-udev-Work-around-systemd-bug-related-to-bind-events.patch +Source0: https://github.com/libimobiledevice/usbmuxd/releases/download/%{version}/usbmuxd-%{version}.tar.bz2 BuildRequires: gcc libimobiledevice-devel libplist-devel libusbx-devel systemd autoconf libtool automake Requires(pre): shadow-utils @@ -34,7 +30,7 @@ sed -i 's/--user usbmux/--user usbmuxd/' systemd/usbmuxd.service.in %build %configure -%make_build V=1 +%make_build %install %make_install @@ -54,14 +50,17 @@ exit 0 %systemd_postun_with_restart usbmuxd.service %files -%doc AUTHORS README COPYING.GPLv2 COPYING.GPLv3 +%doc AUTHORS README.md COPYING.GPLv2 COPYING.GPLv3 %{_unitdir}/usbmuxd.service %{_udevrulesdir}/39-usbmuxd.rules %{_sbindir}/usbmuxd %files help -%{_datadir}/man/man1/usbmuxd.1.gz +%{_datadir}/man/man8/usbmuxd.8.gz %changelog +* Tue Aug 11 2020 lingsheng - 1.1.1-1 +- Update to 1.1.1 + * Fri Nov 29 2019 lingsheng - 1.1.0-16 - Package init