From a7aeefc00b904a47f2685a2a0455a2dbad890384 Mon Sep 17 00:00:00 2001
From: dslm4515 <27793627+dslm4515@users.noreply.gitub.com>
Date: Sat, 24 Feb 2024 12:26:38 -0600
Subject: [PATCH] Patched usbmuxd with libplist 2.3.0 support

---
 build-scripts/usbmuxd.build                  |  5 ++-
 patches/usbmuxd-chimera/libplist-2.3.0.patch | 34 ++++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 patches/usbmuxd-chimera/libplist-2.3.0.patch

diff --git a/build-scripts/usbmuxd.build b/build-scripts/usbmuxd.build
index e7777c7..e615d9b 100644
--- a/build-scripts/usbmuxd.build
+++ b/build-scripts/usbmuxd.build
@@ -11,6 +11,9 @@
 # Recommended:  NONE
 # Optional:     NONE
 
+# Patch in support for newer libplist
+patch -Np1 -i ../patches/usbmuxd-chimera/libplist-2.3.0.patch
+
 autoreconf -fiv &&
 
 ./configure --prefix=/usr \
@@ -52,5 +55,5 @@ useradd  -c "USB Mux Daemon User" \
          -s /bin/false usbmux
 EOF
 sudo -S mv /tmp/doinst.sh install/
-sudo -S makepkg -l y -c n $PKGS/usbmuxd-1.1.1-$(uname -m)-mlfs.txz &&
+sudo -S makepkg -l y -c n $PKGS/usbmuxd-1.1.1-$PSUFFIX &&
 sudo -S rm -rf ${BUILD}/*
diff --git a/patches/usbmuxd-chimera/libplist-2.3.0.patch b/patches/usbmuxd-chimera/libplist-2.3.0.patch
new file mode 100644
index 0000000..6004066
--- /dev/null
+++ b/patches/usbmuxd-chimera/libplist-2.3.0.patch
@@ -0,0 +1,34 @@
+Patch-Source: https://github.com/archlinux/svntogit-packages/blob/72eb72074e5353b698875dcbd9edb4711c649de2/trunk/libplist-2.3.0.diff
+--
+diff --git i/src/utils.c w/src/utils.c
+index 206c684..a91faea 100644
+--- i/src/utils.c
++++ w/src/utils.c
+@@ -302,7 +302,7 @@ int plist_read_from_filename(plist_t *plist, const char *filename)
+ 	return 1;
+ }
+ 
+-int plist_write_to_filename(plist_t plist, const char *filename, enum plist_format_t format)
++int plist_write_to_filename(plist_t plist, const char *filename, plist_format_t format)
+ {
+ 	char *buffer = NULL;
+ 	uint32_t length;
+diff --git i/src/utils.h w/src/utils.h
+index b5cab3f..3e9eb41 100644
+--- i/src/utils.h
++++ w/src/utils.h
+@@ -78,13 +78,8 @@ char *string_concat(const char *str, ...);
+ int buffer_read_from_filename(const char *filename, char **buffer, uint64_t *length);
+ int buffer_write_to_filename(const char *filename, const char *buffer, uint64_t length);
+ 
+-enum plist_format_t {
+-	PLIST_FORMAT_XML,
+-	PLIST_FORMAT_BINARY
+-};
+-
+ int plist_read_from_filename(plist_t *plist, const char *filename);
+-int plist_write_to_filename(plist_t plist, const char *filename, enum plist_format_t format);
++int plist_write_to_filename(plist_t plist, const char *filename, plist_format_t format);
+ 
+ uint64_t mstime64(void);
+ void get_tick_count(struct timeval * tv);