commit usbmuxd for openSUSE:Factory
Hello community,
here is the log from the commit of package usbmuxd for openSUSE:Factory
checked in at Thu Mar 31 10:03:11 CEST 2011.
--------
--- usbmuxd/usbmuxd.changes 2010-12-09 01:05:06.000000000 +0100
+++ /mounts/work_src_done/STABLE/usbmuxd/usbmuxd.changes 2011-03-24 17:51:17.000000000 +0100
@@ -1,0 +2,13 @@
+Thu Mar 24 17:45:01 CEST 2011 - opensuse@sukimashita.com
+
+- Create and use "usbmux" user in %pre to fix bno#679159
+
+-------------------------------------------------------------------
+Thu Mar 24 11:25:01 CEST 2011 - opensuse@sukimashita.com
+
+- Update to version 1.0.7
+ * Detect iPad 2 and upcoming next generation iPhone devices
+ * Fix support for ancient devices running iOS 1.x
+ * Optionally use inotify instead of polling to safe energy
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
_service:download_url:usbmuxd-1.0.6.tar.bz2
New:
----
_service:download_url:usbmuxd-1.0.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ usbmuxd.spec ++++++
--- /var/tmp/diff_new_pack.c0o4GZ/_old 2011-03-31 09:59:21.000000000 +0200
+++ /var/tmp/diff_new_pack.c0o4GZ/_new 2011-03-31 09:59:21.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package usbmuxd (Version 1.0.6)
+# spec file for package usbmuxd
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,8 +19,8 @@
Name: usbmuxd
%define _libname libusbmuxd
-Version: 1.0.6
-Release: 2
+Version: 1.0.7
+Release: 1
License: LGPL v2.1 or GPL v2
Summary: Socket daemon for the usbmux protocol of iPhone/iPod Touch devices
Url: http://git.marcansoft.com/?p=usbmuxd.git
@@ -32,6 +32,7 @@
BuildRequires: libusb-1_0-devel >= 1.0.3
BuildRequires: pkg-config
BuildRequires: udev
+Requires(pre): pwdutils
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -79,6 +80,10 @@
It allows you to map a port of a service running on the device (like sshd) and
redirect it to your local machine where you can interact with it.
+%pre
+getent passwd usbmux >/dev/null || useradd -r -g nogroup -d /var/lib/%{name} -s /sbin/nologin -c "%{name} daemon" usbmux
+exit 0
+
%prep
%setup -q
@@ -105,6 +110,8 @@
%install
cd build
%{__make} install DESTDIR=%{buildroot}
+# make sure the device gets owned by the usbmux user
+sed -i 's@RUN+="/usr/sbin/usbmuxd -u -U usbmux"@OWNER="usbmux", RUN+="/usr/sbin/usbmuxd -u -U usbmux"@' %{buildroot}/lib/udev/rules.d/85-usbmuxd.rules
%clean
rm -rf %{buildroot}
++++++ _service ++++++
--- /var/tmp/diff_new_pack.c0o4GZ/_old 2011-03-31 09:59:21.000000000 +0200
+++ /var/tmp/diff_new_pack.c0o4GZ/_new 2011-03-31 09:59:21.000000000 +0200
@@ -1,7 +1,7 @@
<services>
<service name="download_url">
- <param name="host">marcansoft.com</param>
- <param name="protocol">http</param>
- <param name="path">/uploads/usbmuxd/usbmuxd-1.0.6.tar.bz2</param>
- </service>
+
+
+
+ <param name="host">marcansoft.com</param><param name="path">/uploads/usbmuxd/usbmuxd-1.0.7.tar.bz2</param><param name="protocol">http</param></service>
</services>
\ No newline at end of file
++++++ _service:download_url:usbmuxd-1.0.6.tar.bz2 -> _service:download_url:usbmuxd-1.0.7.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usbmuxd-1.0.6/Modules/FindInotify.cmake new/usbmuxd-1.0.7/Modules/FindInotify.cmake
--- old/usbmuxd-1.0.6/Modules/FindInotify.cmake 1970-01-01 01:00:00.000000000 +0100
+++ new/usbmuxd-1.0.7/Modules/FindInotify.cmake 2011-03-15 12:35:15.000000000 +0100
@@ -0,0 +1,11 @@
+set(INOTIFY_H "NOTFOUND")
+find_file(INOTIFY_H
+ "sys/inotify.h"
+ PATHS ENV INCLUDE
+)
+
+if (INOTIFY_H)
+ set(INOTIFY_FOUND TRUE)
+else()
+ set(INOTIFY_FOUND FALSE)
+endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usbmuxd-1.0.6/daemon/usb-linux.c new/usbmuxd-1.0.7/daemon/usb-linux.c
--- old/usbmuxd-1.0.6/daemon/usb-linux.c 2010-09-28 03:32:44.000000000 +0200
+++ new/usbmuxd-1.0.7/daemon/usb-linux.c 2011-03-15 12:35:15.000000000 +0100
@@ -334,16 +334,23 @@
usbmuxd_log(LL_WARNING, "Endpoint count mismatch for interface %d of device %d-%d", intf->bInterfaceNumber, bus, address);
continue;
}
- if((intf->endpoint[0].bEndpointAddress & 0x80) != LIBUSB_ENDPOINT_OUT ||
- (intf->endpoint[1].bEndpointAddress & 0x80) != LIBUSB_ENDPOINT_IN) {
+ if((intf->endpoint[0].bEndpointAddress & 0x80) == LIBUSB_ENDPOINT_OUT &&
+ (intf->endpoint[1].bEndpointAddress & 0x80) == LIBUSB_ENDPOINT_IN) {
+ usbdev->interface = intf->bInterfaceNumber;
+ usbdev->ep_out = intf->endpoint[0].bEndpointAddress;
+ usbdev->ep_in = intf->endpoint[1].bEndpointAddress;
+ usbmuxd_log(LL_INFO, "Found interface %d with endpoints %02x/%02x for device %d-%d", usbdev->interface, usbdev->ep_out, usbdev->ep_in, bus, address);
+ break;
+ } else if((intf->endpoint[1].bEndpointAddress & 0x80) == LIBUSB_ENDPOINT_OUT &&
+ (intf->endpoint[0].bEndpointAddress & 0x80) == LIBUSB_ENDPOINT_IN) {
+ usbdev->interface = intf->bInterfaceNumber;
+ usbdev->ep_out = intf->endpoint[1].bEndpointAddress;
+ usbdev->ep_in = intf->endpoint[0].bEndpointAddress;
+ usbmuxd_log(LL_INFO, "Found interface %d with swapped endpoints %02x/%02x for device %d-%d", usbdev->interface, usbdev->ep_out, usbdev->ep_in, bus, address);
+ break;
+ } else {
usbmuxd_log(LL_WARNING, "Endpoint type mismatch for interface %d of device %d-%d", intf->bInterfaceNumber, bus, address);
- continue;
}
- usbdev->interface = intf->bInterfaceNumber;
- usbdev->ep_out = intf->endpoint[0].bEndpointAddress;
- usbdev->ep_in = intf->endpoint[1].bEndpointAddress;
- usbmuxd_log(LL_INFO, "Found interface %d with endpoints %02x/%02x for device %d-%d", usbdev->interface, usbdev->ep_out, usbdev->ep_in, bus, address);
- break;
}
libusb_free_config_descriptor(config);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usbmuxd-1.0.6/daemon/usb.h new/usbmuxd-1.0.7/daemon/usb.h
--- old/usbmuxd-1.0.6/daemon/usb.h 2010-09-28 03:32:44.000000000 +0200
+++ new/usbmuxd-1.0.7/daemon/usb.h 2011-03-15 12:35:15.000000000 +0100
@@ -46,7 +46,7 @@
#define VID_APPLE 0x5ac
#define PID_RANGE_LOW 0x1290
-#define PID_RANGE_MAX 0x129f
+#define PID_RANGE_MAX 0x12af
struct usb_device;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usbmuxd-1.0.6/libusbmuxd/CMakeLists.txt new/usbmuxd-1.0.7/libusbmuxd/CMakeLists.txt
--- old/usbmuxd-1.0.6/libusbmuxd/CMakeLists.txt 2010-09-28 03:32:44.000000000 +0200
+++ new/usbmuxd-1.0.7/libusbmuxd/CMakeLists.txt 2011-03-15 12:35:15.000000000 +0100
@@ -1,6 +1,15 @@
include_directories (${CMAKE_SOURCE_DIR}/common)
find_package(Threads)
+option(WANT_INOTIFY "Build with inotify support" ON)
+if (WANT_INOTIFY)
+find_package(Inotify)
+if (INOTIFY_FOUND)
+ add_definitions("-DHAVE_INOTIFY")
+ message("-- libusbmuxd will be built with inotify support")
+endif()
+endif(WANT_INOTIFY)
+
add_library (libusbmuxd SHARED libusbmuxd.c sock_stuff.c ${CMAKE_SOURCE_DIR}/common/utils.c)
find_library (PTHREAD pthread)
@@ -24,6 +33,9 @@
if(APPLE)
set_target_properties(libusbmuxd PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
endif()
+if(WIN32)
+ set_target_properties(libusbmuxd PROPERTIES PREFIX "lib" IMPORT_PREFIX "lib")
+endif()
install(TARGETS libusbmuxd
RUNTIME DESTINATION bin
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usbmuxd-1.0.6/libusbmuxd/libusbmuxd.c new/usbmuxd-1.0.7/libusbmuxd/libusbmuxd.c
--- old/usbmuxd-1.0.6/libusbmuxd/libusbmuxd.c 2010-09-28 03:32:44.000000000 +0200
+++ new/usbmuxd-1.0.7/libusbmuxd/libusbmuxd.c 2011-03-15 12:35:15.000000000 +0100
@@ -30,13 +30,24 @@
#include
participants (1)
-
root@hilbert.suse.de