From nobody Thu Jul 11 01:45:46 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WKHcV3LXnz5Pt9n; Thu, 11 Jul 2024 01:45:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WKHcV17RCz4g9g; Thu, 11 Jul 2024 01:45:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720662346; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LwYDGj4iRKGot1/h5ZZP2GMtYdf3YdlqW6VATjKAko8=; b=YSv2TWHLI1bOKh91h1twGK1Q9DpTYTfZwmxVao1aUnVET596ULL9qupCaOMdsmP4Ca45jg qitOOjQtpNn0fASO4BvuqVDrovch40HaviTspCMORt/hO2apJmZlALWQso3bZzMvUuuN37 EaIvCNVMOKuUQQse2O7k4PLs+WOurNb8Tbv3Cp4MH31Hc9ovoZL2Pv8WIiogKV1ys25Q58 CsWvOFGvMdfFkdsZtyc1PUwY5VJf95p8HirU3XnRDMuk4Znlz4j/JU8VPb/KodyZSWDv28 xtUxG4SdoRChsKcCP9zu0Eoe5OtKrhbSuUvPsktSR31nBFCe3nfsb9WzMSqfow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720662346; a=rsa-sha256; cv=none; b=Y5H3HRbtHK8CxXcQ2LgL40RrNRnWjUrglW4fu/zcuFYPFBb9lBbWWXFx2TYpx+ERz+l7sk OyTeyih4mGAvCnW0LwHAwvFd1SdNkB97ZIgDX/6/BEzjrblex5dL/PfPNAiYgVb+pBwL0p aRH4YqPDmCr3d5U7y6iDCC4tE28eqO4kejToWOf+0036s2Jzew88VzhiYv0e8nDWs3Frs1 HaMnPoWaIHqLsmfeVxmmf0AKQdpT6ajnqJFa97FZlQ+iLLH23hCNuRFYJU1yEX56U9M2s2 z4YZHjylU3dUxa1WG+p6p1a5uedRTjLolG0l7gW5SuGm4kCenYSBe8L5NKVeKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720662346; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LwYDGj4iRKGot1/h5ZZP2GMtYdf3YdlqW6VATjKAko8=; b=oPidwSBcDy1wbEypF1NDPgGreT9KAG1gv5e38Icvcm6AgyDa4/s9P/k54sXR2qmhTVrZgT IamPdmxnDH3WCXzFYqQxxdTAssvtm4WreMoWzg3bE4hfnGk/T0UaUJZV6t//AgPJzxyrGN +zG5E5tKkkAefq9JHivvxMD7ofF1isRPR38Y/O3sOwfdSvbcswmv7tsYSfFLlzsixUn5bO evyff4OIHpbNFQoAEZESxhQiywvG08oJA6nj7zuopocbVDfkLaLjto7L2WW1SVfw2pix2m e764wsAkqmuithpPDnDkyWd17q3sLqSJyM6LRGmiXbwe2c4BOqR6NciDrZ5Tkg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WKHcV0lZ8zgxc; Thu, 11 Jul 2024 01:45:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46B1jkoM051914; Thu, 11 Jul 2024 01:45:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46B1jkka051911; Thu, 11 Jul 2024 01:45:46 GMT (envelope-from git) Date: Thu, 11 Jul 2024 01:45:46 GMT Message-Id: <202407110145.46B1jkka051911@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: b5256acd117d - main - comms/usbmuxd: Update to latest git commit List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b5256acd117dbb9692efabed6bdd5b588b1741e9 Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=b5256acd117dbb9692efabed6bdd5b588b1741e9 commit b5256acd117dbb9692efabed6bdd5b588b1741e9 Author: Jason E. Hale AuthorDate: 2024-07-11 00:46:37 +0000 Commit: Jason E. Hale CommitDate: 2024-07-11 01:45:32 +0000 comms/usbmuxd: Update to latest git commit This is needed to build with the rest of the libimobiledevice stack. See next commit for more details. PR: 280014 Reported by: --- comms/usbmuxd/Makefile | 24 +++++++++++++++--------- comms/usbmuxd/distinfo | 6 +++--- comms/usbmuxd/files/patch-src_client.c | 13 ------------- 3 files changed, 18 insertions(+), 25 deletions(-) diff --git a/comms/usbmuxd/Makefile b/comms/usbmuxd/Makefile index ce219c0512b2..92e22795e166 100644 --- a/comms/usbmuxd/Makefile +++ b/comms/usbmuxd/Makefile @@ -1,27 +1,30 @@ PORTNAME= usbmuxd -DISTVERSION= 1.1.1 -PORTREVISION= 3 +DISTVERSION= 1.1.1-58 +DISTVERSIONSUFFIX= -gbc0b91c CATEGORIES= comms -MASTER_SITES= https://github.com/libimobiledevice/${PORTNAME}/releases/download/${PORTVERSION}/ +#MASTER_SITES= https://github.com/libimobiledevice/${PORTNAME}/releases/download/${DISTVERSION}/ MAINTAINER= jhale@FreeBSD.org COMMENT= Daemon for multiplexing connections over USB to iPhone/iPod Touch WWW= https://www.libimobiledevice.org -LICENSE= GPLv2 GPLv3 -LICENSE_COMB= dual +LICENSE= GPLv2 GPLv3 +LICENSE_COMB= dual LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING.GPLv2 LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING.GPLv3 LIB_DEPENDS= libplist-2.0.so:devel/libplist \ - libimobiledevice-1.0.so:comms/libimobiledevice + libimobiledevice-1.0.so:comms/libimobiledevice \ + libimobiledevice-glue-1.0.so:comms/libimobiledevice-glue -USES= autoreconf cpe libtool localbase pathfix pkgconfig tar:bzip2 +USES= autoreconf cpe libtool localbase pathfix pkgconfig CPE_VENDOR= nikias_bassen +USE_GITHUB= yes +GH_ACCOUNT= libimobiledevice + GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-systemd -GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share SUB_LIST= USERS=${USERS} \ GROUPS=${GROUPS} @@ -39,9 +42,12 @@ OPTIONS_DEFAULT= DEVD DEVD_SUB_FILES= ${PORTNAME}.conf DEVD_PLIST_FILES= etc/devd/${PORTNAME}.conf +post-patch: + @echo "${DISTVERSIONFULL}" > ${WRKSRC}/.tarball-version + post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} post-install-DEVD-on: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/devd diff --git a/comms/usbmuxd/distinfo b/comms/usbmuxd/distinfo index 9a6d75721b02..532706a3035e 100644 --- a/comms/usbmuxd/distinfo +++ b/comms/usbmuxd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1611089774 -SHA256 (usbmuxd-1.1.1.tar.bz2) = c0ec9700172bf635ccb5bed98daae607d2925c2bc3597f25706ecd9dfbfd2d9e -SIZE (usbmuxd-1.1.1.tar.bz2) = 345290 +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 diff --git a/comms/usbmuxd/files/patch-src_client.c b/comms/usbmuxd/files/patch-src_client.c deleted file mode 100644 index 4065dd4c615c..000000000000 --- a/comms/usbmuxd/files/patch-src_client.c +++ /dev/null @@ -1,13 +0,0 @@ -client.c:210:18: error: use of undeclared identifier 'IPPROTO_TCP' - setsockopt(cfd, IPPROTO_TCP, TCP_NODELAY, (void*)&yes, sizeof(int)); - ---- src/client.c.orig 2020-06-09 16:20:07 UTC -+++ src/client.c -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - #include - #include - #include