From 4aa3104dabf21092ca33ef071cfd6379b78b83e1 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens04@gmail.com>
Date: Wed, 20 Nov 2019 17:03:27 -0600
Subject: [PATCH] libusbmuxd: update to 2.0.0

Change from pkg-config to pkgconf

Signed-off-by: Nathan Owens <ndowens04@gmail.com>
---
 common/shlibs                                 |  2 +-
 .../libusbmuxd/patches/CVE-2016-5104.patch    | 32 -------------------
 srcpkgs/libusbmuxd/patches/icat.patch         | 15 +++++++++
 srcpkgs/libusbmuxd/template                   | 17 ++++++----
 4 files changed, 26 insertions(+), 40 deletions(-)
 delete mode 100644 srcpkgs/libusbmuxd/patches/CVE-2016-5104.patch
 create mode 100644 srcpkgs/libusbmuxd/patches/icat.patch

diff --git a/common/shlibs b/common/shlibs
index 48505264d94..71ad28313cd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1947,7 +1947,7 @@ libfm-qt.so.6 libfm-qt-0.14.0_1
 libqtermwidget5.so.0 qtermwidget-0.6.0_1
 libnpth.so.0 npth-1.1_1
 libglfw.so.3 glfw-3.0.4_1
-libusbmuxd.so.4 libusbmuxd-1.0.10_1
+libusbmuxd.so.6 libusbmuxd-1.0.10_1
 libimobiledevice.so.6 libimobiledevice-1.2.0_1
 libstfl.so.0 stfl-0.23_1
 libCDApplet.so cairo-dock-plugins-3.4.0_1
diff --git a/srcpkgs/libusbmuxd/patches/CVE-2016-5104.patch b/srcpkgs/libusbmuxd/patches/CVE-2016-5104.patch
deleted file mode 100644
index c5c672374d5..00000000000
--- a/srcpkgs/libusbmuxd/patches/CVE-2016-5104.patch
+++ /dev/null
@@ -1,32 +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/srcpkgs/libusbmuxd/patches/icat.patch b/srcpkgs/libusbmuxd/patches/icat.patch
new file mode 100644
index 00000000000..9644ce4e261
--- /dev/null
+++ b/srcpkgs/libusbmuxd/patches/icat.patch
@@ -0,0 +1,15 @@
+diff --git tools/icat.c tools/icat.c
+index b306a47..7183461 100644
+--- tools/icat.c
++++ tools/icat.c
+@@ -38,7 +38,9 @@
+ #include <sys/ioctl.h>
+ #include <signal.h>
+ #endif
+-
++#if !(__GLIBC__)
++#include <sys/select.h>
++#endif
+ #include "usbmuxd.h"
+ #include "socket.h"
+ 
diff --git a/srcpkgs/libusbmuxd/template b/srcpkgs/libusbmuxd/template
index 9ef4e6b5d2c..66855903cf4 100644
--- a/srcpkgs/libusbmuxd/template
+++ b/srcpkgs/libusbmuxd/template
@@ -1,17 +1,20 @@
 # Template file for 'libusbmuxd'
 pkgname=libusbmuxd
-version=1.0.10
-revision=2
-patch_args="-Np1"
+version=2.0.0
+revision=1
 build_style=gnu-configure
-hostmakedepends="pkg-config"
+hostmakedepends="automake libtool pkgconf"
 makedepends="libusb-devel libplist-devel"
 short_desc="USB Multiplex Daemon library"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2,LGPL-2.1"
+license="LGPL-2.1-only"
 homepage="https://marcan.st/blog/iphonelinux/usbmuxd/"
-distfiles="http://www.libimobiledevice.org/downloads/${pkgname}-${version}.tar.bz2"
-checksum=1aa21391265d2284ac3ccb7cf278126d10d354878589905b35e8102104fec9f2
+distfiles="https://github.com/libimobiledevice/libusbmuxd/archive/${version}.tar.gz"
+checksum=ecf287b9d5fa28645a6b5ed640b6bd174134227c4fd8fde28d0678df2be0e97a
+
+pre_configure() {
+	autoreconf -fi
+}
 
 libusbmuxd-devel_package() {
 	short_desc+=" - development files"