From nobody Tue May 24 01:53:04 2022 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 67BFD1B43D16; Tue, 24 May 2022 01:53:04 +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 4L6cfS2RYdz3N1S; Tue, 24 May 2022 01:53:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653357184; 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=xQst7h2uPkiGj8x1ERtMbkgXABjAa4/sUPladRkWihM=; b=nvxrK0g0+PR8mqBFLhPDYduJ8x5VY0jUQty+k0/1y1swwWlf4l6ta71JgoZXjCK4AA9kEF h3aYFC4S/10KCIpM1ibjyhMeR9HiJKWT2X2MvYEnN8gCqBs7uFoxrO/+/v1PQ+4yru1LBQ Qoupoqud/Z7jxYk1HVfF81vwJmzetbLVY1+92uGRntdnAftm9NQdw0gqi4uNwOhSK2xW1Y tBUKZ2DEBa/ufr0DPpNrAojcOOAURFhQ07T92UpP3f2ixC1Wk7Ai2TERsZrndA99VQ/tye aQZ1JgzUjDnYHDWbkBI3s3yhdlueWTxFuZHMbae3aQPv/ln5q4YDM92as3xlRQ== 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 33F4F1B986; Tue, 24 May 2022 01:53:04 +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 24O1r4mJ093776; Tue, 24 May 2022 01:53:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24O1r4Y0093775; Tue, 24 May 2022 01:53:04 GMT (envelope-from git) Date: Tue, 24 May 2022 01:53:04 GMT Message-Id: <202205240153.24O1r4Y0093775@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: f3c7a7686768 - main - sysutils/fusefs-ntfs: prune two obsolete patches from the port 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: f3c7a7686768351238894670b203c28526d247c1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653357184; 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=xQst7h2uPkiGj8x1ERtMbkgXABjAa4/sUPladRkWihM=; b=fmafZo0pe3sGYUvFyjeBCYXMMUSV8d4wEClXidQvUm04YsDaAoGoktc5CLr+y9RcJP0hyh acfT+ne+XRIEI1CGqsZmIp7ar9CkwFCr3p9F+XML2knDboc4aHQD4xkV9vbO1mf2uZ9+YA /PzgluyPpzJBjspXBh7WSGc4NvgMXRomq0Gh40Z2ClXFac8lcuJtV1kli6A7F7BISQmK8p ua0fG/9s1llBVz72wCH+3XjoCXhejygZmt8M9Wb1LO87lydUOLI8Wpp5EJC5cyYZvNx+7S 5Xma08XYUlf512WLf5AEBGYWZepjizYrjqCwQxAHkR5pzDSMxw9NTQUFOYDA5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653357184; a=rsa-sha256; cv=none; b=m/POU5mH/iHa+LUGAfVP0kGG6229F/f1duIxOoTthyA5om5XS8E0o47jJ1xmwV4LB7H7Bs CjxYn795kwjCf8y0SZIFiE5B40Q7OWGJR0EGM8QXNeKCal3tvbnSC1rvDczYDbt2sdoeBk aojlZIBpdN/vVCh/AdSeY/pttuEXZxL4lPGgxPCk9H+UJMP8Ba4xDPgGCIVLNr0W+pzszH Hrudpwx3NPdorhklM/4ukPgUTC2s7DeKWSkyDqTNieXcKsLNVU8GJeSV7Wo3Ngo+libelc IRjDbeL/SImOnvdTXMnNVKIZFBNEt0+S5OQ+O1v68orCXS4sH6cOnArf5EKKHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=f3c7a7686768351238894670b203c28526d247c1 commit f3c7a7686768351238894670b203c28526d247c1 Author: Alexey Dokuchaev AuthorDate: 2022-05-24 01:52:14 +0000 Commit: Alexey Dokuchaev CommitDate: 2022-05-24 01:52:14 +0000 sysutils/fusefs-ntfs: prune two obsolete patches from the port They still apply, but serve no purpose now, and can be deleted. PR: 256198, 256201 --- .../fusefs-ntfs/files/patch-libntfs-3g__device.c | 56 ---------------------- sysutils/fusefs-ntfs/files/patch-src__lowntfs-3g.c | 17 ------- 2 files changed, 73 deletions(-) diff --git a/sysutils/fusefs-ntfs/files/patch-libntfs-3g__device.c b/sysutils/fusefs-ntfs/files/patch-libntfs-3g__device.c deleted file mode 100644 index 723a3c91aff9..000000000000 --- a/sysutils/fusefs-ntfs/files/patch-libntfs-3g__device.c +++ /dev/null @@ -1,56 +0,0 @@ ---- ./libntfs-3g/device.c.orig Tue Jan 9 18:22:57 2007 -+++ ./libntfs-3g/device.c Mon Apr 30 13:40:54 2007 -@@ -63,6 +63,9 @@ - #ifdef HAVE_LINUX_HDREG_H - #include - #endif -+#ifdef __FreeBSD__ -+#include -+#endif - - #include "types.h" - #include "mst.h" -@@ -533,6 +536,17 @@ - } - } - #endif -+#ifdef DIOCGMEDIASIZE -+ { off_t size; -+ -+ if (dev->d_ops->ioctl(dev, DIOCGMEDIASIZE, &size) >= 0) { -+ ntfs_log_debug("DIOCGMEDIASIZE nr bytes = %llu (0x%llx)\n", -+ (unsigned long long)size, -+ (unsigned long long)size); -+ return (s64)size / block_size; -+ } -+ } -+#endif - /* - * We couldn't figure it out by using a specialized ioctl, - * so do binary search to find the size of the device. -@@ -681,7 +695,24 @@ - return sect_size; - } - } --#else -+#elif defined(DIOCGSECTORSIZE) -+ /* -+ * XXX On FreeBSD (where we have DIOCGSECTORSIZE) the low-level I/O -+ * system already knows the sector size, and doing an ioctl is needless. -+ * However, I don't know how to extract that information cleanly, -+ * without letting a bunch of platform specific #ifdef-s to sneak in. -+ * So now I rather just re-do the ioctl... -+ */ -+ { -+ size_t sect_size = 0; -+ -+ if (!dev->d_ops->ioctl(dev, DIOCGSECTORSIZE, §_size)) { -+ ntfs_log_debug("DIOCGSECTORSIZE sector size = %d bytes\n", -+ (int)sect_size); -+ return sect_size; -+ } -+ } -+#else - errno = EOPNOTSUPP; - #endif - return -1; diff --git a/sysutils/fusefs-ntfs/files/patch-src__lowntfs-3g.c b/sysutils/fusefs-ntfs/files/patch-src__lowntfs-3g.c deleted file mode 100644 index 17b17d165015..000000000000 --- a/sysutils/fusefs-ntfs/files/patch-src__lowntfs-3g.c +++ /dev/null @@ -1,17 +0,0 @@ ---- src/lowntfs-3g.c.orig 2010-10-02 08:22:46.000000000 -0300 -+++ src/lowntfs-3g.c 2010-10-10 22:04:14.000000000 -0300 -@@ -2541,10 +2541,14 @@ - if (ntfs_inode_close(ni)) - set_fuse_error(&ret); - done : -+#ifndef __FreeBSD__ - if (ret < 0) - fuse_reply_err(req, -ret); - else - fuse_reply_bmap(req, lidx); -+#else -+ ; -+#endif - } - - #ifdef HAVE_SETXATTR