mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-08-02 07:27:49 +00:00
Merge pull request #4636 from CvH/10.0/usbmuxd
usbmuxd updated to 1.1.1
This commit is contained in:
commit
c4e3295ae9
@ -2,11 +2,11 @@
|
||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="libimobiledevice"
|
||||
PKG_VERSION="1.2.0"
|
||||
PKG_SHA256="786b0de0875053bf61b5531a86ae8119e320edab724fc62fe2150cc931f11037"
|
||||
PKG_VERSION="1.3.0"
|
||||
PKG_SHA256="53f2640c6365cd9f302a6248f531822dc94a6cced3f17128d4479a77bd75b0f6"
|
||||
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/libimobiledevice/releases/download/${PKG_VERSION}/libimobiledevice-${PKG_VERSION}.tar.bz2"
|
||||
PKG_DEPENDS_TARGET="toolchain libusbmuxd openssl"
|
||||
PKG_LONGDESC="A cross-platform software library that talks the protocols to support Apple devices."
|
||||
PKG_TOOLCHAIN="autotools"
|
||||
|
@ -1,12 +0,0 @@
|
||||
diff -u -r libimobiledevice-1.2.0/src/idevice.c libimobiledevice-1.2.0-nossl3/src/idevice.c
|
||||
--- libimobiledevice-1.2.0/src/idevice.c 2015-01-28 02:10:32.000000000 +0100
|
||||
+++ libimobiledevice-1.2.0-nossl3/src/idevice.c 2016-03-03 18:33:45.912308242 +0100
|
||||
@@ -678,7 +678,7 @@
|
||||
}
|
||||
BIO_set_fd(ssl_bio, (int)(long)connection->data, BIO_NOCLOSE);
|
||||
|
||||
- SSL_CTX *ssl_ctx = SSL_CTX_new(SSLv3_method());
|
||||
+ SSL_CTX *ssl_ctx = SSL_CTX_new(SSLv23_method());
|
||||
if (ssl_ctx == NULL) {
|
||||
debug_info("ERROR: Could not create SSL context.");
|
||||
BIO_free(ssl_bio);
|
@ -2,11 +2,11 @@
|
||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="libusbmuxd"
|
||||
PKG_VERSION="1.0.10"
|
||||
PKG_SHA256="1aa21391265d2284ac3ccb7cf278126d10d354878589905b35e8102104fec9f2"
|
||||
PKG_VERSION="2.0.2"
|
||||
PKG_SHA256="cc6a808553da4efa9fa5638be256d5ae020498795d9d260d280b87074e799b20"
|
||||
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/libusbmuxd/releases/download/${PKG_VERSION}/libusbmuxd-${PKG_VERSION}.tar.bz2"
|
||||
PKG_DEPENDS_TARGET="toolchain libplist"
|
||||
PKG_LONGDESC="A USB multiplex daemon."
|
||||
|
||||
|
@ -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
|
||||
|
@ -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"
|
||||
|
@ -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);
|
||||
|
@ -3,15 +3,13 @@
|
||||
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="libusb"
|
||||
PKG_VERSION="1.0.22"
|
||||
PKG_SHA256="75aeb9d59a4fdb800d329a545c2e6799f732362193b465ea198f2aa275518157"
|
||||
PKG_VERSION="1.0.23"
|
||||
PKG_SHA256="db11c06e958a82dac52cf3c65cb4dd2c3f339c8a988665110e0d24d19312ad8d"
|
||||
PKG_LICENSE="LGPLv2.1"
|
||||
PKG_SITE="http://libusb.info/"
|
||||
PKG_URL="$SOURCEFORGE_SRC/libusb/files/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_URL="https://github.com/libusb/libusb/releases/download/v${PKG_VERSION}/libusb-${PKG_VERSION}.tar.bz2"
|
||||
PKG_DEPENDS_TARGET="toolchain systemd"
|
||||
PKG_LONGDESC="The libusb project's aim is to create a Library for use by user level applications to USB devices."
|
||||
#libusb sometimes fails to build if building paralell
|
||||
PKG_BUILD_FLAGS="-parallel"
|
||||
|
||||
PKG_CONFIGURE_OPTS_TARGET="--enable-shared \
|
||||
--enable-static \
|
||||
|
Loading…
x
Reference in New Issue
Block a user