From nobody Mon Jan 30 09:57:36 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 4P53Wh41y4z3c69d; Mon, 30 Jan 2023 09:57:36 +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 4P53Wh24Lnz3qML; Mon, 30 Jan 2023 09:57:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675072656; 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=jyM16ZYQ/r+9adMtnV351KOwdv/NUo+txcg02tnAXTM=; b=MuTnf1jznoitMmiNagCaHue5Y8hPVVlVWH/C5O1qyzjPFgV4D+Q3DICjCBwFpmBGu22D04 mk6iVXM6v12S+dgJcxOex2Y42j6aLPSKvQ8OKraov1n0Rhk4JHsqk+X9ykUm5hmmZOhkQw uzE/sVx5EiAoaV7YTenrRtjCLfsNe5Nl4fcRQAXavjqhKtKSTEJgiFRvhPwqLdhAchtvTo aW21rE0SK3TWej4aofypYScz+XOIcGfHEqf/cHBGY3eVEWGCD7WYWNIg0wfQYZzMc0hxEo WE1fQBxnzsNBHUo/vU1vcBbTYt2UIBZLn0LDagnHiFbRHFnainQBggSU8+bQDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675072656; 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=jyM16ZYQ/r+9adMtnV351KOwdv/NUo+txcg02tnAXTM=; b=OND8IlYTwanzoJU9qxnPP7c7VsiEEFsIkr0kO6BPkqPilrkda6vRHQcwVZ5bpEv7ILX68f 6er/cuRD/xDhXvwG8eZPLxn/LpVC/6yKXaGHy5pPsoHMitwKdutmfaGlWW5pqaM8VfCfWZ Kci8iyy13xMBkBhzP0hOcCm+/XmhT4tTClHk9rxaOVnZVETJhtL2k4lhKXW/5PFe6D1H4j wIEBG2uLClo+lhJER37NfRHAb5/4FasF9LaQRQ6ZnN+dOlR0dHx8pz2S1F46865u04S6BP JDDgixOW0DPa9zcCmI9M6do+HvufsVD0uTkecs8WLacFhGGS4Qq9TIuIs8sKSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675072656; a=rsa-sha256; cv=none; b=lFpBpurdwGIX5QDnmhSH0tt089cTi7dOaS8TzpbCVq+wJmJhM5MzqwByYIwIjvVrhWcHI4 h4yBjohqKKotNkMHn4IS8RmkAdnxayGrau+BtTyhas8lZi9QRpftXNO/iD4K7hHNjh/3KJ ToJwme0FiRwitnaiQa+aRO6Gl0puQGwUjcnRzaxvRl+bqsV+ADkEH5iT1Zyg+nW66XC3pT KHVKe0ahyZpwDoE9ekRqzKV68DNUGAzBfOKL+JGw9p9V0mSbl2/TH1XHjVI+lg1uA7N15M EYdAmWs8FX2CFc+G0JQKXobbZpu2My/wQ9h70P/BGUE5m4oY1CYHZPbyKqJvHA== 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 4P53Wh19ZYz13vq; Mon, 30 Jan 2023 09:57:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30U9va8x073105; Mon, 30 Jan 2023 09:57:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30U9va2s073104; Mon, 30 Jan 2023 09:57:36 GMT (envelope-from git) Date: Mon, 30 Jan 2023 09:57:36 GMT Message-Id: <202301300957.30U9va2s073104@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: 7625d4e4e5dd - main - www/writefreely: Pick patch to fix segmentation fault 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: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7625d4e4e5dd24a06c7d946d7b4328c8f17410bb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=7625d4e4e5dd24a06c7d946d7b4328c8f17410bb commit 7625d4e4e5dd24a06c7d946d7b4328c8f17410bb Author: Robert Clausecker AuthorDate: 2023-01-30 08:41:05 +0000 Commit: Fernando Apesteguía CommitDate: 2023-01-30 09:53:14 +0000 www/writefreely: Pick patch to fix segmentation fault Selectively picking patch from upstream to fix a segmentation fault. Adding sample configuration to workaround the problem. PR: 268809 Reported by: trash@nazileaks.eu --- www/writefreely/Makefile | 12 ++++++++++-- www/writefreely/distinfo | 4 +++- www/writefreely/files/config.ini.sample.in | 10 ++++++++++ www/writefreely/pkg-plist | 1 + 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/www/writefreely/Makefile b/www/writefreely/Makefile index 1ec485a85931..796b04652d48 100644 --- a/www/writefreely/Makefile +++ b/www/writefreely/Makefile @@ -1,11 +1,18 @@ PORTNAME= writefreely DISTVERSIONPREFIX= v DISTVERSION= 0.13.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www textproc 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 + +PATCH_SITES= https://github.com/writefreely/writefreely/commit/ +PATCHFILES= 99d72881cf833326f02d86a8896bbd2b8156327b.diff:-p1 + + MAINTAINER= fuz@fuz.su + COMMENT= Clean, Markdown-based publishing platform made for writers + WWW= https://writefreely.org MAINTAINER= fuz@fuz.su COMMENT= Clean, Markdown-based publishing platform made for writers @@ -96,7 +103,7 @@ GH_TUPLE= aymerick:douceur:v0.2.0:aymerick_douceur/vendor/github.com/aymerick/do USE_RC_SUBR= writefreely GO_TARGET= ./cmd/writefreely -SUB_FILES= pkg-message +SUB_FILES= config.ini.sample pkg-message USERS= writefreely GROUPS= writefreely @@ -149,6 +156,7 @@ do-install-DOCS-on: post-install: ${MKDIR} ${STAGEDIR}${WWWDIR}/keys + ${INSTALL_DATA} ${WRKDIR}/config.ini.sample ${STAGEDIR}${WWWDIR} cd ${WRKSRC} && ${COPYTREE_SHARE} pages ${STAGEDIR}${WWWDIR} cd ${WRKSRC} && ${COPYTREE_SHARE} static ${STAGEDIR}${WWWDIR} ${INSTALL_DATA} ${WRKDIR}/css/*.css ${STAGEDIR}${WWWDIR}/static/css/ diff --git a/www/writefreely/distinfo b/www/writefreely/distinfo index 4a27251b1193..e445b7794739 100644 --- a/www/writefreely/distinfo +++ b/www/writefreely/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1668161444 +TIMESTAMP = 1674562387 SHA256 (writeas/core-socks-v1.0.0.tar.gz) = 9d199f31b9fcaa97b4c52483f16e226fe7b40a0014b6070788f415cff29f2c32 SIZE (writeas/core-socks-v1.0.0.tar.gz) = 11604 SHA256 (writeas/writefreely-css-0.13.2.tar.gz) = 099ad7bb876e9cef2155af71df65825cd8776beb66de523430169c2eb52adf88 @@ -153,3 +153,5 @@ SHA256 (writeas/writefreely-go-nodeinfo-v1.2.0_GH0.tar.gz) = bcf74cbb4ff56cab570 SIZE (writeas/writefreely-go-nodeinfo-v1.2.0_GH0.tar.gz) = 3560 SHA256 (writeas/writefreely-documentation-v0.13.1_GH0.tar.gz) = 071263600c4aeba84f12a5794eb7c59f70b3bee6f1a7d0757ab0f50c3cc25f38 SIZE (writeas/writefreely-documentation-v0.13.1_GH0.tar.gz) = 19082 +SHA256 (writeas/99d72881cf833326f02d86a8896bbd2b8156327b.diff) = eaa803e2e34323e8e6ea90ec666b3769330fd8baf0a6f444b2275a8352f58b26 +SIZE (writeas/99d72881cf833326f02d86a8896bbd2b8156327b.diff) = 2580 diff --git a/www/writefreely/files/config.ini.sample.in b/www/writefreely/files/config.ini.sample.in new file mode 100644 index 000000000000..a154708a2b65 --- /dev/null +++ b/www/writefreely/files/config.ini.sample.in @@ -0,0 +1,10 @@ +; Preliminary configuration file. Run +; +; %%PREFIX%%/etc/rc.d/writefreely setup +; +; to set up writefreely. +[server] +templates_parent_dir = %%WWWDIR%% +static_parent_dir = %%WWWDIR%% +pages_parent_dir = %%WWWDIR%% +keys_parent_dir = %%WWWDIR%% diff --git a/www/writefreely/pkg-plist b/www/writefreely/pkg-plist index ace00809ad18..189cb8349328 100644 --- a/www/writefreely/pkg-plist +++ b/www/writefreely/pkg-plist @@ -21,6 +21,7 @@ bin/writefreely %%PORTDOCS%%%%DOCSDIR%%/writer/static.md %%PORTDOCS%%%%DOCSDIR%%/writer/writing.md @dir(writefreely,writefreely,) %%WWWDIR%% +@sample(writefreely,writefreely,) %%WWWDIR%%/config.ini.sample %%WWWDIR%%/pages/404-general.tmpl %%WWWDIR%%/pages/404.tmpl %%WWWDIR%%/pages/410.tmpl