From nobody Sun Sep 24 10:40:30 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RtjFp3S9bz4tmnh; Sun, 24 Sep 2023 10:40:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RtjFp2Tqrz4Hsl; Sun, 24 Sep 2023 10:40:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695552030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UvJ1wH48XGdyJSWsjOPlZcZmSL+sGrK9nr6MHtJMuTI=; b=jI8QqWZWRDkgTbXMwe4PYD6qBNg2/+VmqGP9Mtsn65NmuME5rxzcaVRdYRVBhduXWarnHa AQWQTvuy4LN9JSpJKj7ApaqJqTt2yYHx4T0A2NwOBcHvPkyfxH5Z5qiDaPxA4fjOHHGDXO MfqaxAC0F+CN/xrTQNm+HTDrNWgQbD0xYEc82AjEgN9bCU6CvaYR20fkGEqnUurgzqQcpS EGtqQRQ52d7WnG4bdWBZrdfL5Fj6vgQkoD/nPgJlPrRSMLpTiSMSKnlbQRjeiPa/nnGlz0 uGDKddFRlpBk2ICsxdHCApiZkGGtMNjqGpNROLuWQI31RPv+TL6CWJFy4IdPzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695552030; a=rsa-sha256; cv=none; b=duX6tG9U1dEuTxJnoGpR63KKlHmzEgYeet/1ALasvieN/LfsHcwUFxKLHnHwQV6K3ILJAm kFPvC9AEVbjaBsqjqZsAGtkcJoLOOH8JgnY8iItGmtBlFslDDLcvbGrYzb2D9xA6Fm+yZO 2zD8d3edZ+U1Y0OWlQxCw1Vv1uNewZ7LmCFm/wAEah9Px0GABN9aUik69KwKXILm/4uN64 WT8mIkyIXgupCtSJjMC9ERhzUlx6JX9MliygXFzjdJqs0CSqg8KP312pWT0soGaLASLS5h KneMv6jbtbghAGbz3RPjzqYEYHLaoOUxPY9AVPuNQD/UIoh2t/T0s0B+mgQlGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695552030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UvJ1wH48XGdyJSWsjOPlZcZmSL+sGrK9nr6MHtJMuTI=; b=Ww8rbK5g0dOFRmK/EkBqcAXM6myRK7fO1O0QTdL/m0mHVNy0YHpNd4hWkRRUaOxtkkGPXP bqZ5QXWaotMggDLPRPXXiowtcrXveQomv9xbRO1bIVvbaNtTqaZMU9T2E9IkN4OxQJOzvx D+8922WHgJDUav0r5JtKEKwITayZI9s+LKu1nO3cW/lBiXFuhTjDulQUbliK9yQNWm+DMP gRWrrwlWNC+Ak2+RKGM2DvQSuXmhzsOWYXNmpfxaFrx+rC9b5x1b4uFkiYBjKz1k0BL/nT FywXkNGTfAYAW5w6KBVA6N/GnRXkHl+GQE7dRj9u7TZRS3PqiPZEkePiRaiX5A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RtjFp1DcQzk2p; Sun, 24 Sep 2023 10:40:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38OAeUKQ021936; Sun, 24 Sep 2023 10:40:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38OAeUDS021933; Sun, 24 Sep 2023 10:40:30 GMT (envelope-from git) Date: Sun, 24 Sep 2023 10:40:30 GMT Message-Id: <202309241040.38OAeUDS021933@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 15c3128e9401 - main - net-im/mastodon: Update version 4.1.9=>4.2.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 15c3128e9401146eef7195d1b5009bd2d43245c7 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=15c3128e9401146eef7195d1b5009bd2d43245c7 commit 15c3128e9401146eef7195d1b5009bd2d43245c7 Author: Muhammad Moinur Rahman AuthorDate: 2023-09-23 18:18:40 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-09-24 10:40:22 +0000 net-im/mastodon: Update version 4.1.9=>4.2.0 Changelog: https://github.com/mastodon/mastodon/releases/tag/v4.2.0 --- net-im/mastodon/Makefile | 2 +- net-im/mastodon/distinfo | 6 ++--- net-im/mastodon/files/patch-.profile | 6 ++--- net-im/mastodon/files/patch-Gemfile | 20 ----------------- net-im/mastodon/files/patch-dist_nginx.conf | 35 ++++++++++++++--------------- 5 files changed, 24 insertions(+), 45 deletions(-) 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,6 +1,6 @@ PORTNAME= mastodon DISTVERSIONPREFIX= v -DISTVERSION= 4.1.9 +DISTVERSION= 4.2.0 CATEGORIES= net-im www MAINTAINER= bofh@FreeBSD.org 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,6 +1,6 @@ ---- 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; @@ -9,38 +9,37 @@ 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";