diff --git a/2.0.2.tar.gz b/2.0.2.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..27ffa4b59434642b1efb0c6f88996d13f7186e39 Binary files /dev/null and b/2.0.2.tar.gz differ diff --git a/CVE-2016-5104.patch b/CVE-2016-5104.patch deleted file mode 100644 index 8de02d87a4da6c4cd9981d95c5f560c2cb9df816..0000000000000000000000000000000000000000 --- a/CVE-2016-5104.patch +++ /dev/null @@ -1,31 +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-1.0.10.tar.bz2 b/libusbmuxd-1.0.10.tar.bz2 deleted file mode 100644 index a3e04e9b27ee53e2cce0856d9f22150fd8dbe186..0000000000000000000000000000000000000000 Binary files a/libusbmuxd-1.0.10.tar.bz2 and /dev/null differ diff --git a/libusbmuxd.spec b/libusbmuxd.spec index 33f458afec004ee99af196e78a18915085c8ba44..4e7700f5099ec5b87b58f76c99a43692d36ae5f4 100644 --- a/libusbmuxd.spec +++ b/libusbmuxd.spec @@ -1,15 +1,16 @@ Name: libusbmuxd -Version: 1.0.10 -Release: 9%{?dist} +Version: 2.0.2 +Release: 5%{?dist} Summary: Client library USB multiplex daemon for Apple's iOS devices -Group: System Environment/Libraries License: LGPLv2+ URL: http://www.libimobiledevice.org/ -Source0: http://www.libimobiledevice.org/downloads/%{name}-%{version}.tar.bz2 -Patch0: CVE-2016-5104.patch +Source0: https://github.com/libimobiledevice/%{name}/archive/%{version}.tar.gz -BuildRequires: libplist-devel >= 1.11 +BuildRequires: gcc +BuildRequires: libplist-devel >= 2.2.0 +BuildRequires: autoconf automake libtool +BuildRequires: make %description libusbmuxd is the client library used for communicating with Apple's iPod Touch, @@ -18,7 +19,6 @@ to be accessed simultaneously. %package utils Summary: Utilities for communicating with Apple's iOS devices -Group: Applications/System License: GPLv2+ Requires: %{name}%{?_isa} = %{version}-%{release} @@ -27,7 +27,6 @@ Utilities for Apple's iOS devices %package devel Summary: Development package for %{name} -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Obsoletes: usbmuxd-devel < 1.0.9 @@ -36,7 +35,8 @@ Files for development with %{name}. %prep %setup -q -%patch0 -p1 -b .soc + +NOCONFIGURE=1 ./autogen.sh %build %configure --disable-static @@ -44,10 +44,10 @@ Files for development with %{name}. sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -make %{?_smp_mflags} V=1 +%make_build %install -make install DESTDIR=%{buildroot} INSTALL='install -p' +%make_install #Remove libtool archives. find %{buildroot} -type f -name "*.la" -delete @@ -55,25 +55,58 @@ find %{buildroot} -type f -name "*.la" -delete %check make check -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files %{!?_licensedir:%global license %%doc} %license COPYING -%doc README AUTHORS -%{_libdir}/libusbmuxd.so.4* +%doc README.md AUTHORS +%{_libdir}/libusbmuxd-2.0.so.* %files utils %{_bindir}/iproxy +%{_bindir}/inetcat +%{_mandir}/man1/* %files devel %{_includedir}/usbmuxd* -%{_libdir}/pkgconfig/libusbmuxd.pc -%{_libdir}/libusbmuxd.so +%{_libdir}/pkgconfig/libusbmuxd-2.0.pc +%{_libdir}/libusbmuxd-2.0.so %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 2.0.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 2.0.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 2.0.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 13 2020 Tom Stellard - 2.0.2-2 +- Use make macros +- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro + +* Tue Jun 16 2020 Bastien Nocera - 2.0.2-1 ++ libusbmuxd-2.0.2-1 +- Update to 2.0.2 + +* Wed Jan 29 2020 Fedora Release Engineering - 2.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Nov 23 2019 Bastien Nocera - 2.0.0-1 ++ libusbmuxd-2.0.0-1 +- Update to 2.0.0 + +* Thu Jul 25 2019 Fedora Release Engineering - 1.0.10-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 1.0.10-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 1.0.10-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 1.0.10-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild