diff options
Diffstat (limited to 'filesystems')
-rw-r--r-- | filesystems/hfsfuse/Makefile | 13 | ||||
-rw-r--r-- | filesystems/hfsfuse/distinfo | 6 | ||||
-rw-r--r-- | filesystems/hfsfuse/pkg-descr | 4 | ||||
-rw-r--r-- | filesystems/libblkid/Makefile | 2 | ||||
-rw-r--r-- | filesystems/libblkid/files/patch-libblkid_src_devname.c | 30 | ||||
-rw-r--r-- | filesystems/libblkid/files/patch-libblkid_src_probe.c | 49 | ||||
-rw-r--r-- | filesystems/libblkid/files/patch-misc-utils_blkid.c | 18 | ||||
-rw-r--r-- | filesystems/py-pyfakefs/Makefile | 4 | ||||
-rw-r--r-- | filesystems/py-pyfakefs/distinfo | 6 | ||||
-rw-r--r-- | filesystems/sandboxfs/Makefile | 2 | ||||
-rw-r--r-- | filesystems/sasquatch/Makefile | 2 | ||||
-rw-r--r-- | filesystems/ufs/Makefile | 1 | ||||
-rw-r--r-- | filesystems/xfuse/Makefile | 1 | ||||
-rw-r--r-- | filesystems/zerofs/Makefile | 1 | ||||
-rw-r--r-- | filesystems/ztop/Makefile | 2 |
15 files changed, 122 insertions, 19 deletions
diff --git a/filesystems/hfsfuse/Makefile b/filesystems/hfsfuse/Makefile index 39f64ce87979..c0a29c76c9bf 100644 --- a/filesystems/hfsfuse/Makefile +++ b/filesystems/hfsfuse/Makefile @@ -1,5 +1,5 @@ PORTNAME= hfsfuse -DISTVERSION= 0.242 +DISTVERSION= 0.289 CATEGORIES= filesystems MASTER_SITES= https://github.com/0x09/${PORTNAME}/releases/download/${DISTVERSION}/ PKGNAMEPREFIX= fusefs- @@ -9,18 +9,20 @@ COMMENT= FUSE driver for HFS+ filesystems WWW= https://github.com/0x09/hfsfuse LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/src/COPYING +LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libublio.so:devel/libublio \ - libutf8proc.so:textproc/utf8proc + libutf8proc.so:textproc/utf8proc \ + liblzfse.so:archivers/lzfse -USES= fuse gmake +USES= fuse gmake libarchive USE_CSTD= gnu11 ALL_TARGET= config all PLIST_FILES= bin/hfsdump \ - bin/hfsfuse + bin/hfsfuse \ + bin/hfstar PORTDOCS= README.md @@ -33,6 +35,7 @@ OPTIONS_DEFINE= DOCS do-install: ${INSTALL_PROGRAM} ${WRKSRC}/hfsdump ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/hfsfuse ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/hfstar ${STAGEDIR}${PREFIX}/bin do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/filesystems/hfsfuse/distinfo b/filesystems/hfsfuse/distinfo index 400e07a7fc37..c5c8a05a05a2 100644 --- a/filesystems/hfsfuse/distinfo +++ b/filesystems/hfsfuse/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1730040774 -SHA256 (hfsfuse-0.242.tar.gz) = 2cda7fd5d2fd3419c24907c1f59d04230162ce9491a65553c3d6254677ee62f3 -SIZE (hfsfuse-0.242.tar.gz) = 270946 +TIMESTAMP = 1744864204 +SHA256 (hfsfuse-0.289.tar.gz) = b19597dda364a670eebf05d0681c77db4b0f625f19b9e16f4b2b65dd8d16c360 +SIZE (hfsfuse-0.289.tar.gz) = 297704 diff --git a/filesystems/hfsfuse/pkg-descr b/filesystems/hfsfuse/pkg-descr index f919854c8e6e..5f965b7c3c68 100644 --- a/filesystems/hfsfuse/pkg-descr +++ b/filesystems/hfsfuse/pkg-descr @@ -4,5 +4,5 @@ modifications. This driver is read-only and cannot write to or damage the target filesystem in any way. -hfsfuse also includes a standalone tool, hfsdump, to inspect the -contents of an HFS+ volume without FUSE. +hfsfuse also includes two standalone tools, hfsdump and hfstar, +which can be used in an HFS+ volume without FUSE. diff --git a/filesystems/libblkid/Makefile b/filesystems/libblkid/Makefile index 077bc2158912..3367ae62ac6b 100644 --- a/filesystems/libblkid/Makefile +++ b/filesystems/libblkid/Makefile @@ -1,7 +1,7 @@ PORTNAME= libblkid DISTVERSIONPREFIX= v DISTVERSION= 2.41.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= filesystems MAINTAINER= arrowd@FreeBSD.org diff --git a/filesystems/libblkid/files/patch-libblkid_src_devname.c b/filesystems/libblkid/files/patch-libblkid_src_devname.c new file mode 100644 index 000000000000..cf1040ef3f52 --- /dev/null +++ b/filesystems/libblkid/files/patch-libblkid_src_devname.c @@ -0,0 +1,30 @@ +--- libblkid/src/devname.c.orig 2025-06-24 07:55:28 UTC ++++ libblkid/src/devname.c +@@ -224,7 +224,11 @@ static void probe_one(blkid_cache cache, const char *p + + if (stat(device, &st) == 0 && + (S_ISBLK(st.st_mode) || +- (S_ISCHR(st.st_mode) && !strncmp(ptname, "ubi", 3))) && ++ (S_ISCHR(st.st_mode) ++#ifdef __linux__ ++ && !strncmp(ptname, "ubi", 3) ++#endif ++ )) && + st.st_rdev == devno) { + devname = strdup(device); + goto get_dev; +@@ -251,8 +255,12 @@ set_pri: + dev->bid_pri = BLKID_PRI_DM; + if (is_dm_leaf(ptname)) + dev->bid_pri += 5; +- } else if (!strncmp(ptname, "md", 2)) +- dev->bid_pri = BLKID_PRI_MD; ++ } else { ++#ifdef __linux__ ++ if (!strncmp(ptname, "md", 2)) ++ dev->bid_pri = BLKID_PRI_MD; ++#endif ++ } + if (removable) + dev->bid_flags |= BLKID_BID_FL_REMOVABLE; + } diff --git a/filesystems/libblkid/files/patch-libblkid_src_probe.c b/filesystems/libblkid/files/patch-libblkid_src_probe.c new file mode 100644 index 000000000000..aecc99b2b03b --- /dev/null +++ b/filesystems/libblkid/files/patch-libblkid_src_probe.c @@ -0,0 +1,49 @@ +--- libblkid/src/probe.c.orig 2025-06-24 07:55:28 UTC ++++ libblkid/src/probe.c +@@ -594,7 +594,18 @@ static struct blkid_bufinfo *read_buffer(blkid_probe p + DBG(LOWPROBE, ul_debug("\tread: off=%"PRIu64" len=%"PRIu64"", + real_off, len)); + +- ret = read(pr->fd, bf->data, len); ++ /* on FreeBSD, devices are unbuffered so we need to align to full I/O blocks by ourselves */ ++ if (len % pr->io_size) { ++ unsigned rawlen = len + (pr->io_size - len % pr->io_size); ++ char buf[rawlen]; ++ ret = read(pr->fd, buf, rawlen); ++ if (ret < 0 || ret < len) ++ return NULL; ++ memcpy(bf->data, buf, len); ++ ret = len; ++ } else { ++ ret = read(pr->fd, bf->data, len); ++ } + if (ret != (ssize_t) len) { + DBG(LOWPROBE, ul_debug("\tread failed: %m")); + remove_buffer(bf); +@@ -718,7 +729,7 @@ const unsigned char *blkid_probe_get_buffer(blkid_prob + struct blkid_bufinfo *bf = NULL; + uint64_t real_off, bias, len_align; + +- bias = off % pr->io_size; ++ bias = off % /* pr->io_size */ 4096; + off -= bias; + len += bias; + +@@ -1106,6 +1117,7 @@ int blkid_probe_set_device(blkid_probe pr, int fd, + goto err; + } + } else if (S_ISCHR(sb.st_mode)) { ++#ifdef __linux__ + char buf[PATH_MAX]; + + if (!sysfs_chrdev_devno_to_devname(sb.st_rdev, buf, sizeof(buf)) +@@ -1114,6 +1126,9 @@ int blkid_probe_set_device(blkid_probe pr, int fd, + errno = EINVAL; + goto err; + } ++#else ++ /* no-op, FreeBSD maps block devices as character */ ++#endif + devsiz = 1; /* UBI devices are char... */ + } else if (S_ISREG(sb.st_mode)) + devsiz = sb.st_size; /* regular file */ diff --git a/filesystems/libblkid/files/patch-misc-utils_blkid.c b/filesystems/libblkid/files/patch-misc-utils_blkid.c new file mode 100644 index 000000000000..6fe581bc1c13 --- /dev/null +++ b/filesystems/libblkid/files/patch-misc-utils_blkid.c @@ -0,0 +1,18 @@ +--- misc-utils/blkid.c.orig 2025-06-24 07:55:28 UTC ++++ misc-utils/blkid.c +@@ -876,6 +876,7 @@ int main(int argc, char **argv) + else if (S_ISREG(sb.st_mode)) + ; + else if (S_ISCHR(sb.st_mode)) { ++#ifdef __linux__ + char buf[PATH_MAX]; + + if (!sysfs_chrdev_devno_to_devname( +@@ -883,6 +884,7 @@ int main(int argc, char **argv) + continue; + if (strncmp(buf, "ubi", 3) != 0) + continue; ++#endif + } else + continue; + diff --git a/filesystems/py-pyfakefs/Makefile b/filesystems/py-pyfakefs/Makefile index e449e2e2dd44..ef825750a3c7 100644 --- a/filesystems/py-pyfakefs/Makefile +++ b/filesystems/py-pyfakefs/Makefile @@ -1,5 +1,5 @@ PORTNAME= pyfakefs -PORTVERSION= 5.9.2 +PORTVERSION= 5.9.3 CATEGORIES= filesystems devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,7 +12,7 @@ WWW= https://pytest-pyfakefs.readthedocs.io/en/stable/ \ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=45:devel/py-setuptools@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=61.2:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-xdist>=0,1:devel/py-pytest-xdist@${PY_FLAVOR} diff --git a/filesystems/py-pyfakefs/distinfo b/filesystems/py-pyfakefs/distinfo index a994bed83730..3ca076470eef 100644 --- a/filesystems/py-pyfakefs/distinfo +++ b/filesystems/py-pyfakefs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1757120776 -SHA256 (pyfakefs-5.9.2.tar.gz) = 66c5c6ccd4097b484f8782f9a5078fee0533d465e0d9caf594c9157d54382553 -SIZE (pyfakefs-5.9.2.tar.gz) = 231068 +TIMESTAMP = 1757436531 +SHA256 (pyfakefs-5.9.3.tar.gz) = b458b11abc8862d4d8500816170a9b25e10d07437332b9dffd651069f3d4c40c +SIZE (pyfakefs-5.9.3.tar.gz) = 229964 diff --git a/filesystems/sandboxfs/Makefile b/filesystems/sandboxfs/Makefile index 2ca6983f3aa4..e36cdecb4654 100644 --- a/filesystems/sandboxfs/Makefile +++ b/filesystems/sandboxfs/Makefile @@ -1,7 +1,7 @@ PORTNAME= sandboxfs DISTVERSIONPREFIX= sandboxfs- DISTVERSION= 0.2.0 -PORTREVISION= 50 +PORTREVISION= 51 CATEGORIES= filesystems PKGNAMEPREFIX= fusefs- diff --git a/filesystems/sasquatch/Makefile b/filesystems/sasquatch/Makefile index 71946e990520..d1c278bb9e8e 100644 --- a/filesystems/sasquatch/Makefile +++ b/filesystems/sasquatch/Makefile @@ -2,7 +2,7 @@ PORTNAME= sasquatch DISTVERSION= 4.3 CATEGORIES= filesystems sysutils -MAINTAINER= tiago.gasiba@gmail.com +MAINTAINER= tiga@FreeBSD.org COMMENT= SquashFS extractor with patches for firmware analysis WWW= https://gitlab.com/tgasiba/sasquatch/ diff --git a/filesystems/ufs/Makefile b/filesystems/ufs/Makefile index c8d35e734db2..b2b77ae34e05 100644 --- a/filesystems/ufs/Makefile +++ b/filesystems/ufs/Makefile @@ -1,5 +1,6 @@ PORTNAME= ufs DISTVERSION= 0.6.0 +PORTREVISION= 1 CATEGORIES= filesystems sysutils PKGNAMEPREFIX= fusefs- diff --git a/filesystems/xfuse/Makefile b/filesystems/xfuse/Makefile index 8253d69012e4..9eb6bc413433 100644 --- a/filesystems/xfuse/Makefile +++ b/filesystems/xfuse/Makefile @@ -1,5 +1,6 @@ PORTNAME= xfuse DISTVERSION= 0.5.1 +PORTREVISION= 1 CATEGORIES= filesystems MASTER_SITES= CRATESIO MASTER_SITE_SUBDIR= xfs-fuse/${DISTVERSION} diff --git a/filesystems/zerofs/Makefile b/filesystems/zerofs/Makefile index 33d72d1fdc14..e789888398cf 100644 --- a/filesystems/zerofs/Makefile +++ b/filesystems/zerofs/Makefile @@ -1,6 +1,7 @@ PORTNAME= zerofs DISTVERSIONPREFIX= v DISTVERSION= 0.15.2 +PORTREVISION= 1 CATEGORIES= filesystems sysutils MAINTAINER= stephan@lichtenauer.co.za diff --git a/filesystems/ztop/Makefile b/filesystems/ztop/Makefile index 6f5e82b0f8c9..ffc4b00b3c50 100644 --- a/filesystems/ztop/Makefile +++ b/filesystems/ztop/Makefile @@ -1,7 +1,7 @@ PORTNAME= ztop DISTVERSIONPREFIX= v DISTVERSION= 0.3.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= filesystems sysutils MAINTAINER= asomers@FreeBSD.org |