Upgrade libusbmuxd to 2.1.0, libimobiledevice to 1.3.0, libplist to 2.7.0 and usbmuxd to 1.1.1 (#14876)

Co-authored-by: Sandeep Karambelkar <sandeep.karambelkar@gmail.com>

Author: v-aaditya

SPECS-EXTENDED/libimobiledevice/a7568f456d10f1aff61534e3216201a857865247...9b857fc42cdc4921e1e3f190c5ea907774e04758.patch

@@ -1,5 +1,5 @@
 {
  "Signatures": {
-  "libimobiledevice-1.2.0.tar.bz2": "786b0de0875053bf61b5531a86ae8119e320edab724fc62fe2150cc931f11037"
+  "libimobiledevice-1.3.0.tar.bz2": "53f2640c6365cd9f302a6248f531822dc94a6cced3f17128d4479a77bd75b0f6"
  }
 }

SPECS-EXTENDED/libimobiledevice/libimobiledevice.signatures.json

@@ -1,20 +1,15 @@
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
-Name:          libimobiledevice
-Version:       1.2.1
-Release:       1%{?dist}
-Summary:       Library for connecting to mobile devices
-
-License:       LGPLv2+
-URL:           http://www.libimobiledevice.org/
-Source0:       http://www.libimobiledevice.org/downloads/%{name}-1.2.0.tar.bz2
-# Upstream patches, generated with:
-# git format-patch --stdout  344409e1d1ad917d377b256214c5411dda82e6b0...9b857fc42cdc4921e1e3f190c5ea907774e04758
-# b5a70e9aaf538dad0aba0b800b122955e8ac494b
-# 26373b334889f5ae2e2737ff447eb25b1700fa2f
-# 97f8ac9e9ad9ee73ca635a26831bfe950a5d673b
-# were manually removed
-Patch0:        a7568f456d10f1aff61534e3216201a857865247...9b857fc42cdc4921e1e3f190c5ea907774e04758.patch
+Name:           libimobiledevice
+Version:        1.3.0
+Release:        1%{?dist}
+Summary:        Library for connecting to mobile devices
+
+License:        LGPLv2+
+URL:            http://www.libimobiledevice.org/
+Source0:        https://github.com/libimobiledevice/libimobiledevice/releases/download/%{version}/%{name}-%{version}.tar.bz2
+# Patch to fix 1.3.0 redefining enum from libplist
+Patch0:         upgrade-fixes-1.3.0.patch
 
 BuildRequires: glib2-devel
 BuildRequires: openssl-devel
@@ -30,7 +25,7 @@ BuildRequires: git-core
 BuildRequires: autoconf automake libtool
 
 %description
-libimobiledevice is a library for connecting to mobile devices including phones 
+libimobiledevice is a library for connecting to mobile devices including phones
 and music players
 
 %package devel
@@ -48,34 +43,31 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 Utilites for use with libimobiledevice.
 
 %prep
-%autosetup -S git_am -n %{name}-1.2.0
-
-# Fix dir permissions on html docs
-chmod +x docs/html
-
+%autosetup -p1 -S git_am -n %{name}-%{version}
 ACLOCAL="aclocal -I m4" autoreconf -f -i
 
 %build
 %configure --disable-static --enable-openssl --enable-dev-tools --without-cython
 # Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath
 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
+#make %{?_smp_mflags} V=1
 
 %install
-make install DESTDIR=%{buildroot}
+%make_install
+#make install DESTDIR=%{buildroot}
 
 #Remove libtool archives.
-find %{buildroot} -type f -name "*.la" -delete
+#find %{buildroot} -type f -name "*.la" -delete
 
 %ldconfig_scriptlets
 
 %files
 %{!?_licensedir:%global license %%doc}
 %license COPYING.LESSER
 %doc AUTHORS README.md
-%{_libdir}/libimobiledevice.so.6*
+%{_libdir}/libimobiledevice-1.0.so.6*
 
 %files utils
 %doc %{_datadir}/man/man1/idevice*
@@ -84,10 +76,14 @@ find %{buildroot} -type f -name "*.la" -delete
 %files devel
 %doc docs/html/
 %{_libdir}/pkgconfig/libimobiledevice-1.0.pc
-%{_libdir}/libimobiledevice.so
+%{_libdir}/libimobiledevice-1.0.*
 %{_includedir}/libimobiledevice/
 
 %changelog
+* Fri Nov 14 2025 Sandeep Karambelkar <skarambelkar@microsoft.com> - 1.3.0-1
+- Update to version 1.3.0
+- License verified
+
 * Thu Oct 14 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.2.1-1
 - Initial CBL-Mariner import from Fedora 32 (license: MIT).
 - Converting the 'Release' tag to the '[number].[distribution]' format.
@@ -317,7 +313,7 @@ find %{buildroot} -type f -name "*.la" -delete
 - New git snapshot
 
 * Mon Dec 8 2008 Peter Robinson <pbrobinson@gmail.com> 0.1.0-6.git8c3a01e
-- Fix devel dependency 
+- Fix devel dependency
 
 * Mon Dec 8 2008 Peter Robinson <pbrobinson@gmail.com> 0.1.0-5.git8c3a01e
 - Fix gnutls check for new rawhide version

SPECS-EXTENDED/libimobiledevice/libimobiledevice.spec

@@ -0,0 +1,55 @@
+From 0e1a8d973c105a1bbc9d60b2e71f49268d9a8617 Mon Sep 17 00:00:00 2001
+From: Sandeep Karambelkar <skarambelkar@microsoft.com>
+Date: Fri, 14 Nov 2025 14:49:32
+Subject: [PATCH] Patch out plist.h redefinitions
+
+---
+ common/utils.c |  4 ++++
+ common/utils.h | 10 ++++++++--
+ 2 files changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/common/utils.c b/common/utils.c
+index 7f66ec2..e06debf 100644
+--- a/common/utils.c
++++ b/common/utils.c
+@@ -314,7 +314,11 @@ int plist_read_from_filename(plist_t *plist, const char *filename)
+ 	return 1;
+ }
+
++#ifndef LIBPLIST_H
+ int plist_write_to_filename(plist_t plist, const char *filename, enum plist_format_t format)
++#else
++int plist_write_to_filename(plist_t plist, const char *filename, plist_format_t format)
++#endif
+ {
+ 	char *buffer = NULL;
+ 	uint32_t length;
+diff --git a/common/utils.h b/common/utils.h
+index 2c3acec..dc5b8a3 100644
+--- a/common/utils.h
++++ b/common/utils.h
+@@ -51,13 +51,19 @@ char *generate_uuid(void);
+ void buffer_read_from_filename(const char *filename, char **buffer, uint64_t *length);
+ void buffer_write_to_filename(const char *filename, const char *buffer, uint64_t length);
+
+-enum plist_format_t {
++#ifndef LIBPLIST_H
++typedef enum plist_format_t {
+ 	PLIST_FORMAT_XML,
+ 	PLIST_FORMAT_BINARY
+-};
++} plist_format_t;
++#endif
+
+ int plist_read_from_filename(plist_t *plist, const char *filename);
++#ifndef LIBPLIST_H
+ int plist_write_to_filename(plist_t plist, const char *filename, enum plist_format_t format);
++#else
++int plist_write_to_filename(plist_t plist, const char *filename, plist_format_t format);
++#endif
+
+ void plist_print_to_stream(plist_t plist, FILE* stream);
+ 
+-- 
+2.45.4
+

SPECS-EXTENDED/libimobiledevice/upgrade-fixes-1.3.0.patch

@@ -1,5 +1,5 @@
 {
  "Signatures": {
-  "libplist-2.6.0.tar.bz2": "67be9ee3169366589c92dc7c22809b90f51911dd9de22520c39c9a64fb047c9c"
+  "libplist-2.7.0.tar.bz2": "7ac42301e896b1ebe3c654634780c82baa7cb70df8554e683ff89f7c2643eb8b"
  }
-}
+}

SPECS-EXTENDED/libplist/libplist.signatures.json

@@ -3,7 +3,7 @@ Distribution:   Azure Linux
 %{!?python3_sitearch: %global python_sitearch %(%{__python3} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 
 Name:     libplist
-Version:  2.6.0
+Version:  2.7.0
 Release:  1%{?dist}
 Summary:  Library for manipulating Apple Binary and XML Property Lists
 
@@ -62,6 +62,8 @@ export PYTHON='%{_bindir}/python3'
 
 %install
 %make_install
+cd %{buildroot}%{_libdir}/pkgconfig/
+ln -s libplist-2.0.pc libplist.pc
 
 find $RPM_BUILD_ROOT -type f -name "*.la" -delete
 
@@ -83,6 +85,8 @@ make check
 %{_libdir}/libplist++-2.0.so.4*
 
 %files devel
+# This is required for some old package reference
+%{_libdir}/pkgconfig/libplist.pc
 %{_libdir}/pkgconfig/libplist-2.0.pc
 %{_libdir}/pkgconfig/libplist++-2.0.pc
 %{_libdir}/libplist-2.0.so
@@ -93,6 +97,10 @@ make check
 %{python3_sitearch}/plist*
 
 %changelog
+* Fri Nov 14 2025 Sandeep Karambelkar <skarambelkar@microsoft.com> - 2.7.0-1
+- Update to version 2.7.0
+- License verified
+
 * Tue Oct 29 2024 Kevin Lockwood <v-klockwood@microsoft.com> - 2.6.0-1
 - Update to 2.6.0
 - License verified.

SPECS-EXTENDED/libplist/libplist.spec

@@ -1,5 +1,5 @@
 {
  "Signatures": {
-  "libusbmuxd-2.0.0.tar.gz": "ecf287b9d5fa28645a6b5ed640b6bd174134227c4fd8fde28d0678df2be0e97a"
+  "libusbmuxd-2.1.0.tar.bz2": "c35bf68f8e248434957bd5b234c389b02206a06ecd9303a7fb931ed7a5636b16"
  }
 }

SPECS-EXTENDED/libusbmuxd/libusbmuxd.signatures.json

@@ -1,17 +1,18 @@
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
 Name:          libusbmuxd
-Version:       2.0.0
-Release:       3%{?dist}
+Version:       2.1.0
+Release:       1%{?dist}
 Summary:       Client library USB multiplex daemon for Apple's iOS devices
 
-License:       LGPLv2+
+License:       LGPL-2.1-or-later
 URL:           http://www.libimobiledevice.org/
-Source0:       https://github.com/libimobiledevice/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source:        https://github.com/libimobiledevice/%{name}/releases/download/%{version}/%{name}-%{version}.tar.bz2
 
 BuildRequires:  gcc
 BuildRequires:  libplist-devel >= 2.1.0
 BuildRequires:  autoconf automake libtool
+BuildRequires:  libimobiledevice-glue-devel
 
 %description
 libusbmuxd is the client library used for communicating with Apple's iPod Touch,
@@ -35,9 +36,7 @@ Obsoletes: usbmuxd-devel < 1.0.9
 Files for development with %{name}.
 
 %prep
-%setup -q
-
-NOCONFIGURE=1 ./autogen.sh
+%autosetup -p1
 
 %build
 %configure --disable-static
@@ -62,18 +61,24 @@ make check
 %{!?_licensedir:%global license %%doc}
 %license COPYING
 %doc README.md AUTHORS
-%{_libdir}/libusbmuxd.so.*
+%{_libdir}/libusbmuxd-2.0.so.*
 
 %files utils
 %{_bindir}/iproxy
-%{_bindir}/icat
+%{_bindir}/inetcat
+%doc %{_mandir}/man1/inetcat.1.gz
+%doc %{_mandir}/man1/iproxy.1.gz
 
 %files devel
 %{_includedir}/usbmuxd*
-%{_libdir}/pkgconfig/libusbmuxd.pc
-%{_libdir}/libusbmuxd.so
+%{_libdir}/pkgconfig/libusbmuxd-2.0.pc
+%{_libdir}/libusbmuxd-2.0.so
 
 %changelog
+* Wed Oct 15 2025 Aditya Singh <v-aditysing@microsoft.com> - 2.1.0-1
+- Upgrade to 2.1.0
+- License verified
+
 * Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 2.0.0-3
 - Initial CBL-Mariner import from Fedora 32 (license: MIT).