aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Dokuchaev <danfe@FreeBSD.org>2022-05-24 01:52:14 +0000
committerAlexey Dokuchaev <danfe@FreeBSD.org>2022-05-24 01:52:14 +0000
commitf3c7a7686768351238894670b203c28526d247c1 (patch)
tree5811da511150eb51cd9e677cf7839ca2ed6125ef
parent2e76962a16fdd60ce35a4f9db7a55fd255679b78 (diff)
downloadports-f3c7a7686768351238894670b203c28526d247c1.tar.gz
ports-f3c7a7686768351238894670b203c28526d247c1.zip
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
-rw-r--r--sysutils/fusefs-ntfs/files/patch-libntfs-3g__device.c56
-rw-r--r--sysutils/fusefs-ntfs/files/patch-src__lowntfs-3g.c17
2 files changed, 0 insertions, 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 <linux/hdreg.h>
- #endif
-+#ifdef __FreeBSD__
-+#include <sys/disk.h>
-+#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, &sect_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