diff --git a/SPECS-EXTENDED/libimobiledevice/libimobiledevice.signatures.json b/SPECS-EXTENDED/libimobiledevice/libimobiledevice.signatures.json index e2340c63928..344dcb2c09d 100644 --- a/SPECS-EXTENDED/libimobiledevice/libimobiledevice.signatures.json +++ b/SPECS-EXTENDED/libimobiledevice/libimobiledevice.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "libimobiledevice-1.2.0.tar.bz2": "786b0de0875053bf61b5531a86ae8119e320edab724fc62fe2150cc931f11037" + "libimobiledevice-1.3.0.tar.bz2": "53f2640c6365cd9f302a6248f531822dc94a6cced3f17128d4479a77bd75b0f6" } -} +} \ No newline at end of file diff --git a/SPECS-EXTENDED/libimobiledevice/libimobiledevice.spec b/SPECS-EXTENDED/libimobiledevice/libimobiledevice.spec index 03ba6da416c..0927f7c92ba 100644 --- a/SPECS-EXTENDED/libimobiledevice/libimobiledevice.spec +++ b/SPECS-EXTENDED/libimobiledevice/libimobiledevice.spec @@ -1,20 +1,15 @@ Vendor: Microsoft Corporation Distribution: Azure Linux Name: libimobiledevice -Version: 1.2.1 +Version: 1.3.0 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 +URL: https://www.libimobiledevice.org/ +Source0: https://github.com/%{name}/%{name}/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 @@ -48,7 +43,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} Utilites for use with libimobiledevice. %prep -%autosetup -S git_am -n %{name}-1.2.0 +%autosetup -S git_am -n %{name}-%{version} # Fix dir permissions on html docs chmod +x docs/html @@ -75,7 +70,7 @@ find %{buildroot} -type f -name "*.la" -delete %{!?_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 +79,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.so %{_includedir}/libimobiledevice/ %changelog +* Wed Apr 23 2025 Kevin Lockwood - 1.3.0-1 +- Update to version 1.3.0 +- License verified + * Thu Oct 14 2021 Pawel Winogrodzki - 1.2.1-1 - Initial CBL-Mariner import from Fedora 32 (license: MIT). - Converting the 'Release' tag to the '[number].[distribution]' format. diff --git a/SPECS-EXTENDED/libimobiledevice/upgrade-fixes-1.3.0.patch b/SPECS-EXTENDED/libimobiledevice/upgrade-fixes-1.3.0.patch new file mode 100644 index 00000000000..42abf67d244 --- /dev/null +++ b/SPECS-EXTENDED/libimobiledevice/upgrade-fixes-1.3.0.patch @@ -0,0 +1,53 @@ +From 0e1a8d973c105a1bbc9d60b2e71f49268d9a8617 Mon Sep 17 00:00:00 2001 +From: Kevin Lockwood +Date: Wed, 23 Apr 2025 16:15:46 -0700 +Subject: [PATCH] Patch out plist.h redefinitions + +--- + common/utils.c | 4 ++++ + common/utils.h | 6 ++++++ + 2 files changed, 10 insertions(+) + +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..661f170 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); + ++#ifndef LIBPLIST_H + enum plist_format_t { + PLIST_FORMAT_XML, + PLIST_FORMAT_BINARY + }; ++#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.34.1 + diff --git a/cgmanifest.json b/cgmanifest.json index 29a17a1c4e7..8b09f6a937f 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -9841,8 +9841,8 @@ "type": "other", "other": { "name": "libimobiledevice", - "version": "1.2.1", - "downloadUrl": "http://www.libimobiledevice.org/downloads/libimobiledevice-1.2.0.tar.bz2" + "version": "1.3.0", + "downloadUrl": "https://github.com/libimobiledevice/libimobiledevice/releases/download/1.3.0/libimobiledevice-1.3.0.tar.bz2" } } },