diff --git a/filesystems/httpdirfs/Makefile b/filesystems/httpdirfs/Makefile index 72b7540be860..87a6bcd49671 100644 --- a/filesystems/httpdirfs/Makefile +++ b/filesystems/httpdirfs/Makefile @@ -1,34 +1,31 @@ PORTNAME= httpdirfs -DISTVERSION= 1.2.7 -PORTREVISION= 3 +DISTVERSION= 1.2.9 CATEGORIES= filesystems PKGNAMEPREFIX= fusefs- MAINTAINER= alven@FreeBSD.org -COMMENT= FUSE filesystem to mount HTTP directory listings, with a permanent cache +COMMENT= FUSE filesystem to mount HTTP directory listings, with permanent cache WWW= https://github.com/fangfufu/httpdirfs/ LICENSE= GPL3OPENSSL LICENSE_NAME= GPLv3 or later with execption to link with OpenSSL LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LIB_DEPENDS= libcurl.so:ftp/curl \ libexpat.so:textproc/expat2 \ libgumbo.so:devel/gumbo \ libuuid.so:misc/libuuid USES= fuse:3 meson pkgconfig ssl USE_GITHUB= yes GH_ACCOUNT= fangfufu -PLIST_FILES= bin/httpdirfs -PORTDOCS= README.md - OPTIONS_DEFINE= DOCS +OPTIONS_SUB= yes post-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}/ + ${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} *.md ${STAGEDIR}${DOCSDIR} .include diff --git a/filesystems/httpdirfs/distinfo b/filesystems/httpdirfs/distinfo index 345a4baea24e..3a41e324726c 100644 --- a/filesystems/httpdirfs/distinfo +++ b/filesystems/httpdirfs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1734773125 -SHA256 (fangfufu-httpdirfs-1.2.7_GH0.tar.gz) = c7de6851aaef3132971b9add4a1ed235777db0316f48414ff9d93a316055e9f3 -SIZE (fangfufu-httpdirfs-1.2.7_GH0.tar.gz) = 81749 +TIMESTAMP = 1778886236 +SHA256 (fangfufu-httpdirfs-1.2.9_GH0.tar.gz) = 9a437c87d6c0307e97e236e03d938fd83cafb7aeffa29134d67fe9b881f1a369 +SIZE (fangfufu-httpdirfs-1.2.9_GH0.tar.gz) = 91333 diff --git a/filesystems/httpdirfs/files/patch-curl b/filesystems/httpdirfs/files/patch-curl deleted file mode 100644 index 6b888715536d..000000000000 --- a/filesystems/httpdirfs/files/patch-curl +++ /dev/null @@ -1,51 +0,0 @@ ---- src/link.c.orig 2024-11-01 20:22:40 UTC -+++ src/link.c -@@ -66,14 +66,14 @@ static CURL *Link_to_curl(Link *link) - if (ret) { - lprintf(error, "%s", curl_easy_strerror(ret)); - } -- ret = curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); -+ ret = curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L); - if (ret) { - lprintf(error, "%s", curl_easy_strerror(ret)); - } - /* - * for following directories without the '/' - */ -- ret = curl_easy_setopt(curl, CURLOPT_MAXREDIRS, 2); -+ ret = curl_easy_setopt(curl, CURLOPT_MAXREDIRS, 2L); - if (ret) { - lprintf(error, "%s", curl_easy_strerror(ret)); - } -@@ -81,11 +81,11 @@ static CURL *Link_to_curl(Link *link) - if (ret) { - lprintf(error, "%s", curl_easy_strerror(ret)); - } -- ret = curl_easy_setopt(curl, CURLOPT_TCP_KEEPALIVE, 1); -+ ret = curl_easy_setopt(curl, CURLOPT_TCP_KEEPALIVE, 1L); - if (ret) { - lprintf(error, "%s", curl_easy_strerror(ret)); - } -- ret = curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 15); -+ ret = curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 15L); - if (ret) { - lprintf(error, "%s", curl_easy_strerror(ret)); - } -@@ -118,7 +118,7 @@ static CURL *Link_to_curl(Link *link) - } - } - if (CONFIG.insecure_tls) { -- ret = curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0); -+ ret = curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L); - if (ret) { - lprintf(error, "%s", curl_easy_strerror(ret)); - } -@@ -197,7 +197,7 @@ static void Link_req_file_stat(Link *this_link) - { - lprintf(debug, "%s\n", this_link->f_url); - CURL *curl = Link_to_curl(this_link); -- CURLcode ret = curl_easy_setopt(curl, CURLOPT_NOBODY, 1); -+ CURLcode ret = curl_easy_setopt(curl, CURLOPT_NOBODY, 1L); - if (ret) { - lprintf(error, "%s", curl_easy_strerror(ret)); - } diff --git a/filesystems/httpdirfs/files/patch-src_link.c b/filesystems/httpdirfs/files/patch-src_link.c index ce08ede9c550..8143009c13a1 100644 --- a/filesystems/httpdirfs/files/patch-src_link.c +++ b/filesystems/httpdirfs/files/patch-src_link.c @@ -1,11 +1,51 @@ ---- src/link.c.orig 2025-01-12 11:28:19 UTC +--- src/link.c.orig 2026-05-13 00:00:39 UTC +++ src/link.c -@@ -995,7 +995,7 @@ static CURL *Link_download_curl_setup(Link *link, size +@@ -66,14 +66,14 @@ static CURL *Link_to_curl(Link *link) + if (ret) { + lprintf(error, "%s", curl_easy_strerror(ret)); + } +- ret = curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); ++ ret = curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L); + if (ret) { + lprintf(error, "%s", curl_easy_strerror(ret)); + } + /* + * for following directories without the '/' + */ +- ret = curl_easy_setopt(curl, CURLOPT_MAXREDIRS, 2); ++ ret = curl_easy_setopt(curl, CURLOPT_MAXREDIRS, 2L); + if (ret) { + lprintf(error, "%s", curl_easy_strerror(ret)); + } +@@ -81,11 +81,11 @@ static CURL *Link_to_curl(Link *link) + if (ret) { + lprintf(error, "%s", curl_easy_strerror(ret)); + } +- ret = curl_easy_setopt(curl, CURLOPT_TCP_KEEPALIVE, 1); ++ ret = curl_easy_setopt(curl, CURLOPT_TCP_KEEPALIVE, 1L); + if (ret) { + lprintf(error, "%s", curl_easy_strerror(ret)); + } +- ret = curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 15); ++ ret = curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 15L); + if (ret) { + lprintf(error, "%s", curl_easy_strerror(ret)); + } +@@ -117,7 +117,7 @@ static CURL *Link_to_curl(Link *link) + } + } + if (CONFIG.insecure_tls) { +- ret = curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0); ++ ret = curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L); + if (ret) { + lprintf(error, "%s", curl_easy_strerror(ret)); + } +@@ -1051,7 +1051,7 @@ static CURL *Link_download_curl_setup(Link *link, size size_t end = start + req_size - 1; char range_str[64]; - snprintf(range_str, sizeof(range_str), "%lu-%lu", start, end); + snprintf(range_str, sizeof(range_str), "%zu-%zu", start, end); lprintf(debug, "%s: %s\n", link->linkname, range_str); CURL *curl = Link_to_curl(link); diff --git a/filesystems/httpdirfs/pkg-plist b/filesystems/httpdirfs/pkg-plist new file mode 100644 index 000000000000..a07211d23db8 --- /dev/null +++ b/filesystems/httpdirfs/pkg-plist @@ -0,0 +1,4 @@ +bin/httpdirfs +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.md +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/README.md +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/USAGE.md