-
Notifications
You must be signed in to change notification settings - Fork 6.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[libplist/libusbmuxd/libimobiledevice/libideviceactivation/usbmuxd] U…
…pdate version (#13811) Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
- Loading branch information
1 parent
46a2a00
commit 334aec6
Showing
19 changed files
with
253 additions
and
50 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| Source: libgpod | ||
| Version: 2019-08-29 | ||
| Port-Version: 1 | ||
| Port-Version: 2 | ||
| Homepage: https://github.com/fadingred/libgpod | ||
| Description: libgpod is a library meant to abstract access to an iPod content. | ||
| Build-Depends: glib, libplist, sqlite3 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| Source: libideviceactivation | ||
| Version: 1.2.137 | ||
| Version: 1.2.235 | ||
| Description: A library to handle the activation process of iOS devices | ||
| Build-Depends: libimobiledevice, libxml2, curl, libplist | ||
| Build-Depends: libimobiledevice, libxml2, curl, libplist |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| Source: libimobiledevice | ||
| Version: 1.2.185 | ||
| Version: 1.3.6 | ||
| Homepage: http://www.libimobiledevice.org | ||
| Description: A cross-platform protocol library to communicate with iOS devices | ||
| Build-Depends: libplist, libusbmuxd, openssl, dirent, getopt |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,112 @@ | ||
| From dd35fb7fcad54c5ba465bf252e22a82c721fd825 Mon Sep 17 00:00:00 2001 | ||
| From: Billy Robert O'Neal III <bion@microsoft.com> | ||
| Date: Mon, 19 Oct 2020 18:22:47 -0700 | ||
| Subject: [PATCH] Add dllexports missing from connection_proxy.h functions. | ||
|
|
||
| --- | ||
| include/libimobiledevice/companion_proxy.h | 22 +++++++++++----------- | ||
| 1 file changed, 11 insertions(+), 11 deletions(-) | ||
|
|
||
| diff --git a/include/libimobiledevice/companion_proxy.h b/include/libimobiledevice/companion_proxy.h | ||
| index 19c88ebb..29b8e96d 100644 | ||
| --- a/include/libimobiledevice/companion_proxy.h | ||
| +++ b/include/libimobiledevice/companion_proxy.h | ||
| @@ -65,7 +65,7 @@ typedef void (*companion_proxy_device_event_cb_t) (plist_t event, void* userdata | ||
| * @return COMPANION_PROXY_E_SUCCESS on success, COMPANION_PROXY_E_INVALID_ARG when | ||
| * the arguments are invalid, or an COMPANION_PROXY_E_* error code otherwise. | ||
| */ | ||
| -companion_proxy_error_t companion_proxy_client_new(idevice_t device, lockdownd_service_descriptor_t service, companion_proxy_client_t* client); | ||
| +LIBIMOBILEDEVICE_API_MSC companion_proxy_error_t companion_proxy_client_new(idevice_t device, lockdownd_service_descriptor_t service, companion_proxy_client_t* client); | ||
|
|
||
| /** | ||
| * Starts a new companion_proxy service on the specified device and connects to it. | ||
| @@ -80,7 +80,7 @@ companion_proxy_error_t companion_proxy_client_new(idevice_t device, lockdownd_s | ||
| * @return COMPANION_PROXY_E_SUCCESS on success, or an COMPANION_PROXY_E_* error | ||
| * code otherwise. | ||
| */ | ||
| -companion_proxy_error_t companion_proxy_client_start_service(idevice_t device, companion_proxy_client_t* client, const char* label); | ||
| +LIBIMOBILEDEVICE_API_MSC companion_proxy_error_t companion_proxy_client_start_service(idevice_t device, companion_proxy_client_t* client, const char* label); | ||
|
|
||
| /** | ||
| * Disconnects a companion_proxy client from the device and frees up the | ||
| @@ -91,7 +91,7 @@ companion_proxy_error_t companion_proxy_client_start_service(idevice_t device, c | ||
| * @return COMPANION_PROXY_E_SUCCESS on success, COMPANION_PROXY_E_INVALID_ARG when | ||
| * client is NULL, or an COMPANION_PROXY_E_* error code otherwise. | ||
| */ | ||
| -companion_proxy_error_t companion_proxy_client_free(companion_proxy_client_t client); | ||
| +LIBIMOBILEDEVICE_API_MSC companion_proxy_error_t companion_proxy_client_free(companion_proxy_client_t client); | ||
|
|
||
| /** | ||
| * Sends a plist to the service. | ||
| @@ -102,7 +102,7 @@ companion_proxy_error_t companion_proxy_client_free(companion_proxy_client_t cli | ||
| * @return COMPANION_PROXY_E_SUCCESS on success, | ||
| * COMPANION_PROXY_E_INVALID_ARG when client or plist is NULL | ||
| */ | ||
| -companion_proxy_error_t companion_proxy_send(companion_proxy_client_t client, plist_t plist); | ||
| +LIBIMOBILEDEVICE_API_MSC companion_proxy_error_t companion_proxy_send(companion_proxy_client_t client, plist_t plist); | ||
|
|
||
| /** | ||
| * Receives a plist from the service. | ||
| @@ -113,7 +113,7 @@ companion_proxy_error_t companion_proxy_send(companion_proxy_client_t client, pl | ||
| * @return COMPANION_PROXY_E_SUCCESS on success, | ||
| * COMPANION_PROXY_E_INVALID_ARG when client or plist is NULL | ||
| */ | ||
| -companion_proxy_error_t companion_proxy_receive(companion_proxy_client_t client, plist_t * plist); | ||
| +LIBIMOBILEDEVICE_API_MSC companion_proxy_error_t companion_proxy_receive(companion_proxy_client_t client, plist_t * plist); | ||
|
|
||
| /** | ||
| * Retrieves a list of paired devices. | ||
| @@ -127,7 +127,7 @@ companion_proxy_error_t companion_proxy_receive(companion_proxy_client_t client, | ||
| * COMPANION_PROXY_E_NO_DEVICES if no devices are paired, | ||
| * or a COMPANION_PROXY_E_* error code otherwise. | ||
| */ | ||
| -companion_proxy_error_t companion_proxy_get_device_registry(companion_proxy_client_t client, plist_t* paired_devices); | ||
| +LIBIMOBILEDEVICE_API_MSC companion_proxy_error_t companion_proxy_get_device_registry(companion_proxy_client_t client, plist_t* paired_devices); | ||
|
|
||
| /** | ||
| * Starts listening for paired devices. | ||
| @@ -143,7 +143,7 @@ companion_proxy_error_t companion_proxy_get_device_registry(companion_proxy_clie | ||
| * @return COMPANION_PROXY_E_SUCCESS on success, | ||
| * or a COMPANION_PROXY_E_* error code otherwise. | ||
| */ | ||
| -companion_proxy_error_t companion_proxy_start_listening_for_devices(companion_proxy_client_t client, companion_proxy_device_event_cb_t callback, void* userdata); | ||
| +LIBIMOBILEDEVICE_API_MSC companion_proxy_error_t companion_proxy_start_listening_for_devices(companion_proxy_client_t client, companion_proxy_device_event_cb_t callback, void* userdata); | ||
|
|
||
| /** | ||
| * Stops listening for paired devices | ||
| @@ -153,7 +153,7 @@ companion_proxy_error_t companion_proxy_start_listening_for_devices(companion_pr | ||
| * @return COMPANION_PROXY_E_SUCCESS on success, | ||
| * or a COMPANION_PROXY_E_* error code otherwise. | ||
| */ | ||
| -companion_proxy_error_t companion_proxy_stop_listening_for_devices(companion_proxy_client_t client); | ||
| +LIBIMOBILEDEVICE_API_MSC companion_proxy_error_t companion_proxy_stop_listening_for_devices(companion_proxy_client_t client); | ||
|
|
||
| /** | ||
| * Returns a value for the given key. | ||
| @@ -169,7 +169,7 @@ companion_proxy_error_t companion_proxy_stop_listening_for_devices(companion_pro | ||
| * COMPANION_PROXY_E_UNSUPPORTED_KEY if the companion device doesn't support the given key, | ||
| * or a COMPANION_PROXY_E_* error code otherwise. | ||
| */ | ||
| -companion_proxy_error_t companion_proxy_get_value_from_registry(companion_proxy_client_t client, const char* companion_udid, const char* key, plist_t* value); | ||
| +LIBIMOBILEDEVICE_API_MSC companion_proxy_error_t companion_proxy_get_value_from_registry(companion_proxy_client_t client, const char* companion_udid, const char* key, plist_t* value); | ||
|
|
||
| /** | ||
| * Start forwarding a service port on the companion device to a port on the idevice. | ||
| @@ -186,7 +186,7 @@ companion_proxy_error_t companion_proxy_get_value_from_registry(companion_proxy_ | ||
| * @return COMPANION_PROXY_E_SUCCESS on success, | ||
| * or a COMPANION_PROXY_E_* error code otherwise. | ||
| */ | ||
| -companion_proxy_error_t companion_proxy_start_forwarding_service_port(companion_proxy_client_t client, uint16_t remote_port, const char* service_name, uint16_t* forward_port, plist_t options); | ||
| +LIBIMOBILEDEVICE_API_MSC companion_proxy_error_t companion_proxy_start_forwarding_service_port(companion_proxy_client_t client, uint16_t remote_port, const char* service_name, uint16_t* forward_port, plist_t options); | ||
|
|
||
| /** | ||
| * Stop forwarding a service port between companion device and idevice. | ||
| @@ -199,7 +199,7 @@ companion_proxy_error_t companion_proxy_start_forwarding_service_port(companion_ | ||
| * @return COMPANION_PROXY_E_SUCCESS on success, | ||
| * or a COMPANION_PROXY_E_* error code otherwise. | ||
| */ | ||
| -companion_proxy_error_t companion_proxy_stop_forwarding_service_port(companion_proxy_client_t client, uint16_t remote_port); | ||
| +LIBIMOBILEDEVICE_API_MSC companion_proxy_error_t companion_proxy_stop_forwarding_service_port(companion_proxy_client_t client, uint16_t remote_port); | ||
|
|
||
| #ifdef __cplusplus | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,33 +1,75 @@ | ||
| cmake_minimum_required(VERSION 3.8) | ||
| project(plist C) | ||
| project(plist C CXX) | ||
|
|
||
| file(GLOB_RECURSE PLIST_HEADER include/plist/*.h) | ||
| file(GLOB_RECURSE PLIST_SRC src/*.c) | ||
|
|
||
| set(PLIST_SRC | ||
| src/base64.c | ||
| src/bytearray.c | ||
| src/hashtable.c | ||
| src/ptrarray.c | ||
| src/time64.c | ||
| src/xplist.c | ||
| src/bplist.c | ||
| src/plist.c | ||
| ) | ||
|
|
||
| set(PLISTPP_SRC | ||
| src/Node.cpp | ||
| src/Structure.cpp | ||
| src/Array.cpp | ||
| src/Boolean.cpp | ||
| src/Data.cpp | ||
| src/Date.cpp | ||
| src/Dictionary.cpp | ||
| src/Integer.cpp | ||
| src/Key.cpp | ||
| src/Real.cpp | ||
| src/String.cpp | ||
| src/Uid.cpp | ||
| ) | ||
|
|
||
| file(GLOB_RECURSE LIBCNARY_HEADER libcnary/include/*.h) | ||
| file(GLOB_RECURSE LIBCNARY_SRC libcnary/*c) | ||
|
|
||
| add_library(plist ${PLIST_SRC} ${PLIST_HEADER} ${LIBCNARY_SRC} ${LIBCNARY_HEADER}) | ||
| target_include_directories(plist PRIVATE src include libcnary/include) | ||
| set_target_properties(plist PROPERTIES OUTPUT_NAME plist-2.0) | ||
|
|
||
| add_library(plist++ STATIC ${PLISTPP_SRC} ${PLIST_HEADER} ${LIBCNARY_SRC} ${LIBCNARY_HEADER}) | ||
| set_target_properties(plist++ PROPERTIES OUTPUT_NAME plist++-2.0) | ||
| target_include_directories(plist++ PRIVATE src include libcnary/include) | ||
|
|
||
| if(WIN32) | ||
| if(WIN32 AND BUILD_SHARED_LIBS) | ||
| target_compile_options(plist PRIVATE -W3 -WX- -sdl-) | ||
| target_compile_definitions(plist PRIVATE -DLIBPLIST_EXPORTS) | ||
| target_compile_options(plist++ PRIVATE -W3 -WX- -sdl-) | ||
| target_compile_definitions(plist++ PRIVATE -DLIBPLIST_EXPORTS) | ||
| endif() | ||
| target_link_libraries(plist++ PRIVATE plist) | ||
|
|
||
| install( | ||
| TARGETS plist | ||
| TARGETS plist plist++ | ||
| RUNTIME DESTINATION bin | ||
| ARCHIVE DESTINATION lib | ||
| LIBRARY DESTINATION lib | ||
| ) | ||
|
|
||
| set(PACKAGE_NAME libplist) | ||
| set(PACKAGE_VERSION 2.0) | ||
| set(prefix ${CMAKE_INSTALL_PREFIX}) | ||
| set(exec_prefix \${prefix}) | ||
| set(libdir \${prefix}/lib) | ||
| set(includedir \${prefix}/../include) | ||
| foreach (PLIST_PKGCONFIG libplist-2.0.pc libplist++-2.0.pc) | ||
| configure_file( | ||
| ${CMAKE_CURRENT_SOURCE_DIR}/src/libplist.pc.in | ||
| ${CMAKE_CURRENT_BINARY_DIR}/libplist.pc | ||
| ${CMAKE_CURRENT_SOURCE_DIR}/src/${PLIST_PKGCONFIG}.in | ||
| ${CMAKE_CURRENT_BINARY_DIR}/${PLIST_PKGCONFIG} | ||
| @ONLY | ||
| ) | ||
| install( | ||
| FILES ${CMAKE_CURRENT_BINARY_DIR}/libplist.pc | ||
| FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLIST_PKGCONFIG} | ||
| DESTINATION lib/pkgconfig) | ||
| endforeach() | ||
|
|
||
| install(FILES ${PLIST_HEADER} DESTINATION include/plist) | ||
| install(FILES ${PLIST_HEADER} DESTINATION include/plist) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| Source: libplist | ||
| Version: 1.2.185 | ||
| Version: 1.3.6 | ||
| Description: A library to handle Apple Property List format in binary or XML |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| Source: libusbmuxd | ||
| Version: 1.2.185-1 | ||
| Version: 1.2.219 | ||
| Description: A client library to multiplex connections from and to iOS devices | ||
| Build-Depends: libplist | ||
| Supports: !(uwp|linux|osx) |
Oops, something went wrong.