diff options
| author | Scott Kenney <sak@codered.rmta.org> | 2026-07-07 17:12:39 +0000 |
|---|---|---|
| committer | Vladimir Druzenko <vvd@FreeBSD.org> | 2026-07-07 17:18:01 +0000 |
| commit | 0d08dd9c80a4c70142c2737f8d857a491daa6b11 (patch) | |
| tree | 5d986121fcbaf55a42ded334964ec4de151174e5 | |
| parent | 6734d1c66825f2abe49b3eea2095136796b6e296 (diff) | |
net-im/mastodon: Update 4.3.6 => 4.6.3, take maintainership
Changelog:
https://github.com/mastodon/mastodon/blob/v4.6.3/CHANGELOG.md
Improve port:
- Update WWW - old url redirects to new.
- Replace RM in post-extract with EXTRACT_AFTER_ARGS.
PR: 296573
Sponsored by: UNIS Labs
Co-authored-by: Vladimir Druzenko <vvd@FreeBSD.org>
| -rw-r--r-- | net-im/mastodon/Makefile | 34 | ||||
| -rw-r--r-- | net-im/mastodon/distinfo | 6 | ||||
| -rw-r--r-- | net-im/mastodon/files/patch-dist_nginx.conf | 5 |
3 files changed, 16 insertions, 29 deletions
diff --git a/net-im/mastodon/Makefile b/net-im/mastodon/Makefile index 96b9829a8b24..dd1ea4557380 100644 --- a/net-im/mastodon/Makefile +++ b/net-im/mastodon/Makefile @@ -1,12 +1,11 @@ PORTNAME= mastodon DISTVERSIONPREFIX= v -DISTVERSION= 4.3.6 -PORTREVISION= 1 +DISTVERSION= 4.6.3 CATEGORIES= net-im www -MAINTAINER= ports@FreeBSD.org +MAINTAINER= saken@codered.rmta.org COMMENT= GNU Social-compatible microblogging server -WWW= https://github.com/tootsuite/mastodon +WWW= https://github.com/mastodon/mastodon/ LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE @@ -27,37 +26,24 @@ USES= magick:7,run pgsql sudo USE_GITHUB= yes USE_RC_SUBR= mastodon_sidekiq mastodon_streaming mastodon_web +EXTRACT_AFTER_ARGS= ${.circleci .devcontainer .git* .dockerignore \ + dist/*.service docker-compose.yml \ + Dockerfile Vagrantfile:L:S|^|--exclude |} \ + --no-same-owner --no-same-permissions + NO_ARCH= yes NO_BUILD= yes USERS= ${PORTNAME} GROUPS= ${PORTNAME} -RM_MASTODONFILES= .dockerignore dist/mastodon-web.service \ - dist/mastodon-sidekiq.service \ - dist/mastodon-streaming.service \ - docker-compose.yml \ - Dockerfile \ - Vagrantfile -RM_MASTODONDIRS= .circleci .devcontainer .github - -post-extract: -.for _F in ${RM_MASTODONFILES} - @${RM} ${WRKSRC}/${_F} -.endfor -.for _D in ${RM_MASTODONDIRS} - @${RM} -r ${WRKSRC}/${_D} -.endfor - post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|'\ ${WRKSRC}/dist/nginx.conf do-install: - ${FIND} ${WRKSRC} -name '*.orig' -delete - ${FIND} ${WRKSRC} -name '*.bak' -delete - ${FIND} ${WRKSRC} -name '*.gitkeep' -delete - ${FIND} ${WRKSRC} -name '*.gitignore' -delete + ${FIND} ${WRKSRC} -name '*.orig' -delete \ + -o -name '*.bak' -delete ${MV} ${WRKSRC}/dist/nginx.conf ${WRKSRC}/dist/nginx.conf.sample (cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/www/${PORTNAME}) diff --git a/net-im/mastodon/distinfo b/net-im/mastodon/distinfo index 837de72072a0..7992a126a235 100644 --- a/net-im/mastodon/distinfo +++ b/net-im/mastodon/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1741880168 -SHA256 (mastodon-mastodon-v4.3.6_GH0.tar.gz) = 1ea3d54ecd90539e08c1441a6f330a3c1404b42b89d78a52acea9fdcdf713e94 -SIZE (mastodon-mastodon-v4.3.6_GH0.tar.gz) = 38126888 +TIMESTAMP = 1783396467 +SHA256 (mastodon-mastodon-v4.6.3_GH0.tar.gz) = 84a5df07b389e1452b1a8602fa8ef35e362a4a90df79df7b8f930584b634a39e +SIZE (mastodon-mastodon-v4.6.3_GH0.tar.gz) = 47768561 diff --git a/net-im/mastodon/files/patch-dist_nginx.conf b/net-im/mastodon/files/patch-dist_nginx.conf index f0f3ebc631fa..5454af46d95b 100644 --- a/net-im/mastodon/files/patch-dist_nginx.conf +++ b/net-im/mastodon/files/patch-dist_nginx.conf @@ -1,4 +1,4 @@ ---- dist/nginx.conf.orig 2023-09-21 14:51:32 UTC +--- dist/nginx.conf.orig 2026-07-03 13:22:15 UTC +++ dist/nginx.conf @@ -25,7 +25,7 @@ server { listen 80; @@ -9,7 +9,7 @@ location /.well-known/acme-challenge/ { allow all; } location / { return 301 https://$host$request_uri; } } -@@ -35,25 +35,25 @@ server { +@@ -35,26 +35,26 @@ server { listen [::]:443 ssl http2; server_name example.com; @@ -37,6 +37,7 @@ keepalive_timeout 70; sendfile on; client_max_body_size 99m; + proxy_read_timeout 120; ## Increase if you experience 504 errors uploading media - root /home/mastodon/live/public; + root %%PREFIX%%/www/mastodon/public; |