net-im/mastodon: Update to version 2.0.0.

Upstream changes:https://github.com/tootsuite/mastodon/releases/tag/v2.0.0

net-im/mastodon/Makefile

@@ -2,8 +2,7 @@
 
 PORTNAME=	mastodon
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.6.1
-PORTREVISION=	1
+DISTVERSION=	2.0.0
 CATEGORIES=	net-im www
 
 MAINTAINER=	jrm@FreeBSD.org
@@ -53,6 +52,7 @@ BR_DEPENDS=	ffmpeg>0:multimedia/ffmpeg \
 		rubygem-link_header>=0.0.8:www/rubygem-link_header \
 		rubygem-mime-types>=3.1:misc/rubygem-mime-types \
 		rubygem-nokogiri>=1.8.0_1:textproc/rubygem-nokogiri \
+		rubygem-nsa-rails5>=0.2:devel/rubygem-nsa-rails5 \
 		rubygem-oj>=3.3.4:devel/rubygem-oj \
 		rubygem-ostatus2>=2.0.1:www/rubygem-ostatus2 \
 		rubygem-ox>=2.5.0:textproc/rubygem-ox \
@@ -75,7 +75,7 @@ BR_DEPENDS=	ffmpeg>0:multimedia/ffmpeg \
 		rubygem-simple-navigation>=4.0.5_1:devel/rubygem-simple-navigation \
 		rubygem-simple_form-rails5>=3.5.0:devel/rubygem-simple_form-rails5 \
 		rubygem-sprockets-rails-rails5>=3.2.0:devel/rubygem-sprockets-rails-rails5 \
-		rubygem-statsd-instrument>=2.1.4:devel/rubygem-statsd-instrument \
+		rubygem-strong_migrations>=0.1.9:devel/rubygem-strong_migrations \
 		rubygem-twitter-text>=1.14.7:textproc/rubygem-twitter-text \
 		rubygem-tzinfo-data>=1.2017.2:devel/rubygem-tzinfo-data \
 		rubygem-webpacker-rails5>=2.0:devel/rubygem-webpacker-rails5 \
@@ -89,7 +89,7 @@ USES=		gmake gnome pgsql python:build,2 shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	tootsuite jehops:mn
 GH_PROJECT=	mastodon_node:mn
-GH_TAGNAME=	1.6.0:mn
+GH_TAGNAME=	2.0.0:mn
 USE_GNOME=	libxml2 libxslt
 USE_RC_SUBR=	mastodon_stream mastodon_web mastodon_workers
 USE_RUBY=	yes
@@ -114,6 +114,7 @@ do-build:
 	@${RM} ${WRKSRC}/Gemfile.lock
 	HOME=${WRKSRC_mn} yarn config set yarn-offline-mirror ${WRKSRC_mn} --offline
 	HOME=${WRKSRC_mn} yarn config set nodedir ${LOCALBASE} --offline
+	@${CP} ${FILESDIR}/yarn.lock.in ${WRKSRC}/yarn.lock
 	(cd ${WRKSRC} && HOME=${WRKSRC_mn} yarn --offline)
 	(cd ${WRKSRC} && \
 		NODE_ENV=production RAILS_ENV=production \

net-im/mastodon/distinfo

@@ -1,5 +1,5 @@
-TIMESTAMP = 1505726996
-SHA256 (tootsuite-mastodon-v1.6.1_GH0.tar.gz) = f7db6526e7238a6c1ec373aa84584ca9db9a481ff98ba54ec7037dd8cb54c8c5
-SIZE (tootsuite-mastodon-v1.6.1_GH0.tar.gz) = 10331458
-SHA256 (jehops-mastodon_node-1.6.0_GH0.tar.gz) = 833ff93c656ef08c0b97cfcd116ebf77ffa5dee3a343b9fcb60439b48dcff443
-SIZE (jehops-mastodon_node-1.6.0_GH0.tar.gz) = 121167009
+TIMESTAMP = 1508351570
+SHA256 (tootsuite-mastodon-v2.0.0_GH0.tar.gz) = f61368d2f13257eb4a0d94ddc9e4cf37954f8cf07ea7980002136b051b27e6fb
+SIZE (tootsuite-mastodon-v2.0.0_GH0.tar.gz) = 12254619
+SHA256 (jehops-mastodon_node-2.0.0_GH0.tar.gz) = 29926725a12c61faec23d6192c5755b42d9a4c929fd6b66181c67eaa5259939c
+SIZE (jehops-mastodon_node-2.0.0_GH0.tar.gz) = 28504279

net-im/mastodon/files/mastodon_stream.in

@@ -1,33 +1,59 @@
-#! /bin/sh
+#!/bin/sh
+
+# $FreeBSD$
 
 # PROVIDE: mastodon_stream
 # REQUIRE: LOGIN postgresql nginx redis
 # KEYWORD: shutdown
 
-#
 # Add the following line to /etc/rc.conf to enable the Mastodon streaming
 # service.
 #
-#  mastodon_stream_enable="YES"
+# mastodon_stream_enable="YES"
+#
+# mastodon_stream_port:       default 4000
+#
+# The options below can be set in /etc/rc.conf.  If they are not set there, they
+# will be read from .env.production.
+#
+# mastodon_db_name:           e.g., mastodon_production
+# mastodon_db_host:           e.g., localhost
+# mastodon_db_user:           e.g., mastodon
+# mastodon_db_port:           e.g., 5432
+# mastodon_local_domain:      e.g., mastodon.mydomain.org (once set, do not change)
+# mastodon_smtp_from_address: e.g., mastodon@mydomain.org
+# mastodon_redis_host:        e.g., localhost
+# mastodon_redis_port:        e.g., 6397
+#
 
 . /etc/rc.subr
 
+desc="Mastodon streaming server"
 name=mastodon_stream
-rcvar="${name}_enable"
+rcvar=mastodon_stream_enable
 
-sig_stop="HUP"
+load_rc_config $name
 
-load_rc_config "$name"
-
-: ${mastodon_stream_enable:="NO"}
-: ${mastodon_stream_port="4000"}
+: ${mastodon_stream_enable:=NO}
+: ${mastodon_stream_port=4000}
 
+sig_stop=HUP
 mastodon_stream_chdir="%%WWWDIR%%"
 mastodon_stream_env="HOME=%%WWWDIR%% \
 NODE_ENV=production \
 PORT=\"${mastodon_stream_port}\" \
+${mastodon_db_url:+DATABASE_URL=\"${mastodon_db_url}\"} \
+${mastodon_db_host:+DB_HOST=\"${mastodon_db_host}\"} \
+${mastodon_db_name:+DB_NAME=\"${mastodon_db_name}\"} \
+${mastodon_db_port:+DB_PORT=\"${mastodon_db_port}\"} \
+${mastodon_db_user:+DB_USER=\"${mastodon_db_user}\"} \
+${mastodon_db_password:+DB_PASS=\"${mastodon_db_password}\"} \
+${mastodon_local_domain:+LOCAL_DOMAIN=\"${mastodon_local_domain}\"} \
+${mastodon_smtp_from_address:+SMTP_FROM_ADDRESS=\"${mastodon_smtp_from_address}\"} \
+${mastodon_redis_host:+REDIS_HOST=\"${mastodon_redis_host}\"} \
+${mastodon_redis_port:+REDIS_PORT=\"${mastodon_redis_port}\"} \
 USER=mastodon"
-mastodon_stream_user="mastodon"
+mastodon_stream_user=mastodon
 
 command="%%PREFIX%%/bin/node"
 command_args="./streaming/index.js \

net-im/mastodon/files/mastodon_web.in

@@ -1,4 +1,6 @@
-#! /bin/sh
+#!/bin/sh
+
+# $FreeBSD$
 
 # PROVIDE: mastodon_web
 # REQUIRE: LOGIN postgresql nginx redis
@@ -8,28 +10,58 @@
 # Add the following line to /etc/rc.conf to enable the Mastodon web server.
 #
 #  mastodon_web_enable="YES"
+#
+# mastodon_web_concurrency:    default: 2
+# mastodon_web_loglevel:       debug or error, default: error
+# mastodon_web_port:           default: 3000
+# mastodon_web_threads:        default: 5
+#
+# The options below can be set in /etc/rc.conf.  If they are not set there, they
+# will be read from .env.production.
+#
+# mastodon_db_name:           e.g., mastodon_production
+# mastodon_db_host:           e.g., localhost
+# mastodon_db_user:           e.g., mastodon
+# mastodon_db_port:           e.g., 5432
+# mastodon_local_domain:      e.g., mastodon.mydomain.org (once set, do not change)
+# mastodon_smtp_from_address: e.g., mastodon@mydomain.org
+# mastodon_redis_host:        e.g., localhost
+# mastodon_redis_port:        e.g., 6397
+#
+
 
 . /etc/rc.subr
 
+desc="Mastodon web workers server"
 name=mastodon_web
-rcvar="${name}_enable"
+rcvar=mastodon_web_enable
 
-load_rc_config "$name"
+load_rc_config $name
 
-: ${mastodon_web_enable:="NO"}
-
-: ${mastodon_web_concurrency:="2"}
-: ${mastodon_web_loglevel:="error"}
-: ${mastodon_web_port:="3000"}
-: ${mastodon_web_threads:="5"}
+: ${mastodon_web_enable:=NO}
+: ${mastodon_web_concurrency:=2}
+: ${mastodon_web_loglevel:=error}
+: ${mastodon_web_port:=3000}
+: ${mastodon_web_threads:=5}
 
 mastodon_web_chdir="%%WWWDIR%%"
 mastodon_web_env="MAX_THREADS=\"${mastodon_web_threads}\" \
 PORT=\"${mastodon_web_port}\" \
 RAILS_ENV=production \
 RAILS_LOG_LEVEL=\"${mastodon_web_loglevel}\" \
-WEB_CONCURRENCY=\"${mastodon_web_concurrency}\""
-mastodon_web_user="mastodon"
+WEB_CONCURRENCY=\"${mastodon_web_concurrency}\" \
+${mastodon_db_url:+DATABASE_URL=\"${mastodon_db_url}\"} \
+${mastodon_db_host:+DB_HOST=\"${mastodon_db_host}\"} \
+${mastodon_db_name:+DB_NAME=\"${mastodon_db_name}\"} \
+${mastodon_db_port:+DB_PORT=\"${mastodon_db_port}\"} \
+${mastodon_db_user:+DB_USER=\"${mastodon_db_user}\"} \
+${mastodon_db_password:+DB_PASS=\"${mastodon_db_password}\"} \
+${mastodon_local_domain:+LOCAL_DOMAIN=\"${mastodon_local_domain}\"} \
+${mastodon_smtp_from_address:+SMTP_FROM_ADDRESS=\"${mastodon_smtp_from_address}\"} \
+${mastodon_redis_host:+REDIS_HOST=\"${mastodon_redis_host}\"} \
+${mastodon_redis_port:+REDIS_PORT=\"${mastodon_redis_port}\"}"
+
+mastodon_web_user=mastodon
 pidfile="%%WWWDIR%%/tmp/${name}.pid"
 procname="%%RUBY%%:"
 

net-im/mastodon/files/mastodon_workers.in

@@ -1,32 +1,62 @@
-#! /bin/sh
+#!/bin/sh
+
+# $FreeBSD$
 
 # PROVIDE: mastodon_workers
 # REQUIRE: LOGIN postgresql nginx redis
 # KEYWORD: shutdown
 
-#
-# Add the following line to /etc/rc.conf to enable the Mastodon background
+# Add the following lines to /etc/rc.conf to enable the Mastodon background
 # workers.
 #
-#  mastodon_workers_enable="YES"
+# mastodon_workers_enable="YES"
+#
+# mastodon_workers_dbpool:    default: 5
+# mastodon_workers_loglevel:  debug or error, default: error
+# mastodon_workers_threads:   default: 5
+#
+# The options below can be set in /etc/rc.conf.  If they are not set there, they
+# will be read from .env.production.
+#
+# mastodon_db_name:           e.g., mastodon_production
+# mastodon_db_host:           e.g., localhost
+# mastodon_db_user:           e.g., mastodon
+# mastodon_db_port:           e.g., 5432
+# mastodon_local_domain:      e.g., mastodon.mydomain.org (once set, do not change)
+# mastodon_smtp_from_address: e.g., mastodon@mydomain.org
+# mastodon_redis_host:        e.g., localhost
+# mastodon_redis_port:        e.g., 6397
+#
 
 . /etc/rc.subr
 
+desc="Mastodon background workers server"
 name=mastodon_workers
-rcvar="${name}_enable"
+rcvar=mastodon_workers_enable
 
-load_rc_config "$name"
+load_rc_config $name
 
-: ${mastodon_workers_enable:="NO"}
-: ${mastodon_workers_loglevel:="error"}
-: ${mastodon_workers_dbpool:="5"}
-: ${mastodon_workers_threads:="5"}
+: ${mastodon_workers_enable:=NO}
+: ${mastodon_workers_loglevel:=error}
+: ${mastodon_workers_dbpool:=5}
+: ${mastodon_workers_threads:=5}
 
 mastodon_workers_chdir="%%WWWDIR%%"
 mastodon_workers_env="DB_POOL=\"${mastodon_workers_dbpool}\" \
 RAILS_ENV=production \
-RAILS_LOG_LEVEL=\"${mastodon_workers_loglevel}\""
-mastodon_workers_user="mastodon"
+RAILS_LOG_LEVEL=\"${mastodon_workers_loglevel}\" \
+${mastodon_db_url:+DATABASE_URL=\"${mastodon_db_url}\"} \
+${mastodon_db_host:+DB_HOST=\"${mastodon_db_host}\"} \
+${mastodon_db_name:+DB_NAME=\"${mastodon_db_name}\"} \
+${mastodon_db_port:+DB_PORT=\"${mastodon_db_port}\"} \
+${mastodon_db_user:+DB_USER=\"${mastodon_db_user}\"} \
+${mastodon_db_password:+DB_PASS=\"${mastodon_db_password}\"} \
+${mastodon_local_domain:+LOCAL_DOMAIN=\"${mastodon_local_domain}\"} \
+${mastodon_smtp_from_address:+SMTP_FROM_ADDRESS=\"${mastodon_smtp_from_address}\"} \
+${mastodon_redis_host:+REDIS_HOST=\"${mastodon_redis_host}\"} \
+${mastodon_redis_port:+REDIS_PORT=\"${mastodon_redis_port}\"}"
+
+mastodon_workers_user=mastodon
 pidfile="%%WWWDIR%%/tmp/${name}.pid"
 procname="%%RUBY%%:"
 

net-im/mastodon/files/patch-.env.production.sample

@@ -1,22 +1,67 @@
---- .env.production.sample.orig	2017-05-26 12:16:04 UTC
+--- .env.production.sample.orig	2017-10-18 18:36:47 UTC
 +++ .env.production.sample
-@@ -1,11 +1,11 @@
+@@ -1,19 +1,33 @@
++# The following entries can be set in /etc/rc.conf.  The entries in /etc/rc.conf will take priority over values set here.
++# 
++# mastodon_db_name=mastodon_production
++# mastodon_db_host=localhost
++# mastodon_db_user=mastodon
++# mastodon_db_port=5432
++#
++# mastodon_local_domain=mastodon.example.com
++# mastodon_smtp_from_address=mastodon@example.com
++#
++# mastodon_redis_host=localhost
++# mastodon_redis_port=6379
++#
++
  # Service dependencies
  # You may set REDIS_URL instead for more advanced options
+ # You may also set REDIS_NAMESPACE to share Redis between multiple Mastodon servers
 -REDIS_HOST=redis
-+REDIS_HOST=localhost
- REDIS_PORT=6379
+-REDIS_PORT=6379
++# REDIS_HOST=localhost
++# REDIS_PORT=6379
  # You may set DATABASE_URL instead for more advanced options
 -DB_HOST=db
 -DB_USER=postgres
 -DB_NAME=postgres
-+DB_HOST=localhost
-+DB_USER=mastodon
-+DB_NAME=mastodon_production
- DB_PASS=
- DB_PORT=5432
+-DB_PASS=
+-DB_PORT=5432
++# DB_HOST=localhost
++# DB_USER=mastodon
++# DB_NAME=mastodon_production
++# DB_PASS=
++# DB_PORT=5432
  
-@@ -47,16 +47,16 @@ OTP_SECRET=
+ # Federation
+ # Note: Changing LOCAL_DOMAIN or LOCAL_HTTPS at a later time will cause unwanted side effects.
+ # LOCAL_DOMAIN should *NOT* contain the protocol part of the domain e.g https://example.com.
+-LOCAL_DOMAIN=example.com 
++# LOCAL_DOMAIN=mastodon.example.com 
+ LOCAL_HTTPS=true
+ 
+ # Use this only if you need to run mastodon on a different domain than the one used for federation.
+@@ -26,8 +40,7 @@ LOCAL_HTTPS=true
+ # be added. Comma separated values
+ # ALTERNATE_DOMAINS=example1.com,example2.com
+ 
+-# Application secrets
+-# Generate each with the `RAILS_ENV=production bundle exec rake secret` task (`docker-compose run --rm web rake secret` if you use docker compose)
++# Application secrets; Generate each with the `RAILS_ENV=production rake secret`
+ PAPERCLIP_SECRET=
+ SECRET_KEY_BASE=
+ OTP_SECRET=
+@@ -37,7 +50,7 @@ OTP_SECRET=
+ # You should only generate this once per instance. If you later decide to change it, all push subscription will
+ # be invalidated, requiring the users to access the website again to resubscribe.
+ #
+-# Generate with `RAILS_ENV=production bundle exec rake mastodon:webpush:generate_vapid_key` task (`docker-compose run --rm web rake mastodon:webpush:generate_vapid_key` if you use docker compose)
++# Generate with `RAILS_ENV=production rake mastodon:webpush:generate_vapid_key`
+ #
+ # For more information visit https://rossta.net/blog/using-the-web-push-api-with-vapid.html
+ VAPID_PRIVATE_KEY=
+@@ -59,18 +72,18 @@ VAPID_PUBLIC_KEY=
  # If you want to use an SMTP server without authentication (e.g local Postfix relay)
  # then set SMTP_AUTH_METHOD and SMTP_OPENSSL_VERIFY_MODE to 'none' and 
  # *comment* SMTP_LOGIN and SMTP_PASSWORD (leaving them blank is not enough).
@@ -25,18 +70,25 @@
 -SMTP_LOGIN=
 -SMTP_PASSWORD=
 -SMTP_FROM_ADDRESS=notifications@example.com
-+#SMTP_SERVER=smtp.mailgun.org
-+#SMTP_PORT=587
-+#SMTP_LOGIN=
-+#SMTP_PASSWORD=
-+SMTP_FROM_ADDRESS=mastodon@example.com
- #SMTP_DOMAIN= # defaults to LOCAL_DOMAIN
- #SMTP_DELIVERY_METHOD=smtp # delivery method can also be sendmail
+-#SMTP_DOMAIN= # defaults to LOCAL_DOMAIN
+-#SMTP_DELIVERY_METHOD=smtp # delivery method can also be sendmail
 -#SMTP_AUTH_METHOD=plain
-+SMTP_AUTH_METHOD=none
- #SMTP_CA_FILE=/etc/ssl/certs/ca-certificates.crt
+-#SMTP_CA_FILE=/etc/ssl/certs/ca-certificates.crt
 -#SMTP_OPENSSL_VERIFY_MODE=peer
+-#SMTP_ENABLE_STARTTLS_AUTO=true
+-#SMTP_TLS=true
++# SMTP_SERVER=smtp.mailgun.org
++# SMTP_PORT=587
++# SMTP_LOGIN=
++# SMTP_PASSWORD=
++# SMTP_FROM_ADDRESS=mastodon@example.com
++# SMTP_DOMAIN= # defaults to LOCAL_DOMAIN
++# SMTP_DELIVERY_METHOD=smtp # delivery method can also be sendmail
++SMTP_AUTH_METHOD=none
++# SMTP_CA_FILE=/etc/ssl/certs/ca-certificates.crt
 +SMTP_OPENSSL_VERIFY_MODE=none
- #SMTP_ENABLE_STARTTLS_AUTO=true
- 
++# SMTP_ENABLE_STARTTLS_AUTO=true
++# SMTP_TLS=true
  
+ # Optional user upload path and URL (images, avatars). Default is :rails_root/public/system. If you set this variable, you are responsible for making your HTTP server (eg. nginx) serve these files.
+ # PAPERCLIP_ROOT_PATH=/var/lib/mastodon/public-system

net-im/mastodon/files/patch-Gemfile

@@ -1,4 +1,4 @@
---- Gemfile.orig	2017-09-10 13:10:03 UTC
+--- Gemfile.orig	2017-10-13 19:06:23 UTC
 +++ Gemfile
 @@ -11,7 +11,7 @@ gem 'uglifier', '~> 3.2'
  
@@ -9,18 +9,15 @@
  gem 'dotenv-rails', '~> 2.2'
  
  gem 'aws-sdk', '~> 2.9'
-@@ -21,9 +21,8 @@ gem 'paperclip-av-transcoder', '~> 0.6'
+@@ -21,7 +21,6 @@ gem 'paperclip-av-transcoder', '~> 0.6'
  
  gem 'active_model_serializers', '~> 0.10'
  gem 'addressable', '~> 2.5'
 -gem 'bootsnap'
  gem 'browser'
--gem 'charlock_holmes', '~> 0.7.5'
-+gem 'charlock_holmes', '~> 0.7.3'
+ gem 'charlock_holmes', '~> 0.7.5'
  gem 'iso-639'
- gem 'cld3', '~> 3.1'
- gem 'devise', '~> 4.2'
-@@ -73,45 +72,6 @@ gem 'webpush'
+@@ -74,45 +73,6 @@ gem 'webpush'
  gem 'json-ld-preloaded', '~> 2.2.1'
  gem 'rdf-normalize', '~> 0.3.1'
  
@@ -53,8 +50,8 @@
 -  gem 'letter_opener', '~> 1.4'
 -  gem 'letter_opener_web', '~> 1.3'
 -  gem 'rubocop', require: false
--  gem 'brakeman', '~> 3.6', require: false
--  gem 'bundler-audit', '~> 0.5', require: false
+-  gem 'brakeman', '~> 4.0', require: false
+-  gem 'bundler-audit', '~> 0.6', require: false
 -  gem 'scss_lint', '~> 0.53', require: false
 -
 -  gem 'capistrano', '~> 3.8'

net-im/mastodon/files/patch-package.json

@@ -1,40 +1,60 @@
---- package.json.orig	2017-09-09 15:36:27 UTC
+--- package.json.orig	2017-10-17 10:02:47 UTC
 +++ package.json
-@@ -7,10 +7,9 @@
+@@ -2,15 +2,9 @@
+   "name": "mastodon",
+   "license": "AGPL-3.0",
+   "scripts": {
+-    "postversion": "git push --tags",
+-    "build:development": "cross-env RAILS_ENV=development ./bin/webpack",
      "build:production": "cross-env RAILS_ENV=production ./bin/webpack",
      "manage:translations": "node ./config/webpack/translationRunner.js",
-     "start": "node ./streaming/index.js",
--    "test": "npm run test:lint && npm run test:mocha",
-+    "test": "yarn run test:lint && yarn run test:mocha",
-     "test:lint": "eslint -c .eslintrc.yml --ext=js app/javascript/ config/webpack/ spec/javascript/ streaming/",
--    "test:mocha": "cross-env NODE_ENV=test mocha --require ./spec/javascript/setup.js --compilers js:babel-register ./spec/javascript/components/**/*.test.js",
+-    "start": "node ./streaming/index.js",
+-    "test": "npm run test:lint && npm run test:jest",
+-    "test:lint": "eslint -c .eslintrc.yml --ext=js app/javascript/ config/webpack/ spec/javascript/ streaming/",
+-    "test:jest": "cross-env NODE_ENV=test jest --coverage",
 -    "postinstall": "npm rebuild node-sass"
-+    "test:mocha": "cross-env NODE_ENV=test mocha --require ./spec/javascript/setup.js --compilers js:babel-register ./spec/javascript/components/**/*.test.js"
++    "start": "node ./streaming/index.js"
    },
    "repository": {
      "type": "git",
-@@ -117,24 +116,5 @@
+@@ -116,40 +110,5 @@
      "webpack-manifest-plugin": "^1.2.1",
      "webpack-merge": "^4.1.0",
      "websocket.js": "^0.1.12"
 -  },
 -  "devDependencies": {
 -    "babel-eslint": "^7.2.3",
--    "chai": "^4.1.0",
--    "chai-enzyme": "^0.8.0",
--    "enzyme": "^2.9.1",
+-    "enzyme": "^3.0.0",
+-    "enzyme-adapter-react-16": "^1.0.0",
 -    "eslint": "^3.19.0",
+-    "eslint-plugin-import": "^2.7.0",
 -    "eslint-plugin-jsx-a11y": "^4.0.0",
 -    "eslint-plugin-react": "^6.10.3",
--    "jsdom": "^11.1.0",
--    "mocha": "^3.4.1",
+-    "jest": "^21.2.1",
+-    "raf": "^3.4.0",
 -    "react-intl-translations-manager": "^5.0.0",
--    "react-test-renderer": "^15.6.1",
--    "sinon": "^2.3.7",
+-    "react-test-renderer": "^16.0.0",
 -    "webpack-dev-server": "^2.6.1",
 -    "yargs": "^8.0.2"
 -  },
 -  "optionalDependencies": {
 -    "fsevents": "*"
+-  },
+-  "jest": {
+-    "projects": [
+-      "<rootDir>/app/javascript/mastodon"
+-    ],
+-    "testPathIgnorePatterns": [
+-      "<rootDir>/node_modules/",
+-      "<rootDir>/vendor/",
+-      "<rootDir>/config/",
+-      "<rootDir>/log/",
+-      "<rootDir>/public/",
+-      "<rootDir>/tmp/"
+-    ],
+-    "setupFiles": [
+-      "raf/polyfill"
+-    ],
+-    "setupTestFrameworkScriptFile": "<rootDir>/app/javascript/mastodon/test_setup.js"
    }
  }

net-im/mastodon/files/patch-yarn.lock

@@ -1,68 +0,0 @@
---- yarn.lock.orig	2017-09-10 13:10:03 UTC
-+++ yarn.lock
-@@ -1289,8 +1289,6 @@ chokidar@^1.6.0, chokidar@^1.7.0:
-     is-glob "^2.0.0"
-     path-is-absolute "^1.0.0"
-     readdirp "^2.0.0"
--  optionalDependencies:
--    fsevents "^1.0.0"
- 
- cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
-   version "1.0.4"
-@@ -1442,8 +1440,6 @@ compression-webpack-plugin@^0.4.0:
-   dependencies:
-     async "0.2.x"
-     webpack-sources "^0.1.0"
--  optionalDependencies:
--    node-zopfli "^2.0.0"
- 
- compression@^1.5.2:
-   version "1.7.0"
-@@ -2646,13 +2642,6 @@ fs.realpath@^1.0.0:
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
- 
--fsevents@*, fsevents@^1.0.0:
--  version "1.1.2"
--  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.2.tgz#3282b713fb3ad80ede0e9fcf4611b5aa6fc033f4"
--  dependencies:
--    nan "^2.3.0"
--    node-pre-gyp "^0.6.36"
--
- fstream-ignore@^1.0.5:
-   version "1.0.5"
-   resolved "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105"
-@@ -4051,7 +4040,7 @@ node-forge@0.6.33:
- 
- node-gyp@^3.3.1:
-   version "3.6.2"
--  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.6.2.tgz#9bfbe54562286284838e750eac05295853fa1c60"
-+  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.6.2.tgz#04669fb2b0ce0dd24d769015dc78a07f2895e6b3"
-   dependencies:
-     fstream "^1.0.0"
-     glob "^7.0.3"
-@@ -4132,15 +4121,6 @@ node-sass@^4.5.2:
-     sass-graph "^2.1.1"
-     stdout-stream "^1.4.0"
- 
--node-zopfli@^2.0.0:
--  version "2.0.2"
--  resolved "https://registry.yarnpkg.com/node-zopfli/-/node-zopfli-2.0.2.tgz#a7a473ae92aaea85d4c68d45bbf2c944c46116b8"
--  dependencies:
--    commander "^2.8.1"
--    defaults "^1.0.2"
--    nan "^2.0.0"
--    node-pre-gyp "^0.6.4"
--
- "nopt@2 || 3":
-   version "3.0.6"
-   resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
-@@ -6581,6 +6561,8 @@ uuid@^3.0.0, uuid@^3.0.1, uuid@^3.1.0:
- uws@^8.14.0:
-   version "8.14.0"
-   resolved "https://registry.yarnpkg.com/uws/-/uws-8.14.0.tgz#acc1488d13ecb23fe2f942a7eafb06681fa91431"
-+  dependencies:
-+    node-gyp "^3.3.1"
- 
- validate-npm-package-license@^3.0.1:
-   version "3.0.1"

net-im/mastodon/pkg-message

@@ -1,5 +1,14 @@
 ############################################################
 
+Upgrading notes: Version 2.0.0 includes database migrations.
+As the mastodon user, run
+
+   % RAILS_ENV=production rails db:migrate
+
+Some options may now be set in /etc/rc.conf.  See the
+comments in the rc scripts (mastodon_web, mastodon_workers,
+and mastodon_stream) for details.
+
 Visit this URL to get started with Mastodon.
 http://ftfl.ca/blog/2017-05-23-mastodon-freebsd.html