From 08394a6b4d5676ba9e1dc5a28267b84ba53ae622 Mon Sep 17 00:00:00 2001 From: CvH Date: Sun, 1 Nov 2020 19:37:08 +0100 Subject: [PATCH] usbmuxd: update to 1.1.1 --- packages/addons/service/usbmuxd/changelog.txt | 8 +- packages/addons/service/usbmuxd/package.mk | 8 +- ...muxd-0001-remove-duplicate-functions.patch | 75 ++++++++++++------- 3 files changed, 60 insertions(+), 31 deletions(-) diff --git a/packages/addons/service/usbmuxd/changelog.txt b/packages/addons/service/usbmuxd/changelog.txt index 747949c2d5..c6817bfb7b 100644 --- a/packages/addons/service/usbmuxd/changelog.txt +++ b/packages/addons/service/usbmuxd/changelog.txt @@ -1,2 +1,8 @@ -8.1.100 +102 +- updated libimobiledevice to 1.3.0 +- updated libusb to 1.0.23 +- updated libusbmuxd to 2.0.2 +- updated usbmuxd to 1.1.1 + +100 - initial release diff --git a/packages/addons/service/usbmuxd/package.mk b/packages/addons/service/usbmuxd/package.mk index a7362246ce..b29fcfe54b 100644 --- a/packages/addons/service/usbmuxd/package.mk +++ b/packages/addons/service/usbmuxd/package.mk @@ -2,13 +2,13 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="usbmuxd" -PKG_VERSION="1.1.0" -PKG_SHA256="3e8948b4fe4250ee5c4bd41ccd1b83c09b8a6f5518a7d131a66fd38bd461b42d" -PKG_REV="101" +PKG_VERSION="1.1.1" +PKG_SHA256="c0ec9700172bf635ccb5bed98daae607d2925c2bc3597f25706ecd9dfbfd2d9e" +PKG_REV="102" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.libimobiledevice.org" -PKG_URL="http://www.libimobiledevice.org/downloads/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="https://github.com/libimobiledevice/usbmuxd/releases/download/${PKG_VERSION}/usbmuxd-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain libusb libimobiledevice" PKG_SECTION="service" PKG_SHORTDESC="USB Multiplex Daemon" diff --git a/packages/addons/service/usbmuxd/patches/usbmuxd-0001-remove-duplicate-functions.patch b/packages/addons/service/usbmuxd/patches/usbmuxd-0001-remove-duplicate-functions.patch index b9bd887cc4..1187b9fe76 100644 --- a/packages/addons/service/usbmuxd/patches/usbmuxd-0001-remove-duplicate-functions.patch +++ b/packages/addons/service/usbmuxd/patches/usbmuxd-0001-remove-duplicate-functions.patch @@ -1,10 +1,12 @@ -diff -Naur a/src/utils.c b/src/utils.c ---- a/src/utils.c 2014-10-16 04:23:27.000000000 -0700 -+++ b/src/utils.c 2015-11-12 14:41:05.656507596 -0800 -@@ -156,149 +156,6 @@ +diff --git a/src/utils.c b/src/utils.c +index 206c684..2ce59ff 100644 +--- a/src/utils.c ++++ b/src/utils.c +@@ -160,170 +160,6 @@ char *stpcpy(char * s1, const char * s2) + } #endif - /** +-/** - * Concatenate strings into a newly allocated string - * - * @note: Specify NULL for the last string in the varargs list @@ -59,7 +61,7 @@ diff -Naur a/src/utils.c b/src/utils.c - return result; -} - --void buffer_read_from_filename(const char *filename, char **buffer, uint64_t *length) +-int buffer_read_from_filename(const char *filename, char **buffer, uint64_t *length) -{ - FILE *f; - uint64_t size; @@ -68,7 +70,7 @@ diff -Naur a/src/utils.c b/src/utils.c - - f = fopen(filename, "rb"); - if (!f) { -- return; +- return 0; - } - - fseek(f, 0, SEEK_END); @@ -77,26 +79,49 @@ diff -Naur a/src/utils.c b/src/utils.c - - if (size == 0) { - fclose(f); -- return; +- return 0; - } - - *buffer = (char*)malloc(sizeof(char)*(size+1)); +- +- if (!buffer) { +- return 0; +- } +- +- int ret = 1; - if (fread(*buffer, sizeof(char), size, f) != size) { - usbmuxd_log(LL_ERROR, "%s: ERROR: couldn't read %d bytes from %s", __func__, (int)size, filename); +- free(*buffer); +- ret = 0; +- errno = EIO; - } - fclose(f); - - *length = size; +- return ret; -} - --void buffer_write_to_filename(const char *filename, const char *buffer, uint64_t length) +-int buffer_write_to_filename(const char *filename, const char *buffer, uint64_t length) -{ - FILE *f; - - f = fopen(filename, "wb"); - if (f) { -- fwrite(buffer, sizeof(char), length, f); +- size_t written = fwrite(buffer, sizeof(char), length, f); - fclose(f); +- +- if (written == length) { +- return 1; +- } +- else { +- // Not all data could be written. +- errno = EIO; +- return 0; +- } +- } +- else { +- // Failed to open the file, let the caller know. +- return 0; - } -} - @@ -108,9 +133,7 @@ diff -Naur a/src/utils.c b/src/utils.c - if (!filename) - return 0; - -- buffer_read_from_filename(filename, &buffer, &length); -- -- if (!buffer) { +- if (!buffer_read_from_filename(filename, &buffer, &length)) { - return 0; - } - @@ -140,20 +163,20 @@ diff -Naur a/src/utils.c b/src/utils.c - else - return 0; - -- buffer_write_to_filename(filename, buffer, length); +- int res = buffer_write_to_filename(filename, buffer, length); - - free(buffer); - -- return 1; +- return res; -} - --/** - * Get number of milliseconds since the epoch. - */ - uint64_t mstime64(void) -diff -Naur a/src/utils.h b/src/utils.h ---- a/src/utils.h 2014-10-16 04:29:50.000000000 -0700 -+++ b/src/utils.h 2015-11-12 14:40:41.990644890 -0800 + #ifndef HAVE_CLOCK_GETTIME + typedef int clockid_t; + #define CLOCK_MONOTONIC 1 +diff --git a/src/utils.h b/src/utils.h +index b5cab3f..f862271 100644 +--- a/src/utils.h ++++ b/src/utils.h @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -163,14 +186,14 @@ diff -Naur a/src/utils.h b/src/utils.h #ifndef UTILS_H #define UTILS_H -@@ -73,18 +75,6 @@ +@@ -73,18 +75,6 @@ void collection_copy(struct collection *dest, struct collection *src); #ifndef HAVE_STPCPY char *stpcpy(char * s1, const char * s2); #endif -char *string_concat(const char *str, ...); - --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); +-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, @@ -181,4 +204,4 @@ diff -Naur a/src/utils.h b/src/utils.h -int plist_write_to_filename(plist_t plist, const char *filename, enum plist_format_t format); uint64_t mstime64(void); - + void get_tick_count(struct timeval * tv);