From 0c3a98f196459741a2f8f7c3dd9b64cf68060cec Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Mon, 25 Nov 2019 12:03:14 +0100
Subject: [PATCH] + libusbmuxd-2.0.0-1 Update to 2.0.0

---
 .gitignore          |  1 +
 CVE-2016-5104.patch | 31 -------------------------------
 libusbmuxd.spec     | 22 ++++++++++++++--------
 sources             |  2 +-
 4 files changed, 16 insertions(+), 40 deletions(-)
 delete mode 100644 CVE-2016-5104.patch

diff --git a/.gitignore b/.gitignore
index 42c4951..963a14c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /libusbmuxd-1.0.9.tar.bz2
 /libusbmuxd-1.0.10.tar.bz2
+/2.0.0.tar.gz
diff --git a/CVE-2016-5104.patch b/CVE-2016-5104.patch
deleted file mode 100644
index 8de02d8..0000000
--- a/CVE-2016-5104.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 4397b3376dc4e4cb1c991d0aed61ce6482614196 Mon Sep 17 00:00:00 2001
-From: Joshua Hill <posixninja@gmail.com>
-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.spec b/libusbmuxd.spec
index 76bddf3..a411cca 100644
--- a/libusbmuxd.spec
+++ b/libusbmuxd.spec
@@ -1,15 +1,15 @@
 Name:          libusbmuxd
-Version:       1.0.10
-Release:       12%{?dist}
+Version:       2.0.0
+Release:       1%{?dist}
 Summary:       Client library USB multiplex daemon for Apple's iOS devices
 
 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:  gcc
-BuildRequires: libplist-devel >= 1.11
+BuildRequires:  libplist-devel >= 2.1.0
+BuildRequires:  autoconf automake libtool
 
 %description
 libusbmuxd is the client library used for communicating with Apple's iPod Touch,
@@ -34,7 +34,8 @@ Files for development with %{name}.
 
 %prep
 %setup -q
-%patch0 -p1 -b .soc
+
+NOCONFIGURE=1 ./autogen.sh
 
 %build
 %configure --disable-static
@@ -58,11 +59,12 @@ make check
 %files
 %{!?_licensedir:%global license %%doc}
 %license COPYING
-%doc README AUTHORS
-%{_libdir}/libusbmuxd.so.4*
+%doc README.md AUTHORS
+%{_libdir}/libusbmuxd.so.*
 
 %files utils
 %{_bindir}/iproxy
+%{_bindir}/icat
 
 %files devel
 %{_includedir}/usbmuxd*
@@ -70,6 +72,10 @@ make check
 %{_libdir}/libusbmuxd.so
 
 %changelog
+* Sat Nov 23 2019 Bastien Nocera <bnocera@redhat.com> - 2.0.0-1
++ libusbmuxd-2.0.0-1
+- Update to 2.0.0
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.10-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
diff --git a/sources b/sources
index 19f8922..05da477 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e5351ff6f6eedcb50701e02d91cc480c  libusbmuxd-1.0.10.tar.bz2
+SHA512 (2.0.0.tar.gz) = 5e071210b548eac18c1356e41d5a71f961acdc5546cf6857884f218ade69d9700149133af68ead2ee23b2751a594d2d2d7d98048b3ecc29549a81a9aa3bafb80