diff --git a/.gitignore b/.gitignore index 4b88290..1de3677 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/usbmuxd-1.0.8.tar.bz2 +SOURCES/usbmuxd-1.1.0.tar.bz2 diff --git a/.usbmuxd.metadata b/.usbmuxd.metadata index 99b785b..36d6e8c 100644 --- a/.usbmuxd.metadata +++ b/.usbmuxd.metadata @@ -1 +1 @@ -56bd90d5ff94c1d9c528f8b49deffea25b7384e8 SOURCES/usbmuxd-1.0.8.tar.bz2 +a8f5d44b3014d57a6ae40960b56cc6f497876097 SOURCES/usbmuxd-1.1.0.tar.bz2 diff --git a/SOURCES/0001-Use-systemd-to-start-usbmuxd.patch b/SOURCES/0001-Use-systemd-to-start-usbmuxd.patch deleted file mode 100644 index 3928a41..0000000 --- a/SOURCES/0001-Use-systemd-to-start-usbmuxd.patch +++ /dev/null @@ -1,61 +0,0 @@ -From c15d2f6f22a3d5013c8b1cd6ca9c8a31be3748d5 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Mon, 9 Jul 2012 16:30:33 +0100 -Subject: [PATCH] Use systemd to start usbmuxd - -Instead of using udev. udev should not be used to start -long-running daemons. The started daemon will receive SIGKILL -after all event handling has been done, as udev.service cleans -up all the lingering processes. - -We instead ask udev to tell systemd to start us up through the -usbmuxd.service file. - -See: -https://bugzilla.redhat.com/show_bug.cgi?id=786853 -for more details. ---- - udev/85-usbmuxd.rules.in | 2 +- - udev/CMakeLists.txt | 2 ++ - udev/usbmuxd.service.in | 7 +++++++ - 3 files changed, 10 insertions(+), 1 deletion(-) - create mode 100644 udev/usbmuxd.service.in - -diff --git a/udev/85-usbmuxd.rules.in b/udev/85-usbmuxd.rules.in -index 6f2186b..d9de100 100644 ---- a/udev/85-usbmuxd.rules.in -+++ b/udev/85-usbmuxd.rules.in -@@ -1,7 +1,7 @@ - # usbmuxd ("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}", OWNER="usbmux", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -u -U usbmux" -+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" - - # 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" -diff --git a/udev/CMakeLists.txt b/udev/CMakeLists.txt -index 0f7042d..3067a75 100644 ---- a/udev/CMakeLists.txt -+++ b/udev/CMakeLists.txt -@@ -1,2 +1,4 @@ - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/85-usbmuxd.rules.in ${CMAKE_CURRENT_BINARY_DIR}/85-usbmuxd.rules @ONLY) -+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/usbmuxd.service.in ${CMAKE_CURRENT_BINARY_DIR}/usbmuxd.service @ONLY) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/85-usbmuxd.rules DESTINATION /lib/udev/rules.d/) -+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/usbmuxd.service DESTINATION /lib/systemd/system/) -diff --git a/udev/usbmuxd.service.in b/udev/usbmuxd.service.in -new file mode 100644 -index 0000000..bcfb347 ---- /dev/null -+++ b/udev/usbmuxd.service.in -@@ -0,0 +1,7 @@ -+[Unit] -+Description=iOS USB Muxer -+ -+[Service] -+Type=simple -+ExecStart=/sbin/usbmuxd -u -U usbmux -+PIDFile=/var/run/usbmuxd.pid --- -1.7.10.2 - diff --git a/SPECS/usbmuxd.spec b/SPECS/usbmuxd.spec index a15be17..68c2cc6 100644 --- a/SPECS/usbmuxd.spec +++ b/SPECS/usbmuxd.spec @@ -1,56 +1,44 @@ Name: usbmuxd -Version: 1.0.8 -Release: 11%{?dist} +Version: 1.1.0 +Release: 1%{?dist} Summary: Daemon for communicating with Apple's iOS devices Group: Applications/System # All code is dual licenses as GPLv3+ or GPLv2+, except libusbmuxd which is LGPLv2+. -License: GPLv3+ or GPLv2+ and LGPLv2+ +License: GPLv3+ or GPLv2+ URL: http://www.libimobiledevice.org/ Source0: http://www.libimobiledevice.org/downloads/%{name}-%{version}.tar.bz2 -Patch0: 0001-Use-systemd-to-start-usbmuxd.patch +BuildRequires: libimobiledevice-devel BuildRequires: libplist-devel BuildRequires: libusbx-devel -BuildRequires: cmake -# For the systemd RPM macros BuildRequires: systemd + Requires(pre): shadow-utils -Requires(post): systemd-units -Requires(preun): systemd-units -Requires(postun): systemd-units +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd +# for multilib upgrade path +Obsoletes: usbmuxd < 1.0.9 %description usbmuxd is a daemon used for communicating with Apple's iPod Touch, iPhone, iPad and Apple TV devices. It allows multiple services on the device to be accessed simultaneously. -%package devel -Summary: Development package for %{name} -Group: Development/Libraries -Requires: usbmuxd = %{version}-%{release} -Requires: pkgconfig -Requires: libusbx-devel - -%description devel -Files for development with %{name}. - %prep %setup -q -%patch0 -p1 -b .systemd # Set the owner of the device node to be usbmuxd -sed -i.owner 's/OWNER="usbmux"/OWNER="usbmuxd"/' udev/85-usbmuxd.rules.in -sed -i.user 's/-U usbmux/-U usbmuxd/' udev/usbmuxd.service.in +sed -i.owner 's/OWNER="usbmux"/OWNER="usbmuxd"/' udev/39-usbmuxd.rules.in +sed -i.user 's/--user usbmux/--user usbmuxd/' systemd/usbmuxd.service.in %build -export CMAKE_PREFIX_PATH=/usr -%{cmake} . +%configure -make %{?_smp_mflags} +make %{?_smp_mflags} V=1 %install -export CMAKE_PREFIX_PATH=/usr$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %pre @@ -61,31 +49,31 @@ useradd -r -g usbmuxd -d / -s /sbin/nologin \ exit 0 %post -/sbin/ldconfig %systemd_post usbmuxd.service %preun %systemd_preun usbmuxd.service %postun -/sbin/ldconfig %systemd_postun_with_restart usbmuxd.service %files -%doc AUTHORS README COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1 README.devel -/lib/udev/rules.d/85-usbmuxd.rules -/lib/systemd/system/usbmuxd.service -%{_bindir}/iproxy +%license COPYING.GPLv2 COPYING.GPLv3 +%doc AUTHORS README +%{_unitdir}/usbmuxd.service +/usr/lib/udev/rules.d/39-usbmuxd.rules %{_sbindir}/usbmuxd -%{_libdir}/libusbmuxd.so.* - -%files devel -%doc README.devel -%{_includedir}/*.h -%{_libdir}/libusbmuxd.so -%{_libdir}/pkgconfig/libusbmuxd.pc +%{_datadir}/man/man1/usbmuxd.1.gz %changelog +* Wed Mar 15 2017 Kalev Lember - 1.1.0-1 +- Update to 1.1.0 +- Resolves: #1431534 + +* Thu Mar 09 2017 Kalev Lember - 1.0.8-12 +- Rebuilt for libplist 1.2 +- Related: #1430798 + * Fri Jan 24 2014 Daniel Mach - 1.0.8-11 - Mass rebuild 2014-01-24