diff --git a/2.0.1.tar.gz b/2.0.1.tar.gz new file mode 100644 index 0000000..d58ffec --- /dev/null +++ b/2.0.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f93faf3b3a73e283646f4d62b3421aeccf58142266b0eb22b2b13dd4b2362eb8 +size 42157 diff --git a/baselibs.conf b/baselibs.conf index 173fd26..36633cf 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1 +1 @@ -libusbmuxd4 +libusbmuxd6 diff --git a/libusbmuxd-1.0.10.tar.bz2 b/libusbmuxd-1.0.10.tar.bz2 deleted file mode 100644 index 44b820b..0000000 --- a/libusbmuxd-1.0.10.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1aa21391265d2284ac3ccb7cf278126d10d354878589905b35e8102104fec9f2 -size 292649 diff --git a/libusbmuxd-CVE-2016-5104.patch b/libusbmuxd-CVE-2016-5104.patch deleted file mode 100644 index 9465297..0000000 --- a/libusbmuxd-CVE-2016-5104.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 4397b3376dc4e4cb1c991d0aed61ce6482614196 Mon Sep 17 00:00:00 2001 -From: Joshua Hill -Date: Tue, 29 Dec 2015 23:09:37 +0100 -Subject: [PATCH] common: [security fix] Make sure sockets only listen locally - ---- - common/socket.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/common/socket.c b/common/socket.c -index 27b93ba..4cdefd6 100644 ---- a/common/socket.c -+++ b/common/socket.c -@@ -203,7 +203,7 @@ int socket_create(uint16_t port) - - memset((void *) &saddr, 0, sizeof(saddr)); - saddr.sin_family = AF_INET; -- saddr.sin_addr.s_addr = htonl(INADDR_ANY); -+ saddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK); - saddr.sin_port = htons(port); - - if (0 > bind(sfd, (struct sockaddr *) &saddr, sizeof(saddr))) { -@@ -368,7 +368,7 @@ int socket_accept(int fd, uint16_t port) - - memset(&addr, 0, sizeof(addr)); - addr.sin_family = AF_INET; -- addr.sin_addr.s_addr = htonl(INADDR_ANY); -+ addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK); - addr.sin_port = htons(port); - - addr_len = sizeof(addr); - diff --git a/libusbmuxd.changes b/libusbmuxd.changes index 5283b03..e4ab9c5 100644 --- a/libusbmuxd.changes +++ b/libusbmuxd.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Mar 12 10:38:20 UTC 2020 - Tomáš Chvátal + +- Update to 2.1.0: + - Add proper support for USB and network (WiFi sync) devices reported by usbmuxd + - Add new usbmuxd_events_subscribe/unsubscribe functions with a context so it can be used in different threads + - Add new tool 'icat' + - Lots of bug fixes and other improvements + - Rename 'icat' tool to 'inetcat' due to name conflict with sleuthkit's icat +- Remove merged patch libusbmuxd-CVE-2016-5104.patch + ------------------------------------------------------------------- Thu Jan 23 14:56:51 UTC 2020 - Cristian Rodríguez diff --git a/libusbmuxd.spec b/libusbmuxd.spec index add08f9..a8abe0c 100644 --- a/libusbmuxd.spec +++ b/libusbmuxd.spec @@ -16,24 +16,21 @@ # -%define major 4 - +%define major 6 Name: libusbmuxd -Version: 1.0.10 +Version: 2.0.1 Release: 0 Summary: A client library to multiplex connections from and to iOS devices License: LGPL-2.1-or-later AND GPL-2.0-or-later -Group: Development/Libraries/C and C++ -URL: http://cgit.sukimashita.com/libusbmuxd.git -Source: http://www.libimobiledevice.org/downloads/%{name}-%{version}.tar.bz2 +URL: https://github.com/libimobiledevice/libusbmuxd +Source: https://github.com/libimobiledevice/libusbmuxd/archive/%{version}.tar.gz Source99: baselibs.conf -# PATCH-FIX-UPSTREAM libusbmuxd-CVE-2016-5104.patch CVE-2016-5104 boo#982014 dimstar@opensuse.org - Make sure sockets only listen locally -Patch0: libusbmuxd-CVE-2016-5104.patch +BuildRequires: autoconf +BuildRequires: automake BuildRequires: gcc-c++ BuildRequires: libplist-devel >= 1.11 -BuildRequires: libusb-1_0-devel >= 1.0.3 -BuildRequires: pkg-config -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: libtool +BuildRequires: pkgconfig %description 'usbmuxd' stands for "USB multiplexing daemon". This daemon is in charge of @@ -47,7 +44,6 @@ This package contains the usbmuxd communication interface library 'libusbmuxd'. %package -n %{name}%{major} Summary: A client library to multiplex connections from and to iOS devices -Group: System/Libraries Recommends: usbmuxd %description -n %{name}%{major} @@ -62,7 +58,6 @@ This package contains the usbmuxd communication interface library 'libusbmuxd'. %package devel Summary: Development files for %{name} -Group: Development/Libraries/C and C++ Requires: %{name}%{major} = %{version} %description devel @@ -76,11 +71,12 @@ a virtual network device. The %{name}-devel package contains libraries and header files for developing applications that use %{name}. -%package -n iproxy -Summary: An example tool to forward localhost ports to iOS devices -Group: Productivity/Networking/Other +%package tools +Summary: An example tools to forward localhost ports to iOS devices +Provides: iproxy = %{version} +Obsoletes: iproxy < %{version} -%description -n iproxy +%description tools 'usbmuxd' stands for "USB multiplexing daemon". This daemon is in charge of multiplexing connections over USB to an iPhone or iPod touch. To users, it means you can sync your music, contacts, photos, etc. over USB. To developers, it @@ -96,36 +92,34 @@ notification and backup services running on the device). %prep %setup -q -%patch0 -p1 %build -export CFLAGS="%optflags -fexceptions" -%configure -make %{?_smp_mflags} V=1 +autoreconf -fvi +export CFLAGS="%{optflags} -fexceptions" +%configure \ + --disable-static +%make_build %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} - -rm %{buildroot}%{_libdir}/%{name}.*a +%make_install +find %{buildroot} -type f -name "*.la" -delete -print %post -n %{name}%{major} -p /sbin/ldconfig - %postun -n %{name}%{major} -p /sbin/ldconfig %files -n %{name}%{major} -%defattr(-,root,root) -%doc AUTHORS COPYING README +%license COPYING +%doc AUTHORS README.md %{_libdir}/libusbmuxd.so.* %files devel -%defattr(-,root,root,-) %{_includedir}/usbmuxd.h %{_includedir}/usbmuxd-proto.h %{_libdir}/%{name}.so %{_libdir}/pkgconfig/%{name}.pc -%files -n iproxy -%defattr(-,root,root) +%files tools %{_bindir}/iproxy +%{_bindir}/inetcat %changelog