rpms/usbmuxd/F-11 usbmuxd-udevuser.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 usbmuxd.spec, 1.1, 1.2
Peter Robinson
pbrobinson at fedoraproject.org
Fri Feb 5 06:21:37 UTC 2010
Author: pbrobinson
Update of /cvs/pkgs/rpms/usbmuxd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19228
Modified Files:
.cvsignore sources usbmuxd.spec
Added Files:
usbmuxd-udevuser.patch
Log Message:
- New stable 1.0.0 release
usbmuxd-udevuser.patch:
85-usbmuxd.rules.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE usbmuxd-udevuser.patch ---
--- usbmuxd-1.0.0/udev/85-usbmuxd.rules.in.orig 2010-01-30 08:14:05.000000000 +0000
+++ usbmuxd-1.0.0/udev/85-usbmuxd.rules.in 2010-01-30 08:14:56.000000000 +0000
@@ -1,7 +1,7 @@
# usbmuxd (iPhone "Apple Mobile Device" MUXer listening on /var/run/usbmuxd)
# Forces iPhone 1.0, 3G, 3GS and iPodTouch 1 and 2 to USB configuration 3 and run usbmuxd
-ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="129[0-9]", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -u -U"
+ACTION=="add", SUBSYSTEM=="usb", OWNER="usbmuxd", ATTR{idVendor}=="05ac", ATTR{idProduct}=="129[0-9]", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -u -U"
# Exit usbmuxd when the last phone is removed
ACTION=="remove", SUBSYSTEM=="usb", ENV{PRODUCT}=="5ac/129[0-9]/*", ENV{INTERFACE}=="255/*", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -x"
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/usbmuxd/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 11 Aug 2009 08:45:31 -0000 1.2
+++ .cvsignore 5 Feb 2010 06:21:37 -0000 1.3
@@ -1 +1 @@
-usbmuxd-0.1.4.tar.gz
+usbmuxd-1.0.0.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/usbmuxd/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 11 Aug 2009 08:45:31 -0000 1.2
+++ sources 5 Feb 2010 06:21:37 -0000 1.3
@@ -1 +1 @@
-bc57116f092a922653ba472177f082f0 usbmuxd-0.1.4.tar.gz
+75b513c1cf95c488ed71d9f618ce1889 usbmuxd-1.0.0.tar.bz2
Index: usbmuxd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/usbmuxd/F-11/usbmuxd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- usbmuxd.spec 11 Aug 2009 08:45:31 -0000 1.1
+++ usbmuxd.spec 5 Feb 2010 06:21:37 -0000 1.2
@@ -1,16 +1,19 @@
Name: usbmuxd
-Version: 0.1.4
-Release: 1%{?dist}
+Version: 1.0.0
+Release: 2%{?dist}
Summary: Daemon for communicating with Apple's iPod Touch and iPhone
Group: Applications/System
-License: GPLv2+ and LGPLv2+
-URL: http://cgit.pims.selfip.net/usbmuxd/
-Source0: http://cgit.pims.selfip.net/%{name}/snapshot/%{name}-%{version}.tar.gz
+# All code is dual licenses as GPLv3+ or GPLv2+, except libusbmuxd which is LGPLv2+.
+License: GPLv3+ or GPLv2+ and LGPLv2+
+URL: http://marcansoft.com/uploads/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0: http://marcansoft.com/uploads/usbmuxd/%{name}-%{version}.tar.bz2
+Patch0: usbmuxd-udevuser.patch
-BuildRequires: libusb-devel
-BuildRequires: automake autoconf libtool
+BuildRequires: libusb1-devel
+BuildRequires: cmake
+Requires(pre): shadow-utils
%description
usbmuxd is a daemon used for communicating with Apple's iPod Touch and iPhone
@@ -22,40 +25,47 @@ Summary: Development package for %{name}
Group: Development/Libraries
Requires: usbmuxd = %{version}-%{release}
Requires: pkgconfig
+Requires: libusb1-devel
%description devel
Files for development with %{name}.
%prep
%setup -q
+%patch0 -p1 -b .udevuser
%build
-%configure --enable-static=no
+export CMAKE_PREFIX_PATH=/usr
+%{cmake} .
+
make %{?_smp_mflags}
%install
+export CMAKE_PREFIX_PATH=/usr$RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.{a,la}
-
-# Install udev rules in the correct location
-rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d/
-install -D -p -m0644 udev/85-usbmuxd.rules $RPM_BUILD_ROOT/lib/udev/rules.d/85-usbmuxd.rules
%clean
rm -rf $RPM_BUILD_ROOT
+%pre
+getent group usbmuxd >/dev/null || groupadd -r usbmuxd
+getent passwd usbmuxd >/dev/null || \
+useradd -r -g usbmuxd -d / -s /sbin/nologin \
+-c "usbmuxd user" usbmuxd
+exit 0
+
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
-%doc AUTHORS README COPYING
+%doc AUTHORS README COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1 README.devel
/lib/udev/rules.d/85-usbmuxd.rules
%{_bindir}/iproxy
-%{_libdir}/libusbmuxd.so.*
%{_sbindir}/usbmuxd
+%{_libdir}/libusbmuxd.so.*
%files devel
%defattr(-,root,root,-)
@@ -65,6 +75,25 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/libusbmuxd.pc
%changelog
+* Fri Jan 29 2010 Peter Robinson <pbrobinson at gmail.com> 1.0.0-2
+- Run deamon under the usbmuxd user
+
+* Mon Dec 7 2009 Peter Robinson <pbrobinson at gmail.com> 1.0.0-1
+- New stable 1.0.0 release
+
+* Sat Oct 31 2009 Peter Robinson <pbrobinson at gmail.com> 1.0.0-0.1.rc2
+- New 1.0.0-rc2 test release
+
+* Thu Oct 29 2009 Peter Robinson <pbrobinson at gmail.com> 1.0.0-0.2.rc1
+- Add patch to fix install of 64 bit libs
+
+* Tue Oct 27 2009 Peter Robinson <pbrobinson at gmail.com> 1.0.0-0.1.rc1
+- New 1.0.0-rc1 test release
+
+* Fri Aug 14 2009 Bastien Nocera <bnocera at redhat.com> 0.1.4-2
+- Make usbmuxd autostart on newer kernels
+- (Still doesn't exit properly though)
+
* Mon Aug 10 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.4-1
- Update to 0.1.4
More information about the scm-commits
mailing list