From nobody Sun Sep 10 16:13:26 2023 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 4RkFJQ4VJ8z4s1cS; Sun, 10 Sep 2023 16:13:26 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RkFJQ3S6Wz3NsN; Sun, 10 Sep 2023 16:13:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694362406; 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=TkL268Si4z9m1O/8ml3m6qcSUXkRKoLXD03sS9R26zg=; b=eLYVMX/CmOKiBJONXrRPMRG9hk+839K5UUF8nFkLvjrIqRY2loK6HUO2mbi92VfpxuPm4H Ul/ssib8jiuL33Pj5UOd+ECOL7o/M3JjMGZkL8eadE5ESJXtqpjb8ffje2vsdkEwRH2hoC fc8eMbdKRdDpQ01UDnWY3TEJz38NGKhyKLlmdC/7uHtHq3c2bKbfAtIhpFvBAocVe5G/0Q eegFZG9QJ0MvlRfov1qG3govYb+/bH37JRaLWW9bK3kvWZ4ppmAnzZUjTCXX1KwFkYv1DW bRIcmf7VMBxjb2M8riHWSPRZTXcsVQGLJKvJ+39FzQneVnfgyKNEl475kj8yqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694362406; a=rsa-sha256; cv=none; b=lL8CdlfmSBP29DU0t2lh+7Mv2K0VRO/mYhbsz8qCwVXwPJYS8b/+ncACQDYnfHiI9EUww6 xF8Wx2htgrGy5tjtEEDd1CokerHoltr0IB6pSyiZV4hG264f7jZdKZetKu27lkHemeGxiJ 85UibVD9nqLNhwCWwt37OGdeF+tiAZU6yJyj5JiU9u05tHl8fUSscYEHU8Ig9OWIalAVIN DNVh/tQzeIAUabAMBZnLohPS8sNSxHo7VIWurPYdPgnFy2IoyAmhywt6qawyPywosIbVKH WW79481ic48W5huaoYo7wmpvG7grF4HN3gZ/daa9HRzi6fX1XWD4wq5V7Ih2PA== 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=1694362406; 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=TkL268Si4z9m1O/8ml3m6qcSUXkRKoLXD03sS9R26zg=; b=Ir1jbWNCP/fgnZLwrLmYHzURzf1jjDu1lzvFBodKA17L0vSI8M75IzZ5onU2vv4y86ehck m4BuD2QOYusIOL2U/rvsS2oHjQdNL+H+wwKnsVA/Xqaqd5ccl/dFfPH7FCrPdZB6IQaeXz snsJMJc4ldyH90ZtlyPtAlqpQGjN+4MtW6OO8wqeTJNSr1W4zAz53a/+XkEoBESu5SJYTc wxOQyuQtC2sYU3RRjGnD5By8EDl9TbERVpK4AGSrBuiL1HWqnWQrjGN7a6IE1tgtmu8HRN /Td4vbTEcS+MiPFOAjiFbyu0N0W47YuJYc2Sdk4fBYd3SNug6xg90Scslpsu6Q== 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 4RkFJQ2GfXz1CN2; Sun, 10 Sep 2023 16:13:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38AGDQEZ024355; Sun, 10 Sep 2023 16:13:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38AGDQ6F024352; Sun, 10 Sep 2023 16:13:26 GMT (envelope-from git) Date: Sun, 10 Sep 2023 16:13:26 GMT Message-Id: <202309101613.38AGDQ6F024352@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: e5731e2bf4e7 - main - net-p2p/libutp: update to g20230213 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e5731e2bf4e706904cae6131fc5e7fd32d6814c7 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=e5731e2bf4e706904cae6131fc5e7fd32d6814c7 commit e5731e2bf4e706904cae6131fc5e7fd32d6814c7 Author: Rafe AuthorDate: 2023-09-06 00:45:48 +0000 Commit: Robert Clausecker CommitDate: 2023-09-10 16:12:57 +0000 net-p2p/libutp: update to g20230213 In preparation of the following net-p2p/transmission update. The library must be updated in lockstep. PR: 269504 Reported by: dutchman01@quicknet.nl Approved by: rigoletto, tcberner (maintainer timeout) Reviewed By: fcharlier_ploup.net Differential Revision: https://reviews.freebsd.org/D40910 --- net-p2p/libutp/Makefile | 17 ++++++++--------- net-p2p/libutp/distinfo | 6 +++--- net-p2p/libutp/files/patch-CMakeLists.txt | 30 ++++++++++++++++++++++-------- net-p2p/libutp/pkg-plist | 10 ++++++++++ 4 files changed, 43 insertions(+), 20 deletions(-) diff --git a/net-p2p/libutp/Makefile b/net-p2p/libutp/Makefile index 60a6b5ae31ef..9150ca449f76 100644 --- a/net-p2p/libutp/Makefile +++ b/net-p2p/libutp/Makefile @@ -1,10 +1,10 @@ PORTNAME= libutp -DISTVERSION= g20180515 +DISTVERSION= g20230213 CATEGORIES= net-p2p -MAINTAINER= rigoletto@FreeBSD.org -COMMENT= uTorrent Transport Protocol library and sample utilities -WWW= https://github.com/bittorrent/libutp +MAINTAINER= mondo.debater_0q@icloud.com +COMMENT= uTorrent Transport Protocol library and sample utilities. +WWW= https://github.com/transmission/libutp LICENSE= MIT @@ -12,12 +12,11 @@ USES= cmake uidfix USE_GITHUB= yes GH_ACCOUNT= transmission -GH_TAGNAME= fda9f4b3db97ccb243fcbed2ce280eb4135d705b +GH_TAGNAME= c95738b1a6644b919e5b64d3ea9736cfc5894e0b USE_LDCONFIG= yes - -PLIST_FILES= include/libutp/utp.h \ - include/libutp/utypes.h \ - lib/libutp.so +CMAKE_ON= LIBUTP_SHARED +CMAKE_OFF= LIBUTP_ENABLE_WERROR +CMAKE_BUILD_TYPE= Release .include diff --git a/net-p2p/libutp/distinfo b/net-p2p/libutp/distinfo index 443fdc9d884a..7ebb081422bd 100644 --- a/net-p2p/libutp/distinfo +++ b/net-p2p/libutp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1668792304 -SHA256 (transmission-libutp-g20180515-fda9f4b3db97ccb243fcbed2ce280eb4135d705b_GH0.tar.gz) = c515e6f9add47d3d202389e8a62feb765f0ae41d6398cc238e44028be520774e -SIZE (transmission-libutp-g20180515-fda9f4b3db97ccb243fcbed2ce280eb4135d705b_GH0.tar.gz) = 71743 +TIMESTAMP = 1690649660 +SHA256 (transmission-libutp-g20230213-c95738b1a6644b919e5b64d3ea9736cfc5894e0b_GH0.tar.gz) = d856fde68828d52eb39df40e15ad5dc4efaa9a51d4121bcbfbe47fed2163d20a +SIZE (transmission-libutp-g20230213-c95738b1a6644b919e5b64d3ea9736cfc5894e0b_GH0.tar.gz) = 59698 diff --git a/net-p2p/libutp/files/patch-CMakeLists.txt b/net-p2p/libutp/files/patch-CMakeLists.txt index 35e1773d3966..27dc44215202 100644 --- a/net-p2p/libutp/files/patch-CMakeLists.txt +++ b/net-p2p/libutp/files/patch-CMakeLists.txt @@ -1,11 +1,25 @@ ---- CMakeLists.txt.orig 2017-01-01 23:21:43 UTC +--- CMakeLists.txt.orig 2023-08-04 09:40:52 UTC +++ CMakeLists.txt -@@ -11,7 +11,7 @@ include_directories(.) +@@ -56,6 +56,13 @@ if(WIN32) + libutp_inet_ntop.h) + endif() - include_directories(.) ++if(CMAKE_VERSION VERSION_LESS 3.25) ++ set(BSD OFF) ++ if(CMAKE_SYSTEM_NAME MATCHES "BSD") ++ set(BSD ON) ++ endif() ++ endif() ++ + add_library(libutp ${LIBUTP_LIBRARY_TYPE} + include/libutp/utp.h + include/libutp/utp_types.h +@@ -118,7 +125,7 @@ if(LIBUTP_BUILD_PROGRAMS AND NOT MSVC) --add_library(${PROJECT_NAME} STATIC -+add_library(${PROJECT_NAME} SHARED - utp.cpp - utp_utils.cpp - ${${PROJECT_NAME}_ADD_SOURCES} + target_compile_definitions(ucat + PRIVATE +- $<$>:_POSIX_C_SOURCE=200112L> ++ $<$,$>>:_POSIX_C_SOURCE=200112L> + $<$:_DARWIN_C_SOURCE>) + + target_link_libraries(ucat diff --git a/net-p2p/libutp/pkg-plist b/net-p2p/libutp/pkg-plist new file mode 100644 index 000000000000..a7d219d201ae --- /dev/null +++ b/net-p2p/libutp/pkg-plist @@ -0,0 +1,10 @@ +bin/ucat +lib/cmake/libutp/libutp-config-version.cmake +lib/cmake/libutp/libutp-config.cmake +lib/cmake/libutp/libutp-targets.cmake +lib/cmake/libutp/libutp-targets-release.cmake +include/libutp/utp.h +include/libutp/utp_types.h +lib/libutp.so +%%DOCSDIR%%/LICENSE +%%DOCSDIR%%/README.md