pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
update some libimobiledev packages
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By: wiz
Date: Thu Jul 31 20:27:19 2025 +0200
Changeset: 8aaf48ef782dfbcbe1ab579ffd2b8ea141e0aa37
Modified Files:
Makefile
libusbmuxd/Makefile
libusbmuxd/buildlink3.mk
libusbmuxd/distinfo
Added Files:
libimobiledevice-glue/DESCR
libimobiledevice-glue/Makefile
libimobiledevice-glue/PLIST
libimobiledevice-glue/buildlink3.mk
libimobiledevice-glue/distinfo
libimobiledevice-glue/patches/patch-src_socket.c
libimobiledevice-glue/patches/patch-src_utils.c
libusbmuxd/patches/patch-src_libusbmuxd.c
Removed Files:
libplist2/DESCR
libplist2/Makefile
libplist2/PLIST
libplist2/buildlink3.mk
libplist2/distinfo
Log Message:
update some libimobiledev packages
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=8aaf48ef782dfbcbe1ab579ffd2b8ea141e0aa37
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 2 +-
libimobiledevice-glue/DESCR | 2 ++
libimobiledevice-glue/Makefile | 21 ++++++++++++++++
libimobiledevice-glue/PLIST | 14 +++++++++++
libimobiledevice-glue/buildlink3.mk | 14 +++++++++++
libimobiledevice-glue/distinfo | 7 ++++++
libimobiledevice-glue/patches/patch-src_socket.c | 31 +++++++++++++++++++++++
libimobiledevice-glue/patches/patch-src_utils.c | 15 +++++++++++
libplist2/DESCR | 10 --------
libplist2/Makefile | 32 ------------------------
libplist2/PLIST | 23 -----------------
libplist2/buildlink3.mk | 15 -----------
libplist2/distinfo | 5 ----
libusbmuxd/Makefile | 13 +++++-----
libusbmuxd/buildlink3.mk | 4 ++-
libusbmuxd/distinfo | 7 +++---
libusbmuxd/patches/patch-src_libusbmuxd.c | 15 +++++++++++
17 files changed, 133 insertions(+), 97 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index cb27cdb398..3269f4a816 100644
--- a/Makefile
+++ b/Makefile
@@ -2085,6 +2085,7 @@ SUBDIR+= libi2pd
SUBDIR+= libical2
SUBDIR+= libifstat
SUBDIR+= libimobiledevice
+SUBDIR+= libimobiledevice-glue
SUBDIR+= libinput
SUBDIR+= libinstpatch
SUBDIR+= libircclient
@@ -2133,7 +2134,6 @@ SUBDIR+= libpar2
SUBDIR+= libpare
SUBDIR+= libparsifal
SUBDIR+= libpatterns
-SUBDIR+= libplist2
SUBDIR+= libppd
SUBDIR+= libpsurface
SUBDIR+= libpthread-stubs
diff --git a/libimobiledevice-glue/DESCR b/libimobiledevice-glue/DESCR
new file mode 100644
index 0000000000..f2b2c9a2df
--- /dev/null
+++ b/libimobiledevice-glue/DESCR
@@ -0,0 +1,2 @@
+Library with common code used by the libraries and tools around
+the libimobiledevice project.
diff --git a/libimobiledevice-glue/Makefile b/libimobiledevice-glue/Makefile
new file mode 100644
index 0000000000..52ddd6d26b
--- /dev/null
+++ b/libimobiledevice-glue/Makefile
@@ -0,0 +1,21 @@
+# $NetBSD$
+
+DISTNAME= libimobiledevice-glue-1.3.2
+CATEGORIES= misc
+MASTER_SITES= ${MASTER_SITE_GITHUB:=libimobiledevice/}
+GITHUB_RELEASE= ${PKGVERSION_NOREV}
+EXTRACT_SUFX= .tar.bz2
+
+MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE= https://github.com/libimobiledevice/libimobiledevice-glue
+COMMENT= Library with common code for the libimobiledevice project
+LICENSE= gnu-lgpl-v2.1
+
+GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
+USE_TOOLS+= pkg-config
+
+PKGCONFIG_OVERRIDE+= src/libimobiledevice-glue-1.0.pc.in
+
+.include "../../textproc/libplist/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/libimobiledevice-glue/PLIST b/libimobiledevice-glue/PLIST
new file mode 100644
index 0000000000..584d25b1d7
--- /dev/null
+++ b/libimobiledevice-glue/PLIST
@@ -0,0 +1,14 @@
+@comment $NetBSD$
+include/libimobiledevice-glue/cbuf.h
+include/libimobiledevice-glue/collection.h
+include/libimobiledevice-glue/glue.h
+include/libimobiledevice-glue/nskeyedarchive.h
+include/libimobiledevice-glue/opack.h
+include/libimobiledevice-glue/sha.h
+include/libimobiledevice-glue/socket.h
+include/libimobiledevice-glue/termcolors.h
+include/libimobiledevice-glue/thread.h
+include/libimobiledevice-glue/tlv.h
+include/libimobiledevice-glue/utils.h
+lib/libimobiledevice-glue-1.0.la
+lib/pkgconfig/libimobiledevice-glue-1.0.pc
diff --git a/libimobiledevice-glue/buildlink3.mk b/libimobiledevice-glue/buildlink3.mk
new file mode 100644
index 0000000000..aaf07b51c7
--- /dev/null
+++ b/libimobiledevice-glue/buildlink3.mk
@@ -0,0 +1,14 @@
+# $NetBSD$
+
+BUILDLINK_TREE+= libimobiledevice-glue
+
+.if !defined(LIBIMOBILEDEVICE_GLUE_BUILDLINK3_MK)
+LIBIMOBILEDEVICE_GLUE_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.libimobiledevice-glue+= libimobiledevice-glue>=1.3.2
+BUILDLINK_PKGSRCDIR.libimobiledevice-glue?= ../../wip/libimobiledevice-glue
+
+.include "../../textproc/libplist/buildlink3.mk"
+.endif # LIBIMOBILEDEVICE_GLUE_BUILDLINK3_MK
+
+BUILDLINK_TREE+= -libimobiledevice-glue
diff --git a/libimobiledevice-glue/distinfo b/libimobiledevice-glue/distinfo
new file mode 100644
index 0000000000..9e50b79179
--- /dev/null
+++ b/libimobiledevice-glue/distinfo
@@ -0,0 +1,7 @@
+$NetBSD$
+
+BLAKE2s (libimobiledevice-glue-1.3.2.tar.bz2) = 21da3cc0fa1a80616f87fb28ef0b00c1d6301be335f469a7f2d1ba3777d22f95
+SHA512 (libimobiledevice-glue-1.3.2.tar.bz2) = d12b853dedec39a28c34c19dc1a2d26e81d9aba0e64d9c7ed03aa921feee5613598a30e9c51bd79d9ec840399a97091525fc5e4c5ac4b20d68ea8c96a35fc7d1
+Size (libimobiledevice-glue-1.3.2.tar.bz2) = 338101 bytes
+SHA1 (patch-src_socket.c) = 44ff0856f92923d802f4ed9a7caa4578f917e122
+SHA1 (patch-src_utils.c) = a2f7bd1ae225b07f95501e4abd71bbe7e6d9379d
diff --git a/libimobiledevice-glue/patches/patch-src_socket.c b/libimobiledevice-glue/patches/patch-src_socket.c
new file mode 100644
index 0000000000..d9f5c54e26
--- /dev/null
+++ b/libimobiledevice-glue/patches/patch-src_socket.c
@@ -0,0 +1,31 @@
+$NetBSD$
+
+Add NetBSD support.
+
+--- src/socket.c.orig 2025-07-31 18:18:24.287306854 +0000
++++ src/socket.c
+@@ -56,7 +56,7 @@
+ #ifdef AF_INET6
+ #include <net/if.h>
+ #include <ifaddrs.h>
+-#if defined (__APPLE__) || defined (__FreeBSD__) || defined (__HAIKU__)
++#if defined (__APPLE__) || defined (__FreeBSD__) || defined (__HAIKU__) || defined (__NetBSD__)
+ #include <net/if_dl.h>
+ #endif
+ #ifdef __linux__
+@@ -907,13 +907,13 @@ int get_primary_mac_address(unsigned cha
+ if (ifa->ifa_flags & IFF_LOOPBACK) {
+ continue;
+ }
+-#if defined(__APPLE__) || defined (__FreeBSD__) || defined (__HAIKU__)
++#if defined(__APPLE__) || defined (__FreeBSD__) || defined (__HAIKU__) || defined (__NetBSD__)
+ if (ifa->ifa_addr->sa_family != AF_LINK) {
+ continue;
+ }
+ #if defined (__APPLE__)
+ if (!strcmp(ifa->ifa_name, "en0")) {
+-#elif defined (__FreeBSD__) || defined (__HAIKU__)
++#elif defined (__FreeBSD__) || defined (__HAIKU__) || defined (__NetBSD__)
+ {
+ #endif
+ memcpy(mac_addr_buf, (unsigned char *)LLADDR((struct sockaddr_dl *)(ifa)->ifa_addr), 6);
diff --git a/libimobiledevice-glue/patches/patch-src_utils.c b/libimobiledevice-glue/patches/patch-src_utils.c
new file mode 100644
index 0000000000..da8313b543
--- /dev/null
+++ b/libimobiledevice-glue/patches/patch-src_utils.c
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fix ctype(3) usage.
+
+--- src/utils.c.orig 2025-07-31 18:18:48.354814064 +0000
++++ src/utils.c
+@@ -220,7 +220,7 @@ char *string_toupper(char* str)
+ char *res = strdup(str);
+ size_t i;
+ for (i = 0; i < strlen(res); i++) {
+- res[i] = toupper(res[i]);
++ res[i] = toupper((unsigned char)res[i]);
+ }
+ return res;
+ }
diff --git a/libplist2/DESCR b/libplist2/DESCR
deleted file mode 100644
index c0c409115e..0000000000
--- a/libplist2/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-The project provides an interface to read and write plist files in binary or
-XML format alongside a command-line utility named plistutil.
-
-Some key features are:
-
- * Formats: Supports binary and XML format
- * Utility: Provides a plistutil utility for the command-line
- * Python: Provides Cython based bindings for Python
- * Tested: Uses fuzzing and data compliance tests
- * Efficient: Lean library with performance and resources in mind
diff --git a/libplist2/Makefile b/libplist2/Makefile
deleted file mode 100644
index 6fb033b83e..0000000000
--- a/libplist2/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD$
-
-DISTNAME= libplist-${PKGVERSION_NOREV}
-PKGNAME= libplist2-2.2.0
-CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_GITHUB:=libimobiledevice/libplist/releases/download/2.2.0/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= https://www.libimobiledevice.org/
-COMMENT= Handle Apple Binary and XML Property Lists
-LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1
-
-GNU_CONFIGURE= yes
-CONFIG_SHELL= bash
-USE_TOOLS+= bash gmake pkg-config
-USE_LIBTOOL= yes
-USE_LANGUAGES= c c++
-
-PKGCONFIG_OVERRIDE+= libplist++-2.0.pc.in
-PKGCONFIG_OVERRIDE+= libplist-2.0.pc.in
-PY_PATCHPLIST= yes
-
-PYTHON_VERSIONS_ACCEPTED= 27
-
-CONFLICTS+= libplist-[0-9]*
-
-.include "../../devel/py-cython/buildlink3.mk"
-.include "../../devel/py-cython/tool.mk"
-.include "../../lang/python/extension.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/libplist2/PLIST b/libplist2/PLIST
deleted file mode 100644
index 80e7068cdf..0000000000
--- a/libplist2/PLIST
+++ /dev/null
@@ -1,23 +0,0 @@
-@comment $NetBSD$
-bin/plistutil
-include/plist/Array.h
-include/plist/Boolean.h
-include/plist/Data.h
-include/plist/Date.h
-include/plist/Dictionary.h
-include/plist/Integer.h
-include/plist/Key.h
-include/plist/Node.h
-include/plist/Real.h
-include/plist/String.h
-include/plist/Structure.h
-include/plist/Uid.h
-include/plist/cython/plist.pxd
-include/plist/plist++.h
-include/plist/plist.h
-lib/libplist++-2.0.la
-lib/libplist-2.0.la
-lib/pkgconfig/libplist++-2.0.pc
-lib/pkgconfig/libplist-2.0.pc
-${PYSITELIB}/plist.la
-man/man1/plistutil.1
diff --git a/libplist2/buildlink3.mk b/libplist2/buildlink3.mk
deleted file mode 100644
index fab05090c2..0000000000
--- a/libplist2/buildlink3.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD$
-
-BUILDLINK_TREE+= libplist2
-
-.if !defined(LIBPLIST2_BUILDLINK3_MK)
-LIBPLIST2_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.libplist2+= libplist2>=2.2.0
-BUILDLINK_ABI_DEPENDS.libplist2+= libplist2>=2.2.0
-BUILDLINK_PKGSRCDIR.libplist2?= ../../wip/libplist2
-
-.include "../../textproc/libxml2/buildlink3.mk"
-.endif # LIBPLIST2_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -libplist2
diff --git a/libplist2/distinfo b/libplist2/distinfo
deleted file mode 100644
index 1587c1bbf0..0000000000
--- a/libplist2/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD$
-
-RMD160 (libplist-2.2.0.tar.bz2) = 43ee77e02b0413564913bb011bf1ca9591b7b3f1
-SHA512 (libplist-2.2.0.tar.bz2) = dcd922ebb28efa3c507253dd4671fdb3e4d367540734765b8d545756f6be2731fc401e7992cc6b06cdbde866fd7e17ff6188895505988b41f738226a004d7291
-Size (libplist-2.2.0.tar.bz2) = 451801 bytes
diff --git a/libusbmuxd/Makefile b/libusbmuxd/Makefile
index 5b4a4d1499..82ee7ca993 100644
--- a/libusbmuxd/Makefile
+++ b/libusbmuxd/Makefile
@@ -1,8 +1,9 @@
# $NetBSD$
-DISTNAME= libusbmuxd-2.0.2
+DISTNAME= libusbmuxd-2.1.1
CATEGORIES= comms
-MASTER_SITES= ${MASTER_SITE_GITHUB:=libimobiledevice/libusbmuxd/releases/download/2.0.2/}
+MASTER_SITES= ${MASTER_SITE_GITHUB:=libimobiledevice/}
+GITHUB_RELEASE= ${PKGVERSION_NOREV}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= weabot%protonmail.com@localhost
@@ -10,14 +11,12 @@ HOMEPAGE= https://www.libimobiledevice.org/
COMMENT= Communication interface library for usbmuxd
LICENSE= gnu-lgpl-v2.1
-USE_TOOLS+= pkg-config
-
-.include "../../wip/libplist2/buildlink3.mk"
-
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_TOOLS+= pkg-config
-PKGCONFIG_OVERRIDE+= libusbmuxd-2.0.pc.in
+PKGCONFIG_OVERRIDE+= src/libusbmuxd-2.0.pc.in
+.include "../../textproc/libplist/buildlink3.mk"
+.include "../../wip/libimobiledevice-glue/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/libusbmuxd/buildlink3.mk b/libusbmuxd/buildlink3.mk
index 8560e180e6..b75215020e 100644
--- a/libusbmuxd/buildlink3.mk
+++ b/libusbmuxd/buildlink3.mk
@@ -5,9 +5,11 @@ BUILDLINK_TREE+= libusbmuxd
.if !defined(LIBUSBMUXD_BUILDLINK3_MK)
LIBUSBMUXD_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.libusbmuxd+= libusbmuxd>=1.0.10
+BUILDLINK_API_DEPENDS.libusbmuxd+= libusbmuxd>=2.1.1
BUILDLINK_PKGSRCDIR.libusbmuxd?= ../../wip/libusbmuxd
+.include "../../textproc/libplist/buildlink3.mk"
+.include "../../wip/libimobiledevice-glue/buildlink3.mk"
.endif # LIBUSBMUXD_BUILDLINK3_MK
BUILDLINK_TREE+= -libusbmuxd
diff --git a/libusbmuxd/distinfo b/libusbmuxd/distinfo
index 76ef7499eb..3d01c1c88d 100644
--- a/libusbmuxd/distinfo
+++ b/libusbmuxd/distinfo
@@ -1,5 +1,6 @@
$NetBSD$
-RMD160 (libusbmuxd-2.0.2.tar.bz2) = 3ece419a757a58fc62d34f10f69afc7fbfbb9e60
-SHA512 (libusbmuxd-2.0.2.tar.bz2) = d3bec006db86c96f032782ef95ffa9cb6427a0ffb45a91d441346d77472343548819572976b4545a04763e8031eb15b7e40dc6b9184a1a363ddcc0d2827323bb
-Size (libusbmuxd-2.0.2.tar.bz2) = 340634 bytes
+BLAKE2s (libusbmuxd-2.1.1.tar.bz2) = e9f40f932124a59703285044dbf0d1f9d83389e418383a7552317678097624a7
+SHA512 (libusbmuxd-2.1.1.tar.bz2) = f1327a64e0a1dc0f08d2e2355271feb34194753de1d622a0259e23fc751d2720af9b4a06555e0d5f7e86d00765e7400cdc246727cceb0715bf991a278c0dedb9
+Size (libusbmuxd-2.1.1.tar.bz2) = 325055 bytes
+SHA1 (patch-src_libusbmuxd.c) = b51da7f924790d9a978445557a7db38e23334722
diff --git a/libusbmuxd/patches/patch-src_libusbmuxd.c b/libusbmuxd/patches/patch-src_libusbmuxd.c
new file mode 100644
index 0000000000..4644af1bac
--- /dev/null
+++ b/libusbmuxd/patches/patch-src_libusbmuxd.c
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Add NetBSD support.
+
+--- src/libusbmuxd.c.orig 2025-07-31 18:22:11.292175556 +0000
++++ src/libusbmuxd.c
+@@ -658,7 +658,7 @@ static void get_bundle_id()
+
+ static void get_prog_name()
+ {
+-#if defined(__APPLE__) || defined(__FreeBSD__)
++#if defined(__APPLE__) || defined(__FreeBSD__) || defined (__NetBSD__)
+ const char *pname = getprogname();
+ if (pname) {
+ prog_name = strdup(pname);
Home |
Main Index |
Thread Index |
Old Index