From nobody Fri May 5 06:32: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 4QCLT66Pywz49pY0; Fri, 5 May 2023 06:32: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 4QCLT65D6jz46rF; Fri, 5 May 2023 06:32:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683268346; 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=kD940MtWwh+8H3luec2RP0cSSptLVP6YWl8RPQWxGzI=; b=fB0xhNEK9AMEYlet+v3JCv8andQh9Klmt13Q472xDi63HaADdGuxLhuoVHX+zhpa9r2EBL qsZwr5KAAOzX/8Fhe4Uck1AjJcDa25P7RoiyHx7Z9QpWgqn6KNqxK9BzAjB45G6kUyD1SP gt+jrus8yEpjbz4Zz3SOo1Pp5Yw8FiHX1jHk/W+hd/W/p/X3EHMoRXlxmBPAIFuEpfNclH QwkzFhimePUxbb6LWJlyOX8qZZ9CQW5K5TTOXWhwiMGKXuevjvtyy8BjARuYCrAtbHJrFh f2jy+A6opouuHWf95A9CXXbRSTeCLnEBVGsSpY/GYkxL6agzriWExjtBe5Th+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683268346; 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=kD940MtWwh+8H3luec2RP0cSSptLVP6YWl8RPQWxGzI=; b=Vf7PjMGgk/KcRXJjRXJuko4rHpwMjfjp+iWZLj0Wqqp6AI3O1wzPRw64YmxTE9kWuC/2rh 5I+PGR3dhPy8xFi7jO04pF27qB08wuvhThMSvSMXn8wHYZ5xiqFIgYIbXxE/aL/LuMl6k+ T43AfheoxcK5C1ohGqCQ/3BFe2/l8yhOeqytn2Y/txN6rAgSzXEZkC9YEH3NNJmN8AIl3F G4yYu3HG4sVBa9POEJka7Idd25U6w7kd8NwMGavmkfow7oZEjcBaZBkMSOwGdSWA/DCZ5R vc7yvO7DdLSA+LzwChpupnOPf/6I958NHAI9UL0IuyAAibVUr2DBaxBRSmzOMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683268346; a=rsa-sha256; cv=none; b=sT8DTCeRC18wQmHJVLaD8/JlmzhwlRtJEwJJLyl/yA4LCTrTajo3f6Nnq4sCUj3RbH+5rN sYIcq9FyB8LPOmjiL/4wzZ6XDfozxp1xNQqNz6Q9csr8mwk/Y/9j45Ni3d7a7nqDTjxPfk zxE6vLipCNlV6JypTkYT8l3JNKZ9T9j4cjz/JFudwxnks0urF2EpyYA0rtolFgA3aGyBPY zx+1Ko5yvecuDMh4/yE7tF/c+N5H5LvvaEgKPlqzLFSd8Fl7S3PNVRGcFnb5V5OVsfPtHM x/DQVl61SNTV/QRjeIcvFyZIWlV8yNk9et4q5ueaZm0otQ7zmNr7T/yeiTM8gA== 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 4QCLT64HLbzkHy; Fri, 5 May 2023 06:32:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3456WQcI038498; Fri, 5 May 2023 06:32:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3456WQtt038497; Fri, 5 May 2023 06:32:26 GMT (envelope-from git) Date: Fri, 5 May 2023 06:32:26 GMT Message-Id: <202305050632.3456WQtt038497@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: fcfb4ecb1956 - main - sysutils/ntfs2btrfs: the port had been updated to version 20230501 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: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fcfb4ecb19567c9dbb5cde5db4070c51cd5d4058 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=fcfb4ecb19567c9dbb5cde5db4070c51cd5d4058 commit fcfb4ecb19567c9dbb5cde5db4070c51cd5d4058 Author: Alexey Dokuchaev AuthorDate: 2023-05-05 06:31:14 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-05-05 06:31:14 +0000 sysutils/ntfs2btrfs: the port had been updated to version 20230501 - Back out upstream commit b456295 (walk_btree: use concept rather than std::function) to unbreak the build on older FreeBSD versions - Reword port description slightly for better readability and looks Reported by: portscout --- sysutils/ntfs2btrfs/Makefile | 4 ++-- sysutils/ntfs2btrfs/distinfo | 6 +++--- sysutils/ntfs2btrfs/files/patch-src_ntfs.cpp | 11 +++++++++++ sysutils/ntfs2btrfs/pkg-descr | 6 +++--- 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/sysutils/ntfs2btrfs/Makefile b/sysutils/ntfs2btrfs/Makefile index 358e6dba4554..7d8ea00fc08a 100644 --- a/sysutils/ntfs2btrfs/Makefile +++ b/sysutils/ntfs2btrfs/Makefile @@ -1,5 +1,5 @@ PORTNAME= ntfs2btrfs -PORTVERSION= 20220812 +PORTVERSION= 20230501 CATEGORIES= sysutils MAINTAINER= danfe@FreeBSD.org @@ -19,7 +19,7 @@ PLIST_FILES= sbin/${PORTNAME} share/man/man8/${PORTNAME}.8.gz post-patch: # One should not try to mmap(2) disk devices on FreeBSD, it won't work - @${REINPLACE_CMD} -e '3390s,WIN32,_${OPSYS}__,' \ + @${REINPLACE_CMD} -e '3449s,WIN32,_${OPSYS}__,' \ ${WRKSRC}/src/ntfs2btrfs.cpp .include diff --git a/sysutils/ntfs2btrfs/distinfo b/sysutils/ntfs2btrfs/distinfo index 632de3f2784e..e0ecb1e9b75e 100644 --- a/sysutils/ntfs2btrfs/distinfo +++ b/sysutils/ntfs2btrfs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1660262820 -SHA256 (maharmstone-ntfs2btrfs-20220812_GH0.tar.gz) = 9ce07535e6191ab45f204a4dd281be4768d7917df4426ee7c71aa9c308a2fe93 -SIZE (maharmstone-ntfs2btrfs-20220812_GH0.tar.gz) = 98059 +TIMESTAMP = 1682974776 +SHA256 (maharmstone-ntfs2btrfs-20230501_GH0.tar.gz) = 15924a22e9d80e4ca28bf5524708dd8f69d840df1e781a659ce953fee7d90730 +SIZE (maharmstone-ntfs2btrfs-20230501_GH0.tar.gz) = 98816 diff --git a/sysutils/ntfs2btrfs/files/patch-src_ntfs.cpp b/sysutils/ntfs2btrfs/files/patch-src_ntfs.cpp new file mode 100644 index 000000000000..74817c12412f --- /dev/null +++ b/sysutils/ntfs2btrfs/files/patch-src_ntfs.cpp @@ -0,0 +1,11 @@ +--- src/ntfs.cpp.orig 2023-05-01 20:59:36 UTC ++++ src/ntfs.cpp +@@ -465,7 +465,7 @@ string_view ntfs::find_sd(uint32_t id, ntfs_file& secu + } + + static void walk_btree(const index_root& ir, const list& mappings, const index_node_header& inh, ntfs& dev, +- const invocable auto& func, unsigned int level) { ++ const function& func, unsigned int level) { + auto ent = reinterpret_cast((uint8_t*)&inh + inh.first_entry); + + do { diff --git a/sysutils/ntfs2btrfs/pkg-descr b/sysutils/ntfs2btrfs/pkg-descr index ed0ee1654542..6845f5661a10 100644 --- a/sysutils/ntfs2btrfs/pkg-descr +++ b/sysutils/ntfs2btrfs/pkg-descr @@ -1,5 +1,5 @@ Ntfs2btrfs is a tool which does in-place conversion of Microsoft's NTFS file system to the open-source file system Btrfs, much as btrfs-convert -does for ext2. The original image is saved as a reflink copy at -``image/ntfs.img'', and if you want to keep the conversion you can delete -this to free up space. +does for ext2. The original file system image is saved as a reflink copy +at `image/ntfs.img', and can be deleted to free up space if you want to +keep the conversion.