From db97c76e2c5ed63cf8436ec408f9647f5fb07978 Mon Sep 17 00:00:00 2001 From: "Jason E. Hale" Date: Fri, 4 Jul 2025 01:38:19 -0400 Subject: [PATCH] imobiledevice: Update suite to lastest versions comms/libimobiledevice-glue: Update to 1.3.2 comms/libimobiledevice: Update to git commit cb34a17 comms/libusbmuxd: Update to 2.1.1 comms/usbmuxd: Update to git commit 523f700 devel/libplist: Update to 2.7.0 security/libtatsu: Update to 1.0.5 --- comms/libimobiledevice-glue/Makefile | 2 +- comms/libimobiledevice-glue/distinfo | 6 +++--- comms/libimobiledevice-glue/pkg-plist | 2 +- comms/libimobiledevice/Makefile | 7 ++++--- comms/libimobiledevice/distinfo | 6 +++--- comms/libimobiledevice/files/patch-cython | 19 ------------------- comms/libimobiledevice/pkg-plist | 1 + comms/libusbmuxd/Makefile | 2 +- comms/libusbmuxd/distinfo | 6 +++--- comms/libusbmuxd/pkg-plist | 2 +- comms/usbmuxd/Makefile | 5 ++--- comms/usbmuxd/distinfo | 6 +++--- comms/usbmuxd/files/patch-configure.ac | 14 ++------------ comms/usbmuxd/files/patch-src_usb.c | 21 +++++++++++++++++++++ comms/usbmuxd/files/usbmuxd.conf.in | 4 ++-- devel/libplist/Makefile | 2 +- devel/libplist/distinfo | 6 +++--- devel/libplist/pkg-plist | 4 ++-- security/libtatsu/Makefile | 2 +- security/libtatsu/distinfo | 6 +++--- security/libtatsu/pkg-plist | 2 +- 21 files changed, 59 insertions(+), 66 deletions(-) delete mode 100644 comms/libimobiledevice/files/patch-cython create mode 100644 comms/usbmuxd/files/patch-src_usb.c diff --git a/comms/libimobiledevice-glue/Makefile b/comms/libimobiledevice-glue/Makefile index 2230f88e16a5..4d259ec937b2 100644 --- a/comms/libimobiledevice-glue/Makefile +++ b/comms/libimobiledevice-glue/Makefile @@ -1,5 +1,5 @@ PORTNAME= libimobiledevice-glue -PORTVERSION= 1.3.1 +PORTVERSION= 1.3.2 CATEGORIES= comms MASTER_SITES= https://github.com/libimobiledevice/${PORTNAME}/releases/download/${PORTVERSION}/ diff --git a/comms/libimobiledevice-glue/distinfo b/comms/libimobiledevice-glue/distinfo index 916b80fc062d..38c2cf8b3067 100644 --- a/comms/libimobiledevice-glue/distinfo +++ b/comms/libimobiledevice-glue/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1735634662 -SHA256 (libimobiledevice-glue-1.3.1.tar.bz2) = 6e2849f221e6ab970566a115d42f3c20f8848e4d40c2ed61ac20dc85f40fa54f -SIZE (libimobiledevice-glue-1.3.1.tar.bz2) = 339881 +TIMESTAMP = 1751592250 +SHA256 (libimobiledevice-glue-1.3.2.tar.bz2) = 6489a3411b874ecd81c87815d863603f518b264a976319725e0ed59935546774 +SIZE (libimobiledevice-glue-1.3.2.tar.bz2) = 338101 diff --git a/comms/libimobiledevice-glue/pkg-plist b/comms/libimobiledevice-glue/pkg-plist index 698cfd32ab04..d32dcc2caa00 100644 --- a/comms/libimobiledevice-glue/pkg-plist +++ b/comms/libimobiledevice-glue/pkg-plist @@ -12,5 +12,5 @@ include/libimobiledevice-glue/utils.h lib/libimobiledevice-glue-1.0.a lib/libimobiledevice-glue-1.0.so lib/libimobiledevice-glue-1.0.so.0 -lib/libimobiledevice-glue-1.0.so.0.3.1 +lib/libimobiledevice-glue-1.0.so.0.3.2 libdata/pkgconfig/libimobiledevice-glue-1.0.pc diff --git a/comms/libimobiledevice/Makefile b/comms/libimobiledevice/Makefile index 00e6c574c368..b8e4156201c8 100644 --- a/comms/libimobiledevice/Makefile +++ b/comms/libimobiledevice/Makefile @@ -1,7 +1,7 @@ PORTNAME= libimobiledevice -DISTVERSION= 1.3.0-241 +DISTVERSION= 1.3.0-300 PORTREVISION?= 0 -DISTVERSIONSUFFIX= -g2a0a6d5 +DISTVERSIONSUFFIX= -gcb34a17 CATEGORIES?= comms #MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${DISTVERSION}/ @@ -12,7 +12,8 @@ WWW= https://www.libimobiledevice.org LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/COPYING.LESSER -USES+= autoreconf cpe libtool localbase:ldflags pathfix pkgconfig ssl +USES+= autoreconf cpe libtool localbase:ldflags pathfix pkgconfig \ + readline ssl USE_GITHUB= yes GNU_CONFIGURE= yes diff --git a/comms/libimobiledevice/distinfo b/comms/libimobiledevice/distinfo index 6c8b853e7d26..8ec9aee3f8a7 100644 --- a/comms/libimobiledevice/distinfo +++ b/comms/libimobiledevice/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1720418798 -SHA256 (libimobiledevice-libimobiledevice-1.3.0-241-g2a0a6d5_GH0.tar.gz) = 75e7c7b778b0b377f961b2bc642f6b30fc2e7f73221153c6a94de7e2bffc4dcf -SIZE (libimobiledevice-libimobiledevice-1.3.0-241-g2a0a6d5_GH0.tar.gz) = 411083 +TIMESTAMP = 1751600582 +SHA256 (libimobiledevice-libimobiledevice-1.3.0-300-gcb34a17_GH0.tar.gz) = a3bd75332a403855e46458606fb8bccc166e54c4755c7481bb5ddae275394069 +SIZE (libimobiledevice-libimobiledevice-1.3.0-300-gcb34a17_GH0.tar.gz) = 420171 diff --git a/comms/libimobiledevice/files/patch-cython b/comms/libimobiledevice/files/patch-cython deleted file mode 100644 index e4a19f7e4d8f..000000000000 --- a/comms/libimobiledevice/files/patch-cython +++ /dev/null @@ -1,19 +0,0 @@ -Obtained from: https://github.com/libimobiledevice/libimobiledevice/commit/0bf0f9e941c85d06ce4b5909d7a61b3a4f2a6a05 - ---- cython/debugserver.pxi.orig 2024-07-01 16:27:27 UTC -+++ cython/debugserver.pxi -@@ -43,13 +43,7 @@ cdef class DebugServerError(BaseError): - BaseError.__init__(self, *args, **kwargs) - - --# from http://stackoverflow.com/a/17511714 --# https://github.com/libimobiledevice/libimobiledevice/pull/198 --from cpython cimport PY_MAJOR_VERSION --if PY_MAJOR_VERSION <= 2: -- from cpython.string cimport PyString_AsString --else: -- from cpython.bytes cimport PyBytes_AsString as PyString_AsString -+from cpython.bytes cimport PyBytes_AsString as PyString_AsString - cdef char ** to_cstring_array(list_str): - if not list_str: - return NULL diff --git a/comms/libimobiledevice/pkg-plist b/comms/libimobiledevice/pkg-plist index 361b606c2223..5d80ce566f8f 100644 --- a/comms/libimobiledevice/pkg-plist +++ b/comms/libimobiledevice/pkg-plist @@ -36,6 +36,7 @@ include/libimobiledevice/mobilebackup.h include/libimobiledevice/mobilebackup2.h include/libimobiledevice/mobilesync.h include/libimobiledevice/notification_proxy.h +include/libimobiledevice/ostrace.h include/libimobiledevice/preboard.h include/libimobiledevice/property_list_service.h include/libimobiledevice/restore.h diff --git a/comms/libusbmuxd/Makefile b/comms/libusbmuxd/Makefile index c7cc52711d3a..1d2624d627d2 100644 --- a/comms/libusbmuxd/Makefile +++ b/comms/libusbmuxd/Makefile @@ -1,5 +1,5 @@ PORTNAME= libusbmuxd -PORTVERSION= 2.1.0 +PORTVERSION= 2.1.1 CATEGORIES= comms MASTER_SITES= https://github.com/libimobiledevice/${PORTNAME}/releases/download/${PORTVERSION}/ diff --git a/comms/libusbmuxd/distinfo b/comms/libusbmuxd/distinfo index f93e5af5579a..0168b55c85f0 100644 --- a/comms/libusbmuxd/distinfo +++ b/comms/libusbmuxd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1713935966 -SHA256 (libusbmuxd-2.1.0.tar.bz2) = c35bf68f8e248434957bd5b234c389b02206a06ecd9303a7fb931ed7a5636b16 -SIZE (libusbmuxd-2.1.0.tar.bz2) = 325055 +TIMESTAMP = 1751592169 +SHA256 (libusbmuxd-2.1.1.tar.bz2) = 5546f1aba1c3d1812c2b47d976312d00547d1044b84b6a461323c621f396efce +SIZE (libusbmuxd-2.1.1.tar.bz2) = 325055 diff --git a/comms/libusbmuxd/pkg-plist b/comms/libusbmuxd/pkg-plist index 4e7eb6e63478..fa75a90beae2 100644 --- a/comms/libusbmuxd/pkg-plist +++ b/comms/libusbmuxd/pkg-plist @@ -5,7 +5,7 @@ include/usbmuxd.h lib/libusbmuxd-2.0.a lib/libusbmuxd-2.0.so lib/libusbmuxd-2.0.so.7 -lib/libusbmuxd-2.0.so.7.0.0 +lib/libusbmuxd-2.0.so.7.0.1 libdata/pkgconfig/libusbmuxd-2.0.pc share/man/man1/inetcat.1.gz share/man/man1/iproxy.1.gz diff --git a/comms/usbmuxd/Makefile b/comms/usbmuxd/Makefile index bff38d002dee..e4e6205907d9 100644 --- a/comms/usbmuxd/Makefile +++ b/comms/usbmuxd/Makefile @@ -1,7 +1,6 @@ PORTNAME= usbmuxd -DISTVERSION= 1.1.1-58 -PORTREVISION= 1 -DISTVERSIONSUFFIX= -gbc0b91c +DISTVERSION= 1.1.1-69 +DISTVERSIONSUFFIX= -g523f700 CATEGORIES= comms #MASTER_SITES= https://github.com/libimobiledevice/${PORTNAME}/releases/download/${DISTVERSION}/ diff --git a/comms/usbmuxd/distinfo b/comms/usbmuxd/distinfo index 532706a3035e..b9c10b331399 100644 --- a/comms/usbmuxd/distinfo +++ b/comms/usbmuxd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1720421685 -SHA256 (libimobiledevice-usbmuxd-1.1.1-58-gbc0b91c_GH0.tar.gz) = 2a88c8a27ba43cf00e9aed5b09791a5ce651758a87dc802954c73b0690ddacab -SIZE (libimobiledevice-usbmuxd-1.1.1-58-gbc0b91c_GH0.tar.gz) = 65593 +TIMESTAMP = 1751596899 +SHA256 (libimobiledevice-usbmuxd-1.1.1-69-g523f700_GH0.tar.gz) = 1f04ae56c26c34f3ee7c36617dedc3d444c078c3d0f87b600b97e8526ff224ec +SIZE (libimobiledevice-usbmuxd-1.1.1-69-g523f700_GH0.tar.gz) = 65623 diff --git a/comms/usbmuxd/files/patch-configure.ac b/comms/usbmuxd/files/patch-configure.ac index 40c76ce88439..6a870ed7697e 100644 --- a/comms/usbmuxd/files/patch-configure.ac +++ b/comms/usbmuxd/files/patch-configure.ac @@ -1,19 +1,9 @@ -Remove bash-ism from configure script. Disable udev/systemd detection for *BSD as the catch-all assumes a Linux system. A configuration file for devd(8) is provided by this port instead. ---- configure.ac.orig 2020-06-09 02:57:16 UTC +--- configure.ac.orig 2025-02-01 20:07:39 UTC +++ configure.ac -@@ -36,7 +36,7 @@ if test "x$have_limd" = "xyes"; then - AC_SUBST(libimobiledevice_CFLAGS) - AC_SUBST(libimobiledevice_LIBS) - CACHED_CFLAGS="$CFLAGS" -- CFLAGS+=" $libimobiledevice_CFLAGS" -+ CFLAGS="$CFLAGS $libimobiledevice_CFLAGS" - AC_CACHE_CHECK(for enum idevice_connection_type, ac_cv_enum_idevice_connection_type, - AC_TRY_COMPILE([ - #include -@@ -125,7 +125,7 @@ case ${host_os} in +@@ -126,7 +126,7 @@ case ${host_os} in AC_SUBST(WINDRES) activation_method="manual" ;; diff --git a/comms/usbmuxd/files/patch-src_usb.c b/comms/usbmuxd/files/patch-src_usb.c new file mode 100644 index 000000000000..e63bfc010502 --- /dev/null +++ b/comms/usbmuxd/files/patch-src_usb.c @@ -0,0 +1,21 @@ +Our base copy of libusb is lagging behind quite a bit. + +The LIBUSB_SPEED_SUPER_PLUS emum was added in libusb 1.0.24 (5 years +ago). "Support" for the LIBUSB_SPEED_SUPER_PLUS enum was added in [1]. + +[1] https://cgit.freebsd.org/src/commit/?id=f938c0a90313125a9518307e80ca92d4c71f7745 + +--- src/usb.c.orig 2025-02-01 20:07:39 UTC ++++ src/usb.c +@@ -625,9 +625,11 @@ static void device_complete_initialization(struct mode + case LIBUSB_SPEED_SUPER: + usbdev->speed = 5000000000; + break; ++#if defined(__FreeBSD__) && __FreeBSD_version >= 1500044 + case LIBUSB_SPEED_SUPER_PLUS: + usbdev->speed = 10000000000; + break; ++#endif + case LIBUSB_SPEED_HIGH: + case LIBUSB_SPEED_UNKNOWN: + default: diff --git a/comms/usbmuxd/files/usbmuxd.conf.in b/comms/usbmuxd/files/usbmuxd.conf.in index 62b79de65440..18a7a8a11b54 100644 --- a/comms/usbmuxd/files/usbmuxd.conf.in +++ b/comms/usbmuxd/files/usbmuxd.conf.in @@ -10,7 +10,7 @@ notify 100 { match "subsystem" "DEVICE"; match "type" "ATTACH"; match "vendor" "0x05ac"; - match "product" "(0x12[9a][0-9a-f]|0x8600)"; + match "product" "(0x12[9a][0-9a-f]|0x190[1-5]|0x8600)"; action "chgrp %%GROUPS%% /dev/$cdev; chmod g+rw /dev/$cdev"; action "%%PREFIX%%/sbin/usbmuxd -U %%USERS%% -z"; }; @@ -20,7 +20,7 @@ notify 100 { match "subsystem" "DEVICE"; match "type" "DETACH"; match "vendor" "0x05ac"; - match "product" "(0x12[9a][0-9a-f]|0x8600)"; + match "product" "(0x12[9a][0-9a-f]|0x190[1-5]|0x8600)"; action "%%PREFIX%%/sbin/usbmuxd -x"; action "sleep 5"; }; diff --git a/devel/libplist/Makefile b/devel/libplist/Makefile index 9eeec7850dc0..1477948aef39 100644 --- a/devel/libplist/Makefile +++ b/devel/libplist/Makefile @@ -1,5 +1,5 @@ PORTNAME= libplist -PORTVERSION= 2.6.0 +PORTVERSION= 2.7.0 PORTREVISION?= 0 CATEGORIES= devel MASTER_SITES= https://github.com/libimobiledevice/${PORTNAME}/releases/download/${PORTVERSION}/ diff --git a/devel/libplist/distinfo b/devel/libplist/distinfo index 55bb122e43b4..626e224bb6fb 100644 --- a/devel/libplist/distinfo +++ b/devel/libplist/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1720417590 -SHA256 (libplist-2.6.0.tar.bz2) = 67be9ee3169366589c92dc7c22809b90f51911dd9de22520c39c9a64fb047c9c -SIZE (libplist-2.6.0.tar.bz2) = 493169 +TIMESTAMP = 1751591691 +SHA256 (libplist-2.7.0.tar.bz2) = 7ac42301e896b1ebe3c654634780c82baa7cb70df8554e683ff89f7c2643eb8b +SIZE (libplist-2.7.0.tar.bz2) = 484474 diff --git a/devel/libplist/pkg-plist b/devel/libplist/pkg-plist index 56eedb62014f..af4fc3b56419 100644 --- a/devel/libplist/pkg-plist +++ b/devel/libplist/pkg-plist @@ -16,11 +16,11 @@ include/plist/plist.h lib/libplist++-2.0.a lib/libplist++-2.0.so lib/libplist++-2.0.so.4 -lib/libplist++-2.0.so.4.6.0 +lib/libplist++-2.0.so.4.7.0 lib/libplist-2.0.a lib/libplist-2.0.so lib/libplist-2.0.so.4 -lib/libplist-2.0.so.4.6.0 +lib/libplist-2.0.so.4.7.0 libdata/pkgconfig/libplist++-2.0.pc libdata/pkgconfig/libplist-2.0.pc share/man/man1/plistutil.1.gz diff --git a/security/libtatsu/Makefile b/security/libtatsu/Makefile index fb01c94d2270..160fd4ad189a 100644 --- a/security/libtatsu/Makefile +++ b/security/libtatsu/Makefile @@ -1,5 +1,5 @@ PORTNAME= libtatsu -PORTVERSION= 1.0.4 +PORTVERSION= 1.0.5 CATEGORIES= security MASTER_SITES= https://github.com/libimobiledevice/${PORTNAME}/releases/download/${PORTVERSION}/ diff --git a/security/libtatsu/distinfo b/security/libtatsu/distinfo index 0fdad022aa4d..92912414065a 100644 --- a/security/libtatsu/distinfo +++ b/security/libtatsu/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1735634837 -SHA256 (libtatsu-1.0.4.tar.bz2) = 08094e58364858360e1743648581d9bad055ba3b06e398c660e481ebe0ae20b3 -SIZE (libtatsu-1.0.4.tar.bz2) = 302883 +TIMESTAMP = 1751592033 +SHA256 (libtatsu-1.0.5.tar.bz2) = 536fa228b14f156258e801a7f4d25a3a9dd91bb936bf6344e23171403c57e440 +SIZE (libtatsu-1.0.5.tar.bz2) = 302913 diff --git a/security/libtatsu/pkg-plist b/security/libtatsu/pkg-plist index d5158077f18a..b96204970301 100644 --- a/security/libtatsu/pkg-plist +++ b/security/libtatsu/pkg-plist @@ -3,5 +3,5 @@ include/libtatsu/tss.h lib/libtatsu.a lib/libtatsu.so lib/libtatsu.so.0 -lib/libtatsu.so.0.0.2 +lib/libtatsu.so.0.0.3 libdata/pkgconfig/libtatsu-1.0.pc -- 2.49.0