git: 063b95551dbc - main - www/writefreely: Update to 0.13.2

From: Juraj Lutter <otis_at_FreeBSD.org>
Date: Sat, 12 Nov 2022 12:24:34 UTC
The branch main has been updated by otis:

URL: https://cgit.FreeBSD.org/ports/commit/?id=063b95551dbc76ac3a53de374a67206f3309106a

commit 063b95551dbc76ac3a53de374a67206f3309106a
Author:     Robert Clausecker <fuz@fuz.su>
AuthorDate: 2022-11-12 12:20:40 +0000
Commit:     Juraj Lutter <otis@FreeBSD.org>
CommitDate: 2022-11-12 12:24:24 +0000

    www/writefreely: Update to 0.13.2
    
    Changelog:
    https://github.com/writefreely/writefreely/releases/tag/v0.13.2
    
    PR:             267707
---
 www/writefreely/Makefile              | 56 ++++++++++++++++----------------
 www/writefreely/distinfo              | 56 ++++++++++++++++++--------------
 www/writefreely/files/patch-go.mod    | 27 ----------------
 www/writefreely/files/patch-go.sum    | 61 -----------------------------------
 www/writefreely/files/patch-gopher.go | 11 -------
 www/writefreely/files/patch-handle.go | 11 -------
 6 files changed, 58 insertions(+), 164 deletions(-)

diff --git a/www/writefreely/Makefile b/www/writefreely/Makefile
index b862a686c8ac..c95d96aac3e7 100644
--- a/www/writefreely/Makefile
+++ b/www/writefreely/Makefile
@@ -1,12 +1,9 @@
 PORTNAME=	writefreely
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.13.1
-PORTREVISION=	6
+DISTVERSION=	0.13.2
 CATEGORIES=	www textproc
-MASTER_SITES=	https://code.as/core/socks/archive/v1.0.0.tar.gz?dummy=/:core_socks \
-		https://git.mills.io/prologic/go-gopher/archive/:go_gopher
-DISTFILES=	core-socks-v1.0.0.tar.gz:core_socks \
-		b7ebb55feece2abb74a651c217db6f7ead778170.tar.gz:go_gopher
+MASTER_SITES=	https://code.as/core/socks/archive/v1.0.0.tar.gz?dummy=/:core_socks
+DISTFILES=	core-socks-v1.0.0.tar.gz:core_socks
 DIST_SUBDIR=	writeas
 
 MAINTAINER=	fuz@fuz.su
@@ -15,7 +12,7 @@ WWW=		https://writefreely.org
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
-LICENSE_DISTFILES_CC-BY-NC-SA-4.0=	writefreely-documentation-${DISTVERSIONPREFIX}${DISTVERSION}_GH0.tar.gz
+LICENSE_DISTFILES_CC-BY-NC-SA-4.0=	writefreely-documentation-v0.13.1_GH0.tar.gz
 
 BUILD_DEPENDS=	go-bindata:devel/go-bindata
 
@@ -24,25 +21,25 @@ USE_GITHUB=	yes
 GH_TUPLE=	aymerick:douceur:v0.2.0:aymerick_douceur/vendor/github.com/aymerick/douceur \
 		beevik:etree:v1.1.0:beevik_etree/vendor/github.com/beevik/etree \
 		captncraig:cors:e80254a89df1:captncraig_cors/vendor/github.com/captncraig/cors \
-		chris-ramon:douceur:v0.2.0:chris_ramon_douceur \
 		chzyer:readline:2972be24d48e:chzyer_readline/vendor/github.com/chzyer/readline \
 		clbanning:mxj:v1.8.4:clbanning_mxj/vendor/github.com/clbanning/mxj \
-		cpuguy83:go-md2man:f79a8a8ca69d:cpuguy83_go_md2man_v2/vendor/github.com/cpuguy83/go-md2man/v2 \
+		cpuguy83:go-md2man:v2.0.1:cpuguy83_go_md2man_v2/vendor/github.com/cpuguy83/go-md2man/v2 \
 		davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
 		dchest:uniuri:7aecb25e1fe5:dchest_uniuri/vendor/github.com/dchest/uniuri \
 		dustin:go-humanize:v1.0.0:dustin_go_humanize/vendor/github.com/dustin/go-humanize \
 		fatih:color:v1.10.0:fatih_color/vendor/github.com/fatih/color \
 		fatih:structs:v1.1.0:fatih_structs/vendor/github.com/fatih/structs \
 		go-fed:httpsig:0ef28562fabe:go_fed_httpsig/vendor/github.com/go-fed/httpsig \
-		go-ini:ini:v1.62.0:go_ini_ini/vendor/gopkg.in/ini.v1 \
+		go-ini:ini:v1.62.0:go_ini_ini_1/vendor/gopkg.in/ini.v1 \
+		go-ini:ini:v1.66.4:go_ini_ini/vendor/github.com/go-ini/ini \
 		go-sql-driver:mysql:v1.6.0:go_sql_driver_mysql/vendor/github.com/go-sql-driver/mysql \
 		go-test:deep:v1.0.1:go_test_deep/vendor/github.com/go-test/deep \
 		go-yaml:yaml:9f266ea9e77c:go_yaml_yaml/vendor/gopkg.in/yaml.v3 \
 		gofrs:uuid:v3.3.0:gofrs_uuid/vendor/github.com/gofrs/uuid \
 		golang:crypto:75b288015ac9:golang_crypto/vendor/golang.org/x/crypto \
-		golang:net:04defd469f4e:golang_net/vendor/golang.org/x/net \
-		golang:sys:04245dca01da:golang_sys/vendor/golang.org/x/sys \
-		golang:text:v0.3.6:golang_text/vendor/golang.org/x/text \
+		golang:net:bcab6841153b:golang_net/vendor/golang.org/x/net \
+		golang:sys:3c1f35247d10:golang_sys/vendor/golang.org/x/sys \
+		golang:text:v0.3.7:golang_text/vendor/golang.org/x/text \
 		gologme:log:v1.2.0:gologme_log/vendor/github.com/gologme/log \
 		gopherjs:gopherjs:d547d1d9531e:gopherjs_gopherjs/vendor/github.com/gopherjs/gopherjs \
 		gorilla:csrf:v1.7.0:gorilla_csrf/vendor/github.com/gorilla/csrf \
@@ -64,20 +61,23 @@ GH_TUPLE=	aymerick:douceur:v0.2.0:aymerick_douceur/vendor/github.com/aymerick/do
 		mattn:go-colorable:v0.1.8:mattn_go_colorable/vendor/github.com/mattn/go-colorable \
 		mattn:go-isatty:v0.0.12:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
 		mattn:go-sqlite3:v1.14.6:mattn_go_sqlite3/vendor/github.com/mattn/go-sqlite3 \
-		microcosm-cc:bluemonday:v1.0.5:microcosm_cc_bluemonday/vendor/github.com/microcosm-cc/bluemonday \
+		microcosm-cc:bluemonday:v1.0.21:microcosm_cc_bluemonday/vendor/github.com/microcosm-cc/bluemonday \
 		mitchellh:go-wordwrap:v1.0.1:mitchellh_go_wordwrap/vendor/github.com/mitchellh/go-wordwrap \
 		nu7hatch:gouuid:179d4d0c4d8d:nu7hatch_gouuid/vendor/github.com/nu7hatch/gouuid \
+		petermattis:goid:b0b1615b78e5:petermattis_goid/vendor/github.com/petermattis/goid \
 		pkg:errors:v0.9.1:pkg_errors/vendor/github.com/pkg/errors \
 		pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
 		rainycape:unidecode:cb7f23ec59be:rainycape_unidecode/vendor/github.com/rainycape/unidecode \
-		russross:blackfriday:v2.0.1:russross_blackfriday_v2/vendor/github.com/russross/blackfriday/v2 \
+		russross:blackfriday:v2.1.0:russross_blackfriday_v2/vendor/github.com/russross/blackfriday/v2 \
+		sasha-s:go-deadlock:v0.3.1:sasha_s_go_deadlock/vendor/github.com/sasha-s/go-deadlock \
 		shurcooL:sanitized_anchor_name:v1.0.0:shurcool_sanitized_anchor_name/vendor/github.com/shurcooL/sanitized_anchor_name \
 		smartystreets:assertions:b6c0e53d7304:smartystreets_assertions/vendor/github.com/smartystreets/assertions \
 		smartystreets:goconvey:044398e4856c:smartystreets_goconvey/vendor/github.com/smartystreets/goconvey \
 		stretchr:testify:v1.7.0:stretchr_testify/vendor/github.com/stretchr/testify \
-		urfave:cli:v2.3.0:urfave_cli_v2/vendor/github.com/urfave/cli/v2 \
+		urfave:cli:v2.5.1:urfave_cli_v2/vendor/github.com/urfave/cli/v2 \
 		writeas:activity:v0.1.2:writeas_activity/vendor/github.com/writeas/activity \
 		writeas:activityserve:d7ab3eaa4481:writeas_activityserve/vendor/github.com/writeas/activityserve \
+		writeas:go-strip-markdown:v2.0.1:writeas_go_strip_markdown/vendor/github.com/writeas/go-strip-markdown \
 		writeas:go-strip-markdown:v2.1.1:writeas_go_strip_markdown_v2/vendor/github.com/writeas/go-strip-markdown/v2 \
 		writeas:go-webfinger:v1.1.0:writeas_go_webfinger/vendor/github.com/writeas/go-webfinger \
 		writeas:go-writeas:v2.0.2:writeas_go_writeas_v2/vendor/github.com/writeas/go-writeas/v2 \
@@ -88,8 +88,10 @@ GH_TUPLE=	aymerick:douceur:v0.2.0:aymerick_douceur/vendor/github.com/aymerick/do
 		writeas:openssl-go:v1.0.0:writeas_openssl_go/vendor/github.com/writeas/openssl-go \
 		writeas:saturday:392b95a03320:writeas_saturday/vendor/github.com/writeas/saturday \
 		writeas:slug:v1.2.0:writeas_slug/vendor/github.com/writeas/slug \
-		writeas:web-core:95a3a717ed8f:writeas_web_core/vendor/github.com/writeas/web-core \
+		writeas:web-core:v1.4.1:writeas_web_core/vendor/github.com/writeas/web-core \
+		writefreely:go-gopher:40127126f83b:writefreely_go_gopher/vendor/github.com/writefreely/go-gopher \
 		writefreely:go-nodeinfo:v1.2.0:writefreely_go_nodeinfo/vendor/github.com/writefreely/go-nodeinfo
+
 USE_RC_SUBR=	writefreely
 GO_TARGET=	./cmd/writefreely
 
@@ -110,29 +112,25 @@ CSS_DIST_DISTFILES=		writefreely-css-${DISTVERSION}.tar.gz:css
 CSS_LESSC_BUILD_DEPENDS=	npm:www/npm
 CSS_LESSC_VARS=			LEGAL_PACKAGE=yes \
 				NO_PACKAGE="uses www/npm to fetch files at build time (option CSS_LESSC)"
-DOCS_GH_TUPLE=			writefreely:documentation:${DISTVERSIONPREFIX}${DISTVERSION}:docs
+DOCS_GH_TUPLE=			writefreely:documentation:v0.13.1:docs
 DOCS_VARS=			LICENSE+=CC-BY-NC-SA-4.0 \
 				LICENSE_COMB=multi
 SQLITE3_VARS=			GO_BUILDFLAGS+=-tags=sqlite
 
 post-extract:
-	@${MKDIR} ${WRKSRC}/vendor/github.com/chris-ramon
-	@${RLN} ${WRKSRC_aymerick_douceur} ${WRKSRC}/vendor/github.com/chris-ramon/douceur
 	@${MKDIR} ${WRKSRC}/vendor/code.as/core
 	@${RLN} ${WRKDIR}/socks ${WRKSRC}/vendor/code.as/core/socks
-	@${MKDIR} ${WRKSRC}/vendor/git.mills.io/prologic
-	@${RLN} ${WRKDIR}/go-gopher ${WRKSRC}/vendor/git.mills.io/prologic/go-gopher
-
-# download the lessc program with npm for rolling the writefreely-css distfile
-${WRKDIR}/npm/bin/lessc:
-		@${ECHO_MSG} "=> downloading the lessc utility with NPM"
-		${MKDIR} ${WRKDIR}/npm
-		npm -C ${WRKDIR}/npm -g install less@3.5.3
-		npm -C ${WRKDIR}/npm -g install less-plugin-clean-css
 
 pre-build:
 	cd ${WRKSRC} && go-bindata -pkg writefreely -ignore=\\.gitignore schema.sql sqlite.sql
 
+# download the lessc program with npm for rolling the writefreely-css distfile
+${WRKDIR}/npm/bin/lessc:
+	@${ECHO_MSG} "=> downloading the lessc utility with NPM"
+	${MKDIR} ${WRKDIR}/npm
+	npm -C ${WRKDIR}/npm -g install less@3.5.3
+	npm -C ${WRKDIR}/npm -g install less-plugin-clean-css
+
 # Packaging node.js applications is a PITA, so supply pre-generated CSS files as
 # a custom distfile using lessc, a node.js application.
 do-build-CSS_LESSC-on: ${WRKDIR}/npm/bin/lessc
diff --git a/www/writefreely/distinfo b/www/writefreely/distinfo
index ae0acb3bc451..4a27251b1193 100644
--- a/www/writefreely/distinfo
+++ b/www/writefreely/distinfo
@@ -1,26 +1,22 @@
-TIMESTAMP = 1626524123
+TIMESTAMP = 1668161444
 SHA256 (writeas/core-socks-v1.0.0.tar.gz) = 9d199f31b9fcaa97b4c52483f16e226fe7b40a0014b6070788f415cff29f2c32
 SIZE (writeas/core-socks-v1.0.0.tar.gz) = 11604
-SHA256 (writeas/b7ebb55feece2abb74a651c217db6f7ead778170.tar.gz) = 91667906e140a9ded2f73eabd71c6a2678b255b283ded2456ceb7fc7bed8b941
-SIZE (writeas/b7ebb55feece2abb74a651c217db6f7ead778170.tar.gz) = 4743065
-SHA256 (writeas/writefreely-css-0.13.1.tar.gz) = c690cc21a9761e6fc867138e905804cd2ed9dc10cb70e4de470bab509a409058
-SIZE (writeas/writefreely-css-0.13.1.tar.gz) = 12714
-SHA256 (writeas/writefreely-writefreely-v0.13.1_GH0.tar.gz) = f7ac0a02721bc4fb7451dd1ab3dc3c4b4f450d1d7623b3c55e6d0b1c73add43c
-SIZE (writeas/writefreely-writefreely-v0.13.1_GH0.tar.gz) = 3497792
+SHA256 (writeas/writefreely-css-0.13.2.tar.gz) = 099ad7bb876e9cef2155af71df65825cd8776beb66de523430169c2eb52adf88
+SIZE (writeas/writefreely-css-0.13.2.tar.gz) = 13276
+SHA256 (writeas/writefreely-writefreely-v0.13.2_GH0.tar.gz) = 9f927be8b9b48743d02c44720bfb5adf3f262b336f83a3b82ab7574a1d2fa5f2
+SIZE (writeas/writefreely-writefreely-v0.13.2_GH0.tar.gz) = 3499545
 SHA256 (writeas/aymerick-douceur-v0.2.0_GH0.tar.gz) = ceed015cddc99b600ccbbd6aa0ebe39063554049f70153887d3df7c21fefedbb
 SIZE (writeas/aymerick-douceur-v0.2.0_GH0.tar.gz) = 20914
 SHA256 (writeas/beevik-etree-v1.1.0_GH0.tar.gz) = d1b424a126ce5c46d8e9ba42217e7997cc992bef56d17cc39d1d91525c0dc1de
 SIZE (writeas/beevik-etree-v1.1.0_GH0.tar.gz) = 26390
 SHA256 (writeas/captncraig-cors-e80254a89df1_GH0.tar.gz) = 32bea524b6ef4a31c4ac23d8b09e8555b10e3150f55bc0370515b733a72d9999
 SIZE (writeas/captncraig-cors-e80254a89df1_GH0.tar.gz) = 5659
-SHA256 (writeas/chris-ramon-douceur-v0.2.0_GH0.tar.gz) = ceed015cddc99b600ccbbd6aa0ebe39063554049f70153887d3df7c21fefedbb
-SIZE (writeas/chris-ramon-douceur-v0.2.0_GH0.tar.gz) = 20914
 SHA256 (writeas/chzyer-readline-2972be24d48e_GH0.tar.gz) = 8f425cfb33fce61a137866c0a88117c68f49de79a61a341353fc97339c6b74da
 SIZE (writeas/chzyer-readline-2972be24d48e_GH0.tar.gz) = 36825
 SHA256 (writeas/clbanning-mxj-v1.8.4_GH0.tar.gz) = 335fa9d17855c8540eca83fd8ecacc5979570fe15be04f7c1154f0b71f2c39c7
 SIZE (writeas/clbanning-mxj-v1.8.4_GH0.tar.gz) = 1091271
-SHA256 (writeas/cpuguy83-go-md2man-f79a8a8ca69d_GH0.tar.gz) = c117a3e3741ea39016b678b24db19b1f766277bac7c1c6d721237bb159610178
-SIZE (writeas/cpuguy83-go-md2man-f79a8a8ca69d_GH0.tar.gz) = 52020
+SHA256 (writeas/cpuguy83-go-md2man-v2.0.1_GH0.tar.gz) = 889309ecf43e40d3a76d666b0259dcd71b340ea0fad003784ff3fe0b6c21990e
+SIZE (writeas/cpuguy83-go-md2man-v2.0.1_GH0.tar.gz) = 64220
 SHA256 (writeas/davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
 SIZE (writeas/davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
 SHA256 (writeas/dchest-uniuri-7aecb25e1fe5_GH0.tar.gz) = 63ac3284162c388bd259f4bb26b7892c39a4fe89daef202c5f8c619706bfb4d3
@@ -35,6 +31,8 @@ SHA256 (writeas/go-fed-httpsig-0ef28562fabe_GH0.tar.gz) = f0f3e7726a121fc374a88a
 SIZE (writeas/go-fed-httpsig-0ef28562fabe_GH0.tar.gz) = 19012
 SHA256 (writeas/go-ini-ini-v1.62.0_GH0.tar.gz) = 926ca2ff49018dc5c0991f3a790bc2083a3c52c470167d42f0f0bcd6642ff64e
 SIZE (writeas/go-ini-ini-v1.62.0_GH0.tar.gz) = 50314
+SHA256 (writeas/go-ini-ini-v1.66.4_GH0.tar.gz) = 6b64578fd951b1654ec09893ba7bf2cb8517c1a6905258aa0e5a85fff3fa3a91
+SIZE (writeas/go-ini-ini-v1.66.4_GH0.tar.gz) = 53337
 SHA256 (writeas/go-sql-driver-mysql-v1.6.0_GH0.tar.gz) = 25233aea6418ca7e2e8d83f1bf4f498ef7f79c8c0fee1dc2a8ba623372574b28
 SIZE (writeas/go-sql-driver-mysql-v1.6.0_GH0.tar.gz) = 94168
 SHA256 (writeas/go-test-deep-v1.0.1_GH0.tar.gz) = 074089c0f76c00a709a60f36ec5b3838284732441fbe312726d5b4800bbe4c54
@@ -45,12 +43,12 @@ SHA256 (writeas/gofrs-uuid-v3.3.0_GH0.tar.gz) = e9e33d86dfb753b1569414d733e8483d
 SIZE (writeas/gofrs-uuid-v3.3.0_GH0.tar.gz) = 17919
 SHA256 (writeas/golang-crypto-75b288015ac9_GH0.tar.gz) = 6e74e21bf9dfdbf0a8dac8cb205fbc3bfd8dff308a24080b9d6093a3858f0db2
 SIZE (writeas/golang-crypto-75b288015ac9_GH0.tar.gz) = 1729931
-SHA256 (writeas/golang-net-04defd469f4e_GH0.tar.gz) = 6009a6f0989341df975799276ff1c49af650d4a4ed3fd6db3501b91eb601810d
-SIZE (writeas/golang-net-04defd469f4e_GH0.tar.gz) = 1252122
-SHA256 (writeas/golang-sys-04245dca01da_GH0.tar.gz) = b90ec2bae1f7e395eb368638a6627199efdc28fa9c592a72aac0ae32351fd5d7
-SIZE (writeas/golang-sys-04245dca01da_GH0.tar.gz) = 1231301
-SHA256 (writeas/golang-text-v0.3.6_GH0.tar.gz) = f66bebcf21985b0a713d67c6c35dfc9800d3b6d00d62b83ed0ce5b2ed4cb9760
-SIZE (writeas/golang-text-v0.3.6_GH0.tar.gz) = 8351095
+SHA256 (writeas/golang-net-bcab6841153b_GH0.tar.gz) = 8f6f05718a340ef7c9191468f4a573228eb5bcfb22a1150a0d55e35a9fbf1cad
+SIZE (writeas/golang-net-bcab6841153b_GH0.tar.gz) = 1228275
+SHA256 (writeas/golang-sys-3c1f35247d10_GH0.tar.gz) = 27fdc75cc74da979f59142f1f5a1f08505c55918a0d5019ed4ebb04901834842
+SIZE (writeas/golang-sys-3c1f35247d10_GH0.tar.gz) = 1336787
+SHA256 (writeas/golang-text-v0.3.7_GH0.tar.gz) = 7cab2f6c3133ac1d422edd952b0dd2082fa55a73c2663fb2defd9bf83d649b26
+SIZE (writeas/golang-text-v0.3.7_GH0.tar.gz) = 8354718
 SHA256 (writeas/gologme-log-v1.2.0_GH0.tar.gz) = 06b94718ea898c01c176a8915ccd119d511ee41de388611d8e9afeb1a17bfff6
 SIZE (writeas/gologme-log-v1.2.0_GH0.tar.gz) = 5610
 SHA256 (writeas/gopherjs-gopherjs-d547d1d9531e_GH0.tar.gz) = 9f24adce5539b96eaeae86b6b6b34c3b5d4b54b5552779f1919d583ef2045378
@@ -93,20 +91,24 @@ SHA256 (writeas/mattn-go-isatty-v0.0.12_GH0.tar.gz) = addbdc341d7685ed4cc8d2d8a8
 SIZE (writeas/mattn-go-isatty-v0.0.12_GH0.tar.gz) = 4548
 SHA256 (writeas/mattn-go-sqlite3-v1.14.6_GH0.tar.gz) = c92f80d9d5c16e305955cb5a6885a8d931926e9b489857560364148fd225b690
 SIZE (writeas/mattn-go-sqlite3-v1.14.6_GH0.tar.gz) = 2367133
-SHA256 (writeas/microcosm-cc-bluemonday-v1.0.5_GH0.tar.gz) = f843f1351d6c46e605e9037eecca3ddbe1b61d7363495141b2f4eef553085a24
-SIZE (writeas/microcosm-cc-bluemonday-v1.0.5_GH0.tar.gz) = 160661
+SHA256 (writeas/microcosm-cc-bluemonday-v1.0.21_GH0.tar.gz) = 59b3d324ad7996361cb64cb6f3ed0c91936de7efd62477580691fe4b7529206a
+SIZE (writeas/microcosm-cc-bluemonday-v1.0.21_GH0.tar.gz) = 171200
 SHA256 (writeas/mitchellh-go-wordwrap-v1.0.1_GH0.tar.gz) = 56dc8d3883c765d9791a3698a55c66935b2978ac60e0e3c7c8799b182dd22bb5
 SIZE (writeas/mitchellh-go-wordwrap-v1.0.1_GH0.tar.gz) = 2921
 SHA256 (writeas/nu7hatch-gouuid-179d4d0c4d8d_GH0.tar.gz) = 2ead616e5bb23c0c669a1485cb45f083d8d6752acc5faa5f668521b7e99ec2e1
 SIZE (writeas/nu7hatch-gouuid-179d4d0c4d8d_GH0.tar.gz) = 3733
+SHA256 (writeas/petermattis-goid-b0b1615b78e5_GH0.tar.gz) = 6eb93a6342c9289445892b9667b0a7ada5066a4fcf785a030672339076997a26
+SIZE (writeas/petermattis-goid-b0b1615b78e5_GH0.tar.gz) = 6807
 SHA256 (writeas/pkg-errors-v0.9.1_GH0.tar.gz) = 56bfd893023daa498508bfe161de1be83299fcf15376035e7df79cbd7d6fa608
 SIZE (writeas/pkg-errors-v0.9.1_GH0.tar.gz) = 13415
 SHA256 (writeas/pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda
 SIZE (writeas/pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398
 SHA256 (writeas/rainycape-unidecode-cb7f23ec59be_GH0.tar.gz) = cd66a7ee66c8061c2d05585058323d0bcc6692761db94885511762428acfef96
 SIZE (writeas/rainycape-unidecode-cb7f23ec59be_GH0.tar.gz) = 387823
-SHA256 (writeas/russross-blackfriday-v2.0.1_GH0.tar.gz) = 5a0f38a36b6f3b2d59b72d713451a895a4d3a4406b3533882483782e37797cff
-SIZE (writeas/russross-blackfriday-v2.0.1_GH0.tar.gz) = 79613
+SHA256 (writeas/russross-blackfriday-v2.1.0_GH0.tar.gz) = a13af0fc5305713f5154693feaf654d024689efea76390091a5e8c757335b4f4
+SIZE (writeas/russross-blackfriday-v2.1.0_GH0.tar.gz) = 92896
+SHA256 (writeas/sasha-s-go-deadlock-v0.3.1_GH0.tar.gz) = 01e1337af3e232dc1c9b80b986dcad14035316c9542fd29b8ac960b552746315
+SIZE (writeas/sasha-s-go-deadlock-v0.3.1_GH0.tar.gz) = 11580
 SHA256 (writeas/shurcooL-sanitized_anchor_name-v1.0.0_GH0.tar.gz) = 7e11964980f9b8595c17bc8970f0174621afe464920e38df7f8d77e45058388f
 SIZE (writeas/shurcooL-sanitized_anchor_name-v1.0.0_GH0.tar.gz) = 2143
 SHA256 (writeas/smartystreets-assertions-b6c0e53d7304_GH0.tar.gz) = eb3a9cad97b20a01dd2bfafd7baab237bec8804f325b44d041d1db0e5bc519eb
@@ -115,12 +117,14 @@ SHA256 (writeas/smartystreets-goconvey-044398e4856c_GH0.tar.gz) = 097f2f702e5dfe
 SIZE (writeas/smartystreets-goconvey-044398e4856c_GH0.tar.gz) = 1477095
 SHA256 (writeas/stretchr-testify-v1.7.0_GH0.tar.gz) = 560c0984072cb436b17bbce5699b205d5aa2beb58ef7a94530d7724b5739a8d6
 SIZE (writeas/stretchr-testify-v1.7.0_GH0.tar.gz) = 91073
-SHA256 (writeas/urfave-cli-v2.3.0_GH0.tar.gz) = b17376246f1477157daab86d4a1562d6b004f5be0d15dfc61ebd8bb129384e6b
-SIZE (writeas/urfave-cli-v2.3.0_GH0.tar.gz) = 3408283
+SHA256 (writeas/urfave-cli-v2.5.1_GH0.tar.gz) = d74543c8f78c9df9e53ac66a539d51b4d51b395835935fdbf1fb0d12ca150c9c
+SIZE (writeas/urfave-cli-v2.5.1_GH0.tar.gz) = 3414127
 SHA256 (writeas/writeas-activity-v0.1.2_GH0.tar.gz) = 9dc8d2dc255d779160bdaa557eb079b478f5eec892fed0572e16bfbbea736b57
 SIZE (writeas/writeas-activity-v0.1.2_GH0.tar.gz) = 2654174
 SHA256 (writeas/writeas-activityserve-d7ab3eaa4481_GH0.tar.gz) = 69cf6de86f3c00185dc63ac140155aa940b3d16dc3d5d2df1e0f48f9bae139c4
 SIZE (writeas/writeas-activityserve-d7ab3eaa4481_GH0.tar.gz) = 17398
+SHA256 (writeas/writeas-go-strip-markdown-v2.0.1_GH0.tar.gz) = f556dac36b74f95f9d48d9e00db3311faf8cdfacffb8170c80b35e3827858d16
+SIZE (writeas/writeas-go-strip-markdown-v2.0.1_GH0.tar.gz) = 3278
 SHA256 (writeas/writeas-go-strip-markdown-v2.1.1_GH0.tar.gz) = 5bb5017dd0a5081f9b7a7ceebf266cacfbf071a23f90696c9ccc08203c8922e7
 SIZE (writeas/writeas-go-strip-markdown-v2.1.1_GH0.tar.gz) = 3434
 SHA256 (writeas/writeas-go-webfinger-v1.1.0_GH0.tar.gz) = 41011524c9f8916515df7bc64591e68b022b0515a93d72b0278f4ccffc731159
@@ -141,8 +145,10 @@ SHA256 (writeas/writeas-saturday-392b95a03320_GH0.tar.gz) = 456355f38c3293a61a21
 SIZE (writeas/writeas-saturday-392b95a03320_GH0.tar.gz) = 72780
 SHA256 (writeas/writeas-slug-v1.2.0_GH0.tar.gz) = db766bf635a326b8c56d717e59457d8bae06c6b805d65578c87ebfb47f52fc0d
 SIZE (writeas/writeas-slug-v1.2.0_GH0.tar.gz) = 11624
-SHA256 (writeas/writeas-web-core-95a3a717ed8f_GH0.tar.gz) = cbb9765162265e7c926e58b43a8f7a6cb38773d5520f828ad2eceaa76e9276cd
-SIZE (writeas/writeas-web-core-95a3a717ed8f_GH0.tar.gz) = 36105
+SHA256 (writeas/writeas-web-core-v1.4.1_GH0.tar.gz) = 99bb380e83809bb3def2fb26f9ed386f3d36e3442f6f3f009a9b2ca687a46442
+SIZE (writeas/writeas-web-core-v1.4.1_GH0.tar.gz) = 43983
+SHA256 (writeas/writefreely-go-gopher-40127126f83b_GH0.tar.gz) = 5a9b5a88e347fdeb4079a22be6702d7a91c40dceaa68d7ef37f0fae783c5c1ed
+SIZE (writeas/writefreely-go-gopher-40127126f83b_GH0.tar.gz) = 20246
 SHA256 (writeas/writefreely-go-nodeinfo-v1.2.0_GH0.tar.gz) = bcf74cbb4ff56cab570b0f20d8cf3ce6c711c0e912051e2c20c82c2488d62dde
 SIZE (writeas/writefreely-go-nodeinfo-v1.2.0_GH0.tar.gz) = 3560
 SHA256 (writeas/writefreely-documentation-v0.13.1_GH0.tar.gz) = 071263600c4aeba84f12a5794eb7c59f70b3bee6f1a7d0757ab0f50c3cc25f38
diff --git a/www/writefreely/files/patch-go.mod b/www/writefreely/files/patch-go.mod
deleted file mode 100644
index c815b0d209d7..000000000000
--- a/www/writefreely/files/patch-go.mod
+++ /dev/null
@@ -1,27 +0,0 @@
---- go.mod.orig	2021-06-30 17:17:02 UTC
-+++ go.mod
-@@ -1,6 +1,7 @@
- module github.com/writefreely/writefreely
- 
- require (
-+	git.mills.io/prologic/go-gopher v0.0.0-20210712135410-b7ebb55feece
- 	github.com/clbanning/mxj v1.8.4 // indirect
- 	github.com/dustin/go-humanize v1.0.0
- 	github.com/fatih/color v1.10.0
-@@ -23,7 +24,6 @@ require (
- 	github.com/microcosm-cc/bluemonday v1.0.5
- 	github.com/mitchellh/go-wordwrap v1.0.1
- 	github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d
--	github.com/prologic/go-gopher v0.0.0-20200721020712-3e11dcff0469
- 	github.com/rainycape/unidecode v0.0.0-20150907023854-cb7f23ec59be // indirect
- 	github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304 // indirect
- 	github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c // indirect
-@@ -42,7 +42,7 @@ require (
- 	github.com/writeas/web-core v1.3.1-0.20210330164422-95a3a717ed8f
- 	github.com/writefreely/go-nodeinfo v1.2.0
- 	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
--	golang.org/x/net v0.0.0-20200707034311-ab3426394381
-+	golang.org/x/net v0.0.0-20210614182718-04defd469f4e
- 	gopkg.in/ini.v1 v1.62.0
- )
- 
diff --git a/www/writefreely/files/patch-go.sum b/www/writefreely/files/patch-go.sum
deleted file mode 100644
index 0eaa9f5e64c5..000000000000
--- a/www/writefreely/files/patch-go.sum
+++ /dev/null
@@ -1,61 +0,0 @@
---- go.sum.orig	2021-07-12 09:24:15 UTC
-+++ go.sum
-@@ -1,5 +1,7 @@
- code.as/core/socks v1.0.0 h1:SPQXNp4SbEwjOAP9VzUahLHak8SDqy5n+9cm9tpjZOs=
- code.as/core/socks v1.0.0/go.mod h1:BAXBy5O9s2gmw6UxLqNJcVbWY7C/UPs+801CcSsfWOY=
-+git.mills.io/prologic/go-gopher v0.0.0-20210712135410-b7ebb55feece h1:0esmnntqeuM1iBgHH0HOeSynsLA1l28p2K3h/WZuIfQ=
-+git.mills.io/prologic/go-gopher v0.0.0-20210712135410-b7ebb55feece/go.mod h1:EMXlYOIbYJQhPTtIltgaaHtCYDawV/HL0dYf8ShzAck=
- github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
- github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
- github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
-@@ -99,14 +101,10 @@ github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TC
- github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0=
- github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d h1:VhgPp6v9qf9Agr/56bj7Y/xa04UccTW04VP0Qed4vnQ=
- github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod h1:YUTz3bUH2ZwIWBy3CJBeOBEugqcmXREj14T+iG/4k4U=
--github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
--github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
- github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
- github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
- github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
- github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
--github.com/prologic/go-gopher v0.0.0-20200721020712-3e11dcff0469 h1:rAbv2gekFbUcjhUkruwo0vMJ0JqhUgg9tz7t+bxHbN4=
--github.com/prologic/go-gopher v0.0.0-20200721020712-3e11dcff0469/go.mod h1:c61IFFAJw8ADWu54tti30Tj5VrBstVoTprmET35UEkY=
- github.com/rainycape/unidecode v0.0.0-20150907023854-cb7f23ec59be h1:ta7tUOvsPHVHGom5hKW5VXNc2xZIkfCKP8iaqOyYtUQ=
- github.com/rainycape/unidecode v0.0.0-20150907023854-cb7f23ec59be/go.mod h1:MIDFMn7db1kT65GmV94GzpX9Qdi7N/pQlwb+AN8wh+Q=
- github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q=
-@@ -118,7 +116,6 @@ github.com/smartystreets/assertions v0.0.0-20190116191
- github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c h1:Ho+uVpkel/udgjbwB5Lktg9BtvJSh2DT0Hi6LPSyI2w=
- github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s=
- github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
--github.com/stretchr/testify v1.6.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
- github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
- github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
- github.com/urfave/cli/v2 v2.3.0 h1:qph92Y649prgesehzOrQjdWyxFOp/QVM+6imKHad91M=
-@@ -162,18 +159,22 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
- golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
- golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
- golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
--golang.org/x/net v0.0.0-20200707034311-ab3426394381 h1:VXak5I6aEWmAXeQjA+QSZzlgNrpq9mjcfDemuexIKsU=
--golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-+golang.org/x/net v0.0.0-20210614182718-04defd469f4e h1:XpT3nA5TvE525Ne3hInMh6+GETgn27Zfm9dxsThnX2Q=
-+golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
- golang.org/x/sys v0.0.0-20180525142821-c11f84a56e43/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
- golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
- golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
- golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
- golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
- golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
--golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd h1:xhmwyvizuTgC2qz7ZlMluP20uW+C3Rm0FD/WLDX8884=
--golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
--golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
-+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-+golang.org/x/sys v0.0.0-20210423082822-04245dca01da h1:b3NXsE2LusjYGGjL5bxEVZZORm/YEFFrWFjR8eFrw/c=
-+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
- golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-+golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
-+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
- gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
- gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
- gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
diff --git a/www/writefreely/files/patch-gopher.go b/www/writefreely/files/patch-gopher.go
deleted file mode 100644
index 6f07a2f894b6..000000000000
--- a/www/writefreely/files/patch-gopher.go
+++ /dev/null
@@ -1,11 +0,0 @@
---- gopher.go.orig	2021-07-12 09:15:24 UTC
-+++ gopher.go
-@@ -18,7 +18,7 @@ import (
- 	"regexp"
- 	"strings"
- 
--	"github.com/prologic/go-gopher"
-+	"git.mills.io/prologic/go-gopher"
- 	"github.com/writeas/web-core/log"
- )
- 
diff --git a/www/writefreely/files/patch-handle.go b/www/writefreely/files/patch-handle.go
deleted file mode 100644
index 4ce439c9825d..000000000000
--- a/www/writefreely/files/patch-handle.go
+++ /dev/null
@@ -1,11 +0,0 @@
---- handle.go.orig	2021-07-12 09:17:18 UTC
-+++ handle.go
-@@ -21,7 +21,7 @@ import (
- 	"time"
- 
- 	"github.com/gorilla/sessions"
--	"github.com/prologic/go-gopher"
-+	"git.mills.io/prologic/go-gopher"
- 	"github.com/writeas/impart"
- 	"github.com/writeas/web-core/log"
- 	"github.com/writefreely/writefreely/config"