diff --git a/net-im/mastodon/Makefile b/net-im/mastodon/Makefile index d009d12b2de9..69e0d8998cd3 100644 --- a/net-im/mastodon/Makefile +++ b/net-im/mastodon/Makefile @@ -1,73 +1,73 @@ PORTNAME= mastodon DISTVERSIONPREFIX= v -DISTVERSION= 4.1.9 +DISTVERSION= 4.2.0 CATEGORIES= net-im www MAINTAINER= bofh@FreeBSD.org COMMENT= GNU Social-compatible microblogging server WWW= https://github.com/tootsuite/mastodon LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libidn.so:dns/libidn RUN_DEPENDS= autoconf>=2.71:devel/autoconf \ curl>0:ftp/curl \ ffmpeg>0:multimedia/ffmpeg \ git>=0:devel/git \ gmake>0:devel/gmake \ gnupg>0:security/gnupg \ redis>0:databases/redis \ rubygem-bundler>=0:sysutils/rubygem-bundler \ sudo>0:security/sudo \ wget>0:ftp/wget \ yarn>:www/yarn USES= magick:7,run pgsql USE_GITHUB= yes USE_RC_SUBR= mastodon_sidekiq mastodon_streaming mastodon_web 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 ${MV} ${WRKSRC}/dist/nginx.conf ${WRKSRC}/dist/nginx.conf.sample (cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/www/${PORTNAME}) post-install: @${ECHO_CMD} "@owner mastodon" >> ${TMPPLIST} @${ECHO_CMD} "@group mastodon" >> ${TMPPLIST} ${FIND} -s ${STAGEDIR}${WWWDIR} -not -type d | ${SORT} | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' | \ ${SED} -E -e '/sample$$/ s#^#@sample #' >> ${TMPPLIST} ${FIND} -s ${STAGEDIR}${WWWDIR} -type d | ${SORT} | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/#@dir #' >> ${TMPPLIST} .include diff --git a/net-im/mastodon/distinfo b/net-im/mastodon/distinfo index 5e9181d052a3..1ef3b85ef807 100644 --- a/net-im/mastodon/distinfo +++ b/net-im/mastodon/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695315362 -SHA256 (mastodon-mastodon-v4.1.9_GH0.tar.gz) = 1b0233b1141f64d146d5f9717df1548a162a13df9e028603536226c169c20d2e -SIZE (mastodon-mastodon-v4.1.9_GH0.tar.gz) = 36349349 +TIMESTAMP = 1695333175 +SHA256 (mastodon-mastodon-v4.2.0_GH0.tar.gz) = 97c6bd9eb31efb96b10f78f6397de93a49ce8fa7237ffd73c7407f5d9692dfea +SIZE (mastodon-mastodon-v4.2.0_GH0.tar.gz) = 36327440 diff --git a/net-im/mastodon/files/patch-.profile b/net-im/mastodon/files/patch-.profile index ab2ad3170a9e..94de7f8d75a4 100644 --- a/net-im/mastodon/files/patch-.profile +++ b/net-im/mastodon/files/patch-.profile @@ -1,5 +1,5 @@ ---- .profile.orig 2022-12-06 11:15:00 UTC +--- .profile.orig 2023-09-21 14:51:32 UTC +++ .profile -@@ -1 +1 @@ --LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/app/.apt/lib/x86_64-linux-gnu:/app/.apt/usr/lib/x86_64-linux-gnu/mesa:/app/.apt/usr/lib/x86_64-linux-gnu/pulseaudio +@@ -1 +1,2 @@ + LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/app/.apt/lib/x86_64-linux-gnu:/app/.apt/usr/lib/x86_64-linux-gnu/mesa:/app/.apt/usr/lib/x86_64-linux-gnu/pulseaudio:/app/.apt/usr/lib/x86_64-linux-gnu/openblas-pthread +export LC_ALL="en_US.UTF-8" diff --git a/net-im/mastodon/files/patch-Gemfile b/net-im/mastodon/files/patch-Gemfile deleted file mode 100644 index d09e643501f0..000000000000 --- a/net-im/mastodon/files/patch-Gemfile +++ /dev/null @@ -1,20 +0,0 @@ ---- Gemfile.orig 2023-04-13 16:23:34 UTC -+++ Gemfile -@@ -1,7 +1,7 @@ - # frozen_string_literal: true - - source 'https://rubygems.org' --ruby '>= 2.7.0', '< 3.1.0' -+ruby '>= 2.7.0', '< 3.2.0' - - gem 'pkg-config', '~> 1.5' - gem 'rexml', '~> 3.2' -@@ -122,7 +122,7 @@ group :test do - gem 'climate_control', '~> 0.2' - gem 'faker', '~> 3.1' - gem 'json-schema', '~> 3.0' -- gem 'rack-test', '~> 2.0' -+ gem 'rack-test', '~> 2.0' - gem 'rails-controller-testing', '~> 1.0' - gem 'rspec_junit_formatter', '~> 0.6' - gem 'rspec-sidekiq', '~> 3.1' diff --git a/net-im/mastodon/files/patch-dist_nginx.conf b/net-im/mastodon/files/patch-dist_nginx.conf index 4322a71e51a0..f0f3ebc631fa 100644 --- a/net-im/mastodon/files/patch-dist_nginx.conf +++ b/net-im/mastodon/files/patch-dist_nginx.conf @@ -1,46 +1,45 @@ ---- dist/nginx.conf.orig 2022-11-30 18:16:44 UTC +--- dist/nginx.conf.orig 2023-09-21 14:51:32 UTC +++ dist/nginx.conf -@@ -17,31 +17,32 @@ server { +@@ -25,7 +25,7 @@ server { listen 80; listen [::]:80; server_name example.com; - root /home/mastodon/live/public; + root %%PREFIX%%/www/mastodon/public; location /.well-known/acme-challenge/ { allow all; } location / { return 301 https://$host$request_uri; } } - - server { -- listen 443 ssl http2; -- listen [::]:443 ssl http2; +@@ -35,25 +35,25 @@ server { + listen [::]:443 ssl http2; server_name example.com; -+ # Uncomment these lines once you acquire a certificate: -+ # listen 443 ssl http2; -+ # listen [::]:443 ssl http2; - + - ssl_protocols TLSv1.2 TLSv1.3; -- ssl_ciphers HIGH:!MEDIUM:!LOW:!aNULL:!NULL:!SHA; ++ # ssl_protocols TLSv1.2 TLSv1.3; + + # You can use https://ssl-config.mozilla.org/ to generate your cipher set. + # We recommend their "Intermediate" level. +- ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CHACHA20-POLY1305; ++ # ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CHACHA20-POLY1305; + - ssl_prefer_server_ciphers on; - ssl_session_cache shared:SSL:10m; - ssl_session_tickets off; -+ # ssl_protocols TLSv1.2 TLSv1.3; -+ # ssl_ciphers HIGH:!MEDIUM:!LOW:!aNULL:!NULL:!SHA; + # ssl_prefer_server_ciphers on; + # ssl_session_cache shared:SSL:10m; + # ssl_session_tickets off; - + # Uncomment these lines once you acquire a certificate: - # ssl_certificate /etc/letsencrypt/live/example.com/fullchain.pem; - # ssl_certificate_key /etc/letsencrypt/live/example.com/privkey.pem; + # ssl_certificate %%PREFIX%%/etc/ssl/example.com/fullchain.pem; + # ssl_certificate_key %%PREFIX%%/etc/ssl/example.com/key.pem; - + keepalive_timeout 70; sendfile on; - client_max_body_size 80m; - + client_max_body_size 99m; + - root /home/mastodon/live/public; + root %%PREFIX%%/www/mastodon/public; - + gzip on; gzip_disable "msie6";